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

(-)cad/gmsh/Makefile (-4 / +3 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	gmsh
4
PORTNAME=	gmsh
5
PORTVERSION=	2.8.4
5
PORTVERSION=	2.8.5
6
PORTREVISION=	5
7
CATEGORIES=	cad
6
CATEGORIES=	cad
8
MASTER_SITES=	http://www.geuz.org/gmsh/src/ \
7
MASTER_SITES=	http://www.geuz.org/gmsh/src/ \
9
		http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
8
		http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
Lines 45-51 Link Here
45
.if !defined(WITHOUT_SHARED_LIB)
44
.if !defined(WITHOUT_SHARED_LIB)
46
CMAKE_ARGS+=	-DENABLE_BUILD_SHARED=ON
45
CMAKE_ARGS+=	-DENABLE_BUILD_SHARED=ON
47
ALL_TARGET+=	shared
46
ALL_TARGET+=	shared
48
PLIST_SUB+=	SHARED_LIB=""
47
PLIST_SUB+=	SHARED_LIB="" VER=${PORTVERSION} VE=${PORTVERSION:R}
49
USE_LDCONFIG=	yes
48
USE_LDCONFIG=	yes
50
.else
49
.else
51
PLIST_SUB+=	SHARED_LIB="@comment "
50
PLIST_SUB+=	SHARED_LIB="@comment "
Lines 193-199 Link Here
193
	@${ECHO} "because Taucs requires Metis." >> ${PKGMESSAGE}
192
	@${ECHO} "because Taucs requires Metis." >> ${PKGMESSAGE}
194
.endif
193
.endif
195
194
196
post-patch:
195
pre-configure:
197
	${REINPLACE_CMD} -e s+share/doc/gmsh+${DOCSDIR_REL}+ \
196
	${REINPLACE_CMD} -e s+share/doc/gmsh+${DOCSDIR_REL}+ \
198
		-e s+share/man/man1+man/man1+ ${WRKSRC}/CMakeLists.txt
197
		-e s+share/man/man1+man/man1+ ${WRKSRC}/CMakeLists.txt
199
198
(-)cad/gmsh/distinfo (-2 / +2 lines)
Lines 1-4 Link Here
1
SHA256 (gmsh/gmsh-2.8.4-source.tgz) = 199e27cba3258976eddfd7767560ec52382702076bca5d4bcf067124e6f6624b
1
SHA256 (gmsh/gmsh-2.8.5-source.tgz) = 0ea2fdbcc9ba44c90e03dbc553e7f0ddb2f9044173ac34db123db4fe65af3130
2
SIZE (gmsh/gmsh-2.8.4-source.tgz) = 11866204
2
SIZE (gmsh/gmsh-2.8.5-source.tgz) = 8665258
3
SHA256 (gmsh/manual.pdf) = 8a682ee7f02380f52d5efdde5f9f9d8e927a4f4eb29287a878c1016225568911
3
SHA256 (gmsh/manual.pdf) = 8a682ee7f02380f52d5efdde5f9f9d8e927a4f4eb29287a878c1016225568911
4
SIZE (gmsh/manual.pdf) = 206713
4
SIZE (gmsh/manual.pdf) = 206713
(-)cad/gmsh/files/patch-CMakeLists.txt (-6 / +15 lines)
Lines 1-6 Link Here
1
--- CMakeLists.txt.orig	2013-09-27 12:59:06.000000000 +0000
1
--- CMakeLists.txt.orig	2014-07-09 09:27:58.000000000 +0200
2
+++ CMakeLists.txt	2013-09-27 17:45:20.000000000 +0000
2
+++ CMakeLists.txt	2014-11-17 23:45:13.000000000 +0100
3
@@ -84,6 +84,7 @@
3
@@ -89,6 +89,7 @@
4
 opt(VORO3D "Enable Voro3D (for hex meshing, experimental)" ${DEFAULT})
4
 opt(VORO3D "Enable Voro3D (for hex meshing, experimental)" ${DEFAULT})
5
 opt(WRAP_JAVA "Enable generation of Java wrappers (experimental)" OFF)
5
 opt(WRAP_JAVA "Enable generation of Java wrappers (experimental)" OFF)
6
 opt(WRAP_PYTHON "Enable generation of Python wrappers" OFF)
6
 opt(WRAP_PYTHON "Enable generation of Python wrappers" OFF)
Lines 8-14 Link Here
8
 
8
 
9
 set(GMSH_MAJOR_VERSION 2)
9
 set(GMSH_MAJOR_VERSION 2)
10
 set(GMSH_MINOR_VERSION 8)
10
 set(GMSH_MINOR_VERSION 8)
11
@@ -1318,7 +1319,7 @@
11
@@ -1017,7 +1018,7 @@
12
       # ModelingData
13
       TKBRep TKGeomBase TKG3d TKG2d
14
       # FoundationClasses
15
-      TKAdvTools TKMath TKernel)
16
+      TKMath TKernel)
17
   if(ENABLE_SGEOM)
18
     set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
19
       # For SGEOM
20
@@ -1450,7 +1451,7 @@
12
     set(GMSH_BIN bin)
21
     set(GMSH_BIN bin)
13
     set(GMSH_LIB lib)
22
     set(GMSH_LIB lib)
14
     set(GMSH_DOC share/doc/gmsh)
23
     set(GMSH_DOC share/doc/gmsh)
Lines 17-23 Link Here
17
   endif(ENABLE_OS_SPECIFIC_INSTALL)
26
   endif(ENABLE_OS_SPECIFIC_INSTALL)
18
   if(CYGWIN)
27
   if(CYGWIN)
19
     unix2dos(GMSH_API)
28
     unix2dos(GMSH_API)
20
@@ -1339,7 +1340,7 @@
29
@@ -1471,7 +1472,7 @@
21
   set(GMSH_BIN bin)
30
   set(GMSH_BIN bin)
22
   set(GMSH_LIB lib)
31
   set(GMSH_LIB lib)
23
   set(GMSH_DOC share/doc/gmsh)
32
   set(GMSH_DOC share/doc/gmsh)
Lines 26-32 Link Here
26
 endif(WIN32 OR CYGWIN)
35
 endif(WIN32 OR CYGWIN)
27
 
36
 
28
 # mark targets as optional so we can install them separately if needed
37
 # mark targets as optional so we can install them separately if needed
29
@@ -1394,11 +1395,13 @@
38
@@ -1524,11 +1525,13 @@
30
 if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
39
 if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
31
   install(FILES ${GMSH_API} DESTINATION include/gmsh)
40
   install(FILES ${GMSH_API} DESTINATION include/gmsh)
32
 endif(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
41
 endif(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
(-)cad/gmsh/files/patch-Geo_OCCFace.cpp (+24 lines)
Line 0 Link Here
1
--- Geo/OCCFace.cpp.orig	2014-02-07 08:31:21.000000000 +0100
2
+++ Geo/OCCFace.cpp	2014-11-18 23:35:55.000000000 +0100
3
@@ -28,7 +28,11 @@
4
 #include <BRepMesh_FastDiscret.hxx>
5
 
6
 #if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6)
7
-#include <BOPInt_Context.hxx>
8
+#  if (OCC_VERSION_MINOR < 8)
9
+#  include <BOPInt_Context.hxx>
10
+#  else
11
+#  include <IntTools_Context.hxx>
12
+#  endif
13
 #include <BOPTools_AlgoTools2D.hxx>
14
 #include <BOPTools_AlgoTools.hxx>
15
 #else
16
@@ -455,7 +459,7 @@
17
 void OCCFace::replaceEdgesInternal(std::list<GEdge*> &new_edges)
18
 {
19
 
20
-#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6)
21
+#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6) && (OCC_VERSION_MINOR < 8)
22
   Handle(BOPInt_Context) myContext = new BOPInt_Context;
23
 #elif defined(OCC_VERSION_HEX) && OCC_VERSION_HEX >= 0x060503
24
   Handle(IntTools_Context) myContext = new IntTools_Context;
(-)cad/gmsh/pkg-plist (-2 / +3 lines)
Lines 2-9 Link Here
2
bin/onelab.py
2
bin/onelab.py
3
%%STATIC_LIB%%lib/libGmsh.a
3
%%STATIC_LIB%%lib/libGmsh.a
4
%%SHARED_LIB%%lib/libGmsh.so
4
%%SHARED_LIB%%lib/libGmsh.so
5
%%SHARED_LIB%%lib/libGmsh.so.2.8
5
%%SHARED_LIB%%lib/libGmsh.so.%%VE%%
6
%%SHARED_LIB%%lib/libGmsh.so.2.8.4
6
%%SHARED_LIB%%lib/libGmsh.so.%%VER%%
7
include/gmsh/CGNSOptions.h
7
include/gmsh/CGNSOptions.h
8
include/gmsh/Cell.h
8
include/gmsh/Cell.h
9
include/gmsh/CellComplex.h
9
include/gmsh/CellComplex.h
Lines 50-55 Link Here
50
include/gmsh/MTriangle.h
50
include/gmsh/MTriangle.h
51
include/gmsh/MVertex.h
51
include/gmsh/MVertex.h
52
include/gmsh/MVertexBoundaryLayerData.h
52
include/gmsh/MVertexBoundaryLayerData.h
53
include/gmsh/MetricBasis.h
53
include/gmsh/Numeric.h
54
include/gmsh/Numeric.h
54
include/gmsh/OS.h
55
include/gmsh/OS.h
55
include/gmsh/Octree.h
56
include/gmsh/Octree.h
(-)cad/gmsh-occ/Makefile (-1 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	gmsh
4
PORTNAME=	gmsh
5
PORTREVISION=	3
6
CATEGORIES=	cad
5
CATEGORIES=	cad
7
PKGNAMESUFFIX=	-occ
6
PKGNAMESUFFIX=	-occ
8
7

Return to bug 195173