--- cad/elmerfem/Makefile (revision 396510) +++ cad/elmerfem/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elmerfem -PORTVERSION= 7.0.20141202 +PORTVERSION= 8.0.20150903 CATEGORIES= cad science MAINTAINER= pfg@FreeBSD.org @@ -10,17 +10,16 @@ LICENSE= GPLv2 -LIB_DEPENDS= liblapack.so:${PORTSDIR}/math/lapack \ - libparpack.so:${PORTSDIR}/math/arpack-ng-mpich \ +LIB_DEPENDS= libparpack.so:${PORTSDIR}/math/arpack-ng-mpich \ libmpich.so.8:${PORTSDIR}/net/mpich2 USE_GITHUB= yes GH_ACCOUNT= ElmerCSC -GH_TAGNAME= 0300707 +GH_TAGNAME= 5aaf273 -USES= cmake fortran gmake tcl +USES= blaslapack:netlib cmake fortran gmake tcl -USE_LDCONFIG= yes +USE_LDCONFIG= ${PREFIX}/lib/elmersolver ALL_TARGET= .if !defined(MAINTAINER_MODE) --- cad/elmerfem/distinfo (revision 396510) +++ cad/elmerfem/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (ElmerCSC-elmerfem-7.0.20141202-0300707_GH0.tar.gz) = b361efc406beb17bb5aa5abaf354ad64d842c610b9b66e043ad271b0ce72e380 -SIZE (ElmerCSC-elmerfem-7.0.20141202-0300707_GH0.tar.gz) = 43335735 +SHA256 (ElmerCSC-elmerfem-8.0.20150903-5aaf273_GH0.tar.gz) = ea04b9f475be8b864b6dd52105defe733474ec2c48b9a77eefee837346954083 +SIZE (ElmerCSC-elmerfem-8.0.20150903-5aaf273_GH0.tar.gz) = 45633072 --- cad/elmerfem/files/patch-CMakeLists.txt (revision 396510) +++ cad/elmerfem/files/patch-CMakeLists.txt (working copy) @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2014-09-21 14:50:21.000000000 +0200 -+++ CMakeLists.txt 2014-09-21 14:56:31.000000000 +0200 -@@ -56,7 +56,7 @@ - ADD_SUBDIRECTORY(eio) - ADD_SUBDIRECTORY(matc) +--- CMakeLists.txt.orig 2015-08-18 12:26:58 UTC ++++ CMakeLists.txt +@@ -248,7 +248,7 @@ ADD_SUBDIRECTORY(umfpack) + ADD_SUBDIRECTORY(fhutiter) + ADD_SUBDIRECTORY(meshgen2d) ADD_SUBDIRECTORY(fem) -ADD_SUBDIRECTORY(mathlibs) +#ADD_SUBDIRECTORY(mathlibs) ADD_SUBDIRECTORY(elmergrid) + ADD_SUBDIRECTORY(license_texts) - MESSAGE(STATUS "------------------------------------------------") --- cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt (revision 396510) +++ cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt (working copy) @@ -1,11 +1,11 @@ ---- elmergrid/src/CMakeLists.txt.orig 2014-09-25 15:07:43.000000000 +0200 -+++ elmergrid/src/CMakeLists.txt 2014-09-30 22:31:29.000000000 +0200 -@@ -14,7 +14,7 @@ +--- elmergrid/src/CMakeLists.txt.orig 2015-08-18 12:26:58 UTC ++++ elmergrid/src/CMakeLists.txt +@@ -29,7 +29,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC - TARGET_LINK_LIBRARIES(ElmerGrid matc metis) + TARGET_LINK_LIBRARIES(ElmerGrid metis m) IF(NOT(WIN32)) - SET_TARGET_PROPERTIES(ElmerGrid PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING}) + SET_TARGET_PROPERTIES(ElmerGrid PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}") ENDIF() - #INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/elmergrid/src/ElmerGrid DESTINATION "bin") + INSTALL(TARGETS ElmerGrid RUNTIME DESTINATION "bin") --- cad/elmerfem/files/patch-fem_src_CMakeLists.txt (revision 396510) +++ cad/elmerfem/files/patch-fem_src_CMakeLists.txt (working copy) @@ -1,6 +1,6 @@ ---- fem/src/CMakeLists.txt.orig 2014-09-25 15:07:43.000000000 +0200 -+++ fem/src/CMakeLists.txt 2014-10-06 23:29:26.000000000 +0200 -@@ -117,9 +117,9 @@ +--- fem/src/CMakeLists.txt.orig 2015-08-18 12:26:58 UTC ++++ fem/src/CMakeLists.txt +@@ -131,9 +131,9 @@ ENDIF() ADD_EXECUTABLE(Solver_TGT Solver.F90) @@ -12,7 +12,7 @@ ENDIF() IF(NOT(WITH_MPI)) -@@ -214,7 +214,7 @@ +@@ -229,7 +229,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin") IF(NOT(WIN32)) @@ -21,7 +21,7 @@ ENDIF() # GebhardFactors -@@ -223,7 +223,7 @@ +@@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${ mpi_stubs elmersolver) IF(NOT(WIN32)) @@ -30,17 +30,17 @@ ENDIF() IF(WITH_Trilinos) -@@ -267,9 +267,10 @@ +@@ -282,9 +282,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE IF(WITH_MPI) IF(NOT(WIN32)) -- INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink -- \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi -- \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)") -+ # Create symlink after, to repect STAGEDIR -+ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink -+ #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi -+ #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)") +- 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 --- cad/elmerfem/files/patch-matc_src_CMakeLists.txt (revision 396510) +++ cad/elmerfem/files/patch-matc_src_CMakeLists.txt (working copy) @@ -1,6 +1,6 @@ ---- matc/src/CMakeLists.txt.orig 2014-09-25 15:07:43.000000000 +0200 -+++ matc/src/CMakeLists.txt 2014-09-30 22:27:34.000000000 +0200 -@@ -12,7 +12,7 @@ +--- matc/src/CMakeLists.txt.orig 2015-08-18 12:26:58 UTC ++++ matc/src/CMakeLists.txt +@@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(Matc_bin matc) SET_TARGET_PROPERTIES(Matc_bin PROPERTIES OUTPUT_NAME matc) IF(NOT(WIN32)) --- cad/elmerfem/files/patch-post-src-elmerpost.h (revision 396510) +++ cad/elmerfem/files/patch-post-src-elmerpost.h (working copy) @@ -1,5 +1,5 @@ ---- post/src/elmerpost.h.orig 2014-09-09 15:50:25.000000000 -0500 -+++ post/src/elmerpost.h 2014-09-09 16:25:51.000000000 -0500 +--- post/src/elmerpost.h.orig 2015-08-18 12:26:58 UTC ++++ post/src/elmerpost.h @@ -62,6 +62,7 @@ #include --- cad/elmerfem/files/patch-post-src-screensave.c (revision 396510) +++ cad/elmerfem/files/patch-post-src-screensave.c (working copy) @@ -1,5 +1,5 @@ ---- post/src/screensave.c.orig 2014-09-09 20:47:35.000000000 -0500 -+++ post/src/screensave.c 2014-09-09 20:50:39.000000000 -0500 +--- post/src/screensave.c.orig 2015-08-18 12:26:58 UTC ++++ post/src/screensave.c @@ -32,6 +32,7 @@ #include --- cad/elmerfem/pkg-plist (revision 396510) +++ cad/elmerfem/pkg-plist (working copy) @@ -96,6 +96,7 @@ share/elmersolver/include/timeintegrate.mod share/elmersolver/include/toroidcurrents.mod share/elmersolver/include/types.mod +share/elmersolver/include/vectorhelmholtzutils.mod share/elmersolver/include/viewfactorglobals.mod share/elmersolver/include/vtklegacyfile.mod share/elmersolver/lib/Acoustics.so @@ -126,6 +127,7 @@ share/elmersolver/lib/FlowSolve.so share/elmersolver/lib/FluidicForce.so share/elmersolver/lib/FluxSolver.so +share/elmersolver/lib/FourierLoss.so share/elmersolver/lib/FreeSurfaceReduced.so share/elmersolver/lib/FreeSurfaceSolver.so share/elmersolver/lib/HeatSolve.so @@ -143,6 +145,7 @@ share/elmersolver/lib/MovingElstatSolver.so share/elmersolver/lib/NonphysicalMeshSolve.so share/elmersolver/lib/NormalSolver.so +share/elmersolver/lib/OdeSolver.so share/elmersolver/lib/ParStokes.so share/elmersolver/lib/ParticleAdvector.so share/elmersolver/lib/ParticleDynamics.so @@ -164,6 +167,7 @@ share/elmersolver/lib/SSTKomega.so share/elmersolver/lib/SaveData.so share/elmersolver/lib/SaveGridData.so +share/elmersolver/lib/SaveMesh.so share/elmersolver/lib/ScalarPotentialSolver.so share/elmersolver/lib/ShallowWaterNS.so share/elmersolver/lib/ShearrateSolver.so @@ -187,7 +191,9 @@ share/elmersolver/lib/V2FSolver.so share/elmersolver/lib/VelocityPrecond.so share/elmersolver/lib/ViscousCompressibility.so +share/elmersolver/lib/VectorHelmholtz.so share/elmersolver/lib/VorticitySolver.so +share/elmersolver/lib/WaveSolver.so share/elmersolver/lib/elements.def share/elmersolver/license_texts/GPL-2.txt share/elmersolver/license_texts/LGPL-2.1.txt