Attachment #216746 for bug #248246

View | Details | Raw Unified | Return to bug 248246
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	elmerfem
PORTVERSION=	8.4.20200708
PORTREVISION=	1
DISTVERSIONPREFIX=	release-
CATEGORIES=	science

MAINTAINER=	henrik@gulbra.net

		libopenblas.so:math/openblas \
		libparpack.so:math/arpack-ng

USES=		cmake compiler:c++11-lang fortran
USE_GITHUB=	yes
GH_ACCOUNT=	ElmerCSC
GH_TAGNAME=	679a882b
USE_LDCONFIG=	${PREFIX}/lib/elmersolver

ALL_TARGET=	# empty

CMAKE_ARGS+=	-Wno-dev
.endif

OPTIONS_DEFINE=		GUI OCC
OPTIONS_DEFAULT=	GUI
OPTIONS_SUB=		yes
OCC_IMPLIES=		GUI

GUI_DESC=		Build with ElmerGUI (Graphical User Interface)
GUI_CMAKE_BOOL=		WITH_ELMERGUI WITH_PARAVIEW
GUI_CMAKE_ON=		-DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \
			-DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \
			-DDESIRED_QT_VERSION=5 \
			-DWITH_QT5:BOOL=TRUE \
			-DQT_FOUND:BOOL=TRUE
GUI_LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6
GUI_USES=		gl jpeg qt:5 xorg
GUI_USE=		gl=gl,glu xorg=ice,sm,x11,xext,xt qt=${QT5_LIBS:ts,}

OCC_DESC=		Use OpenCASCADE for CAD import in ElmerGUI
OCC_CMAKE_BOOL=		WITH_OCC
OCC_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2
OCC_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
			libfreetype.so:print/freetype2 \
			libpng16.so:graphics/png \
			libpython3.7m.so:lang/python37 \
			libqwt6.so:x11-toolkits/qwt6 \
			libtiff.so:graphics/tiff \
			libTKernel.so:cad/opencascade \
			libvtksys-8.2.so:math/vtk8
GUI_USE=		gl=gl,glu xorg=ice,sm,x11,xext,xt \
			qt=buildtools_build,concurrent,core,declarative,gui,location,network,opengl,printsupport,qmake_build,script,sensors,sql,svg,webchannel,webkit,widgets,xml

QT5_LIBS=	buildtools_build concurrent core declarative gui location \
		network opengl printsupport qmake_build script sensors \
		sql svg webchannel webkit widgets xml
		-DDESIRED_QT_VERSION=5

.include <bsd.port.pre.mk>


	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \
		${WRKSRC}/elmergrid/src/femelmer.c

post-patch-OCC-on:
	@${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \
		"${WRKSRC}/cmake/Modules/FindOCE.cmake"
	@${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \
		"${WRKSRC}/cmake/Modules/FindOCE.cmake"

post-install:
	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver

Lines 1-3 Link Here

(-)science/elmerfem/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1583810165	1	TIMESTAMP = 1595166083
2	SHA256 (ElmerCSC-elmerfem-release-8.4.20200309-39f692c_GH0.tar.gz) = ac47ad284120077fdb453d7ef2be849b194bedf756bcb5f08fcb46960393ee67	2	SHA256 (ElmerCSC-elmerfem-8.4.20200708-679a882b_GH0.tar.gz) = 13c8b9a4af76ae8fc6b6fcff612572e671ac31cffe070bbef7ace740e4044f1d
3	SIZE (ElmerCSC-elmerfem-release-8.4.20200309-39f692c_GH0.tar.gz) = 59972679	3	SIZE (ElmerCSC-elmerfem-8.4.20200708-679a882b_GH0.tar.gz) = 63393434

Lines 1-6 Link Here

(-)science/elmerfem/files/patch-CMakeLists.txt (-2 / +2 lines)
1	--- CMakeLists.txt.orig 2017-05-19 12:19:26 UTC	1	--- CMakeLists.txt.orig 2020-06-26 12:18:06 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -264,7 +264,7 @@ ADD_SUBDIRECTORY(umfpack)	3	@@ -470,7 +470,7 @@ ADD_SUBDIRECTORY(umfpack)
4	ADD_SUBDIRECTORY(fhutiter)	4	ADD_SUBDIRECTORY(fhutiter)
5	ADD_SUBDIRECTORY(meshgen2d)	5	ADD_SUBDIRECTORY(meshgen2d)
6	ADD_SUBDIRECTORY(fem)	6	ADD_SUBDIRECTORY(fem)

Lines 1-11 Link Here

(-)science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp (-8 / +8 lines)
1	--- ElmerGUI/Application/cad/cadview.cpp.orig 2020-03-06 10:30:22 UTC	1	--- ElmerGUI/Application/cad/cadview.cpp.orig 2020-06-26 12:18:06 UTC
2	+++ ElmerGUI/Application/cad/cadview.cpp	2	+++ ElmerGUI/Application/cad/cadview.cpp
3	@@ -69,7 +69,7 @@	3	@@ -74,7 +74,7 @@
4	#include <TopoDS_Shape.hxx>	4	#include <BRepAdaptor_Curve2d.hxx>
5	#include <BRepTools.hxx>	5	#include <BRepBndLib.hxx>
6	#include <TopTools_HSequenceOfShape.hxx>	6	#include <BRepGProp.hxx>
7	-#include <BRepMesh.hxx>	7	-#include <BRepMesh.hxx>
8	+#include <BRepMesh_IncrementalMesh.hxx>	8	+#include <BRepMesh_IncrementalMesh.hxx>
9	#include <TopExp_Explorer.hxx>	9	#include <BRepTools.hxx>
10	#include <TopoDS_Face.hxx>	10	#include <BRep_Builder.hxx>
11	#include <TopoDS.hxx>	11	#include <BRep_Tool.hxx>




This is **part** of the GitHub commit, only the bit fixing the build:

	CMake Error at fem/tests/CMakeLists.txt:17 (FOREACH):
	  FOREACH Invalid integer: 'depth'
	Call Stack (most recent call first):
	  fem/tests/CMakeLists.txt:29 (SUBDIRLIST)


From f02cb33acd59a32c41fe9f67367155e271c22ae8 Mon Sep 17 00:00:00 2001
From: Foad Sojoodi Farimani <foad@Foads-MacBook-Pro.local>
Date: Fri, 3 Apr 2020 22:25:02 +0200
Subject: [PATCH] now compiles on macOS

---
 README.adoc              | 49 ++++++++--------------------------------
 fem/tests/CMakeLists.txt |  2 +-
 2 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/fem/tests/CMakeLists.txt b/fem/tests/CMakeLists.txt
index e8bd7ed84..06d1168ea 100644
--- fem/tests/CMakeLists.txt
+++ fem/tests/CMakeLists.txt
@@ -14,7 +14,7 @@ SET(MESH2D_BIN "${CMAKE_BINARY_DIR}/meshgen2d/src/Mesh2D")
 
 MACRO(SUBDIRLIST result curdir depth)
   set(glob_pattern "*")
-  FOREACH(D RANGE 1 depth)
+  FOREACH(D RANGE 1 ${depth})
     FILE(GLOB children RELATIVE ${curdir} ${glob_pattern}) 
     FOREACH(child ${children})
       IF(IS_DIRECTORY ${curdir}/${child})

Lines 7-13 Link Here

(-)science/elmerfem/pkg-descr (-3 lines)
7	While Elmer is powerful, it is not for the faint of heart. New users	7	While Elmer is powerful, it is not for the faint of heart. New users
8	can expect to spend days or weeks honing their skills in one domain.	8	can expect to spend days or weeks honing their skills in one domain.
9		9
10	This port is a development version of Elmer, which may or may not be
11	better suited to your needs than the latest official release.
12
13	WWW: https://www.csc.fi/web/elmer	10	WWW: https://www.csc.fi/web/elmer

Return to bug 248246

Lines 2-10 Link Here

(-)science/elmerfem/Makefile (-22 / +31 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= elmerfem	4	PORTNAME= elmerfem
5	PORTVERSION= 8.4.20200309	5	PORTVERSION= 8.4.20200708
6	PORTREVISION= 1
7	DISTVERSIONPREFIX= release-
8	CATEGORIES= science	6	CATEGORIES= science
9		7
10	MAINTAINER= henrik@gulbra.net	8	MAINTAINER= henrik@gulbra.net
Lines 17-26 Link Here
17	libopenblas.so:math/openblas \	15	libopenblas.so:math/openblas \
18	libparpack.so:math/arpack-ng	16	libparpack.so:math/arpack-ng
19		17
20	USES= cmake compiler:c++11-lang fortran tcl	18	USES= cmake compiler:c++11-lang fortran
21	USE_GITHUB= yes	19	USE_GITHUB= yes
22	GH_ACCOUNT= ElmerCSC	20	GH_ACCOUNT= ElmerCSC
23	GH_TAGNAME= 39f692c	21	GH_TAGNAME= 679a882b
24	USE_LDCONFIG= ${PREFIX}/lib/elmersolver	22	USE_LDCONFIG= ${PREFIX}/lib/elmersolver
25		23
26	ALL_TARGET= # empty	24	ALL_TARGET= # empty
Lines 35-59 Link Here
35	CMAKE_ARGS+= -Wno-dev	33	CMAKE_ARGS+= -Wno-dev
36	.endif	34	.endif
37		35
38	OPTIONS_DEFINE= GUI	36	OPTIONS_DEFINE= GUI OCC
39	OPTIONS_DEFAULT= GUI	37	OPTIONS_DEFAULT= GUI
40	OPTIONS_SUB= yes	38	OPTIONS_SUB= yes
		39	OCC_IMPLIES= GUI
41		40
42	GUI_LIB_DEPENDS= libexpat.so:textproc/expat2 \	41	GUI_DESC= Build with ElmerGUI (Graphical User Interface)
		42	GUI_CMAKE_BOOL= WITH_ELMERGUI WITH_PARAVIEW
		43	GUI_CMAKE_ON= -DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \
		44	-DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \
		45	-DDESIRED_QT_VERSION=5 \
		46	-DWITH_QT5:BOOL=TRUE \
		47	-DQT_FOUND:BOOL=TRUE
		48	GUI_LIB_DEPENDS= libqwt6.so:x11-toolkits/qwt6
		49	GUI_USES= gl jpeg qt:5 xorg
		50	GUI_USE= gl=gl,glu xorg=ice,sm,x11,xext,xt qt=${QT5_LIBS:ts,}
		51
		52	OCC_DESC= Use OpenCASCADE for CAD import in ElmerGUI
		53	OCC_CMAKE_BOOL= WITH_OCC
		54	OCC_CMAKE_ON= -DVTK_DIR=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2
		55	OCC_LIB_DEPENDS= libexpat.so:textproc/expat2 \
43	libfreetype.so:print/freetype2 \	56	libfreetype.so:print/freetype2 \
44	libpng16.so:graphics/png \	57	libpng16.so:graphics/png \
45	libpython2.7.so:lang/python27 \	58	libpython3.7m.so:lang/python37 \
46	libqwt6.so:x11-toolkits/qwt6 \
47	libtiff.so:graphics/tiff \	59	libtiff.so:graphics/tiff \
48	libvtksys-6.2.so:math/vtk6	60	libTKernel.so:cad/opencascade \
49	GUI_USES= gl jpeg qt:5 xorg	61	libvtksys-8.2.so:math/vtk8
50	GUI_USE= gl=gl,glu xorg=ice,sm,x11,xext,xt \
51	qt=buildtools_build,concurrent,core,declarative,gui,location,network,opengl,printsupport,qmake_build,script,sensors,sql,svg,webchannel,webkit,widgets,xml
52		62
53	GUI_CMAKE_BOOL= WITH_ELMERGUI WITH_PARAVIEW WITH_QT5 QT_FOUND # WITH_OCC requires the QVTKWidget.h that is only provided by the math/vtk6 with QT5=yes	63	QT5_LIBS= buildtools_build concurrent core declarative gui location \
54	GUI_CMAKE_ON= -DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \	64	network opengl printsupport qmake_build script sensors \
55	-DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \	65	sql svg webchannel webkit widgets xml
56	-DDESIRED_QT_VERSION=5
57		66
58	.include <bsd.port.pre.mk>	67	.include <bsd.port.pre.mk>
59		68
Lines 69-79 Link Here
69	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \	78	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \
70	${WRKSRC}/elmergrid/src/femelmer.c	79	${WRKSRC}/elmergrid/src/femelmer.c
71		80
72	post-patch-GUI-on:	81	post-patch-OCC-on:
73	#@${REINPLACE_CMD} -e "s\|\$${VERSION}\|`${PKG_QUERY} '%v' opencascade`\|" \	82	@${REINPLACE_CMD} -e "s\|\$${VERSION}\|`${PKG_QUERY} '%v' opencascade`\|" \
74	# "${WRKSRC}/cmake/Modules/FindOCE.cmake"	83	"${WRKSRC}/cmake/Modules/FindOCE.cmake"
75	#@${REINPLACE_CMD} -e 's\|$${INCLUDE}\|${LOCALBASE}/include/OpenCASCADE\|' \	84	@${REINPLACE_CMD} -e 's\|$${INCLUDE}\|${LOCALBASE}/include/OpenCASCADE\|' \
76	# "${WRKSRC}/cmake/Modules/FindOCE.cmake"	85	"${WRKSRC}/cmake/Modules/FindOCE.cmake"
77		86
78	post-install:	87	post-install:
79	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver	88	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver

Lines 1-31 Link Here

(-)science/elmerfem/files/patch-git-f02cb33acd59a32c41fe9f67367155e271c22ae8 (-31 lines)
1	This is part of the GitHub commit, only the bit fixing the build:
2
3	CMake Error at fem/tests/CMakeLists.txt:17 (FOREACH):
4	FOREACH Invalid integer: 'depth'
5	Call Stack (most recent call first):
6	fem/tests/CMakeLists.txt:29 (SUBDIRLIST)
7
8
9	From f02cb33acd59a32c41fe9f67367155e271c22ae8 Mon Sep 17 00:00:00 2001
10	From: Foad Sojoodi Farimani <foad@Foads-MacBook-Pro.local>
11	Date: Fri, 3 Apr 2020 22:25:02 +0200
12	Subject: [PATCH] now compiles on macOS
13
14	---
15	README.adoc \| 49 ++++++++--------------------------------
16	fem/tests/CMakeLists.txt \| 2 +-
17	2 files changed, 11 insertions(+), 40 deletions(-)
18
19	diff --git a/fem/tests/CMakeLists.txt b/fem/tests/CMakeLists.txt
20	index e8bd7ed84..06d1168ea 100644
21	--- fem/tests/CMakeLists.txt
22	+++ fem/tests/CMakeLists.txt
23	@@ -14,7 +14,7 @@ SET(MESH2D_BIN "${CMAKE_BINARY_DIR}/meshgen2d/src/Mesh2D")
24
25	MACRO(SUBDIRLIST result curdir depth)
26	set(glob_pattern "*")
27	- FOREACH(D RANGE 1 depth)
28	+ FOREACH(D RANGE 1 ${depth})
29	FILE(GLOB children RELATIVE ${curdir} ${glob_pattern})
30	FOREACH(child ${children})
31	IF(IS_DIRECTORY ${curdir}/${child})

Lines 357-362 Link Here

(-)science/elmerfem/pkg-plist (+2 lines)
357	share/elmersolver/lib/HeatSolve.so	357	share/elmersolver/lib/HeatSolve.so
358	share/elmersolver/lib/HeatSolveVec.so	358	share/elmersolver/lib/HeatSolveVec.so
359	share/elmersolver/lib/HelmholtzBEM.so	359	share/elmersolver/lib/HelmholtzBEM.so
		360	share/elmersolver/lib/HelmholtzProjection.so
360	share/elmersolver/lib/HelmholtzSolve.so	361	share/elmersolver/lib/HelmholtzSolve.so
361	share/elmersolver/lib/IncompressibleNSVec.so	362	share/elmersolver/lib/IncompressibleNSVec.so
362	share/elmersolver/lib/Isosurface.so	363	share/elmersolver/lib/Isosurface.so
Lines 408-413 Link Here
408	share/elmersolver/lib/ShellSolver.so	409	share/elmersolver/lib/ShellSolver.so
409	share/elmersolver/lib/Smitc.so	410	share/elmersolver/lib/Smitc.so
410	share/elmersolver/lib/Spalart-Allmaras.so	411	share/elmersolver/lib/Spalart-Allmaras.so
		412	share/elmersolver/lib/SpringAssembly.so
411	share/elmersolver/lib/StatCurrentSolve.so	413	share/elmersolver/lib/StatCurrentSolve.so
412	share/elmersolver/lib/StatCurrentSolveVec.so	414	share/elmersolver/lib/StatCurrentSolveVec.so
413	share/elmersolver/lib/StatElecBoundary.so	415	share/elmersolver/lib/StatElecBoundary.so