Index: head/cad/elmerfem/Makefile
===================================================================
--- head/cad/elmerfem/Makefile	(revision 371179)
+++ head/cad/elmerfem/Makefile	(revision 371180)
@@ -1,58 +1,53 @@
 # Created by: Pedro Giffuni
 # $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
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	liblapack.so:${PORTSDIR}/math/lapack		\
 		libparpack.so:${PORTSDIR}/math/arpack-ng-mpich	\
 		libmpich.so.8:${PORTSDIR}/net/mpich2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
 GH_PROJECT=	elmerfem
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	bc00ab5
+GH_COMMIT=	539967a
 
 USES=		cmake fortran gmake tcl
 
 USE_LDCONFIG=	yes
 ALL_TARGET=
 
 .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:
-	# 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>
Index: head/cad/elmerfem/distinfo
===================================================================
--- head/cad/elmerfem/distinfo	(revision 371179)
+++ head/cad/elmerfem/distinfo	(revision 371180)
@@ -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
Index: head/cad/elmerfem/files/patch-fem-configure
===================================================================
--- head/cad/elmerfem/files/patch-fem-configure	(revision 371179)
+++ head/cad/elmerfem/files/patch-fem-configure	(nonexistent)
@@ -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

Property changes on: head/cad/elmerfem/files/patch-fem-configure
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/elmerfem/files/patch-fem-acx_elmer.m4
===================================================================
--- head/cad/elmerfem/files/patch-fem-acx_elmer.m4	(revision 371179)
+++ head/cad/elmerfem/files/patch-fem-acx_elmer.m4	(nonexistent)
@@ -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

Property changes on: head/cad/elmerfem/files/patch-fem-acx_elmer.m4
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/elmerfem/files/patch-fem-src-Makefile.in
===================================================================
--- head/cad/elmerfem/files/patch-fem-src-Makefile.in	(revision 371179)
+++ head/cad/elmerfem/files/patch-fem-src-Makefile.in	(nonexistent)
@@ -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) \

Property changes on: head/cad/elmerfem/files/patch-fem-src-Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/elmerfem/pkg-descr
===================================================================
--- head/cad/elmerfem/pkg-descr	(revision 371179)
+++ head/cad/elmerfem/pkg-descr	(revision 371180)
@@ -1,17 +1,14 @@
 Elmer - Open Source Finite Element Software for Multiphysical Problems.
 
 Elmer is an open source multiphysical simulation software mainly
 developed by CSC - IT Center for Science (CSC). Elmer development was
 started 1995 in collaboration with Finnish Universities, research institutes
 and industry. After it's open source publication in 2005, the use and
 development of Elmer has become international.
 
 Elmer includes physical models of fluid dynamics, structural mechanics,
 electromagnetics, heat transfer and acoustics, for example. These are
 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.