Attachment #218090 for bug #249463

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





PORTNAME=	gmsh
DISTVERSION=	4.6.0
PORTREVISION=	1
CATEGORIES=	cad
MASTER_SITES=	LOCAL/wen \
		http://gmsh.info/src/


CMAKE_ARGS=	-DCMAKE_SKIP_RPATH:BOOL=YES

OPTIONS_DEFINE=	CGNS DOCS MED OCC SHARED STATIC PYMOD
OPTIONS_DEFAULT=	CGNS MED OCC
OPTIONS_SUB=	yes


OCC_DESC=	Enable OpenCASCADE geometrical models
SHARED_DESC=	Build shared library and install header files
STATIC_DESC=	Build static library
PYMOD_DESC=		Install Python module (implies SHARED).

PLIST_SUB=	VER=${PORTVERSION} VE=${PORTVERSION:R}


SHARED_CMAKE_BOOL=	ENABLE_BUILD_SHARED
SHARED_USE=		LDCONFIG=yes
STATIC_CMAKE_BOOL=	ENABLE_BUILD_LIB
PYMOD_USES=			python
PYMOD_IMPLIES=		SHARED

post-patch-PYMOD-on:
	@${REINPLACE_CMD} -e "s|PREFIX|${LOCALBASE}|" -e "s|DISTVERSION|${DISTVERSION}|" \
		${WRKSRC}/api/gmsh.py

post-install-PYMOD-on:
	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
	${INSTALL_DATA} ${WRKSRC}/api/gmsh.py ${STAGEDIR}${PYTHON_SITELIBDIR}/

post-install-SHARED-on:
	@${RM} -r ${STAGEDIR}/wrkdirs
	@${RM} ${STAGEDIR}${PREFIX}/include/gmsh.h_cwrap

post-install:
	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/debug
	@${RM} ${STAGEDIR}${PREFIX}/lib/gmsh.jl

.include <bsd.port.mk>




--- api/gmsh.py.orig	2020-09-19 11:32:20 UTC
+++ api/gmsh.py
@@ -25,16 +25,7 @@ GMSH_API_VERSION_MINOR = 6
 __version__ = GMSH_API_VERSION
 
 oldsig = signal.signal(signal.SIGINT, signal.SIG_DFL)
-libdir = os.path.dirname(os.path.realpath(__file__))
-if platform.system() == "Windows":
-    libpath = os.path.join(libdir, "gmsh-4.6.dll")
-elif platform.system() == "Darwin":
-    libpath = os.path.join(libdir, "libgmsh.dylib")
-else:
-    libpath = os.path.join(libdir, "libgmsh.so")
-
-if not os.path.exists(libpath):
-    libpath = find_library("gmsh")
+libpath = "PREFIX/lib/libgmsh.so.DISTVERSION"
 
 lib = CDLL(libpath)
 

Lines 256-258 man/man1/gmsh.1.gz Link Here

(-)b/gmsh/pkg-plist (+6 lines)
256	%%PORTDOCS%%%%DOCSDIR%%/tutorial/view3.pos	256	%%PORTDOCS%%%%DOCSDIR%%/tutorial/view3.pos
257	%%PORTDOCS%%%%DOCSDIR%%/tutorial/view4.pos	257	%%PORTDOCS%%%%DOCSDIR%%/tutorial/view4.pos
258	%%PORTDOCS%%%%DOCSDIR%%/tutorial/view5.msh	258	%%PORTDOCS%%%%DOCSDIR%%/tutorial/view5.msh
		259	%%PYMOD%%%%PYTHON_SITELIBDIR%%/gmsh.py
		260	%%SHARED%%include/gmsh.h
		261	%%SHARED%%include/gmshc.h
		262	%%SHARED%%lib/libgmsh.so
		263	%%SHARED%%lib/libgmsh.so.%%VE%%
		264	%%SHARED%%lib/libgmsh.so.%%VER%%

Return to bug 249463

Lines 3-8 Link Here

(-)b/gmsh/Makefile (-2 / +19 lines)
3		3
4	PORTNAME= gmsh	4	PORTNAME= gmsh
5	DISTVERSION= 4.6.0	5	DISTVERSION= 4.6.0
		6	PORTREVISION= 1
6	CATEGORIES= cad	7	CATEGORIES= cad
7	MASTER_SITES= LOCAL/wen \	8	MASTER_SITES= LOCAL/wen \
8	http://gmsh.info/src/	9	http://gmsh.info/src/
Lines 31-37 USE_XORG= x11 xcursor xext xinerama xfixes xft xrender Link Here
31		32
32	CMAKE_ARGS= -DCMAKE_SKIP_RPATH:BOOL=YES	33	CMAKE_ARGS= -DCMAKE_SKIP_RPATH:BOOL=YES
33		34
34	OPTIONS_DEFINE= CGNS DOCS MED OCC SHARED STATIC	35	OPTIONS_DEFINE= CGNS DOCS MED OCC SHARED STATIC PYMOD
35	OPTIONS_DEFAULT= CGNS MED OCC	36	OPTIONS_DEFAULT= CGNS MED OCC
36	OPTIONS_SUB= yes	37	OPTIONS_SUB= yes
37		38
Lines 40-45 MED_DESC= Enable MED mesh and post file formats Link Here
40	OCC_DESC= Enable OpenCASCADE geometrical models	41	OCC_DESC= Enable OpenCASCADE geometrical models
41	SHARED_DESC= Build shared library and install header files	42	SHARED_DESC= Build shared library and install header files
42	STATIC_DESC= Build static library	43	STATIC_DESC= Build static library
		44	PYMOD_DESC= Install Python module (implies SHARED).
43		45
44	PLIST_SUB= VER=${PORTVERSION} VE=${PORTVERSION:R}	46	PLIST_SUB= VER=${PORTVERSION} VE=${PORTVERSION:R}
45		47
Lines 61-68 OCC_USE= gnome=cairo Link Here
61	SHARED_CMAKE_BOOL= ENABLE_BUILD_SHARED	63	SHARED_CMAKE_BOOL= ENABLE_BUILD_SHARED
62	SHARED_USE= LDCONFIG=yes	64	SHARED_USE= LDCONFIG=yes
63	STATIC_CMAKE_BOOL= ENABLE_BUILD_LIB	65	STATIC_CMAKE_BOOL= ENABLE_BUILD_LIB
		66	PYMOD_USES= python
		67	PYMOD_IMPLIES= SHARED
		68
		69	post-patch-PYMOD-on:
		70	@${REINPLACE_CMD} -e "s\|PREFIX\|${LOCALBASE}\|" -e "s\|DISTVERSION\|${DISTVERSION}\|" \
		71	${WRKSRC}/api/gmsh.py
		72
		73	post-install-PYMOD-on:
		74	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
		75	${INSTALL_DATA} ${WRKSRC}/api/gmsh.py ${STAGEDIR}${PYTHON_SITELIBDIR}/
64		76
65	post-install-SHARED-on:	77	post-install-SHARED-on:
66	${RM} -r ${STAGEDIR}/wrkdirs	78	@${RM} -r ${STAGEDIR}/wrkdirs
		79	@${RM} ${STAGEDIR}${PREFIX}/include/gmsh.h_cwrap
		80
		81	post-install:
		82	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/debug
		83	@${RM} ${STAGEDIR}${PREFIX}/lib/gmsh.jl
67		84
68	.include <bsd.port.mk>	85	.include <bsd.port.mk>

Added Link Here

(-)b/gmsh/files/patch-api_gmsh.py (+20 lines)
1	--- api/gmsh.py.orig 2020-09-19 11:32:20 UTC
2	+++ api/gmsh.py
3	@@ -25,16 +25,7 @@ GMSH_API_VERSION_MINOR = 6
4	__version__ = GMSH_API_VERSION
5
6	oldsig = signal.signal(signal.SIGINT, signal.SIG_DFL)
7	-libdir = os.path.dirname(os.path.realpath(__file__))
8	-if platform.system() == "Windows":
9	- libpath = os.path.join(libdir, "gmsh-4.6.dll")
10	-elif platform.system() == "Darwin":
11	- libpath = os.path.join(libdir, "libgmsh.dylib")
12	-else:
13	- libpath = os.path.join(libdir, "libgmsh.so")
14	-
15	-if not os.path.exists(libpath):
16	- libpath = find_library("gmsh")
17	+libpath = "PREFIX/lib/libgmsh.so.DISTVERSION"
18
19	lib = CDLL(libpath)
20