From owner-svn-ports-head@FreeBSD.ORG Fri May 17 03:24:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6BD1DDAA; Fri, 17 May 2013 03:24:25 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5CD61139; Fri, 17 May 2013 03:24:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4H3OPBe048546; Fri, 17 May 2013 03:24:25 GMT (envelope-from stephen@svn.freebsd.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4H3OOkq048542; Fri, 17 May 2013 03:24:24 GMT (envelope-from stephen@svn.freebsd.org) Message-Id: <201305170324.r4H3OOkq048542@svn.freebsd.org> From: Stephen Montgomery-Smith Date: Fri, 17 May 2013 03:24:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318352 - in head/cad/netgen: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 03:24:25 -0000 Author: stephen Date: Fri May 17 03:24:24 2013 New Revision: 318352 URL: http://svnweb.freebsd.org/changeset/ports/318352 Log: - Change option OCC (build with opencascade libraries) to default to on. - Bump portrevision. PR: ports/178538 Submitted by: thierry@FreeBSD.org Added: head/cad/netgen/files/patch-libsrc_occ_Partition_Inter3d.cxx (contents, props changed) head/cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx (contents, props changed) head/cad/netgen/files/patch-libsrc_occ_Partition_Spliter.cxx (contents, props changed) Modified: head/cad/netgen/Makefile Modified: head/cad/netgen/Makefile ============================================================================== --- head/cad/netgen/Makefile Fri May 17 02:01:27 2013 (r318351) +++ head/cad/netgen/Makefile Fri May 17 03:24:24 2013 (r318352) @@ -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}/${DIST 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 .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 Added: head/cad/netgen/files/patch-libsrc_occ_Partition_Inter3d.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-libsrc_occ_Partition_Inter3d.cxx Fri May 17 03:24:24 2013 (r318352) @@ -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; Added: head/cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx Fri May 17 03:24:24 2013 (r318352) @@ -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 + #include + ++#ifndef PI ++#define PI 3.14159265358979323846 ++#endif ++ + //======================================================================= + //function : Partition_Loop2d + //purpose : Added: head/cad/netgen/files/patch-libsrc_occ_Partition_Spliter.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-libsrc_occ_Partition_Spliter.cxx Fri May 17 03:24:24 2013 (r318352) @@ -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 + } + } + }