diff options
| author | Stephen Montgomery-Smith <stephen@FreeBSD.org> | 2013-05-17 03:24:24 +0000 |
|---|---|---|
| committer | Stephen Montgomery-Smith <stephen@FreeBSD.org> | 2013-05-17 03:24:24 +0000 |
| commit | a7feb8d3d743cc181e6fe1fd57dfe4b78766f695 (patch) | |
| tree | 93c1f672e5ffc32b9184e53467908c8a35dbbf9a /cad/netgen | |
| parent | 85b2bd0d68a983488ff987ec970b48da03f97d65 (diff) | |
| download | ports-a7feb8d3d743cc181e6fe1fd57dfe4b78766f695.tar.gz ports-a7feb8d3d743cc181e6fe1fd57dfe4b78766f695.zip | |
- Change option OCC (build with opencascade libraries) to default to on.
- Bump portrevision.
PR: ports/178538
Submitted by: thierry@FreeBSD.org
Notes
Notes:
svn path=/head/; revision=318352
Diffstat (limited to 'cad/netgen')
| -rw-r--r-- | cad/netgen/Makefile | 6 | ||||
| -rw-r--r-- | cad/netgen/files/patch-libsrc_occ_Partition_Inter3d.cxx | 13 | ||||
| -rw-r--r-- | cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx | 13 | ||||
| -rw-r--r-- | cad/netgen/files/patch-libsrc_occ_Partition_Spliter.cxx | 13 |
4 files changed, 42 insertions, 3 deletions
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile index e3a2a033f06a..c8b762da9d4e 100644 --- a/cad/netgen/Makefile +++ b/cad/netgen/Makefile @@ -3,6 +3,7 @@ PORTNAME= netgen PORTVERSION= 5.0.0 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION:S|.0$||}/ @@ -29,14 +30,13 @@ FETCH_BEFORE_ARGS+= -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} OPTIONS_DEFINE= OCC FFMPEG OCC_DESC= Compile with OpenCascade geometry kernel FFMPEG_DESC= video recording with FFmpeg -OPTIONS_DEFAULT= # OCC Switch it back on when opencascade is updated. +OPTIONS_DEFAULT= OCC .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MOCC} -BROKEN= The opencascade port needs to be updated before OCC will work LIB_DEPENDS+= TKernel.0:${PORTSDIR}/cad/opencascade -CXXFLAGS+= -DOCCGEOMETRY -DOCC63 -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/OpenCAS/ros/inc +CXXFLAGS+= -DOCCGEOMETRY -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/include/OpenCASCADE CONFIGURE_ARGS+= --enable-occ .endif diff --git a/cad/netgen/files/patch-libsrc_occ_Partition_Inter3d.cxx b/cad/netgen/files/patch-libsrc_occ_Partition_Inter3d.cxx new file mode 100644 index 000000000000..cf80b3727f2d --- /dev/null +++ b/cad/netgen/files/patch-libsrc_occ_Partition_Inter3d.cxx @@ -0,0 +1,13 @@ +--- libsrc/occ/Partition_Inter3d.cxx.orig 2012-11-09 16:15:02.000000000 +0100 ++++ libsrc/occ/Partition_Inter3d.cxx 2013-05-12 11:31:45.000000000 +0200 +@@ -243,8 +243,8 @@ + Standard_Integer i, nbExt = anExtPS.NbExt(); + Extrema_POnSurf aPOnSurf; + for (i = 1; i <= nbExt; ++i ) +- if (anExtPS.Value( i ) <= TolE) // V6.3 +- // if (anExtPS.SquareDistance( i ) <= TolE) // V6.5 ++ // if (anExtPS.Value( i ) <= TolE) // V6.3 ++ if (anExtPS.SquareDistance( i ) <= TolE) // V6.5 + { + aPOnSurf = anExtPS.Point( i ); + break; diff --git a/cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx b/cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx new file mode 100644 index 000000000000..a94691f34aa8 --- /dev/null +++ b/cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx @@ -0,0 +1,13 @@ +--- libsrc/occ/Partition_Loop2d.cxx.orig 2012-11-09 16:15:02.000000000 +0100 ++++ libsrc/occ/Partition_Loop2d.cxx 2013-05-12 11:41:09.000000000 +0200 +@@ -52,6 +52,10 @@ + #include <gp_Pnt.hxx> + #include <gp_Pnt2d.hxx> + ++#ifndef PI ++#define PI 3.14159265358979323846 ++#endif ++ + //======================================================================= + //function : Partition_Loop2d + //purpose : diff --git a/cad/netgen/files/patch-libsrc_occ_Partition_Spliter.cxx b/cad/netgen/files/patch-libsrc_occ_Partition_Spliter.cxx new file mode 100644 index 000000000000..fae97ad9fb8d --- /dev/null +++ b/cad/netgen/files/patch-libsrc_occ_Partition_Spliter.cxx @@ -0,0 +1,13 @@ +--- libsrc/occ/Partition_Spliter.cxx.orig 2012-11-09 16:15:02.000000000 +0100 ++++ libsrc/occ/Partition_Spliter.cxx 2013-05-12 11:35:38.000000000 +0200 +@@ -1169,8 +1169,8 @@ + for (; j<=nbj && ok; ++j) { + if (Extrema.IsMin(j)) { + hasMin = Standard_True; +- ok = Extrema.Value(j) <= tol; // V6.3 +- // ok = Extrema.SquareDistance(j) <= tol; // V6.5 ++ // ok = Extrema.Value(j) <= tol; // V6.3 ++ ok = Extrema.SquareDistance(j) <= tol; // V6.5 + } + } + } |