Index: head/cad/elmerfem/Makefile =================================================================== --- head/cad/elmerfem/Makefile +++ head/cad/elmerfem/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= elmerfem -PORTVERSION= 8.2.20161026 -PORTREVISION= 2 +PORTVERSION= 8.3.20170519 CATEGORIES= cad science MAINTAINER= ports@FreeBSD.org @@ -16,7 +15,7 @@ USE_GITHUB= yes GH_ACCOUNT= ElmerCSC -GH_TAGNAME= 5172e02 +GH_TAGNAME= c30fff2 USES= blaslapack:netlib cmake fortran gmake tcl Index: head/cad/elmerfem/distinfo =================================================================== --- head/cad/elmerfem/distinfo +++ head/cad/elmerfem/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1477492415 -SHA256 (ElmerCSC-elmerfem-8.2.20161026-5172e02_GH0.tar.gz) = dbd095591103b13289aab9b3d622ad309a3e5113beaca8562a70e81ef22d6c9e -SIZE (ElmerCSC-elmerfem-8.2.20161026-5172e02_GH0.tar.gz) = 49750654 +TIMESTAMP = 1495312420 +SHA256 (ElmerCSC-elmerfem-8.3.20170519-c30fff2_GH0.tar.gz) = 7b9e9b4abaf4801dec383f7b7d8f339c274aaa0c98d8320564ed4616a1115e68 +SIZE (ElmerCSC-elmerfem-8.3.20170519-c30fff2_GH0.tar.gz) = 57920491 Index: head/cad/elmerfem/files/patch-CMakeLists.txt =================================================================== --- head/cad/elmerfem/files/patch-CMakeLists.txt +++ head/cad/elmerfem/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2016-10-26 13:01:22 UTC +--- CMakeLists.txt.orig 2017-05-19 12:19:26 UTC +++ CMakeLists.txt -@@ -265,7 +265,7 @@ ADD_SUBDIRECTORY(umfpack) +@@ -264,7 +264,7 @@ ADD_SUBDIRECTORY(umfpack) ADD_SUBDIRECTORY(fhutiter) ADD_SUBDIRECTORY(meshgen2d) ADD_SUBDIRECTORY(fem) Index: head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt =================================================================== --- head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt +++ head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt @@ -1,4 +1,4 @@ ---- elmergrid/src/CMakeLists.txt.orig 2016-10-26 13:01:22 UTC +--- elmergrid/src/CMakeLists.txt.orig 2017-05-19 12:19:26 UTC +++ elmergrid/src/CMakeLists.txt @@ -31,7 +31,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC Index: head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt =================================================================== --- head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt +++ head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt @@ -1,6 +1,6 @@ ---- fem/src/CMakeLists.txt.orig 2016-10-26 13:01:22 UTC +--- fem/src/CMakeLists.txt.orig 2017-05-19 12:19:26 UTC +++ fem/src/CMakeLists.txt -@@ -137,11 +137,11 @@ ENDIF() +@@ -129,11 +129,11 @@ SET(ELMERSOLVER_LIBRARIES matc umfpack ADD_EXECUTABLE(Solver_TGT Solver.F90) @@ -15,7 +15,7 @@ ENDIF() IF(NOT(WITH_MPI)) -@@ -246,7 +246,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME +@@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin") IF(NOT(WIN32)) @@ -24,7 +24,7 @@ ENDIF() # GebhardFactors -@@ -255,7 +255,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${ +@@ -247,7 +247,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${ mpi_stubs elmersolver) IF(NOT(WIN32)) @@ -33,7 +33,7 @@ ENDIF() IF(WITH_Trilinos) -@@ -299,9 +299,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE +@@ -291,9 +291,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE IF(WITH_MPI) IF(NOT(WIN32)) Index: head/cad/elmerfem/files/patch-matc_src_CMakeLists.txt =================================================================== --- head/cad/elmerfem/files/patch-matc_src_CMakeLists.txt +++ head/cad/elmerfem/files/patch-matc_src_CMakeLists.txt @@ -1,4 +1,4 @@ ---- matc/src/CMakeLists.txt.orig 2016-10-26 13:01:22 UTC +--- matc/src/CMakeLists.txt.orig 2017-05-19 12:19:26 UTC +++ matc/src/CMakeLists.txt @@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(Matc_bin matc) Index: head/cad/elmerfem/files/patch-post-src-elmerpost.h =================================================================== --- head/cad/elmerfem/files/patch-post-src-elmerpost.h +++ head/cad/elmerfem/files/patch-post-src-elmerpost.h @@ -1,4 +1,4 @@ ---- post/src/elmerpost.h.orig 2016-10-26 13:01:22 UTC +--- post/src/elmerpost.h.orig 2017-05-19 12:19:26 UTC +++ post/src/elmerpost.h @@ -62,6 +62,7 @@ Index: head/cad/elmerfem/files/patch-post-src-screensave.c =================================================================== --- head/cad/elmerfem/files/patch-post-src-screensave.c +++ head/cad/elmerfem/files/patch-post-src-screensave.c @@ -1,4 +1,4 @@ ---- post/src/screensave.c.orig 2016-10-26 13:01:22 UTC +--- post/src/screensave.c.orig 2017-05-19 12:19:26 UTC +++ post/src/screensave.c @@ -32,6 +32,7 @@ #include Index: head/cad/elmerfem/pkg-plist =================================================================== --- head/cad/elmerfem/pkg-plist +++ head/cad/elmerfem/pkg-plist @@ -44,7 +44,7 @@ share/elmersolver/include/generalutils.mod share/elmersolver/include/globmat.mod share/elmersolver/include/globmatc.mod -share/elmersolver/include/h1elementbasisfunctions.mod +share/elmersolver/include/h1basis.mod share/elmersolver/include/harmutils.mod share/elmersolver/include/hashtable.mod share/elmersolver/include/huti_aux.mod @@ -134,9 +134,11 @@ share/elmersolver/lib/ElementStats.so share/elmersolver/lib/EliminateDirichlet.so share/elmersolver/lib/EliminatePeriodic.so +share/elmersolver/lib/Elmer2OpenFoamIO.so share/elmersolver/lib/EnergyRelease.so share/elmersolver/lib/FDiffusion.so share/elmersolver/lib/FDiffusion3D.so +share/elmersolver/lib/FacetShellSolve.so share/elmersolver/lib/FilterTimeSeries.so share/elmersolver/lib/FindOptimum.so share/elmersolver/lib/FlowSolve.so @@ -145,10 +147,10 @@ share/elmersolver/lib/FourierLoss.so share/elmersolver/lib/FreeSurfaceReduced.so share/elmersolver/lib/FreeSurfaceSolver.so +share/elmersolver/lib/HarmonicSignals.so share/elmersolver/lib/HeatSolve.so share/elmersolver/lib/HelmholtzBEM.so share/elmersolver/lib/HelmholtzSolve.so -share/elmersolver/lib/I26.so share/elmersolver/lib/Isosurface.so share/elmersolver/lib/KESolver.so share/elmersolver/lib/Komega.so @@ -187,9 +189,10 @@ share/elmersolver/lib/SaveGridData.so share/elmersolver/lib/SaveMesh.so share/elmersolver/lib/ScalarPotentialSolver.so +share/elmersolver/lib/ScannedFieldSolver.so share/elmersolver/lib/ShallowWaterNS.so share/elmersolver/lib/ShearrateSolver.so -share/elmersolver/lib/ShellSolve.so +share/elmersolver/lib/ShellSolver.so share/elmersolver/lib/Smitc.so share/elmersolver/lib/Spalart-Allmaras.so share/elmersolver/lib/StatCurrentSolve.so @@ -213,9 +216,7 @@ share/elmersolver/lib/VorticitySolver.so share/elmersolver/lib/WPotentialSolver.so share/elmersolver/lib/WaveSolver.so -share/elmersolver/lib/Wsolver.so share/elmersolver/lib/elements.def -share/elmersolver/lib/phasecurrents.so share/elmersolver/license_texts/GPL-2.txt share/elmersolver/license_texts/LGPL-2.1.txt share/elmersolver/license_texts/LICENSES