- Update to 8.2.20160404

- While here, cosmetic fixes and switch to new test framework

PR:		209271
Submitted by:	pfg

3 files changed, 23 insertions, 13 deletions

diff --git a/cad/elmerfem/Makefile b/cad/elmerfem/Makefile
index 87bae6b45c04..90cd9d962cf1 100644
--- a/cad/elmerfem/Makefile
+++ b/cad/elmerfem/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elmerfem
-PORTVERSION=	8.1.20160311
+PORTVERSION=	8.2.20160404
 CATEGORIES=	cad science
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,12 +15,12 @@ LIB_DEPENDS=	libparpack.so:math/arpack-ng-mpich	\
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
-GH_TAGNAME=	dee8ceb
+GH_TAGNAME=	2f5a55c
 
 USES=		blaslapack:netlib cmake fortran gmake tcl
 
 USE_LDCONFIG=	${PREFIX}/lib/elmersolver
-ALL_TARGET=
+ALL_TARGET=	# empty
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
@@ -34,17 +34,15 @@ CXXFLAGS_${ARCH}= -fPIC
 FCFLAGS+=	-fPIC
 FFLAGS+=	-fPIC
 .endif
+
 LDFLAGS+=	-L${LOCALBASE}/lib
 FCPPFLAGS+=	-ansi
 
 post-install:
-	cd  ${STAGEDIR}${PREFIX}/bin	\
-	&& ${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
-	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
+	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
+	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
 
-.if defined(MAINTAINER_MODE)
-regression-test: install
-	cd ${WRKSRC} && LD_LIBRARY_PATH=${PREFIX}/share/elmersolver/lib ${MAKE_CMD} 1dtest_Source
-.endif
+do-test:
+	cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${PREFIX}/share/elmersolver/lib ${MAKE_CMD} 1dtest_Source
 
 .include <bsd.port.post.mk>
diff --git a/cad/elmerfem/distinfo b/cad/elmerfem/distinfo
index 4e952d34b681..ba8651f0002d 100644
--- a/cad/elmerfem/distinfo
+++ b/cad/elmerfem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ElmerCSC-elmerfem-8.1.20160311-dee8ceb_GH0.tar.gz) = a14f2bae53dba5670297457cc822c6b127a5550b8e84d2ed87d7e6679c6c7a5e
-SIZE (ElmerCSC-elmerfem-8.1.20160311-dee8ceb_GH0.tar.gz) = 48386208
+SHA256 (ElmerCSC-elmerfem-8.2.20160404-2f5a55c_GH0.tar.gz) = 653c94c5052b757427019358653308b7fba175889b2d9bb759e3e28d6c24ec65
+SIZE (ElmerCSC-elmerfem-8.2.20160404-2f5a55c_GH0.tar.gz) = 48681524
diff --git a/cad/elmerfem/pkg-plist b/cad/elmerfem/pkg-plist
index 5a19739f589a..f17654823fd7 100644
--- a/cad/elmerfem/pkg-plist
+++ b/cad/elmerfem/pkg-plist
@@ -44,6 +44,7 @@ share/elmersolver/include/gebhardtfactorglobals.mod
 share/elmersolver/include/generalutils.mod
 share/elmersolver/include/globmat.mod
 share/elmersolver/include/globmatc.mod
+share/elmersolver/include/harmutils.mod
 share/elmersolver/include/hashtable.mod
 share/elmersolver/include/huti_aux.mod
 share/elmersolver/include/huti_bicgstab.mod
@@ -74,6 +75,7 @@ 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
@@ -101,6 +103,7 @@ 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
@@ -108,13 +111,17 @@ 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
@@ -138,6 +145,7 @@ share/elmersolver/lib/FreeSurfaceSolver.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
@@ -155,6 +163,7 @@ share/elmersolver/lib/ParStokes.so
 share/elmersolver/lib/ParticleAdvector.so
 share/elmersolver/lib/ParticleDynamics.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
@@ -194,12 +203,15 @@ 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/VectorHelmholtz.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