Date: Mon, 11 Nov 2019 10:59:01 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517252 - in head: . cad cad/elmerfem cad/elmerfem/files Message-ID: <201911111059.xABAx1rJ062520@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Nov 11 10:59:00 2019 New Revision: 517252 URL: https://svnweb.freebsd.org/changeset/ports/517252 Log: - Resurrect `cad/elmerfem' and update to version 8.4 - Remove bundled copy of METIS and use the one from ports - Fix `do-test' by switching to ctest(1) from gmake(1) - Adjust the COMMENT and port description while I'm here Added: head/cad/elmerfem/ - copied from r508754, head/cad/elmerfem/ Modified: head/MOVED head/cad/Makefile head/cad/elmerfem/Makefile head/cad/elmerfem/distinfo head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt head/cad/elmerfem/pkg-descr head/cad/elmerfem/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Mon Nov 11 09:39:51 2019 (r517251) +++ head/MOVED Mon Nov 11 10:59:00 2019 (r517252) @@ -12857,7 +12857,6 @@ www/rubygem-turbolinks-rails5|www/rubygem-turbolinks|2 www/rubygem-turbolinks-rails50|www/rubygem-turbolinks|2019-08-11|Remove unnecessary port after www/rubygem-turbolinks RUN_DEPENDS fix textproc/sphinxsearch-devel|textproc/sphinxsearch|2019-08-11|Has expired: Broken for more than 6 months lang/dmd2||2019-08-11|Has expired: Broken for more than 6 months and upstream has no fix for statfs64 -cad/elmerfem||2019-08-12|Has expired: Broken for more than 6 months sysutils/openhpi||2019-08-12|Has expired: Broken for more than 6 months textproc/scim-bridge||2019-08-17|Has expired: Broken for more than 6 months devel/py-efilter||2019-08-17|Has expired: No longer maintained Modified: head/cad/Makefile ============================================================================== --- head/cad/Makefile Mon Nov 11 09:39:51 2019 (r517251) +++ head/cad/Makefile Mon Nov 11 10:59:00 2019 (r517252) @@ -23,6 +23,7 @@ SUBDIR += dinotrace SUBDIR += electric SUBDIR += electric-ng + SUBDIR += elmerfem SUBDIR += fasm SUBDIR += feappv SUBDIR += fidocadj Modified: head/cad/elmerfem/Makefile ============================================================================== --- head/cad/elmerfem/Makefile Mon Aug 12 17:43:35 2019 (r508754) +++ head/cad/elmerfem/Makefile Mon Nov 11 10:59:00 2019 (r517252) @@ -2,31 +2,29 @@ # $FreeBSD$ PORTNAME= elmerfem -PORTVERSION= 8.3.20170524 -PORTREVISION= 6 +PORTVERSION= 8.4 +DISTVERSIONPREFIX= release- CATEGORIES= cad science MAINTAINER= ports@FreeBSD.org -COMMENT= ELMER FEM package +COMMENT= Finite element software for multiphysical problems LICENSE= GPLv2 -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-05-08 - LIB_DEPENDS= libparpack.so:math/arpack-ng \ + libmetis.so:math/metis \ libmpich.so:net/mpich USE_GITHUB= yes GH_ACCOUNT= ElmerCSC -GH_TAGNAME= release-8.3 -USES= blaslapack:netlib cmake fortran gmake tcl +USES= blaslapack:netlib cmake fortran tcl USE_LDCONFIG= ${PREFIX}/lib/elmersolver ALL_TARGET= # empty +CMAKE_ARGS= -DELMER_FEM_REVISION:STRING=f6bfdc9 + CMAKE_ARGS+= -DHAVE_INTTYPES_H=ON .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev @@ -44,11 +42,16 @@ FFLAGS+= -fPIC LDFLAGS+= -L${LOCALBASE}/lib FCPPFLAGS+= -ansi +post-patch: + @${RM} -r ${WRKSRC}/elmergrid/src/metis-5.1.0 + @${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \ + ${WRKSRC}/elmergrid/src/femelmer.c + post-install: ${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver @${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid do-test: - cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${PREFIX}/share/elmersolver/lib ${MAKE_CMD} 1dtest_Source + @cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS} .include <bsd.port.post.mk> Modified: head/cad/elmerfem/distinfo ============================================================================== --- head/cad/elmerfem/distinfo Mon Aug 12 17:43:35 2019 (r508754) +++ head/cad/elmerfem/distinfo Mon Nov 11 10:59:00 2019 (r517252) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522698688 -SHA256 (ElmerCSC-elmerfem-8.3.20170524-release-8.3_GH0.tar.gz) = 78aee1f7a364baf7dc26c738eb0e613e9b496e105a6ff88f48d0c281ec8c3cde -SIZE (ElmerCSC-elmerfem-8.3.20170524-release-8.3_GH0.tar.gz) = 57956283 +TIMESTAMP = 1545212085 +SHA256 (ElmerCSC-elmerfem-release-8.4_GH0.tar.gz) = cc3ce807d76798361592cc14952cdc3db1ad8f9bac038017514033ce9badc5b3 +SIZE (ElmerCSC-elmerfem-release-8.4_GH0.tar.gz) = 66252712 Modified: head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt ============================================================================== --- head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt Mon Aug 12 17:43:35 2019 (r508754) +++ head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt Mon Nov 11 10:59:00 2019 (r517252) @@ -1,6 +1,26 @@ ---- elmergrid/src/CMakeLists.txt.orig 2017-05-19 12:19:26 UTC +--- elmergrid/src/CMakeLists.txt.orig 2018-12-19 09:34:45 UTC +++ elmergrid/src/CMakeLists.txt -@@ -31,7 +31,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC +@@ -12,19 +12,13 @@ IF(CMAKE_CROSSCOMPILING) + ENDIF() + ENDIF() + +-# Dont install metis +-SET(METIS_INSTALL FALSE CACHE BOOL "") +-ADD_SUBDIRECTORY(metis-5.1.0) +- + SET(elmergrid_SRCS common.h femdef.h femelmer.h femfilein.h + femfileout.h feminfo.h femknot.h femmesh.h + femtypes.h nrutil.h common.c femelmer.c femfilein.c femfileout.c + feminfo.c femknot.c femmesh.c fempre.c + nrutil.c) + +-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/metis) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) +-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/elmergrid/src/metis) + INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/elmergrid/src) + + ADD_DEFINITIONS(-DDISABLE_MATC) +@@ -33,7 +27,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRCS}) TARGET_LINK_LIBRARIES(ElmerGrid metis m) IF(NOT(WIN32)) Modified: head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt ============================================================================== --- head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt Mon Aug 12 17:43:35 2019 (r508754) +++ head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt Mon Nov 11 10:59:00 2019 (r517252) @@ -1,6 +1,6 @@ ---- fem/src/CMakeLists.txt.orig 2017-05-19 12:19:26 UTC +--- fem/src/CMakeLists.txt.orig 2018-12-19 09:34:45 UTC +++ fem/src/CMakeLists.txt -@@ -129,11 +129,11 @@ SET(ELMERSOLVER_LIBRARIES matc umfpack +@@ -175,14 +175,14 @@ ENDIF() ADD_EXECUTABLE(Solver_TGT Solver.F90) @@ -8,14 +8,17 @@ +SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME "${ELMERSOLVER_OUTPUT_NAME}") IF(NOT(WIN32)) -- SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) + MESSAGE(STATUS " ELMERSOLVER_RPATH_STRING_MOD " ${ELMERSOLVER_RPATH_STRING_MOD}) + MESSAGE(STATUS " ELMERLIB_RPATH_STRING " ${ELMERLIB_RPATH_STRING}) + +- SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING_MOD}) - SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH ${ELMERLIB_RPATH_STRING}) -+ SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") ++ SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING_MOD}") + SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH "${ELMERLIB_RPATH_STRING}") ENDIF() IF(NOT(WITH_MPI)) -@@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME +@@ -287,7 +287,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELMERSOLVER_LIBRAR INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin") IF(NOT(WIN32)) @@ -24,7 +27,7 @@ ENDIF() # GebhardFactors -@@ -247,7 +247,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${ +@@ -296,7 +296,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${ELMERSOLVER_LI mpi_stubs elmersolver) IF(NOT(WIN32)) @@ -33,17 +36,3 @@ ENDIF() IF(WITH_Trilinos) -@@ -291,9 +291,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE - - IF(WITH_MPI) - IF(NOT(WIN32)) -- INSTALL(CODE " -- EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver -- WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") -+ # Create symlink after, to respect STAGEDIR -+ #INSTALL(CODE " -+ #EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver -+ #WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)") - ELSE() - INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy - \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe Modified: head/cad/elmerfem/pkg-descr ============================================================================== --- head/cad/elmerfem/pkg-descr Mon Aug 12 17:43:35 2019 (r508754) +++ head/cad/elmerfem/pkg-descr Mon Nov 11 10:59:00 2019 (r517252) @@ -1,5 +1,3 @@ -Elmer - Open Source Finite Element Software for Multiphysical Problems. - Elmer is an open source multiphysical simulation software mainly developed by CSC - IT Center for Science (CSC). Elmer development was started 1995 in collaboration with Finnish Universities, research institutes Modified: head/cad/elmerfem/pkg-plist ============================================================================== --- head/cad/elmerfem/pkg-plist Mon Aug 12 17:43:35 2019 (r508754) +++ head/cad/elmerfem/pkg-plist Mon Nov 11 10:59:00 2019 (r517252) @@ -37,6 +37,7 @@ share/elmersolver/include/dxfile.mod share/elmersolver/include/eigensolve.mod share/elmersolver/include/elementdescription.mod share/elmersolver/include/elementutils.mod +share/elmersolver/include/emwavesolverutils.mod share/elmersolver/include/exchangecorrelations.mod share/elmersolver/include/fetisolve.mod share/elmersolver/include/freesurface.mod @@ -59,6 +60,7 @@ share/elmersolver/include/huti_sfe.mod share/elmersolver/include/huti_tfqmr.mod share/elmersolver/include/integration.mod share/elmersolver/include/interpolation.mod +share/elmersolver/include/interpvartovar.mod share/elmersolver/include/iso_varying_string.mod share/elmersolver/include/iterativemethods.mod share/elmersolver/include/itersolve.mod @@ -66,6 +68,7 @@ share/elmersolver/include/kinds.mod share/elmersolver/include/linearalgebra.mod share/elmersolver/include/linearforms.mod share/elmersolver/include/listmatrix.mod +share/elmersolver/include/listmatrixarray.mod share/elmersolver/include/lists.mod share/elmersolver/include/loadmod.mod share/elmersolver/include/ludecomposition.mod @@ -75,6 +78,8 @@ share/elmersolver/include/materialmodels.mod share/elmersolver/include/maxwell.mod share/elmersolver/include/maxwellaxis.mod share/elmersolver/include/maxwellgeneral.mod +share/elmersolver/include/meshpartition.mod +share/elmersolver/include/meshremeshing.mod share/elmersolver/include/meshutils.mod share/elmersolver/include/messages.mod share/elmersolver/include/mgdynmaterialutils.mod @@ -108,9 +113,12 @@ share/elmersolver/include/vectorhelmholtzutils.mod share/elmersolver/include/vecutils.mod share/elmersolver/include/viewfactorglobals.mod share/elmersolver/include/vtklegacyfile.mod +share/elmersolver/include/zirka.mod +share/elmersolver/include/zirkautils.mod share/elmersolver/lib/Acoustics.so share/elmersolver/lib/AdvectionDiffusion.so share/elmersolver/lib/AdvectionReaction.so +share/elmersolver/lib/AllocateSolver.so share/elmersolver/lib/ArteryOutlet.so share/elmersolver/lib/ArtificialCompressibility.so share/elmersolver/lib/CircuitsAndDynamics.so @@ -126,6 +134,7 @@ share/elmersolver/lib/DirectionSolver.so share/elmersolver/lib/DistanceSolve.so share/elmersolver/lib/DivProjection.so share/elmersolver/lib/DivergenceSolver.so +share/elmersolver/lib/EMWaveSolver.so share/elmersolver/lib/ElasticSolve.so share/elmersolver/lib/ElectricForce.so share/elmersolver/lib/Electrokinetics.so @@ -157,12 +166,14 @@ share/elmersolver/lib/LevelSet.so share/elmersolver/lib/MagneticSolve.so share/elmersolver/lib/MagnetoDynamics.so share/elmersolver/lib/MagnetoDynamics2D.so +share/elmersolver/lib/Mesh2MeshSolver.so share/elmersolver/lib/MeshSolve.so share/elmersolver/lib/ModelPDE.so share/elmersolver/lib/MovingElstatSolver.so share/elmersolver/lib/NonphysicalMeshSolve.so share/elmersolver/lib/NormalSolver.so share/elmersolver/lib/OdeSolver.so +share/elmersolver/lib/OpenFoam2ElmerIO.so share/elmersolver/lib/ParStokes.so share/elmersolver/lib/ParticleAdvector.so share/elmersolver/lib/ParticleDynamics.so @@ -171,6 +182,7 @@ share/elmersolver/lib/PhaseChangeSolve.so share/elmersolver/lib/Poisson.so share/elmersolver/lib/PoissonBEM.so share/elmersolver/lib/PoissonBoltzmannSolve.so +share/elmersolver/lib/PoissonDG.so share/elmersolver/lib/PressurePrecond.so share/elmersolver/lib/PressureUpdate.so share/elmersolver/lib/ProjectToPlane.so @@ -195,6 +207,7 @@ share/elmersolver/lib/ShellSolver.so share/elmersolver/lib/Smitc.so share/elmersolver/lib/Spalart-Allmaras.so share/elmersolver/lib/StatCurrentSolve.so +share/elmersolver/lib/StatCurrentSolveVec.so share/elmersolver/lib/StatElecBoundary.so share/elmersolver/lib/StatElecSolve.so share/elmersolver/lib/StatMagSolve.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911111059.xABAx1rJ062520>