Update cad/elmerfem to 20141015 snapshot.

This brings many small fixes.
While here drop the autoconf support since we are using the CMake branch.

PR:		ports/194410
Submitted by:	pfg@ (maintainer)

6 files changed, 5 insertions, 45 deletions

diff --git a/cad/elmerfem/Makefile b/cad/elmerfem/Makefile
index 2786cd97a61e..c240a526589c 100644
--- a/cad/elmerfem/Makefile
+++ b/cad/elmerfem/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	elmerfem
-PORTVERSION=	7.0.20140925
+PORTVERSION=	7.0.20141015
 CATEGORIES=	cad science
-#DISTNAME=	${PORTNAME}-devel
 
 MAINTAINER=	pfg@FreeBSD.org
 COMMENT=	ELMER FEM package
@@ -19,7 +18,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
 GH_PROJECT=	elmerfem
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	bc00ab5
+GH_COMMIT=	539967a
 
 USES=		cmake fortran gmake tcl
 
@@ -42,17 +41,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 FCPPFLAGS+=	-ansi
 
 post-install:
-	# To avoid conflict with SuiteSparse
-.for mod in amd umfpack
-	${RM} ${STAGEDIR}/${PREFIX}/lib/lib${mod}.a
-.endfor
 	cd  ${STAGEDIR}${PREFIX}/bin	\
 	&& ${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} test/fast
+	cd ${WRKSRC} && LD_LIBRARY_PATH=${PREFIX}/share/elmersolver/lib ${MAKE_CMD} 1dtest_Source
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/cad/elmerfem/distinfo b/cad/elmerfem/distinfo
index b661d0e9d1ba..faa918122779 100644
--- a/cad/elmerfem/distinfo
+++ b/cad/elmerfem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (elmerfem-7.0.20140925.tar.gz) = e1db18873060080809fa7835f09a6f7b5ef09b17b1d5b8d7fc5d6321760c9d02
-SIZE (elmerfem-7.0.20140925.tar.gz) = 42990927
+SHA256 (elmerfem-7.0.20141015.tar.gz) = c339f9c1c9602478d064fadd53338a34645557b96d3cae0cbf0315ba7f24b7a3
+SIZE (elmerfem-7.0.20141015.tar.gz) = 42958413
diff --git a/cad/elmerfem/files/patch-fem-acx_elmer.m4 b/cad/elmerfem/files/patch-fem-acx_elmer.m4
deleted file mode 100644
index 2226d5d9db77..000000000000
--- a/cad/elmerfem/files/patch-fem-acx_elmer.m4
+++ /dev/null
@@ -1,10 +0,0 @@
---- fem/acx_elmer.m4.orig	2014-09-06 21:01:43.000000000 -0500
-+++ fem/acx_elmer.m4	2014-09-06 21:02:07.000000000 -0500
-@@ -851,7 +851,6 @@
- dnl run it
- dnl printf "running: $CXX $acx_cxx_verbose_flag test.cpp 2>&1 |grep -e ' -l'\n"
- acx_cxx_verbose_out=`$CXX $acx_cxx_verbose_flag test.cpp 2>&1 |grep -e ' -l'`
--acx_cxx_verbose_out=${acx_cxx_verbose_out//\"/
- acx_cxx_libs=""
- 
- dnl get only the -l -L -R flags
diff --git a/cad/elmerfem/files/patch-fem-configure b/cad/elmerfem/files/patch-fem-configure
deleted file mode 100644
index f1ce5048f692..000000000000
--- a/cad/elmerfem/files/patch-fem-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- fem/configure.orig	2014-09-06 21:42:30.000000000 -0500
-+++ fem/configure	2014-09-06 21:43:51.000000000 -0500
-@@ -6325,7 +6325,7 @@
- printf "int main(int argc, char **argv) { return(1); }" > test.cpp
- 
- acx_cxx_verbose_out=`$CXX $acx_cxx_verbose_flag test.cpp 2>&1 |grep -e ' -l'`
--acx_cxx_verbose_out=${acx_cxx_verbose_out//\"/
-+#acx_cxx_verbose_out=${acx_cxx_verbose_out//\"/
- acx_cxx_libs=""
- 
- for acx_cxx_ldflag in $acx_cxx_verbose_out; do
diff --git a/cad/elmerfem/files/patch-fem-src-Makefile.in b/cad/elmerfem/files/patch-fem-src-Makefile.in
deleted file mode 100644
index 6c4a1d1609f7..000000000000
--- a/cad/elmerfem/files/patch-fem-src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- fem/src/Makefile.in.orig	2014-09-09 15:04:27.000000000 -0500
-+++ fem/src/Makefile.in	2014-09-09 15:28:20.000000000 -0500
-@@ -1119,7 +1119,7 @@
- @USE_WINDOWS_COMPILER_TRUE@	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS)
- @USE_WINDOWS_COMPILER_FALSE@	$(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \
- @USE_WINDOWS_COMPILER_FALSE@	      -o ViewFactors$(EXE_EXT) ViewFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) \
--@USE_WINDOWS_COMPILER_FALSE@	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS) $(STDCXX_LIBS)
-+@USE_WINDOWS_COMPILER_FALSE@	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS)
- 
- GebhardtFactors$(EXE_EXT): libelmersolver$(SHL_EXT) GebhardtFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT)
- 	$(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \
diff --git a/cad/elmerfem/pkg-descr b/cad/elmerfem/pkg-descr
index 72e4c6cd8917..9b610b97f18d 100644
--- a/cad/elmerfem/pkg-descr
+++ b/cad/elmerfem/pkg-descr
@@ -12,6 +12,3 @@ described by partial differential equations which Elmer solves by the
 Finite Element Method (FEM).
 
 WWW: http://www.csc.fi/elmer/elmersolve/
-
-Note: This package installs in it's own ELMER_HOME path, so you usually
-have to add /usr/local/elmer/bin/ to your shell path.