Date: Mon, 18 Jan 2016 05:58:10 +0000 (UTC) From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406547 - in head/cad/netgen: . files Message-ID: <201601180558.u0I5wAUc032515@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stephen Date: Mon Jan 18 05:58:09 2016 New Revision: 406547 URL: https://svnweb.freebsd.org/changeset/ports/406547 Log: - Update to 5.3.1. - Default OCC to OFF. - Mark broken only if OCC is set. Added: head/cad/netgen/files/patch-libsrc_occ_Partition__Loop2d.cxx - copied, changed from r406546, head/cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx head/cad/netgen/files/patch-nglib_Makefile.in (contents, props changed) Deleted: head/cad/netgen/files/patch-libsrc_occ_Partition_Inter3d.cxx head/cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx head/cad/netgen/files/patch-libsrc_occ_Partition_Spliter.cxx Modified: head/cad/netgen/Makefile head/cad/netgen/distinfo head/cad/netgen/files/patch-libsrc_occ_Makefile.am head/cad/netgen/files/patch-ng_Makefile.am head/cad/netgen/files/patch-ng_Makefile.in head/cad/netgen/files/patch-ng_ng.tcl head/cad/netgen/files/patch-ng_ngappinit.cpp head/cad/netgen/pkg-plist Modified: head/cad/netgen/Makefile ============================================================================== --- head/cad/netgen/Makefile Mon Jan 18 05:56:13 2016 (r406546) +++ head/cad/netgen/Makefile Mon Jan 18 05:58:09 2016 (r406547) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= netgen -PORTVERSION= 5.0.0 -PORTREVISION= 4 +PORTVERSION= 5.3.1 CATEGORIES= cad MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION:S|.0$||}/ @@ -13,7 +12,7 @@ COMMENT= Automatic 3D tetrahedral mesh g LIB_DEPENDS= libTix8.4.3.so:${PORTSDIR}/x11-toolkits/tix \ libtogl.so:${PORTSDIR}/graphics/togl -BROKEN= Does not compile because of issues with cad/opencascade +OCC_BROKEN= Does not compile because of issues with cad/opencascade USE_LDCONFIG= yes USES= gmake jpeg libtool tk @@ -30,7 +29,7 @@ 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 +OPTIONS_DEFAULT= # OCC BROKEN_sparc64= internal gcc error (Bug 23159) Modified: head/cad/netgen/distinfo ============================================================================== --- head/cad/netgen/distinfo Mon Jan 18 05:56:13 2016 (r406546) +++ head/cad/netgen/distinfo Mon Jan 18 05:58:09 2016 (r406547) @@ -1,2 +1,2 @@ -SHA256 (netgen-5.0.0.tar.gz) = c122aa41fe6cc7c491df5df40c1c2a5633ee96a36d363a630ff1c5c4e4921419 -SIZE (netgen-5.0.0.tar.gz) = 1835004 +SHA256 (netgen-5.3.1.tar.gz) = cb97f79d8f4d55c00506ab334867285cde10873c8a8dc783522b47d2bc128bf9 +SIZE (netgen-5.3.1.tar.gz) = 1857185 Modified: head/cad/netgen/files/patch-libsrc_occ_Makefile.am ============================================================================== --- head/cad/netgen/files/patch-libsrc_occ_Makefile.am Mon Jan 18 05:56:13 2016 (r406546) +++ head/cad/netgen/files/patch-libsrc_occ_Makefile.am Mon Jan 18 05:58:09 2016 (r406547) @@ -1,5 +1,5 @@ ---- libsrc/occ/Makefile.am.orig 2010-11-08 10:10:46.000000000 +0600 -+++ libsrc/occ/Makefile.am 2010-11-08 10:10:57.000000000 +0600 +--- libsrc/occ/Makefile.am.orig 2014-08-29 09:54:03 UTC ++++ libsrc/occ/Makefile.am @@ -1,5 +1,4 @@ -noinst_HEADERS = occgeom.hpp occmeshsurf.hpp \ -Partition_Inter2d.hxx Partition_Loop2d.hxx Partition_Loop.hxx \ Copied and modified: head/cad/netgen/files/patch-libsrc_occ_Partition__Loop2d.cxx (from r406546, head/cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx) ============================================================================== --- head/cad/netgen/files/patch-libsrc_occ_Partition_Loop2d.cxx Mon Jan 18 05:56:13 2016 (r406546, copy source) +++ head/cad/netgen/files/patch-libsrc_occ_Partition__Loop2d.cxx Mon Jan 18 05:58:09 2016 (r406547) @@ -1,5 +1,5 @@ ---- 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 +--- libsrc/occ/Partition_Loop2d.cxx.orig 2014-08-29 09:54:03 UTC ++++ libsrc/occ/Partition_Loop2d.cxx @@ -52,6 +52,10 @@ #include <gp_Pnt.hxx> #include <gp_Pnt2d.hxx> Modified: head/cad/netgen/files/patch-ng_Makefile.am ============================================================================== --- head/cad/netgen/files/patch-ng_Makefile.am Mon Jan 18 05:56:13 2016 (r406546) +++ head/cad/netgen/files/patch-ng_Makefile.am Mon Jan 18 05:58:09 2016 (r406547) @@ -1,11 +1,11 @@ ---- ng/Makefile.am-orig 2012-11-22 00:29:00.000000000 +0000 -+++ ng/Makefile.am 2012-11-22 00:29:28.000000000 +0000 -@@ -14,7 +14,7 @@ +--- ng/Makefile.am.orig 2014-08-29 09:54:01 UTC ++++ ng/Makefile.am +@@ -22,7 +22,7 @@ netgen_LDADD = $(top_builddir)/libsrc/vi $(top_builddir)/libsrc/csg/libcsg.la \ $(top_builddir)/libsrc/interface/libinterface.la \ $(top_builddir)/libsrc/meshing/libmesh.la \ -- -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) -+ -L$(TK_BIN_DIR)/Togl-1.7 $(TOGLLIBDIR) -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) +- -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS) ++ -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS) + + # - # $(top_builddir)/libsrc/occ/liboccvis.la - # $(top_builddir)/libsrc/occ/libocc.la Modified: head/cad/netgen/files/patch-ng_Makefile.in ============================================================================== --- head/cad/netgen/files/patch-ng_Makefile.in Mon Jan 18 05:56:13 2016 (r406546) +++ head/cad/netgen/files/patch-ng_Makefile.in Mon Jan 18 05:58:09 2016 (r406547) @@ -1,11 +1,11 @@ ---- ng/Makefile.in-orig 2012-11-22 00:40:30.000000000 +0000 -+++ ng/Makefile.in 2012-11-22 00:41:00.000000000 +0000 -@@ -303,7 +303,7 @@ +--- ng/Makefile.in.orig 2014-10-06 11:04:37 UTC ++++ ng/Makefile.in +@@ -312,7 +312,7 @@ netgen_LDADD = $(top_builddir)/libsrc/vi $(top_builddir)/libsrc/csg/libcsg.la \ $(top_builddir)/libsrc/interface/libinterface.la \ $(top_builddir)/libsrc/meshing/libmesh.la \ -- -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) -+ -L$(TK_BIN_DIR)/Togl-1.7 $(TOGLLIBDIR) -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) +- -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS) ++ -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS) + # - # $(top_builddir)/libsrc/occ/liboccvis.la Modified: head/cad/netgen/files/patch-ng_ng.tcl ============================================================================== --- head/cad/netgen/files/patch-ng_ng.tcl Mon Jan 18 05:56:13 2016 (r406546) +++ head/cad/netgen/files/patch-ng_ng.tcl Mon Jan 18 05:58:09 2016 (r406547) @@ -1,6 +1,6 @@ ---- ng/ng.tcl.orig 2010-06-08 09:33:22.000000000 +0700 -+++ ng/ng.tcl 2010-06-08 09:33:39.000000000 +0700 -@@ -26,7 +26,7 @@ +--- ng/ng.tcl.orig 2014-08-29 09:54:01 UTC ++++ ng/ng.tcl +@@ -32,7 +32,7 @@ if { [lsearch [array names env] NETGENDI set ngdir $env(NETGENDIR) } if { [string length $ngdir] == 0 } { Modified: head/cad/netgen/files/patch-ng_ngappinit.cpp ============================================================================== --- head/cad/netgen/files/patch-ng_ngappinit.cpp Mon Jan 18 05:56:13 2016 (r406546) +++ head/cad/netgen/files/patch-ng_ngappinit.cpp Mon Jan 18 05:58:09 2016 (r406547) @@ -1,6 +1,6 @@ ---- ng/ngappinit.cpp.orig 2010-06-08 09:13:06.000000000 +0700 -+++ ng/ngappinit.cpp 2010-06-08 09:13:20.000000000 +0700 -@@ -151,7 +151,7 @@ +--- ng/ngappinit.cpp.orig 2014-08-29 09:54:01 UTC ++++ ng/ngappinit.cpp +@@ -149,7 +149,7 @@ int main(int argc, char ** argv) if (getenv ("NETGENDIR") && strlen (getenv ("NETGENDIR"))) ngdir = getenv ("NETGENDIR"); else Added: head/cad/netgen/files/patch-nglib_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-nglib_Makefile.in Mon Jan 18 05:58:09 2016 (r406547) @@ -0,0 +1,11 @@ +--- nglib/Makefile.in.orig 2014-10-06 11:04:37 UTC ++++ nglib/Makefile.in +@@ -129,7 +129,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM + CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ $(LDFLAGS) -o $@ -pthread + SOURCES = $(libnglib_la_SOURCES) $(ng_stl_SOURCES) $(ng_vol_SOURCES) + DIST_SOURCES = $(libnglib_la_SOURCES) $(ng_stl_SOURCES) \ + $(ng_vol_SOURCES) Modified: head/cad/netgen/pkg-plist ============================================================================== --- head/cad/netgen/pkg-plist Mon Jan 18 05:56:13 2016 (r406546) +++ head/cad/netgen/pkg-plist Mon Jan 18 05:58:09 2016 (r406547) @@ -118,6 +118,7 @@ lib/libstlvis.so.0.0.0 %%DATADIR%%/include/adfront3.hpp %%DATADIR%%/include/adtree.hpp %%DATADIR%%/include/algprim.hpp +%%DATADIR%%/include/archive_base.hpp %%DATADIR%%/include/array.hpp %%DATADIR%%/include/autodiff.hpp %%DATADIR%%/include/autoptr.hpp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601180558.u0I5wAUc032515>