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

Collapse All | Expand All

(-)cad/elmerfem/Makefile (-6 / +21 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	elmerfem
4
PORTNAME=	elmerfem
5
PORTVERSION=	8.3.20170519
5
PORTVERSION=	8.3.20170601
6
CATEGORIES=	cad science
6
CATEGORIES=	cad science
7
7
8
MAINTAINER=	ports@FreeBSD.org
8
MAINTAINER=	ports@FreeBSD.org
Lines 10-27 Link Here
10
10
11
LICENSE=	GPLv2
11
LICENSE=	GPLv2
12
12
13
LIB_DEPENDS=	libparpack.so:math/arpack-ng-mpich	\
14
		libmpich.so.8:net/mpich2
15
16
USE_GITHUB=	yes
13
USE_GITHUB=	yes
17
GH_ACCOUNT=	ElmerCSC
14
GH_ACCOUNT=	ElmerCSC
18
GH_TAGNAME=	c30fff2
15
GH_TAGNAME=	9eb2346
19
16
20
USES=		blaslapack:netlib cmake fortran gmake tcl
17
USES=		blaslapack cmake:outsource fortran gmake tcl
21
18
22
USE_LDCONFIG=	${PREFIX}/lib/elmersolver
19
USE_LDCONFIG=	${PREFIX}/lib/elmersolver
23
ALL_TARGET=	# empty
20
ALL_TARGET=	# empty
24
21
22
OPTIONS_DEFINE= 	MPI
23
OPTIONS_DEFAULT=
24
OPTIONS_SUB=	yes
25
25
.if !defined(MAINTAINER_MODE)
26
.if !defined(MAINTAINER_MODE)
26
CMAKE_ARGS+=	-Wno-dev
27
CMAKE_ARGS+=	-Wno-dev
27
.endif
28
.endif
Lines 38-45 Link Here
38
LDFLAGS+=	-L${LOCALBASE}/lib
39
LDFLAGS+=	-L${LOCALBASE}/lib
39
FCPPFLAGS+=	-ansi
40
FCPPFLAGS+=	-ansi
40
41
42
.include <bsd.port.options.mk>
43
44
.if ${PORT_OPTIONS:MMPI}
45
# There are various version of MPICH in the tree: arpack-ng needs mpich2
46
LIB_DEPENDS+=	libparpack.so:math/arpack-ng-mpich	\
47
		libmpich.so.8:net/mpich2
48
CMAKE_ARGS+=    -DWITH_MPI:BOOL=TRUE
49
.else
50
LIB_DEPENDS+=	libarpack.so:math/arpack
51
CMAKE_ARGS+=    -DWITH_MPI:BOOL=FALSE #-DWITH_OpenMP:BOOL=TRUE
52
.endif
53
41
post-install:
54
post-install:
55
.if ${PORT_OPTIONS:MMPI}
42
	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
56
	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
57
.endif
43
	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
58
	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
44
59
45
do-test:
60
do-test:
(-)cad/elmerfem/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1495312420
1
TIMESTAMP = 1496348099
2
SHA256 (ElmerCSC-elmerfem-8.3.20170519-c30fff2_GH0.tar.gz) = 7b9e9b4abaf4801dec383f7b7d8f339c274aaa0c98d8320564ed4616a1115e68
2
SHA256 (ElmerCSC-elmerfem-8.3.20170601-9eb2346_GH0.tar.gz) = d2a265631691eaa04f9862e2be0fc74a56924b708cf59207821b796be3bddad3
3
SIZE (ElmerCSC-elmerfem-8.3.20170519-c30fff2_GH0.tar.gz) = 57920491
3
SIZE (ElmerCSC-elmerfem-8.3.20170601-9eb2346_GH0.tar.gz) = 57956825
(-)cad/elmerfem/files/patch-CMakeLists.txt (-1 / +1 lines)
Lines 1-4 Link Here
1
--- CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
1
--- CMakeLists.txt.orig	2017-06-01 12:51:14 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -264,7 +264,7 @@ ADD_SUBDIRECTORY(umfpack)
3
@@ -264,7 +264,7 @@ ADD_SUBDIRECTORY(umfpack)
4
 ADD_SUBDIRECTORY(fhutiter)
4
 ADD_SUBDIRECTORY(fhutiter)
(-)cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt (-1 / +1 lines)
Lines 1-4 Link Here
1
--- elmergrid/src/CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
1
--- elmergrid/src/CMakeLists.txt.orig	2017-06-01 12:51:14 UTC
2
+++ elmergrid/src/CMakeLists.txt
2
+++ elmergrid/src/CMakeLists.txt
3
@@ -31,7 +31,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC
3
@@ -31,7 +31,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC
4
 
4
 
(-)cad/elmerfem/files/patch-fem_src_CMakeLists.txt (-1 / +1 lines)
Lines 1-4 Link Here
1
--- fem/src/CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
1
--- fem/src/CMakeLists.txt.orig	2017-06-01 12:51:14 UTC
2
+++ fem/src/CMakeLists.txt
2
+++ fem/src/CMakeLists.txt
3
@@ -129,11 +129,11 @@ SET(ELMERSOLVER_LIBRARIES matc umfpack 
3
@@ -129,11 +129,11 @@ SET(ELMERSOLVER_LIBRARIES matc umfpack 
4
 
4
 
(-)cad/elmerfem/files/patch-matc_src_CMakeLists.txt (-1 / +1 lines)
Lines 1-4 Link Here
1
--- matc/src/CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
1
--- matc/src/CMakeLists.txt.orig	2017-06-01 12:51:14 UTC
2
+++ matc/src/CMakeLists.txt
2
+++ matc/src/CMakeLists.txt
3
@@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(Matc_bin matc)
3
@@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(Matc_bin matc)
4
 
4
 
(-)cad/elmerfem/files/patch-post-src-elmerpost.h (-1 / +1 lines)
Lines 1-4 Link Here
1
--- post/src/elmerpost.h.orig	2017-05-19 12:19:26 UTC
1
--- post/src/elmerpost.h.orig	2017-06-01 12:51:14 UTC
2
+++ post/src/elmerpost.h
2
+++ post/src/elmerpost.h
3
@@ -62,6 +62,7 @@
3
@@ -62,6 +62,7 @@
4
 
4
 
(-)cad/elmerfem/files/patch-post-src-screensave.c (-1 / +1 lines)
Lines 1-4 Link Here
1
--- post/src/screensave.c.orig	2017-05-19 12:19:26 UTC
1
--- post/src/screensave.c.orig	2017-06-01 12:51:14 UTC
2
+++ post/src/screensave.c
2
+++ post/src/screensave.c
3
@@ -32,6 +32,7 @@
3
@@ -32,6 +32,7 @@
4
 #include <GL/glu.h>
4
 #include <GL/glu.h>
(-)cad/elmerfem/pkg-plist (-2 / +1 lines)
Lines 1-6 Link Here
1
bin/ElmerGrid
1
bin/ElmerGrid
2
bin/ElmerSolver
2
bin/ElmerSolver
3
bin/ElmerSolver_mpi
3
%%MPI%%bin/ElmerSolver_mpi
4
bin/GebhardtFactors
4
bin/GebhardtFactors
5
bin/Mesh2D
5
bin/Mesh2D
6
bin/ViewFactors
6
bin/ViewFactors
Lines 113-119 Link Here
113
share/elmersolver/lib/AdvectionReaction.so
113
share/elmersolver/lib/AdvectionReaction.so
114
share/elmersolver/lib/ArteryOutlet.so
114
share/elmersolver/lib/ArteryOutlet.so
115
share/elmersolver/lib/ArtificialCompressibility.so
115
share/elmersolver/lib/ArtificialCompressibility.so
116
share/elmersolver/lib/CMakeFiles.so
117
share/elmersolver/lib/CircuitsAndDynamics.so
116
share/elmersolver/lib/CircuitsAndDynamics.so
118
share/elmersolver/lib/CoilSolver.so
117
share/elmersolver/lib/CoilSolver.so
119
share/elmersolver/lib/CompressibleNS.so
118
share/elmersolver/lib/CompressibleNS.so

Return to bug 219669