From owner-svn-ports-head@FreeBSD.ORG Sat Nov 22 17:46:24 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C967FAB; Sat, 22 Nov 2014 17:46:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18018D6D; Sat, 22 Nov 2014 17:46:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMHkNvX096191; Sat, 22 Nov 2014 17:46:23 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMHkMRx096183; Sat, 22 Nov 2014 17:46:22 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201411221746.sAMHkMRx096183@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Sat, 22 Nov 2014 17:46:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373082 - in head/cad: gmsh gmsh-occ gmsh/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.18-1 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: Sat, 22 Nov 2014 17:46:24 -0000 Author: stephen Date: Sat Nov 22 17:46:21 2014 New Revision: 373082 URL: https://svnweb.freebsd.org/changeset/ports/373082 QAT: https://qat.redports.org/buildarchive/r373082/ Log: - Update to 2.8.5 and chase cad/opencascade. PR: ports/195173 Submitted by: Thierry Thomas Added: head/cad/gmsh/files/patch-Geo_OCCFace.cpp (contents, props changed) Modified: head/cad/gmsh-occ/Makefile head/cad/gmsh/Makefile head/cad/gmsh/distinfo head/cad/gmsh/files/patch-CMakeLists.txt head/cad/gmsh/pkg-plist Modified: head/cad/gmsh-occ/Makefile ============================================================================== --- head/cad/gmsh-occ/Makefile Sat Nov 22 17:29:50 2014 (r373081) +++ head/cad/gmsh-occ/Makefile Sat Nov 22 17:46:21 2014 (r373082) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= gmsh -PORTREVISION= 3 CATEGORIES= cad PKGNAMESUFFIX= -occ Modified: head/cad/gmsh/Makefile ============================================================================== --- head/cad/gmsh/Makefile Sat Nov 22 17:29:50 2014 (r373081) +++ head/cad/gmsh/Makefile Sat Nov 22 17:46:21 2014 (r373082) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gmsh -PORTVERSION= 2.8.4 -PORTREVISION= 5 +PORTVERSION= 2.8.5 CATEGORIES= cad MASTER_SITES= http://www.geuz.org/gmsh/src/ \ http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/ @@ -45,7 +44,7 @@ PLIST_SUB+= STATIC_LIB="@comment " .if !defined(WITHOUT_SHARED_LIB) CMAKE_ARGS+= -DENABLE_BUILD_SHARED=ON ALL_TARGET+= shared -PLIST_SUB+= SHARED_LIB="" +PLIST_SUB+= SHARED_LIB="" VER=${PORTVERSION} VE=${PORTVERSION:R} USE_LDCONFIG= yes .else PLIST_SUB+= SHARED_LIB="@comment " @@ -193,7 +192,7 @@ post-extract: @${ECHO} "because Taucs requires Metis." >> ${PKGMESSAGE} .endif -post-patch: +pre-configure: ${REINPLACE_CMD} -e s+share/doc/gmsh+${DOCSDIR_REL}+ \ -e s+share/man/man1+man/man1+ ${WRKSRC}/CMakeLists.txt Modified: head/cad/gmsh/distinfo ============================================================================== --- head/cad/gmsh/distinfo Sat Nov 22 17:29:50 2014 (r373081) +++ head/cad/gmsh/distinfo Sat Nov 22 17:46:21 2014 (r373082) @@ -1,4 +1,4 @@ -SHA256 (gmsh/gmsh-2.8.4-source.tgz) = 199e27cba3258976eddfd7767560ec52382702076bca5d4bcf067124e6f6624b -SIZE (gmsh/gmsh-2.8.4-source.tgz) = 11866204 +SHA256 (gmsh/gmsh-2.8.5-source.tgz) = 0ea2fdbcc9ba44c90e03dbc553e7f0ddb2f9044173ac34db123db4fe65af3130 +SIZE (gmsh/gmsh-2.8.5-source.tgz) = 8665258 SHA256 (gmsh/manual.pdf) = 8a682ee7f02380f52d5efdde5f9f9d8e927a4f4eb29287a878c1016225568911 SIZE (gmsh/manual.pdf) = 206713 Modified: head/cad/gmsh/files/patch-CMakeLists.txt ============================================================================== --- head/cad/gmsh/files/patch-CMakeLists.txt Sat Nov 22 17:29:50 2014 (r373081) +++ head/cad/gmsh/files/patch-CMakeLists.txt Sat Nov 22 17:46:21 2014 (r373082) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2013-09-27 12:59:06.000000000 +0000 -+++ CMakeLists.txt 2013-09-27 17:45:20.000000000 +0000 -@@ -84,6 +84,7 @@ +--- CMakeLists.txt.orig 2014-07-09 09:27:58.000000000 +0200 ++++ CMakeLists.txt 2014-11-17 23:45:13.000000000 +0100 +@@ -89,6 +89,7 @@ opt(VORO3D "Enable Voro3D (for hex meshing, experimental)" ${DEFAULT}) opt(WRAP_JAVA "Enable generation of Java wrappers (experimental)" OFF) opt(WRAP_PYTHON "Enable generation of Python wrappers" OFF) @@ -8,7 +8,16 @@ set(GMSH_MAJOR_VERSION 2) set(GMSH_MINOR_VERSION 8) -@@ -1318,7 +1319,7 @@ +@@ -1017,7 +1018,7 @@ + # ModelingData + TKBRep TKGeomBase TKG3d TKG2d + # FoundationClasses +- TKAdvTools TKMath TKernel) ++ TKMath TKernel) + if(ENABLE_SGEOM) + set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED} + # For SGEOM +@@ -1450,7 +1451,7 @@ set(GMSH_BIN bin) set(GMSH_LIB lib) set(GMSH_DOC share/doc/gmsh) @@ -17,7 +26,7 @@ endif(ENABLE_OS_SPECIFIC_INSTALL) if(CYGWIN) unix2dos(GMSH_API) -@@ -1339,7 +1340,7 @@ +@@ -1471,7 +1472,7 @@ set(GMSH_BIN bin) set(GMSH_LIB lib) set(GMSH_DOC share/doc/gmsh) @@ -26,7 +35,7 @@ endif(WIN32 OR CYGWIN) # mark targets as optional so we can install them separately if needed -@@ -1394,11 +1395,13 @@ +@@ -1524,11 +1525,13 @@ if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) install(FILES ${GMSH_API} DESTINATION include/gmsh) endif(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) Added: head/cad/gmsh/files/patch-Geo_OCCFace.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/gmsh/files/patch-Geo_OCCFace.cpp Sat Nov 22 17:46:21 2014 (r373082) @@ -0,0 +1,24 @@ +--- Geo/OCCFace.cpp.orig 2014-02-07 08:31:21.000000000 +0100 ++++ Geo/OCCFace.cpp 2014-11-18 23:35:55.000000000 +0100 +@@ -28,7 +28,11 @@ + #include + + #if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6) +-#include ++# if (OCC_VERSION_MINOR < 8) ++# include ++# else ++# include ++# endif + #include + #include + #else +@@ -455,7 +459,7 @@ + void OCCFace::replaceEdgesInternal(std::list &new_edges) + { + +-#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6) ++#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6) && (OCC_VERSION_MINOR < 8) + Handle(BOPInt_Context) myContext = new BOPInt_Context; + #elif defined(OCC_VERSION_HEX) && OCC_VERSION_HEX >= 0x060503 + Handle(IntTools_Context) myContext = new IntTools_Context; Modified: head/cad/gmsh/pkg-plist ============================================================================== --- head/cad/gmsh/pkg-plist Sat Nov 22 17:29:50 2014 (r373081) +++ head/cad/gmsh/pkg-plist Sat Nov 22 17:46:21 2014 (r373082) @@ -2,8 +2,8 @@ bin/gmsh bin/onelab.py %%STATIC_LIB%%lib/libGmsh.a %%SHARED_LIB%%lib/libGmsh.so -%%SHARED_LIB%%lib/libGmsh.so.2.8 -%%SHARED_LIB%%lib/libGmsh.so.2.8.4 +%%SHARED_LIB%%lib/libGmsh.so.%%VE%% +%%SHARED_LIB%%lib/libGmsh.so.%%VER%% include/gmsh/CGNSOptions.h include/gmsh/Cell.h include/gmsh/CellComplex.h @@ -50,6 +50,7 @@ include/gmsh/MTetrahedron.h include/gmsh/MTriangle.h include/gmsh/MVertex.h include/gmsh/MVertexBoundaryLayerData.h +include/gmsh/MetricBasis.h include/gmsh/Numeric.h include/gmsh/OS.h include/gmsh/Octree.h