View | Details | Raw Unified | Return to bug 193531 | Differences between
and this patch

Collapse All | Expand All

(-)elmerfem/Makefile (-11 / +4 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	elmerfem
4
PORTNAME=	elmerfem
5
PORTVERSION=	7.0.20140925
5
PORTVERSION=	7.0.20141002
6
CATEGORIES=	cad science
6
CATEGORIES=	science cad
7
#DISTNAME=	${PORTNAME}-devel
8
7
9
MAINTAINER=	pfg@FreeBSD.org
8
MAINTAINER=	pfg@FreeBSD.org
10
COMMENT=	ELMER FEM package
9
COMMENT=	ELMER FEM package
Lines 13-25 Link Here
13
12
14
LIB_DEPENDS=	liblapack.so:${PORTSDIR}/math/lapack		\
13
LIB_DEPENDS=	liblapack.so:${PORTSDIR}/math/lapack		\
15
		libparpack.so:${PORTSDIR}/math/arpack-ng-mpich	\
14
		libparpack.so:${PORTSDIR}/math/arpack-ng-mpich	\
16
		libmpich.so.8:${PORTSDIR}/net/mpich2
15
		libmpich.so:${PORTSDIR}/net/mpich2
17
16
18
USE_GITHUB=	yes
17
USE_GITHUB=	yes
19
GH_ACCOUNT=	ElmerCSC
18
GH_ACCOUNT=	ElmerCSC
20
GH_PROJECT=	elmerfem
19
GH_PROJECT=	elmerfem
21
GH_TAGNAME=	${GH_COMMIT}
20
GH_TAGNAME=	${GH_COMMIT}
22
GH_COMMIT=	bc00ab5
21
GH_COMMIT=	78cf1f8
23
22
24
USES=		cmake fortran gmake tcl
23
USES=		cmake fortran gmake tcl
25
24
Lines 42-53 Link Here
42
FCPPFLAGS+=	-ansi
41
FCPPFLAGS+=	-ansi
43
42
44
post-install:
43
post-install:
45
	# To avoid conflict with SuiteSparse
46
.for mod in amd umfpack
47
	${RM} ${STAGEDIR}/${PREFIX}/lib/lib${mod}.a
48
.endfor
49
	cd  ${STAGEDIR}${PREFIX}/bin	\
50
	&& ${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
51
	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
44
	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
52
45
53
.if defined(MAINTAINER_MODE)
46
.if defined(MAINTAINER_MODE)
(-)elmerfem/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (elmerfem-7.0.20140925.tar.gz) = e1db18873060080809fa7835f09a6f7b5ef09b17b1d5b8d7fc5d6321760c9d02
1
SHA256 (elmerfem-7.0.20141002.tar.gz) = 0138006646f5adcf8d5775515be058cadf2056c7a71013ef55b1d88de8d82693
2
SIZE (elmerfem-7.0.20140925.tar.gz) = 42990927
2
SIZE (elmerfem-7.0.20141002.tar.gz) = 42990289
(-)elmerfem/files/patch-fem-acx_elmer.m4 (-10 lines)
Lines 1-10 Link Here
1
--- fem/acx_elmer.m4.orig	2014-09-06 21:01:43.000000000 -0500
2
+++ fem/acx_elmer.m4	2014-09-06 21:02:07.000000000 -0500
3
@@ -851,7 +851,6 @@
4
 dnl run it
5
 dnl printf "running: $CXX $acx_cxx_verbose_flag test.cpp 2>&1 |grep -e ' -l'\n"
6
 acx_cxx_verbose_out=`$CXX $acx_cxx_verbose_flag test.cpp 2>&1 |grep -e ' -l'`
7
-acx_cxx_verbose_out=${acx_cxx_verbose_out//\"/
8
 acx_cxx_libs=""
9
 
10
 dnl get only the -l -L -R flags
(-)elmerfem/files/patch-fem-configure (-11 lines)
Lines 1-11 Link Here
1
--- fem/configure.orig	2014-09-06 21:42:30.000000000 -0500
2
+++ fem/configure	2014-09-06 21:43:51.000000000 -0500
3
@@ -6325,7 +6325,7 @@
4
 printf "int main(int argc, char **argv) { return(1); }" > test.cpp
5
 
6
 acx_cxx_verbose_out=`$CXX $acx_cxx_verbose_flag test.cpp 2>&1 |grep -e ' -l'`
7
-acx_cxx_verbose_out=${acx_cxx_verbose_out//\"/
8
+#acx_cxx_verbose_out=${acx_cxx_verbose_out//\"/
9
 acx_cxx_libs=""
10
 
11
 for acx_cxx_ldflag in $acx_cxx_verbose_out; do
(-)elmerfem/files/patch-fem-src-Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- fem/src/Makefile.in.orig	2014-09-09 15:04:27.000000000 -0500
2
+++ fem/src/Makefile.in	2014-09-09 15:28:20.000000000 -0500
3
@@ -1119,7 +1119,7 @@
4
 @USE_WINDOWS_COMPILER_TRUE@	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS)
5
 @USE_WINDOWS_COMPILER_FALSE@	$(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \
6
 @USE_WINDOWS_COMPILER_FALSE@	      -o ViewFactors$(EXE_EXT) ViewFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) \
7
-@USE_WINDOWS_COMPILER_FALSE@	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS) $(STDCXX_LIBS)
8
+@USE_WINDOWS_COMPILER_FALSE@	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS)
9
 
10
 GebhardtFactors$(EXE_EXT): libelmersolver$(SHL_EXT) GebhardtFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT)
11
 	$(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \
(-)elmerfem/pkg-descr (-3 lines)
Lines 12-17 Link Here
12
Finite Element Method (FEM).
12
Finite Element Method (FEM).
13
13
14
WWW: http://www.csc.fi/elmer/elmersolve/
14
WWW: http://www.csc.fi/elmer/elmersolve/
15
16
Note: This package installs in it's own ELMER_HOME path, so you usually
17
have to add /usr/local/elmer/bin/ to your shell path.

Return to bug 193531