Attachment #153869 for bug #196577




# $FreeBSD$

PORTNAME=	elmerfem
PORTVERSION=	7.0.20150305
CATEGORIES=	cad science

MAINTAINER=	pfg@FreeBSD.org


LICENSE=	GPLv2

LIB_DEPENDS=	libparpack.so:${PORTSDIR}/math/arpack-ng-mpich	\
		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=	799ecc8

USES=		cmake fortran gmake tcl blaslapack:netlib

USE_LDCONFIG=	yes
ALL_TARGET=

Lines 1-2 Link Here

(-)cad/elmerfem/distinfo (-2 / +2 lines)
1	SHA256 (elmerfem-7.0.20141202.tar.gz) = f42a395ad021425ffb6bc8f513682d402c5ee31dfc45aed77b377a141f376a2b	1	SHA256 (elmerfem-7.0.20150305.tar.gz) = 6299fffa71e3b868abe30df5c85704e60309ae171321a6aa9fb61bb061cfd32c
2	SIZE (elmerfem-7.0.20141202.tar.gz) = 43339062	2	SIZE (elmerfem-7.0.20150305.tar.gz) = 44839317




--- fem/src/CMakeLists.txt.orig	2014-12-18 03:11:20.000000000 -0500
+++ fem/src/CMakeLists.txt	2015-01-06 15:46:33.994140478 -0500
@@ -119,9 +119,9 @@
 
 
 ADD_EXECUTABLE(Solver_TGT Solver.F90)

 ENDIF()
 
 IF(NOT(WITH_MPI))
@@ -216,7 +216,7 @@
 INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
 
 IF(NOT(WIN32))

 ENDIF()
 
 # GebhardFactors
@@ -225,7 +225,7 @@
                                       mpi_stubs elmersolver)
 
 IF(NOT(WIN32))

 ENDIF()
 
 IF(WITH_Trilinos)
@@ -269,9 +269,10 @@
 
 IF(WITH_MPI)
   IF(NOT(WIN32))
-    INSTALL(CODE "
-    EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver
-    WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)")
+    # Create symlink after, to respect STAGEDIR
+    #INSTALL(CODE "
+    #EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver
+    #WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)")
   ELSE()
     INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy
     \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe




share/elmersolver/lib/FlowSolve.so
share/elmersolver/lib/FluidicForce.so
share/elmersolver/lib/FluxSolver.so
share/elmersolver/lib/FourierLoss.so
share/elmersolver/lib/FreeSurfaceReduced.so
share/elmersolver/lib/FreeSurfaceSolver.so
share/elmersolver/lib/HeatSolve.so

share/elmersolver/lib/SSTKomega.so
share/elmersolver/lib/SaveData.so
share/elmersolver/lib/SaveGridData.so
share/elmersolver/lib/SaveMesh.so
share/elmersolver/lib/ScalarPotentialSolver.so
share/elmersolver/lib/ShallowWaterNS.so
share/elmersolver/lib/ShearrateSolver.so

share/elmersolver/lib/VelocityPrecond.so
share/elmersolver/lib/ViscousCompressibility.so
share/elmersolver/lib/VorticitySolver.so
share/elmersolver/lib/WaveSolver.so
share/elmersolver/lib/elements.def
share/elmersolver/license_texts/GPL-2.txt
share/elmersolver/license_texts/LGPL-2.1.txt





LICENSE=	BSD3CLAUSE

USES=		fortran libtool blaslapack
USE_LDCONFIG=	yes

CONFLICTS=	arpack-[0-9]*


GNU_CONFIGURE=	yes

CONFIGURE_ARGS=	--with-blas="${BLASLIB}" \
		--with-lapack="${LAPACKLIB}"
LDFLAGS+=	-L${LOCALBASE}/lib

WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}

PKGNAMESUFFIX=	-mpich
.endif

WITH_BLAS?=	blas

.if ${WITH_BLAS} == "gotoblas"
BLAS=		-lgoto2p
LAPACK=		-lgoto2p
LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
.elif ${WITH_BLAS} == "atlas"
BLAS=		-lptf77blas
LAPACK=		-lalapack -lptcblas
LIB_DEPENDS+=	libptf77blas.so:${PORTSDIR}/math/atlas
.elif ${WITH_BLAS} == "blas"
BLAS=		-lblas
LAPACK=		-llapack
LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
		liblapack.so:${PORTSDIR}/math/lapack
.else
IGNORE=		unknown value of WITH_BLAS: ${WITH_BLAS}
.endif

post-patch:
	@${REINPLACE_CMD} -Ee 's|\(libdir\)(/pkgconfig)|(prefix)/libdata\1|' \
	${WRKSRC}/Makefile.in

Return to bug 196577

Lines 2-8 Link Here

(-)cad/elmerfem/Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= elmerfem	4	PORTNAME= elmerfem
5	PORTVERSION= 7.0.20141202	5	PORTVERSION= 7.0.20150305
6	CATEGORIES= cad science	6	CATEGORIES= cad science
7		7
8	MAINTAINER= pfg@FreeBSD.org	8	MAINTAINER= pfg@FreeBSD.org
Lines 10-17 Link Here
10		10
11	LICENSE= GPLv2	11	LICENSE= GPLv2
12		12
13	LIB_DEPENDS= liblapack.so:${PORTSDIR}/math/lapack \	13	LIB_DEPENDS= libparpack.so:${PORTSDIR}/math/arpack-ng-mpich \
14	libparpack.so:${PORTSDIR}/math/arpack-ng-mpich \
15	libmpich.so.8:${PORTSDIR}/net/mpich2	14	libmpich.so.8:${PORTSDIR}/net/mpich2
16		15
17	USE_GITHUB= yes	16	USE_GITHUB= yes
Lines 18-26 Link Here
18	GH_ACCOUNT= ElmerCSC	17	GH_ACCOUNT= ElmerCSC
19	GH_PROJECT= elmerfem	18	GH_PROJECT= elmerfem
20	GH_TAGNAME= ${GH_COMMIT}	19	GH_TAGNAME= ${GH_COMMIT}
21	GH_COMMIT= 0300707	20	GH_COMMIT= 799ecc8
22		21
23	USES= cmake fortran gmake tcl	22	USES= cmake fortran gmake tcl blaslapack:netlib
24		23
25	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
26	ALL_TARGET=	25	ALL_TARGET=

Lines 1-6 Link Here

(-)cad/elmerfem/files/patch-fem_src_CMakeLists.txt (-13 / +13 lines)
1	--- fem/src/CMakeLists.txt.orig 2014-09-25 15:07:43.000000000 +0200	1	--- fem/src/CMakeLists.txt.orig 2014-12-18 03:11:20.000000000 -0500
2	+++ fem/src/CMakeLists.txt 2014-10-06 23:29:26.000000000 +0200	2	+++ fem/src/CMakeLists.txt 2015-01-06 15:46:33.994140478 -0500
3	@@ -117,9 +117,9 @@	3	@@ -119,9 +119,9 @@
4		4
5		5
6	ADD_EXECUTABLE(Solver_TGT Solver.F90)	6	ADD_EXECUTABLE(Solver_TGT Solver.F90)
Lines 12-18 Link Here
12	ENDIF()	12	ENDIF()
13		13
14	IF(NOT(WITH_MPI))	14	IF(NOT(WITH_MPI))
15	@@ -214,7 +214,7 @@	15	@@ -216,7 +216,7 @@
16	INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")	16	INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
17		17
18	IF(NOT(WIN32))	18	IF(NOT(WIN32))
Lines 21-27 Link Here
21	ENDIF()	21	ENDIF()
22		22
23	# GebhardFactors	23	# GebhardFactors
24	@@ -223,7 +223,7 @@	24	@@ -225,7 +225,7 @@
25	mpi_stubs elmersolver)	25	mpi_stubs elmersolver)
26		26
27	IF(NOT(WIN32))	27	IF(NOT(WIN32))
Lines 30-46 Link Here
30	ENDIF()	30	ENDIF()
31		31
32	IF(WITH_Trilinos)	32	IF(WITH_Trilinos)
33	@@ -267,9 +267,10 @@	33	@@ -269,9 +269,10 @@
34		34
35	IF(WITH_MPI)	35	IF(WITH_MPI)
36	IF(NOT(WIN32))	36	IF(NOT(WIN32))
37	- INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink	37	- INSTALL(CODE "
38	- \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi	38	- EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver
39	- \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)")	39	- WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)")
40	+ # Create symlink after, to repect STAGEDIR	40	+ # Create symlink after, to respect STAGEDIR
41	+ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink	41	+ #INSTALL(CODE "
42	+ #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi	42	+ #EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver
43	+ #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)")	43	+ #WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)")
44	ELSE()	44	ELSE()
45	INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy	45	INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy
46	\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe	46	\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe

Lines 126-131 Link Here

(-)cad/elmerfem/pkg-plist (+3 lines)
126	share/elmersolver/lib/FlowSolve.so	126	share/elmersolver/lib/FlowSolve.so
127	share/elmersolver/lib/FluidicForce.so	127	share/elmersolver/lib/FluidicForce.so
128	share/elmersolver/lib/FluxSolver.so	128	share/elmersolver/lib/FluxSolver.so
		129	share/elmersolver/lib/FourierLoss.so
129	share/elmersolver/lib/FreeSurfaceReduced.so	130	share/elmersolver/lib/FreeSurfaceReduced.so
130	share/elmersolver/lib/FreeSurfaceSolver.so	131	share/elmersolver/lib/FreeSurfaceSolver.so
131	share/elmersolver/lib/HeatSolve.so	132	share/elmersolver/lib/HeatSolve.so
Lines 164-169 Link Here
164	share/elmersolver/lib/SSTKomega.so	165	share/elmersolver/lib/SSTKomega.so
165	share/elmersolver/lib/SaveData.so	166	share/elmersolver/lib/SaveData.so
166	share/elmersolver/lib/SaveGridData.so	167	share/elmersolver/lib/SaveGridData.so
		168	share/elmersolver/lib/SaveMesh.so
167	share/elmersolver/lib/ScalarPotentialSolver.so	169	share/elmersolver/lib/ScalarPotentialSolver.so
168	share/elmersolver/lib/ShallowWaterNS.so	170	share/elmersolver/lib/ShallowWaterNS.so
169	share/elmersolver/lib/ShearrateSolver.so	171	share/elmersolver/lib/ShearrateSolver.so
Lines 188-193 Link Here
188	share/elmersolver/lib/VelocityPrecond.so	190	share/elmersolver/lib/VelocityPrecond.so
189	share/elmersolver/lib/ViscousCompressibility.so	191	share/elmersolver/lib/ViscousCompressibility.so
190	share/elmersolver/lib/VorticitySolver.so	192	share/elmersolver/lib/VorticitySolver.so
		193	share/elmersolver/lib/WaveSolver.so
191	share/elmersolver/lib/elements.def	194	share/elmersolver/lib/elements.def
192	share/elmersolver/license_texts/GPL-2.txt	195	share/elmersolver/license_texts/GPL-2.txt
193	share/elmersolver/license_texts/LGPL-2.1.txt	196	share/elmersolver/license_texts/LGPL-2.1.txt

Lines 14-20 Link Here

(-)math/arpack-ng/Makefile (-22 / +3 lines)
14		14
15	LICENSE= BSD3CLAUSE	15	LICENSE= BSD3CLAUSE
16		16
17	USES= fortran libtool	17	USES= fortran libtool blaslapack
18	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
19		19
20	CONFLICTS= arpack-[0-9]*	20	CONFLICTS= arpack-[0-9]*
Lines 22-29 Link Here
22		22
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
24		24
25	CONFIGURE_ARGS= --with-blas="${BLAS}" \	25	CONFIGURE_ARGS= --with-blas="${BLASLIB}" \
26	--with-lapack="${LAPACK}"	26	--with-lapack="${LAPACKLIB}"
27	LDFLAGS+= -L${LOCALBASE}/lib	27	LDFLAGS+= -L${LOCALBASE}/lib
28		28
29	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	29	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Lines 41-65 Link Here
41	PKGNAMESUFFIX= -mpich	41	PKGNAMESUFFIX= -mpich
42	.endif	42	.endif
43		43
44	WITH_BLAS?= blas
45
46	.if ${WITH_BLAS} == "gotoblas"
47	BLAS= -lgoto2p
48	LAPACK= -lgoto2p
49	LIB_DEPENDS+= libgoto2p.so:${PORTSDIR}/math/gotoblas
50	.elif ${WITH_BLAS} == "atlas"
51	BLAS= -lptf77blas
52	LAPACK= -lalapack -lptcblas
53	LIB_DEPENDS+= libptf77blas.so:${PORTSDIR}/math/atlas
54	.elif ${WITH_BLAS} == "blas"
55	BLAS= -lblas
56	LAPACK= -llapack
57	LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas \
58	liblapack.so:${PORTSDIR}/math/lapack
59	.else
60	IGNORE= unknown value of WITH_BLAS: ${WITH_BLAS}
61	.endif
62
63	post-patch:	44	post-patch:
64	@${REINPLACE_CMD} -Ee 's\|\(libdir\)(/pkgconfig)\|(prefix)/libdata\1\|' \	45	@${REINPLACE_CMD} -Ee 's\|\(libdir\)(/pkgconfig)\|(prefix)/libdata\1\|' \
65	${WRKSRC}/Makefile.in	46	${WRKSRC}/Makefile.in