Index: head/cad/elmerfem/Makefile
===================================================================
--- head/cad/elmerfem/Makefile	(revision 441743)
+++ head/cad/elmerfem/Makefile	(revision 441744)
@@ -1,49 +1,48 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	elmerfem
-PORTVERSION=	8.2.20161026
-PORTREVISION=	2
+PORTVERSION=	8.3.20170519
 CATEGORIES=	cad science
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ELMER FEM package
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libparpack.so:math/arpack-ng-mpich	\
 		libmpich.so.8:net/mpich2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
-GH_TAGNAME=	5172e02
+GH_TAGNAME=	c30fff2
 
 USES=		blaslapack:netlib cmake fortran gmake tcl
 
 USE_LDCONFIG=	${PREFIX}/lib/elmersolver
 ALL_TARGET=	# empty
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS_${ARCH}=	-fPIC
 CXXFLAGS_${ARCH}= -fPIC
 FCFLAGS+=	-fPIC
 FFLAGS+=	-fPIC
 .endif
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 FCPPFLAGS+=	-ansi
 
 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
 
 .include <bsd.port.post.mk>
Index: head/cad/elmerfem/distinfo
===================================================================
--- head/cad/elmerfem/distinfo	(revision 441743)
+++ head/cad/elmerfem/distinfo	(revision 441744)
@@ -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	(revision 441743)
+++ head/cad/elmerfem/files/patch-CMakeLists.txt	(revision 441744)
@@ -1,11 +1,11 @@
---- 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)
 -ADD_SUBDIRECTORY(mathlibs)
 +#ADD_SUBDIRECTORY(mathlibs)
  ADD_SUBDIRECTORY(elmergrid)
  ADD_SUBDIRECTORY(license_texts)
  
Index: head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
===================================================================
--- head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt	(revision 441743)
+++ head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt	(revision 441744)
@@ -1,11 +1,11 @@
---- 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
  
  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(TARGETS ElmerGrid RUNTIME DESTINATION "bin")
Index: head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
===================================================================
--- head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt	(revision 441743)
+++ head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt	(revision 441744)
@@ -1,49 +1,49 @@
---- 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)
 -SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME ${ELMERSOLVER_OUTPUT_NAME})
 +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})
 -   SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH ${ELMERLIB_RPATH_STRING})
 +   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
 +   SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH "${ELMERLIB_RPATH_STRING}")
  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))
 -  SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
 +  SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
  ENDIF()
  
  # GebhardFactors
-@@ -255,7 +255,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
+@@ -247,7 +247,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
                                        mpi_stubs elmersolver)
  
  IF(NOT(WIN32))
 -  SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
 +  SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
  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))
 -    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
Index: head/cad/elmerfem/files/patch-matc_src_CMakeLists.txt
===================================================================
--- head/cad/elmerfem/files/patch-matc_src_CMakeLists.txt	(revision 441743)
+++ head/cad/elmerfem/files/patch-matc_src_CMakeLists.txt	(revision 441744)
@@ -1,11 +1,11 @@
---- 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)
  
  SET_TARGET_PROPERTIES(Matc_bin PROPERTIES OUTPUT_NAME matc)
  IF(NOT(WIN32))
 -  SET_TARGET_PROPERTIES(Matc_bin PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
 +  SET_TARGET_PROPERTIES(Matc_bin PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
  ENDIF()
  
  INSTALL(TARGETS matc Matc_bin RUNTIME DESTINATION "bin" LIBRARY DESTINATION ${ELMER_INSTALL_LIB_DIR})
Index: head/cad/elmerfem/files/patch-post-src-elmerpost.h
===================================================================
--- head/cad/elmerfem/files/patch-post-src-elmerpost.h	(revision 441743)
+++ head/cad/elmerfem/files/patch-post-src-elmerpost.h	(revision 441744)
@@ -1,10 +1,10 @@
---- 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 @@
  
  #include <elmer/matc.h>
  
 +#define	USE_INTERP_RESULT
  
  #if defined(MINGW32) || defined(WIN32)
  
Index: head/cad/elmerfem/files/patch-post-src-screensave.c
===================================================================
--- head/cad/elmerfem/files/patch-post-src-screensave.c	(revision 441743)
+++ head/cad/elmerfem/files/patch-post-src-screensave.c	(revision 441744)
@@ -1,10 +1,10 @@
---- 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 <GL/glu.h>
  
  
 +#define	USE_INTERP_RESULT
  #include "tcl.h"
  
  #if !(defined(WIN32) || defined(win32))
Index: head/cad/elmerfem/pkg-plist
===================================================================
--- head/cad/elmerfem/pkg-plist	(revision 441743)
+++ head/cad/elmerfem/pkg-plist	(revision 441744)
@@ -1,222 +1,223 @@
 bin/ElmerGrid
 bin/ElmerSolver
 bin/ElmerSolver_mpi
 bin/GebhardtFactors
 bin/Mesh2D
 bin/ViewFactors
 bin/elmerf90
 bin/elmerld
 bin/matc
 lib/elmersolver/libamd.a
 lib/elmersolver/libamdf77.a
 lib/elmersolver/libelmersolver.so
 lib/elmersolver/libfhuti.so
 lib/elmersolver/libmatc.so
 lib/elmersolver/libmpi_stubs.so
 lib/elmersolver/libumfpack.a
 share/elmersolver/include/adaptive.mod
 share/elmersolver/include/ascbinoutpututils.mod
 share/elmersolver/include/bandmatrix.mod
 share/elmersolver/include/bandwidthoptimize.mod
 share/elmersolver/include/binio.mod
 share/elmersolver/include/blocksolve.mod
 share/elmersolver/include/blowers.mod
 share/elmersolver/include/circmatinitmod.mod
 share/elmersolver/include/circuitsmod.mod
 share/elmersolver/include/circuitutils.mod
 share/elmersolver/include/clusteringmethods.mod
 share/elmersolver/include/componentutils.mod
 share/elmersolver/include/coordinatesystems.mod
 share/elmersolver/include/crsmatrix.mod
 share/elmersolver/include/defutils.mod
 share/elmersolver/include/differentials.mod
 share/elmersolver/include/diffuseconvective.mod
 share/elmersolver/include/diffuseconvectivegeneral.mod
 share/elmersolver/include/directsolve.mod
 share/elmersolver/include/dxfile.mod
 share/elmersolver/include/eigensolve.mod
 share/elmersolver/include/elementdescription.mod
 share/elmersolver/include/elementutils.mod
 share/elmersolver/include/exchangecorrelations.mod
 share/elmersolver/include/fetisolve.mod
 share/elmersolver/include/freesurface.mod
 share/elmersolver/include/gebhardtfactorglobals.mod
 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
 share/elmersolver/include/huti_bicgstab.mod
 share/elmersolver/include/huti_bicgstab_2.mod
 share/elmersolver/include/huti_cg.mod
 share/elmersolver/include/huti_cgs.mod
 share/elmersolver/include/huti_gmres.mod
 share/elmersolver/include/huti_interfaces.mod
 share/elmersolver/include/huti_qmr.mod
 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/iso_varying_string.mod
 share/elmersolver/include/iterativemethods.mod
 share/elmersolver/include/itersolve.mod
 share/elmersolver/include/kinds.mod
 share/elmersolver/include/linearalgebra.mod
 share/elmersolver/include/linearforms.mod
 share/elmersolver/include/listmatrix.mod
 share/elmersolver/include/lists.mod
 share/elmersolver/include/loadmod.mod
 share/elmersolver/include/ludecomposition.mod
 share/elmersolver/include/magnetodynamicsutils.mod
 share/elmersolver/include/mainutils.mod
 share/elmersolver/include/materialmodels.mod
 share/elmersolver/include/maxwell.mod
 share/elmersolver/include/maxwellaxis.mod
 share/elmersolver/include/maxwellgeneral.mod
 share/elmersolver/include/meshutils.mod
 share/elmersolver/include/messages.mod
 share/elmersolver/include/mgdynmaterialutils.mod
 share/elmersolver/include/modeldescription.mod
 share/elmersolver/include/multigrid.mod
 share/elmersolver/include/navierstokes.mod
 share/elmersolver/include/navierstokescylindrical.mod
 share/elmersolver/include/navierstokesgeneral.mod
 share/elmersolver/include/paralleleigensolve.mod
 share/elmersolver/include/parallelutils.mod
 share/elmersolver/include/particledynamicsstuff.mod
 share/elmersolver/include/particleutils.mod
 share/elmersolver/include/pelementbase.mod
 share/elmersolver/include/pelementmaps.mod
 share/elmersolver/include/porousmaterials.mod
 share/elmersolver/include/radiation.mod
 share/elmersolver/include/radiationfactorglobals.mod
 share/elmersolver/include/smoothers.mod
 share/elmersolver/include/solverutils.mod
 share/elmersolver/include/sparitercomm.mod
 share/elmersolver/include/spariterglobals.mod
 share/elmersolver/include/spariterprecond.mod
 share/elmersolver/include/sparitersolve.mod
 share/elmersolver/include/statelecboundaryutils.mod
 share/elmersolver/include/stressgeneral.mod
 share/elmersolver/include/stresslocal.mod
 share/elmersolver/include/timeintegrate.mod
 share/elmersolver/include/toroidcurrents.mod
 share/elmersolver/include/types.mod
 share/elmersolver/include/vectorhelmholtzutils.mod
 share/elmersolver/include/vecutils.mod
 share/elmersolver/include/viewfactorglobals.mod
 share/elmersolver/include/vtklegacyfile.mod
 share/elmersolver/lib/Acoustics.so
 share/elmersolver/lib/AdvectionDiffusion.so
 share/elmersolver/lib/AdvectionReaction.so
 share/elmersolver/lib/ArteryOutlet.so
 share/elmersolver/lib/ArtificialCompressibility.so
 share/elmersolver/lib/CMakeFiles.so
 share/elmersolver/lib/CircuitsAndDynamics.so
 share/elmersolver/lib/CoilSolver.so
 share/elmersolver/lib/CompressibleNS.so
 share/elmersolver/lib/CoordinateTransform.so
 share/elmersolver/lib/CoupledNSUpdate.so
 share/elmersolver/lib/CraigBamptonSolver.so
 share/elmersolver/lib/DCRComplexSolve.so
 share/elmersolver/lib/DFTSolver.so
 share/elmersolver/lib/DataToFieldSolver.so
 share/elmersolver/lib/DirectionSolver.so
 share/elmersolver/lib/DistanceSolve.so
 share/elmersolver/lib/DivProjection.so
 share/elmersolver/lib/DivergenceSolver.so
 share/elmersolver/lib/ElasticSolve.so
 share/elmersolver/lib/ElectricForce.so
 share/elmersolver/lib/Electrokinetics.so
 share/elmersolver/lib/ElementSizeSolver.so
 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
 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/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
 share/elmersolver/lib/LevelSet.so
 share/elmersolver/lib/MagneticSolve.so
 share/elmersolver/lib/MagnetoDynamics.so
 share/elmersolver/lib/MagnetoDynamics2D.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/ParStokes.so
 share/elmersolver/lib/ParticleAdvector.so
 share/elmersolver/lib/ParticleDynamics.so
 share/elmersolver/lib/PartitionMesh.so
 share/elmersolver/lib/PhaseChangeSolve.so
 share/elmersolver/lib/Poisson.so
 share/elmersolver/lib/PoissonBEM.so
 share/elmersolver/lib/PoissonBoltzmannSolve.so
 share/elmersolver/lib/PressurePrecond.so
 share/elmersolver/lib/PressureUpdate.so
 share/elmersolver/lib/ProjectToPlane.so
 share/elmersolver/lib/RateOfChange.so
 share/elmersolver/lib/ReloadData.so
 share/elmersolver/lib/ReloadInput.so
 share/elmersolver/lib/ResultOutputSolve.so
 share/elmersolver/lib/ReynoldsSolver.so
 share/elmersolver/lib/RichardsSolver.so
 share/elmersolver/lib/RigidBodyReduction.so
 share/elmersolver/lib/RigidMeshMapper.so
 share/elmersolver/lib/SOLVER.KEYWORDS
 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/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
 share/elmersolver/lib/StatElecBoundary.so
 share/elmersolver/lib/StatElecSolve.so
 share/elmersolver/lib/StatMagSolve.so
 share/elmersolver/lib/SteadyPhaseChange.so
 share/elmersolver/lib/Stokes.so
 share/elmersolver/lib/StreamSolver.so
 share/elmersolver/lib/StressSolve.so
 share/elmersolver/lib/StructuredFlowLine.so
 share/elmersolver/lib/StructuredMeshMapper.so
 share/elmersolver/lib/StructuredProjectToPlane.so
 share/elmersolver/lib/ThermoElectricSolver.so
 share/elmersolver/lib/TransientPhaseChange.so
 share/elmersolver/lib/TransportEquation.so
 share/elmersolver/lib/V2FSolver.so
 share/elmersolver/lib/VectorHelmholtz.so
 share/elmersolver/lib/VelocityPrecond.so
 share/elmersolver/lib/ViscousCompressibility.so
 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
 share/elmersolver/license_texts/fem/LICENSES