diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile index 4ad0d1170861..65e59dd1e63a 100644 --- a/math/freefem++/Makefile +++ b/math/freefem++/Makefile @@ -1,75 +1,74 @@ PORTNAME= freefem++ DISTVERSIONPREFIX= v -DISTVERSION= 4.12 -PORTREVISION= 1 +DISTVERSION= 4.13 CATEGORIES= math science MAINTAINER= yuri@FreeBSD.org COMMENT= Partial differential equation solver WWW= https://freefem.org/index.html LICENSE= LGPL3 BUILD_DEPENDS= bash:shells/bash \ gmm++>0:math/gmm++ \ pipe:misc/pipe \ tetgen:math/tetgen LIB_DEPENDS= libhdf5.so:science/hdf5 \ libamd.so:math/suitesparse-amd \ libcholmod.so:math/suitesparse-cholmod \ libcolamd.so:math/suitesparse-colamd \ libumfpack.so:math/suitesparse-umfpack \ libarpack.so:math/arpack-ng \ libfftw3.so:math/fftw3 \ libgsl.so:math/gsl \ libipopt.so:math/ipopt \ libmetis.so:math/metis \ libscotch.so:cad/scotch \ libcmumps.so:math/mumps \ libnlopt.so:math/nlopt \ libsuperlu.so:math/superlu \ libsz.so:science/libaec RUN_DEPENDS= bash:shells/bash \ pipe:misc/pipe USES= autoreconf bison blaslapack:openblas compiler:c++14-lang fortran \ gl gmake localbase perl5 pkgconfig shebangfix xorg USE_GITHUB= yes GH_ACCOUNT= FreeFem GH_PROJECT= FreeFem-sources SHEBANG_GLOB= ff-pkg-download.in SHEBANG_FILES= examples/CheckAllEdp ./examples/misc/speedtest.sh CPPFLAGS+= -I${LOCALBASE}/include/superlu .if !defined{WITH_DEBUG} LDFLAGS+= -s .endif GNU_CONFIGURE= yes CONFIGURE_ENV= CNOFLAGS="${CFLAGS}" LIBS=-lz CONFIGURE_ARGS= --disable-download \ --without-mpi \ --with-blas=${BLASLIB} \ --with-lapack=${LAPACKLIB} USE_GL= gl glu glut OPTIONS_DEFINE= EXAMPLES OPTIONS_DEFAULT=EXAMPLES PORTEXAMPLES= * PLIST_SUB= VER=${PORTVERSION} DATADIR= ${PREFIX}/share/FreeFEM/${PORTVERSION} -TEST_TARGET= check +TEST_TARGET= check # 1 test fails, see https://github.com/FreeFem/FreeFem-sources/issues/281 pre-configure: @${REINPLACE_CMD} -e 's|-llapack|${LAPACKLIB}|' ${WRKSRC}/configure.ac post-install: @${MV} ${STAGEDIR}${DATADIR}/examples ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/math/freefem++/distinfo b/math/freefem++/distinfo index 4dcc703bb3e3..c36323c140a4 100644 --- a/math/freefem++/distinfo +++ b/math/freefem++/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680064481 -SHA256 (FreeFem-FreeFem-sources-v4.12_GH0.tar.gz) = 291c5f46761711d6303914f9c4f165fd85a7b7b69141f7473e0b6484ce6ab0f5 -SIZE (FreeFem-FreeFem-sources-v4.12_GH0.tar.gz) = 12885961 +TIMESTAMP = 1687080379 +SHA256 (FreeFem-FreeFem-sources-v4.13_GH0.tar.gz) = d296adc42c6b0cc5f148c44b00bea15939d6c0dbe391613dea8a0693c2c0e3b7 +SIZE (FreeFem-FreeFem-sources-v4.13_GH0.tar.gz) = 12966789 diff --git a/math/freefem++/files/patch-plugin_seq_metis.cpp b/math/freefem++/files/patch-plugin_seq_metis.cpp new file mode 100644 index 000000000000..c9c1bc9f8915 --- /dev/null +++ b/math/freefem++/files/patch-plugin_seq_metis.cpp @@ -0,0 +1,31 @@ +- from https://github.com/FreeFem/FreeFem-sources/issues/280#issuecomment-1596025016 + +--- plugin/seq/metis.cpp.orig 2023-06-18 09:28:12 UTC ++++ plugin/seq/metis.cpp +@@ -97,7 +97,7 @@ KN< R > *partmetis( KN< R > *const &part, FESPACE *con + } + + #endif +- } else epart = 0; ++ } else epart = static_cast(0); + part->resize(nv); + *part = npart; + return part; +@@ -154,7 +154,7 @@ KN< R > *partmetis(Stack s, KN< R > *const &part, Mesh + } + + #endif +- } else epart = 0; ++ } else epart = static_cast(0); + part->resize(nt); + *part = epart; + return part; +@@ -184,7 +184,7 @@ KN< long > *partmetisd(Stack s, KN< long > *const &par + printf(" %d-way Edge-Cut: %7d, Balance: %5.2f\n", nparts, nve, + ComputeElementBalance(nt, nparts, epart)); + #endif +- } else epart = 0; ++ } else epart = static_cast(0); + part->resize(nt); + *part = epart; + return part; diff --git a/math/freefem++/pkg-plist b/math/freefem++/pkg-plist index fe0640e43e90..f78e5d12e8ef 100644 --- a/math/freefem++/pkg-plist +++ b/math/freefem++/pkg-plist @@ -1,244 +1,247 @@ bin/FreeFem++ bin/FreeFem++-nw bin/bamg bin/cvmsh2 bin/ff-c++ bin/ff-get-dep bin/ff-pkg-download bin/ffglut bin/ffmaster bin/ffmedit lib/ff++/%%VER%%/bin/ff-get-dep lib/ff++/%%VER%%/bin/ff-pkg-download lib/ff++/%%VER%%/%%ETCDIR%%.pref lib/ff++/%%VER%%/idp/CC.idp lib/ff++/%%VER%%/idp/DDM-Schwarz-macro.idp lib/ff++/%%VER%%/idp/DDM-funcs-v2.idp lib/ff++/%%VER%%/idp/ElasticLaw2d.idp lib/ff++/%%VER%%/idp/ExtractDofsonBorder.idp lib/ff++/%%VER%%/idp/Heat3d.idp lib/ff++/%%VER%%/idp/MPIGMRESmacro.idp lib/ff++/%%VER%%/idp/MPIplot.idp lib/ff++/%%VER%%/idp/MeshSurface.idp lib/ff++/%%VER%%/idp/ball-buildlayer.idp +lib/ff++/%%VER%%/idp/buildmeshS.idp lib/ff++/%%VER%%/idp/cobrameshcavity.idp lib/ff++/%%VER%%/idp/cube.idp lib/ff++/%%VER%%/idp/ffddm.idp lib/ff++/%%VER%%/idp/ffddm_coarsemeshCS.idp lib/ff++/%%VER%%/idp/ffddm_functions.idp lib/ff++/%%VER%%/idp/ffddm_geneoCS.idp lib/ff++/%%VER%%/idp/ffddm_geneoCS_3rdlvl.idp lib/ff++/%%VER%%/idp/ffddm_geneoCS_saddlepoint.idp lib/ff++/%%VER%%/idp/ffddm_parameters.idp lib/ff++/%%VER%%/idp/ffddm_partitioning.idp lib/ff++/%%VER%%/idp/func-max.idp lib/ff++/%%VER%%/idp/getARGV.idp lib/ff++/%%VER%%/idp/gsl.idp lib/ff++/%%VER%%/idp/macro_ddm.idp lib/ff++/%%VER%%/idp/macro_ddm_substructuring.idp lib/ff++/%%VER%%/idp/mortar-msh.idp lib/ff++/%%VER%%/idp/movemeshsmooth.idp lib/ff++/%%VER%%/include/AFunction.hpp lib/ff++/%%VER%%/include/AFunction_ext.hpp lib/ff++/%%VER%%/include/AddNewFE.h lib/ff++/%%VER%%/include/AnyType.hpp lib/ff++/%%VER%%/include/BFGS.hpp lib/ff++/%%VER%%/include/BamgFreeFem.hpp lib/ff++/%%VER%%/include/BrentLS.hpp lib/ff++/%%VER%%/include/CG.hpp lib/ff++/%%VER%%/include/CGNL.hpp lib/ff++/%%VER%%/include/CodeAlloc.hpp lib/ff++/%%VER%%/include/CubicLS.hpp lib/ff++/%%VER%%/include/DOperator.hpp lib/ff++/%%VER%%/include/DataFindBoundary.hpp lib/ff++/%%VER%%/include/FESpace.hpp lib/ff++/%%VER%%/include/FESpacen.hpp lib/ff++/%%VER%%/include/FQuadTree.hpp lib/ff++/%%VER%%/include/GQuadTree.hpp lib/ff++/%%VER%%/include/GenericMesh.hpp lib/ff++/%%VER%%/include/HashMatrix.hpp lib/ff++/%%VER%%/include/HashTable.hpp lib/ff++/%%VER%%/include/HeapSort.hpp lib/ff++/%%VER%%/include/InitFunct.hpp lib/ff++/%%VER%%/include/Label.hpp lib/ff++/%%VER%%/include/LineSearch.hpp lib/ff++/%%VER%%/include/MatriceCreuse.hpp lib/ff++/%%VER%%/include/MatriceCreuse_tpl.hpp lib/ff++/%%VER%%/include/MatriceElementaire.hpp lib/ff++/%%VER%%/include/Mesh1dn.hpp lib/ff++/%%VER%%/include/Mesh2.h lib/ff++/%%VER%%/include/Mesh2dn.hpp lib/ff++/%%VER%%/include/Mesh3dn.hpp lib/ff++/%%VER%%/include/MeshLn.hpp lib/ff++/%%VER%%/include/MeshPoint.hpp lib/ff++/%%VER%%/include/MeshSn.hpp lib/ff++/%%VER%%/include/Meshio.h lib/ff++/%%VER%%/include/Metric.h lib/ff++/%%VER%%/include/NRJ.hpp lib/ff++/%%VER%%/include/NewtonRaphson.hpp lib/ff++/%%VER%%/include/Operator.hpp lib/ff++/%%VER%%/include/Optima.hpp lib/ff++/%%VER%%/include/P1IsoValue.hpp lib/ff++/%%VER%%/include/Param.hpp lib/ff++/%%VER%%/include/PkLagrange.hpp lib/ff++/%%VER%%/include/PlotStream.hpp lib/ff++/%%VER%%/include/QuadTree.h lib/ff++/%%VER%%/include/QuadratureFormular.hpp lib/ff++/%%VER%%/include/R1.hpp lib/ff++/%%VER%%/include/R2.h lib/ff++/%%VER%%/include/R2.hpp lib/ff++/%%VER%%/include/R3.hpp lib/ff++/%%VER%%/include/RNM.hpp lib/ff++/%%VER%%/include/RNM_op.hpp lib/ff++/%%VER%%/include/RNM_opc.hpp lib/ff++/%%VER%%/include/RNM_tpl.hpp lib/ff++/%%VER%%/include/RefCounter.hpp lib/ff++/%%VER%%/include/RosenBrock.hpp lib/ff++/%%VER%%/include/Serialize.hpp lib/ff++/%%VER%%/include/SetOfE4.h lib/ff++/%%VER%%/include/SkyLineSolver.hpp lib/ff++/%%VER%%/include/SolverSkyLine.hpp lib/ff++/%%VER%%/include/SparseLinearSolver.hpp lib/ff++/%%VER%%/include/String.hpp lib/ff++/%%VER%%/include/VirtualMatrix.hpp lib/ff++/%%VER%%/include/VirtualSolver.hpp lib/ff++/%%VER%%/include/VirtualSolverCG.hpp lib/ff++/%%VER%%/include/VirtualSolverSkyLine.hpp lib/ff++/%%VER%%/include/VirtualSolverSparseSuite.hpp lib/ff++/%%VER%%/include/array_init.hpp lib/ff++/%%VER%%/include/array_resize.hpp lib/ff++/%%VER%%/include/array_tlp.hpp lib/ff++/%%VER%%/include/assertion.hpp lib/ff++/%%VER%%/include/bmo.hpp lib/ff++/%%VER%%/include/clapack.h +lib/ff++/%%VER%%/include/compositeFESpace.hpp lib/ff++/%%VER%%/include/config.h lib/ff++/%%VER%%/include/defs.hpp lib/ff++/%%VER%%/include/eigenv.h lib/ff++/%%VER%%/include/endian.hpp lib/ff++/%%VER%%/include/environment.hpp lib/ff++/%%VER%%/include/error.hpp lib/ff++/%%VER%%/include/fem.hpp lib/ff++/%%VER%%/include/fem3.hpp lib/ff++/%%VER%%/include/ff++.hpp lib/ff++/%%VER%%/include/ffapi.hpp lib/ff++/%%VER%%/include/ffstack.hpp lib/ff++/%%VER%%/include/getprog-unix.hpp lib/ff++/%%VER%%/include/glrgraph.hpp lib/ff++/%%VER%%/include/gmres.hpp lib/ff++/%%VER%%/include/lex.hpp lib/ff++/%%VER%%/include/lg.tab.hpp lib/ff++/%%VER%%/include/lgfem.hpp lib/ff++/%%VER%%/include/lgmesh3.hpp lib/ff++/%%VER%%/include/lgsolver.hpp lib/ff++/%%VER%%/include/libMesh/chrono.h lib/ff++/%%VER%%/include/libMesh/eigenv.h lib/ff++/%%VER%%/include/libMesh/libmeshb7.h lib/ff++/%%VER%%/include/libMesh/memory.h lib/ff++/%%VER%%/include/libmeshb7.h lib/ff++/%%VER%%/include/meshtype.h lib/ff++/%%VER%%/include/mode_open.hpp lib/ff++/%%VER%%/include/msh3.hpp lib/ff++/%%VER%%/include/pcm.hpp lib/ff++/%%VER%%/include/ppmimg.h lib/ff++/%%VER%%/include/problem.hpp lib/ff++/%%VER%%/include/renumb.hpp lib/ff++/%%VER%%/include/rgraph.hpp lib/ff++/%%VER%%/include/showverb.hpp lib/ff++/%%VER%%/include/splitsimplex.hpp lib/ff++/%%VER%%/include/strversionnumber.hpp lib/ff++/%%VER%%/include/throwassert.hpp lib/ff++/%%VER%%/include/ufunction.hpp lib/ff++/%%VER%%/include/versionnumber.hpp lib/ff++/%%VER%%/include/write_hdf5.hpp lib/ff++/%%VER%%/include/write_xdmf.hpp lib/ff++/%%VER%%/lib/BEC.so lib/ff++/%%VER%%/lib/BernardiRaugel.so lib/ff++/%%VER%%/lib/BinaryIO.so lib/ff++/%%VER%%/lib/CircumCenter.so lib/ff++/%%VER%%/lib/ClosePoints.so lib/ff++/%%VER%%/lib/Curvature.so lib/ff++/%%VER%%/lib/DxWriter.so lib/ff++/%%VER%%/lib/Element_HCT.so lib/ff++/%%VER%%/lib/Element_Mixte.so lib/ff++/%%VER%%/lib/Element_Mixte3d.so lib/ff++/%%VER%%/lib/Element_P1bl.so lib/ff++/%%VER%%/lib/Element_P1dc1.so lib/ff++/%%VER%%/lib/Element_P1ncdc.so lib/ff++/%%VER%%/lib/Element_P2bulle3.so lib/ff++/%%VER%%/lib/Element_P2pnc.so lib/ff++/%%VER%%/lib/Element_P2pnc_3d.so lib/ff++/%%VER%%/lib/Element_P3.so lib/ff++/%%VER%%/lib/Element_P3dc.so lib/ff++/%%VER%%/lib/Element_P3nc.so lib/ff++/%%VER%%/lib/Element_P3pnc.so +lib/ff++/%%VER%%/lib/Element_P3pnc_3d.so lib/ff++/%%VER%%/lib/Element_P4.so lib/ff++/%%VER%%/lib/Element_P4dc.so lib/ff++/%%VER%%/lib/Element_PkEdge.so lib/ff++/%%VER%%/lib/Element_QF.so lib/ff++/%%VER%%/lib/FreeFemQA.so lib/ff++/%%VER%%/lib/Helmholtz_FD.so lib/ff++/%%VER%%/lib/IncompleteCholesky.so lib/ff++/%%VER%%/lib/MatD-VFP0.so lib/ff++/%%VER%%/lib/MatrixMarket.so lib/ff++/%%VER%%/lib/MetricKuate.so lib/ff++/%%VER%%/lib/MetricPk.so lib/ff++/%%VER%%/lib/Morley.so lib/ff++/%%VER%%/lib/NewSolver.so lib/ff++/%%VER%%/lib/SaveHB.so lib/ff++/%%VER%%/lib/Schur-Complement.so lib/ff++/%%VER%%/lib/SuperLu.so lib/ff++/%%VER%%/lib/UMFPACK64.so lib/ff++/%%VER%%/lib/VTK_writer.so lib/ff++/%%VER%%/lib/VTK_writer_3d.so lib/ff++/%%VER%%/lib/WHERE.libMesh lib/ff++/%%VER%%/lib/WHERE_LIBRARY lib/ff++/%%VER%%/lib/WHERE_LIBRARY-config lib/ff++/%%VER%%/lib/WHERE_LIBRARY-download lib/ff++/%%VER%%/lib/addNewType.so lib/ff++/%%VER%%/lib/bfstream.so lib/ff++/%%VER%%/lib/biofunc.so lib/ff++/%%VER%%/lib/dfft.so lib/ff++/%%VER%%/lib/distance.so lib/ff++/%%VER%%/lib/exactpartition.so lib/ff++/%%VER%%/lib/ff-AiryBiry.so lib/ff++/%%VER%%/lib/ff-NLopt.so lib/ff++/%%VER%%/lib/ff-cmaes.so lib/ff++/%%VER%%/lib/ff-get-dep.awk lib/ff++/%%VER%%/lib/ffnewuoa.so lib/ff++/%%VER%%/lib/ffrandom.so lib/ff++/%%VER%%/lib/funcTemplate.so lib/ff++/%%VER%%/lib/geophysics.so lib/ff++/%%VER%%/lib/gmsh.so lib/ff++/%%VER%%/lib/gsl.so lib/ff++/%%VER%%/lib/iohdf5.so lib/ff++/%%VER%%/lib/ioply.so lib/ff++/%%VER%%/lib/iovtk.so lib/ff++/%%VER%%/lib/isoline.so lib/ff++/%%VER%%/lib/lapack.so lib/ff++/%%VER%%/lib/lgbmo.so lib/ff++/%%VER%%/lib/libMesh.a lib/ff++/%%VER%%/lib/mat_dervieux.so lib/ff++/%%VER%%/lib/mat_edgeP1.so lib/ff++/%%VER%%/lib/mat_psi.so lib/ff++/%%VER%%/lib/medit.so lib/ff++/%%VER%%/lib/meshtools.so lib/ff++/%%VER%%/lib/metis.so lib/ff++/%%VER%%/lib/msh3.so lib/ff++/%%VER%%/lib/myfunction.so lib/ff++/%%VER%%/lib/myfunction2.so lib/ff++/%%VER%%/lib/pcm2rnm.so lib/ff++/%%VER%%/lib/plotPDF.so lib/ff++/%%VER%%/lib/ppm2rnm.so lib/ff++/%%VER%%/lib/qf11to25.so lib/ff++/%%VER%%/lib/shell.so lib/ff++/%%VER%%/lib/splitedges.so lib/ff++/%%VER%%/lib/splitmesh12.so lib/ff++/%%VER%%/lib/splitmesh3.so lib/ff++/%%VER%%/lib/splitmesh4.so lib/ff++/%%VER%%/lib/splitmesh6.so lib/ff++/%%VER%%/lib/tetgen.so lib/ff++/%%VER%%/lib/vortextools.so %%DATADIR%%/CheckAll %%DATADIR%%/CheckAllEdp %%DATADIR%%/plugin/seq/load.link @dir lib/ff++/%%VER%%/lib/mpi