Attachment #249221 for bug #277307




PORTNAME=	elmerfem
DISTVERSIONPREFIX=	release-
DISTVERSION=	9.0
PORTREVISION=	15
CATEGORIES=	science

PATCH_SITES=	https://github.com/ElmerCSC/${PORTNAME}/commit/

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

pre-configure-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-configure:




--- ElmerGUI/CMakeLists.txt.orig	2020-11-10 19:52:44 UTC
+++ ElmerGUI/CMakeLists.txt
@@ -83,7 +83,11 @@ IF(WITH_OCC)
     MESSAGE(STATUS "  [ElmerGUI] OCE_VERSION:       " ${OCE_VERSION})
     MESSAGE(STATUS "  [ElmerGUI] OCE_INCLUDE_DIRS:  " ${OCE_INCLUDE_DIRS})
   ENDIF()
-  SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKSTEP;TKMesh;TKIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKSTEP209;TKSTEPAttr;TKSTEPBase;TKTopAlgo;TKXSBase" CACHE INTERNAL "")
+  IF(OCE_VERSION AND OCE_VERSION VERSION_GREATER_EQUAL "7.8.0")
+    SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKDESTEP;TKMesh;TKDEIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKTopAlgo;TKXSBase" CACHE INTERNAL "")
+  ELSE()
+    SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKSTEP;TKMesh;TKIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKSTEP209;TKSTEPAttr;TKSTEPBase;TKTopAlgo;TKXSBase" CACHE INTERNAL "")
+  ENDIF()
   MESSAGE(STATUS "  [ElmerGUI] ELMER_OCC_LIBS:    " "${ELMER_OCC_LIBS}")
   MESSAGE(STATUS "------------------------------------------------")
 ENDIF()

Return to bug 277307

Lines 1-7 Link Here

(-)b/science/elmerfem/Makefile (-4 / +4 lines)
1	PORTNAME= elmerfem	1	PORTNAME= elmerfem
2	DISTVERSIONPREFIX= release-	2	DISTVERSIONPREFIX= release-
3	DISTVERSION= 9.0	3	DISTVERSION= 9.0
4	PORTREVISION= 14	4	PORTREVISION= 15
5	CATEGORIES= science	5	CATEGORIES= science
6		6
7	PATCH_SITES= https://github.com/ElmerCSC/${PORTNAME}/commit/	7	PATCH_SITES= https://github.com/ElmerCSC/${PORTNAME}/commit/
Lines 97-106 post-patch: Link Here
97	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \	97	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \
98	${WRKSRC}/elmergrid/src/egparallel.c	98	${WRKSRC}/elmergrid/src/egparallel.c
99		99
100	post-patch-OCC-on:	100	pre-configure-OCC-on:
101	@${REINPLACE_CMD} -e "s\|\$${VERSION}\|`${PKG_QUERY} '%v' opencascade`\|" \	101	${REINPLACE_CMD} -e "s\|\$${VERSION}\|`${PKG_QUERY} '%v' opencascade`\|" \
102	"${WRKSRC}/cmake/Modules/FindOCE.cmake"	102	"${WRKSRC}/cmake/Modules/FindOCE.cmake"
103	@${REINPLACE_CMD} -e 's\|$${INCLUDE}\|${LOCALBASE}/include/OpenCASCADE\|' \	103	${REINPLACE_CMD} -e 's\|$${INCLUDE}\|${LOCALBASE}/include/OpenCASCADE\|' \
104	"${WRKSRC}/cmake/Modules/FindOCE.cmake"	104	"${WRKSRC}/cmake/Modules/FindOCE.cmake"
105		105
106	post-configure:	106	post-configure:

Added Link Here

(-)b/science/elmerfem/files/patch-ElmerGUI_CMakeLists.txt (-1 / +15 lines)
0	-	1	--- ElmerGUI/CMakeLists.txt.orig 2020-11-10 19:52:44 UTC
		2	+++ ElmerGUI/CMakeLists.txt
		3	@@ -83,7 +83,11 @@ IF(WITH_OCC)
		4	MESSAGE(STATUS " [ElmerGUI] OCE_VERSION: " ${OCE_VERSION})
		5	MESSAGE(STATUS " [ElmerGUI] OCE_INCLUDE_DIRS: " ${OCE_INCLUDE_DIRS})
		6	ENDIF()
		7	- SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKSTEP;TKMesh;TKIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKSTEP209;TKSTEPAttr;TKSTEPBase;TKTopAlgo;TKXSBase" CACHE INTERNAL "")
		8	+ IF(OCE_VERSION AND OCE_VERSION VERSION_GREATER_EQUAL "7.8.0")
		9	+ SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKDESTEP;TKMesh;TKDEIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKTopAlgo;TKXSBase" CACHE INTERNAL "")
		10	+ ELSE()
		11	+ SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKSTEP;TKMesh;TKIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKSTEP209;TKSTEPAttr;TKSTEPBase;TKTopAlgo;TKXSBase" CACHE INTERNAL "")
		12	+ ENDIF()
		13	MESSAGE(STATUS " [ElmerGUI] ELMER_OCC_LIBS: " "${ELMER_OCC_LIBS}")
		14	MESSAGE(STATUS "------------------------------------------------")
		15	ENDIF()