- Upgrade to 5.2.0;

- Add regression-tests.

3 files changed, 21 insertions, 8 deletions

diff --git a/science/elmer-fem/Makefile b/science/elmer-fem/Makefile
index 65f051493cc9..10808732b629 100644
--- a/science/elmer-fem/Makefile
+++ b/science/elmer-fem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fem
-PORTVERSION=	5.0.2
+PORTVERSION=	5.2.0
 CATEGORIES=	science tk84
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/
 PKGNAMEPREFIX=	elmer-
@@ -21,8 +21,8 @@ BUILD_DEPENDS=	${FC}:${PORTSDIR}/lang/gfortran	\
 		${LOCALBASE}/lib/libumfpack.a:${PORTSDIR}/math/elmer-umfpack	\
 		${LOCALBASE}/lib/libeiof.a:${PORTSDIR}/science/elmer-eio	\
 		${LOCALBASE}/lib/libhuti.a:${PORTSDIR}/science/elmer-hutiter
-RUN_DEPENDS=	${MACHINE_ARCH}-portbld-freebsd${OSREL}-ElmerGrid:${PORTSDIR}/science/elmergrid \
-		${MACHINE_ARCH}-portbld-freebsd${OSREL}-Mesh2D:${PORTSDIR}/science/elmer-meshgen2d
+RUN_DEPENDS=	ElmerGrid:${PORTSDIR}/science/elmergrid		\
+		Mesh2D:${PORTSDIR}/science/elmer-meshgen2d
 
 USE_GCC=	4.1+
 WITH_FORTRAN=	yes
@@ -30,7 +30,7 @@ FC=	${LOCALBASE}/bin/gfortran41
 F77=	${FC}
 
 .ifdef WITH_OPTIMIZED_FLAGS
-FCFLAGS+=        -O3 -ffast-math -funroll-loops
+FCFLAGS+=	-O3 -ffast-math -funroll-loops
 .endif
 
 USE_AUTOTOOLS=	autoconf:259
@@ -39,6 +39,7 @@ CONFIGURE_ENV+=	FC=${FC} F77=${FC} FCFLAGS="${FCFLAGS}"
 USE_GMAKE=	yes
 ALL_TARGET=
 INSTALLS_SHLIB=	yes
+TEST_ENV=	ELMER_HOME=${PREFIX}
 
 DATADIR=	${PREFIX}/share/elmersolver
 PLIST_SUB=	ARCH=${MACHINE_ARCH}
@@ -50,4 +51,12 @@ CFLAGS+=	-fPIC
 FCFLAGS+=	-fPIC
 .endif
 
+pre-configure:
+	${REINPLACE_CMD} -e 's|make|${GMAKE}|g' ${WRKSRC}/tests/runtests.in
+
+.if defined(MAINTAINER_MODE)
+regression-test:	install
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${TEST_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/science/elmer-fem/distinfo b/science/elmer-fem/distinfo
index 2e36a272f9bf..5da275eb9b10 100644
--- a/science/elmer-fem/distinfo
+++ b/science/elmer-fem/distinfo
@@ -1,3 +1,3 @@
-MD5 (fem-5.0.2.tar.gz) = 562bb027d64ed049bd874c2da72ee47a
-SHA256 (fem-5.0.2.tar.gz) = 58d1ec237ae46f162543c3981b292f5796a24363c7208064d2b8b283b8dd00ff
-SIZE (fem-5.0.2.tar.gz) = 4142887
+MD5 (fem-5.2.0.tar.gz) = 73d8167973087c764e29fabd7ab62d39
+SHA256 (fem-5.2.0.tar.gz) = c05de3cd2952cb2326d9a6de63d3c59d8b98e7b7f368fb6b82ce00a9ae2ec247
+SIZE (fem-5.2.0.tar.gz) = 5365964
diff --git a/science/elmer-fem/pkg-plist b/science/elmer-fem/pkg-plist
index ae2fa2be6831..9ead7d9bc50f 100644
--- a/science/elmer-fem/pkg-plist
+++ b/science/elmer-fem/pkg-plist
@@ -56,8 +56,8 @@ lib/libelmersolver.so
 %%DATADIR%%/include/timeintegrate.mod
 %%DATADIR%%/include/types.mod
 %%DATADIR%%/include/viewfactorglobals.mod
-@dirrm %%DATADIR%%/include
 %%DATADIR%%/lib/AdvectionDiffusion.so
+%%DATADIR%%/lib/ArteryOutlet.so
 %%DATADIR%%/lib/ArtificialCompressibility.so
 %%DATADIR%%/lib/DCRComplexSolve.so
 %%DATADIR%%/lib/ElasticSolve.so
@@ -74,7 +74,9 @@ lib/libelmersolver.so
 %%DATADIR%%/lib/HelmholtzBEM.so
 %%DATADIR%%/lib/HelmholtzSolve.so
 %%DATADIR%%/lib/KESolver.so
+%%DATADIR%%/lib/LevelSet.so
 %%DATADIR%%/lib/MagneticSolve.so
+%%DATADIR%%/lib/MovingElstatSolver.so
 %%DATADIR%%/lib/PoissonBEM.so
 %%DATADIR%%/lib/PoissonBoltzmannSolve.so
 %%DATADIR%%/lib/RateOfChange.so
@@ -86,6 +88,7 @@ lib/libelmersolver.so
 %%DATADIR%%/lib/Smitc.so
 %%DATADIR%%/lib/StatCurrentSolve.so
 %%DATADIR%%/lib/StatElecSolve.so
+%%DATADIR%%/lib/StatMagSolve.so
 %%DATADIR%%/lib/Stokes.so
 %%DATADIR%%/lib/StreamSolver.so
 %%DATADIR%%/lib/StressSolve.so
@@ -93,4 +96,5 @@ lib/libelmersolver.so
 %%DATADIR%%/lib/elements.def
 %%DATADIR%%/lib/libelmersolver.so
 @dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/include
 @dirrm %%DATADIR%%