Attachment #160880 for bug #196577




# $FreeBSD$

PORTNAME=	elmerfem
PORTVERSION=	8.0.20150903
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_TAGNAME=	5aaf273 

USES=		blaslapack:netlib cmake fortran gmake tcl

USE_LDCONFIG=	${PREFIX}/lib/elmersolver
ALL_TARGET=

.if !defined(MAINTAINER_MODE)

Lines 1-2 Link Here

(-)cad/elmerfem/distinfo (-2 / +2 lines)
1	SHA256 (ElmerCSC-elmerfem-7.0.20141202-0300707_GH0.tar.gz) = b361efc406beb17bb5aa5abaf354ad64d842c610b9b66e043ad271b0ce72e380	1	SHA256 (ElmerCSC-elmerfem-8.0.20150903-5aaf273_GH0.tar.gz) = ea04b9f475be8b864b6dd52105defe733474ec2c48b9a77eefee837346954083
2	SIZE (ElmerCSC-elmerfem-7.0.20141202-0300707_GH0.tar.gz) = 43335735	2	SIZE (ElmerCSC-elmerfem-8.0.20150903-5aaf273_GH0.tar.gz) = 45633072




--- CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
+++ CMakeLists.txt
@@ -248,7 +248,7 @@ ADD_SUBDIRECTORY(umfpack)
 ADD_SUBDIRECTORY(fhutiter)
 ADD_SUBDIRECTORY(meshgen2d)
 ADD_SUBDIRECTORY(fem)
-ADD_SUBDIRECTORY(mathlibs)
+#ADD_SUBDIRECTORY(mathlibs)
 ADD_SUBDIRECTORY(elmergrid)
 ADD_SUBDIRECTORY(license_texts)
 
 MESSAGE(STATUS "------------------------------------------------")

Lines 1-11 Link Here

(-)cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt (-5 / +5 lines)
1	--- elmergrid/src/CMakeLists.txt.orig 2014-09-25 15:07:43.000000000 +0200	1	--- elmergrid/src/CMakeLists.txt.orig 2015-08-18 12:26:58 UTC
2	+++ elmergrid/src/CMakeLists.txt 2014-09-30 22:31:29.000000000 +0200	2	+++ elmergrid/src/CMakeLists.txt
3	@@ -14,7 +14,7 @@	3	@@ -29,7 +29,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC
4		4
5	TARGET_LINK_LIBRARIES(ElmerGrid matc metis)	5	TARGET_LINK_LIBRARIES(ElmerGrid metis m)
6	IF(NOT(WIN32))	6	IF(NOT(WIN32))
7	- SET_TARGET_PROPERTIES(ElmerGrid PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})	7	- SET_TARGET_PROPERTIES(ElmerGrid PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
8	+ SET_TARGET_PROPERTIES(ElmerGrid PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")	8	+ SET_TARGET_PROPERTIES(ElmerGrid PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
9	ENDIF()	9	ENDIF()
10		10
11	#INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/elmergrid/src/ElmerGrid DESTINATION "bin")	11	INSTALL(TARGETS ElmerGrid RUNTIME DESTINATION "bin")




--- fem/src/CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
+++ fem/src/CMakeLists.txt
@@ -131,9 +131,9 @@ ENDIF()
 
 
 ADD_EXECUTABLE(Solver_TGT Solver.F90)

 ENDIF()
 
 IF(NOT(WITH_MPI))
@@ -229,7 +229,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME
 INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
 
 IF(NOT(WIN32))

 ENDIF()
 
 # GebhardFactors
@@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
                                       mpi_stubs elmersolver)
 
 IF(NOT(WIN32))

 ENDIF()
 
 IF(WITH_Trilinos)
@@ -282,9 +282,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE
 
 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

Lines 1-6 Link Here

(-)cad/elmerfem/files/patch-matc_src_CMakeLists.txt (-3 / +3 lines)
1	--- matc/src/CMakeLists.txt.orig 2014-09-25 15:07:43.000000000 +0200	1	--- matc/src/CMakeLists.txt.orig 2015-08-18 12:26:58 UTC
2	+++ matc/src/CMakeLists.txt 2014-09-30 22:27:34.000000000 +0200	2	+++ matc/src/CMakeLists.txt
3	@@ -12,7 +12,7 @@	3	@@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(Matc_bin matc)
4		4
5	SET_TARGET_PROPERTIES(Matc_bin PROPERTIES OUTPUT_NAME matc)	5	SET_TARGET_PROPERTIES(Matc_bin PROPERTIES OUTPUT_NAME matc)
6	IF(NOT(WIN32))	6	IF(NOT(WIN32))

Lines 1-5 Link Here

(-)cad/elmerfem/files/patch-post-src-elmerpost.h (-2 / +2 lines)
1	--- post/src/elmerpost.h.orig 2014-09-09 15:50:25.000000000 -0500	1	--- post/src/elmerpost.h.orig 2015-08-18 12:26:58 UTC
2	+++ post/src/elmerpost.h 2014-09-09 16:25:51.000000000 -0500	2	+++ post/src/elmerpost.h
3	@@ -62,6 +62,7 @@	3	@@ -62,6 +62,7 @@
4		4
5	#include <elmer/matc.h>	5	#include <elmer/matc.h>

Lines 1-5 Link Here

(-)cad/elmerfem/files/patch-post-src-screensave.c (-2 / +2 lines)
1	--- post/src/screensave.c.orig 2014-09-09 20:47:35.000000000 -0500	1	--- post/src/screensave.c.orig 2015-08-18 12:26:58 UTC
2	+++ post/src/screensave.c 2014-09-09 20:50:39.000000000 -0500	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>
5		5




share/elmersolver/include/timeintegrate.mod
share/elmersolver/include/toroidcurrents.mod
share/elmersolver/include/types.mod
share/elmersolver/include/vectorhelmholtzutils.mod
share/elmersolver/include/viewfactorglobals.mod
share/elmersolver/include/vtklegacyfile.mod
share/elmersolver/lib/Acoustics.so

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/MovingElstatSolver.so
share/elmersolver/lib/NonphysicalMeshSolve.so
share/elmersolver/lib/NormalSolver.so
share/elmersolver/lib/OdeSolver.so
share/elmersolver/lib/ParStokes.so
share/elmersolver/lib/ParticleAdvector.so
share/elmersolver/lib/ParticleDynamics.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/V2FSolver.so
share/elmersolver/lib/VelocityPrecond.so
share/elmersolver/lib/ViscousCompressibility.so
share/elmersolver/lib/VectorHelmholtz.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

Return to bug 196577

Lines 2-8 Link Here

(-)cad/elmerfem/Makefile (-6 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= elmerfem	4	PORTNAME= elmerfem
5	PORTVERSION= 7.0.20141202	5	PORTVERSION= 8.0.20150903
6	CATEGORIES= cad science	6	CATEGORIES= cad science
7		7
8	MAINTAINER= pfg@FreeBSD.org	8	MAINTAINER= pfg@FreeBSD.org
Lines 10-26 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
18	GH_ACCOUNT= ElmerCSC	17	GH_ACCOUNT= ElmerCSC
19	GH_TAGNAME= 0300707	18	GH_TAGNAME= 5aaf273
20		19
21	USES= cmake fortran gmake tcl	20	USES= blaslapack:netlib cmake fortran gmake tcl
22		21
23	USE_LDCONFIG= yes	22	USE_LDCONFIG= ${PREFIX}/lib/elmersolver
24	ALL_TARGET=	23	ALL_TARGET=
25		24
26	.if !defined(MAINTAINER_MODE)	25	.if !defined(MAINTAINER_MODE)

Lines 1-11 Link Here

(-)cad/elmerfem/files/patch-CMakeLists.txt (-6 / +6 lines)
1	--- CMakeLists.txt.orig 2014-09-21 14:50:21.000000000 +0200	1	--- CMakeLists.txt.orig 2015-08-18 12:26:58 UTC
2	+++ CMakeLists.txt 2014-09-21 14:56:31.000000000 +0200	2	+++ CMakeLists.txt
3	@@ -56,7 +56,7 @@	3	@@ -248,7 +248,7 @@ ADD_SUBDIRECTORY(umfpack)
4	ADD_SUBDIRECTORY(eio)	4	ADD_SUBDIRECTORY(fhutiter)
5	ADD_SUBDIRECTORY(matc)	5	ADD_SUBDIRECTORY(meshgen2d)
6	ADD_SUBDIRECTORY(fem)	6	ADD_SUBDIRECTORY(fem)
7	-ADD_SUBDIRECTORY(mathlibs)	7	-ADD_SUBDIRECTORY(mathlibs)
8	+#ADD_SUBDIRECTORY(mathlibs)	8	+#ADD_SUBDIRECTORY(mathlibs)
9	ADD_SUBDIRECTORY(elmergrid)	9	ADD_SUBDIRECTORY(elmergrid)
		10	ADD_SUBDIRECTORY(license_texts)
10		11
11	MESSAGE(STATUS "------------------------------------------------")

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 2015-08-18 12:26:58 UTC
2	+++ fem/src/CMakeLists.txt 2014-10-06 23:29:26.000000000 +0200	2	+++ fem/src/CMakeLists.txt
3	@@ -117,9 +117,9 @@	3	@@ -131,9 +131,9 @@ ENDIF()
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	@@ -229,7 +229,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME
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	@@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
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	@@ -282,9 +282,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE
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 96-101 Link Here

(-)cad/elmerfem/pkg-plist (+6 lines)
96	share/elmersolver/include/timeintegrate.mod	96	share/elmersolver/include/timeintegrate.mod
97	share/elmersolver/include/toroidcurrents.mod	97	share/elmersolver/include/toroidcurrents.mod
98	share/elmersolver/include/types.mod	98	share/elmersolver/include/types.mod
		99	share/elmersolver/include/vectorhelmholtzutils.mod
99	share/elmersolver/include/viewfactorglobals.mod	100	share/elmersolver/include/viewfactorglobals.mod
100	share/elmersolver/include/vtklegacyfile.mod	101	share/elmersolver/include/vtklegacyfile.mod
101	share/elmersolver/lib/Acoustics.so	102	share/elmersolver/lib/Acoustics.so
Lines 126-131 Link Here
126	share/elmersolver/lib/FlowSolve.so	127	share/elmersolver/lib/FlowSolve.so
127	share/elmersolver/lib/FluidicForce.so	128	share/elmersolver/lib/FluidicForce.so
128	share/elmersolver/lib/FluxSolver.so	129	share/elmersolver/lib/FluxSolver.so
		130	share/elmersolver/lib/FourierLoss.so
129	share/elmersolver/lib/FreeSurfaceReduced.so	131	share/elmersolver/lib/FreeSurfaceReduced.so
130	share/elmersolver/lib/FreeSurfaceSolver.so	132	share/elmersolver/lib/FreeSurfaceSolver.so
131	share/elmersolver/lib/HeatSolve.so	133	share/elmersolver/lib/HeatSolve.so
Lines 143-148 Link Here
143	share/elmersolver/lib/MovingElstatSolver.so	145	share/elmersolver/lib/MovingElstatSolver.so
144	share/elmersolver/lib/NonphysicalMeshSolve.so	146	share/elmersolver/lib/NonphysicalMeshSolve.so
145	share/elmersolver/lib/NormalSolver.so	147	share/elmersolver/lib/NormalSolver.so
		148	share/elmersolver/lib/OdeSolver.so
146	share/elmersolver/lib/ParStokes.so	149	share/elmersolver/lib/ParStokes.so
147	share/elmersolver/lib/ParticleAdvector.so	150	share/elmersolver/lib/ParticleAdvector.so
148	share/elmersolver/lib/ParticleDynamics.so	151	share/elmersolver/lib/ParticleDynamics.so
Lines 164-169 Link Here
164	share/elmersolver/lib/SSTKomega.so	167	share/elmersolver/lib/SSTKomega.so
165	share/elmersolver/lib/SaveData.so	168	share/elmersolver/lib/SaveData.so
166	share/elmersolver/lib/SaveGridData.so	169	share/elmersolver/lib/SaveGridData.so
		170	share/elmersolver/lib/SaveMesh.so
167	share/elmersolver/lib/ScalarPotentialSolver.so	171	share/elmersolver/lib/ScalarPotentialSolver.so
168	share/elmersolver/lib/ShallowWaterNS.so	172	share/elmersolver/lib/ShallowWaterNS.so
169	share/elmersolver/lib/ShearrateSolver.so	173	share/elmersolver/lib/ShearrateSolver.so
Lines 187-193 Link Here
187	share/elmersolver/lib/V2FSolver.so	191	share/elmersolver/lib/V2FSolver.so
188	share/elmersolver/lib/VelocityPrecond.so	192	share/elmersolver/lib/VelocityPrecond.so
189	share/elmersolver/lib/ViscousCompressibility.so	193	share/elmersolver/lib/ViscousCompressibility.so
		194	share/elmersolver/lib/VectorHelmholtz.so
190	share/elmersolver/lib/VorticitySolver.so	195	share/elmersolver/lib/VorticitySolver.so
		196	share/elmersolver/lib/WaveSolver.so
191	share/elmersolver/lib/elements.def	197	share/elmersolver/lib/elements.def
192	share/elmersolver/license_texts/GPL-2.txt	198	share/elmersolver/license_texts/GPL-2.txt
193	share/elmersolver/license_texts/LGPL-2.1.txt	199	share/elmersolver/license_texts/LGPL-2.1.txt