Attachment #147859 for bug #193531

Lines 16-22 Link Here

(-)cad/elmerfem/Makefile (-1 / +5 lines)
16	libmpich.so.8:${PORTSDIR}/net/mpich2	16	libmpich.so.8:${PORTSDIR}/net/mpich2
17		17
18	USE_GITHUB= yes	18	USE_GITHUB= yes
19
20	GH_ACCOUNT= ElmerCSC	19	GH_ACCOUNT= ElmerCSC
21	GH_PROJECT= elmerfem	20	GH_PROJECT= elmerfem
22	GH_TAGNAME= ${GH_COMMIT}	21	GH_TAGNAME= ${GH_COMMIT}
Lines 24-31 Link Here
24		23
25	USES= cmake fortran gmake tcl	24	USES= cmake fortran gmake tcl
26		25
		26	USE_LDCONFIG= yes
27	ALL_TARGET=	27	ALL_TARGET=
28		28
		29	.if !defined(MAINTAINER_MODE)
		30	CMAKE_ARGS+= -Wno-dev
		31	.endif
		32
29	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
30		34
31	.if ${ARCH} == "amd64" \|\| ${ARCH} == "ia64"	35	.if ${ARCH} == "amd64" \|\| ${ARCH} == "ia64"

Line 0 Link Here

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




--- fem/src/CMakeLists.txt.orig	2014-09-25 15:07:43.000000000 +0200
+++ fem/src/CMakeLists.txt	2014-09-30 22:30:14.000000000 +0200
@@ -117,9 +117,9 @@
 
 
 ADD_EXECUTABLE(Solver_TGT Solver.F90)
-  SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME ${ELMERSOLVER_OUTPUT_NAME})
+  SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME "${ELMERSOLVER_OUTPUT_NAME}")
 IF(NOT(WIN32))
-   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
+   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
 ENDIF()
 
 IF(NOT(WITH_MPI))
@@ -214,7 +214,7 @@
 INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
 
 IF(NOT(WIN32))
-  SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
+  SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
 ENDIF()
 
 # GebhardFactors
@@ -223,7 +223,7 @@
                                       mpi_stubs elmersolver)
 
 IF(NOT(WIN32))
-  SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
+  SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
 ENDIF()
 
 IF(WITH_Trilinos)

Line 0 Link Here

(-)cad/elmerfem/files/patch-matc_src_CMakeLists.txt (+11 lines)
	1	--- matc/src/CMakeLists.txt.orig 2014-09-25 15:07:43.000000000 +0200
	2	+++ matc/src/CMakeLists.txt 2014-09-30 22:27:34.000000000 +0200
	3	@@ -12,7 +12,7 @@
	4
	5	SET_TARGET_PROPERTIES(Matc_bin PROPERTIES OUTPUT_NAME matc)
	6	IF(NOT(WIN32))
	7	- SET_TARGET_PROPERTIES(Matc_bin PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
	8	+ SET_TARGET_PROPERTIES(Matc_bin PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
	9	ENDIF()
	10
	11	INSTALL(TARGETS matc Matc_bin RUNTIME DESTINATION "bin" LIBRARY DESTINATION ${ELMER_INSTALL_LIB_DIR})




bin/ElmerGrid
bin/ElmerSolver_mpi
bin/GebhardtFactors
bin/Mesh2D
bin/ViewFactors
bin/elmerf90
bin/elmerld
bin/matc
lib/elmersolver/libamd.a
lib/elmersolver/libamdf77.a
lib/elmersolver/libelmersolver.so
lib/elmersolver/libfhuti.so
lib/elmersolver/libmatc.so
lib/elmersolver/libmpi_stubs.so
lib/elmersolver/libumfpack.a
share/elmersolver/include/adaptive.mod
share/elmersolver/include/ascbinoutpututils.mod
share/elmersolver/include/bandmatrix.mod
share/elmersolver/include/bandwidthoptimize.mod
share/elmersolver/include/binio.mod
share/elmersolver/include/blocksolve.mod
share/elmersolver/include/clusteringmethods.mod
share/elmersolver/include/coordinatesystems.mod
share/elmersolver/include/crsmatrix.mod
share/elmersolver/include/defutils.mod
share/elmersolver/include/differentials.mod
share/elmersolver/include/diffuseconvective.mod
share/elmersolver/include/diffuseconvectivegeneral.mod
share/elmersolver/include/directsolve.mod
share/elmersolver/include/dxfile.mod
share/elmersolver/include/eigensolve.mod
share/elmersolver/include/elementdescription.mod
share/elmersolver/include/elementutils.mod
share/elmersolver/include/exchangecorrelations.mod
share/elmersolver/include/fetisolve.mod
share/elmersolver/include/freesurface.mod
share/elmersolver/include/gebhardtfactorglobals.mod
share/elmersolver/include/generalutils.mod
share/elmersolver/include/globmat.mod
share/elmersolver/include/globmatc.mod
share/elmersolver/include/hashtable.mod
share/elmersolver/include/huti_aux.mod
share/elmersolver/include/huti_bicgstab.mod
share/elmersolver/include/huti_bicgstab_2.mod
share/elmersolver/include/huti_cg.mod
share/elmersolver/include/huti_cgs.mod
share/elmersolver/include/huti_gmres.mod
share/elmersolver/include/huti_interfaces.mod
share/elmersolver/include/huti_qmr.mod
share/elmersolver/include/huti_sfe.mod
share/elmersolver/include/huti_tfqmr.mod
share/elmersolver/include/integration.mod
share/elmersolver/include/interpolation.mod
share/elmersolver/include/iso_varying_string.mod
share/elmersolver/include/iterativemethods.mod
share/elmersolver/include/itersolve.mod
share/elmersolver/include/kinds.mod
share/elmersolver/include/linearalgebra.mod
share/elmersolver/include/listmatrix.mod
share/elmersolver/include/lists.mod
share/elmersolver/include/loadmod.mod
share/elmersolver/include/ludecomposition.mod
share/elmersolver/include/magnetodynamicsutils.mod
share/elmersolver/include/mainutils.mod
share/elmersolver/include/materialmodels.mod
share/elmersolver/include/maxwell.mod
share/elmersolver/include/maxwellaxis.mod
share/elmersolver/include/maxwellgeneral.mod
share/elmersolver/include/meshutils.mod
share/elmersolver/include/messages.mod
share/elmersolver/include/modeldescription.mod
share/elmersolver/include/multigrid.mod
share/elmersolver/include/navierstokes.mod
share/elmersolver/include/navierstokescylindrical.mod
share/elmersolver/include/navierstokesgeneral.mod
share/elmersolver/include/paralleleigensolve.mod
share/elmersolver/include/parallelutils.mod
share/elmersolver/include/particledynamicsstuff.mod
share/elmersolver/include/particleutils.mod
share/elmersolver/include/pelementbase.mod
share/elmersolver/include/pelementmaps.mod
share/elmersolver/include/porousmaterials.mod
share/elmersolver/include/radiation.mod
share/elmersolver/include/radiationfactorglobals.mod
share/elmersolver/include/smoothers.mod
share/elmersolver/include/solverutils.mod
share/elmersolver/include/sparitercomm.mod
share/elmersolver/include/spariterglobals.mod
share/elmersolver/include/spariterprecond.mod
share/elmersolver/include/sparitersolve.mod
share/elmersolver/include/statelecboundaryutils.mod
share/elmersolver/include/stressgeneral.mod
share/elmersolver/include/stresslocal.mod
share/elmersolver/include/timeintegrate.mod
share/elmersolver/include/types.mod
share/elmersolver/include/viewfactorglobals.mod
share/elmersolver/include/vtklegacyfile.mod
share/elmersolver/lib/Acoustics.so
share/elmersolver/lib/AdvectionDiffusion.so
share/elmersolver/lib/AdvectionReaction.so

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

Return to bug 193531

Line 0 Link Here

(-)cad/elmerfem/files/patch-fem_src_CMakeLists.txt (+32 lines)
	1	--- fem/src/CMakeLists.txt.orig 2014-09-25 15:07:43.000000000 +0200
	2	+++ fem/src/CMakeLists.txt 2014-09-30 22:30:14.000000000 +0200
	3	@@ -117,9 +117,9 @@
	4
	5
	6	ADD_EXECUTABLE(Solver_TGT Solver.F90)
	7	- SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME ${ELMERSOLVER_OUTPUT_NAME})
	8	+ SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME "${ELMERSOLVER_OUTPUT_NAME}")
	9	IF(NOT(WIN32))
	10	- SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
	11	+ SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
	12	ENDIF()
	13
	14	IF(NOT(WITH_MPI))
	15	@@ -214,7 +214,7 @@
	16	INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
	17
	18	IF(NOT(WIN32))
	19	- SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
	20	+ SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
	21	ENDIF()
	22
	23	# GebhardFactors
	24	@@ -223,7 +223,7 @@
	25	mpi_stubs elmersolver)
	26
	27	IF(NOT(WIN32))
	28	- SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
	29	+ SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
	30	ENDIF()
	31
	32	IF(WITH_Trilinos)

Lines 1-12 Link Here

(-)cad/elmerfem/pkg-plist (-7 / +97 lines)
1	bin/ElmerGrid	1	bin/ElmerGrid
2	bin/ElmerSolver_mpi	2	bin/ElmerSolver_mpi
		3	bin/GebhardtFactors
		4	bin/Mesh2D
		5	bin/ViewFactors
3	bin/elmerf90	6	bin/elmerf90
		7	bin/elmerld
4	bin/matc	8	bin/matc
5	lib/libamdf77.a	9	lib/elmersolver/libamd.a
6	lib/libbinio.so	10	lib/elmersolver/libamdf77.a
7	lib/libelmersolver.so	11	lib/elmersolver/libelmersolver.so
8	lib/libhuti.so	12	lib/elmersolver/libfhuti.so
9	lib/libmatc.so	13	lib/elmersolver/libmatc.so
		14	lib/elmersolver/libmpi_stubs.so
		15	lib/elmersolver/libumfpack.a
		16	share/elmersolver/include/adaptive.mod
		17	share/elmersolver/include/ascbinoutpututils.mod
		18	share/elmersolver/include/bandmatrix.mod
		19	share/elmersolver/include/bandwidthoptimize.mod
		20	share/elmersolver/include/binio.mod
		21	share/elmersolver/include/blocksolve.mod
		22	share/elmersolver/include/clusteringmethods.mod
		23	share/elmersolver/include/coordinatesystems.mod
		24	share/elmersolver/include/crsmatrix.mod
		25	share/elmersolver/include/defutils.mod
		26	share/elmersolver/include/differentials.mod
		27	share/elmersolver/include/diffuseconvective.mod
		28	share/elmersolver/include/diffuseconvectivegeneral.mod
		29	share/elmersolver/include/directsolve.mod
		30	share/elmersolver/include/dxfile.mod
		31	share/elmersolver/include/eigensolve.mod
		32	share/elmersolver/include/elementdescription.mod
		33	share/elmersolver/include/elementutils.mod
		34	share/elmersolver/include/exchangecorrelations.mod
		35	share/elmersolver/include/fetisolve.mod
		36	share/elmersolver/include/freesurface.mod
		37	share/elmersolver/include/gebhardtfactorglobals.mod
		38	share/elmersolver/include/generalutils.mod
		39	share/elmersolver/include/globmat.mod
		40	share/elmersolver/include/globmatc.mod
		41	share/elmersolver/include/hashtable.mod
		42	share/elmersolver/include/huti_aux.mod
		43	share/elmersolver/include/huti_bicgstab.mod
		44	share/elmersolver/include/huti_bicgstab_2.mod
		45	share/elmersolver/include/huti_cg.mod
		46	share/elmersolver/include/huti_cgs.mod
		47	share/elmersolver/include/huti_gmres.mod
		48	share/elmersolver/include/huti_interfaces.mod
		49	share/elmersolver/include/huti_qmr.mod
		50	share/elmersolver/include/huti_sfe.mod
		51	share/elmersolver/include/huti_tfqmr.mod
		52	share/elmersolver/include/integration.mod
		53	share/elmersolver/include/interpolation.mod
		54	share/elmersolver/include/iso_varying_string.mod
		55	share/elmersolver/include/iterativemethods.mod
		56	share/elmersolver/include/itersolve.mod
		57	share/elmersolver/include/kinds.mod
		58	share/elmersolver/include/linearalgebra.mod
		59	share/elmersolver/include/listmatrix.mod
		60	share/elmersolver/include/lists.mod
		61	share/elmersolver/include/loadmod.mod
		62	share/elmersolver/include/ludecomposition.mod
		63	share/elmersolver/include/magnetodynamicsutils.mod
		64	share/elmersolver/include/mainutils.mod
		65	share/elmersolver/include/materialmodels.mod
		66	share/elmersolver/include/maxwell.mod
		67	share/elmersolver/include/maxwellaxis.mod
		68	share/elmersolver/include/maxwellgeneral.mod
		69	share/elmersolver/include/meshutils.mod
		70	share/elmersolver/include/messages.mod
		71	share/elmersolver/include/modeldescription.mod
		72	share/elmersolver/include/multigrid.mod
		73	share/elmersolver/include/navierstokes.mod
		74	share/elmersolver/include/navierstokescylindrical.mod
		75	share/elmersolver/include/navierstokesgeneral.mod
		76	share/elmersolver/include/paralleleigensolve.mod
		77	share/elmersolver/include/parallelutils.mod
78	share/elmersolver/include/particledynamicsstuff.mod
79	share/elmersolver/include/particleutils.mod
80	share/elmersolver/include/pelementbase.mod
81	share/elmersolver/include/pelementmaps.mod
82	share/elmersolver/include/porousmaterials.mod
83	share/elmersolver/include/radiation.mod
84	share/elmersolver/include/radiationfactorglobals.mod
85	share/elmersolver/include/smoothers.mod
86	share/elmersolver/include/solverutils.mod
87	share/elmersolver/include/sparitercomm.mod
88	share/elmersolver/include/spariterglobals.mod
89	share/elmersolver/include/spariterprecond.mod
90	share/elmersolver/include/sparitersolve.mod
91	share/elmersolver/include/statelecboundaryutils.mod
92	share/elmersolver/include/stressgeneral.mod
93	share/elmersolver/include/stresslocal.mod
94	share/elmersolver/include/timeintegrate.mod
95	share/elmersolver/include/types.mod
96	share/elmersolver/include/viewfactorglobals.mod
97	share/elmersolver/include/vtklegacyfile.mod
10	share/elmersolver/lib/Acoustics.so	98	share/elmersolver/lib/Acoustics.so
11	share/elmersolver/lib/AdvectionDiffusion.so	99	share/elmersolver/lib/AdvectionDiffusion.so
12	share/elmersolver/lib/AdvectionReaction.so	100	share/elmersolver/lib/AdvectionReaction.so
Lines 98-102 Link Here
98	share/elmersolver/lib/ViscousCompressibility.so	186	share/elmersolver/lib/ViscousCompressibility.so
99	share/elmersolver/lib/VorticitySolver.so	187	share/elmersolver/lib/VorticitySolver.so
100	share/elmersolver/lib/elements.def	188	share/elmersolver/lib/elements.def
101	@dirrm share/elmersolver/lib	189	share/elmersolver/license_texts/GPL-2.txt
102	@dirrm share/elmersolver	190	share/elmersolver/license_texts/LGPL-2.1.txt
		191	share/elmersolver/license_texts/LICENSES
		192	share/elmersolver/license_texts/fem/LICENSES