Date: Thu, 22 Nov 2012 14:56:48 +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: r307654 - in head/cad/netgen: . files Message-ID: <201211221456.qAMEumPA002986@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stephen Date: Thu Nov 22 14:56:47 2012 New Revision: 307654 URL: http://svnweb.freebsd.org/changeset/ports/307654 Log: - Update to 5.0.0. - Set OCC option off: cad/opencascade port needs updating before this works. Feature safe: yes Deleted: head/cad/netgen/files/patch-ng_onetcl.cpp Modified: head/cad/netgen/Makefile head/cad/netgen/distinfo head/cad/netgen/files/patch-ng_Makefile.am head/cad/netgen/files/patch-ng_Makefile.in head/cad/netgen/pkg-plist Modified: head/cad/netgen/Makefile ============================================================================== --- head/cad/netgen/Makefile Thu Nov 22 14:48:50 2012 (r307653) +++ head/cad/netgen/Makefile Thu Nov 22 14:56:47 2012 (r307654) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= netgen -PORTVERSION= 4.9.13 -PORTREVISION= 7 +PORTVERSION= 5.0.0 CATEGORIES= cad -MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION}/ +MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION:S|.0$||}/ MAINTAINER= stephen@FreeBSD.org COMMENT= An automatic 3D tetrahedral mesh generator @@ -27,14 +26,15 @@ CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR 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_DEFAULTS= OCC +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. .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 CONFIGURE_ARGS+= --enable-occ @@ -54,7 +54,6 @@ MAKE_ENV= TK_VER=${TK_VER} TCL_VER=${TCL TK_INCLUDEDIR="${TK_INCLUDEDIR}" \ MACHINE=${MACHINE} MAKE=${GMAKE} \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} - .include <bsd.port.pre.mk> .if ${ARCH} == "sparc64" Modified: head/cad/netgen/distinfo ============================================================================== --- head/cad/netgen/distinfo Thu Nov 22 14:48:50 2012 (r307653) +++ head/cad/netgen/distinfo Thu Nov 22 14:56:47 2012 (r307654) @@ -1,2 +1,2 @@ -SHA256 (netgen-4.9.13.tar.gz) = a5f188bb0fafc0536389314efb8fe6d294b93512b54f2b67c9a3e5431c3b0412 -SIZE (netgen-4.9.13.tar.gz) = 1829916 +SHA256 (netgen-5.0.0.tar.gz) = c122aa41fe6cc7c491df5df40c1c2a5633ee96a36d363a630ff1c5c4e4921419 +SIZE (netgen-5.0.0.tar.gz) = 1835004 Modified: head/cad/netgen/files/patch-ng_Makefile.am ============================================================================== --- head/cad/netgen/files/patch-ng_Makefile.am Thu Nov 22 14:48:50 2012 (r307653) +++ head/cad/netgen/files/patch-ng_Makefile.am Thu Nov 22 14:56:47 2012 (r307654) @@ -1,11 +1,11 @@ ---- ng/Makefile.am.orig 2010-05-20 19:08:54.000000000 +0700 -+++ ng/Makefile.am 2010-05-27 16:46:45.000000000 +0700 -@@ -16,7 +16,7 @@ - $(top_builddir)/libsrc/gprim/libgprim.la \ - $(top_builddir)/libsrc/linalg/libla.la \ - $(top_builddir)/libsrc/general/libgen.la \ -- $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) -+ $(OCCLIBS) -L$(TK_BIN_DIR)/Togl-1.7 $(TOGLLIBDIR) -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) - - # add for static linkage of ngsolve: - # /opt/netgen/lib/libngsolve.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngfemng.a /opt/netgen/lib/libngmg.a /opt/netgen/lib/libngla.a /opt/netgen/lib/libngbla.a /opt/netgen/lib/libngstd.a -L/opt/intel/mkl/10.2.1.017/lib/em64t /opt/intel/mkl/10.2.1.017/lib/em64t/libmkl_solver_lp64.a -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core +--- 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 @@ + $(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) + # + # $(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 Thu Nov 22 14:48:50 2012 (r307653) +++ head/cad/netgen/files/patch-ng_Makefile.in Thu Nov 22 14:56:47 2012 (r307654) @@ -1,11 +1,11 @@ ---- ng/Makefile.in.orig 2010-06-03 15:08:20.000000000 +0700 -+++ ng/Makefile.in 2010-06-03 15:08:42.000000000 +0700 -@@ -287,7 +287,7 @@ - $(top_builddir)/libsrc/gprim/libgprim.la \ - $(top_builddir)/libsrc/linalg/libla.la \ - $(top_builddir)/libsrc/general/libgen.la \ -- $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) -+ $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) +--- 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 @@ + $(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) - - # add for static linkage of ngsolve: + # + # $(top_builddir)/libsrc/occ/liboccvis.la Modified: head/cad/netgen/pkg-plist ============================================================================== --- head/cad/netgen/pkg-plist Thu Nov 22 14:48:50 2012 (r307653) +++ head/cad/netgen/pkg-plist Thu Nov 22 14:56:47 2012 (r307654) @@ -1,3 +1,5 @@ +bin/acisgeom.tcl +bin/csgeom.tcl bin/dialog.tcl bin/drawing.tcl bin/menustat.tcl @@ -11,20 +13,52 @@ bin/ngicon.tcl bin/ngshell.tcl bin/ngtesting.tcl bin/ngvisual.tcl +bin/occgeom.tcl bin/parameters.tcl bin/sockets.tcl +bin/stlgeom.tcl bin/variables.tcl include/ngexception.hpp include/nginterface.h include/nginterface_v2.hpp include/nglib.h -include/parallelinterface.hpp include/soldata.hpp +lib/libcsg.la +lib/libcsg.so +lib/libcsg.so.0 +lib/libcsgvis.la +lib/libcsgvis.so +lib/libcsgvis.so.0 +lib/libgeom2d.la +lib/libgeom2d.so +lib/libgeom2d.so.0 +lib/libgeom2dvis.la +lib/libgeom2dvis.so +lib/libgeom2dvis.so.0 +lib/libinterface.la +lib/libinterface.so +lib/libinterface.so.0 +lib/libmesh.la +lib/libmesh.so +lib/libmesh.so.0 +lib/libocc.la +lib/libocc.so +lib/libocc.so.0 +lib/liboccvis.la +lib/liboccvis.so +lib/liboccvis.so.0 lib/libnglib.la lib/libnglib.so lib/libnglib.so.1 +lib/libstl.la +lib/libstl.so +lib/libstl.so.0 +lib/libstlvis.la +lib/libstlvis.so +lib/libstlvis.so.0 %%DOCSDIR%%/ng4.pdf %%DATADIR%%/boxcyl.geo +%%DATADIR%%/boundarycondition.geo %%DATADIR%%/circle_on_cube.geo %%DATADIR%%/cone.geo %%DATADIR%%/cube.geo @@ -176,7 +210,6 @@ lib/libnglib.so.1 %%DATADIR%%/include/specials.hpp %%DATADIR%%/include/specpoin.hpp %%DATADIR%%/include/spline.hpp -%%DATADIR%%/include/spline2d.hpp %%DATADIR%%/include/spline3d.hpp %%DATADIR%%/include/splinegeometry.hpp %%DATADIR%%/include/stack.hpp @@ -196,7 +229,11 @@ lib/libnglib.so.1 %%DATADIR%%/include/vector.hpp %%DATADIR%%/include/vispar.hpp %%DATADIR%%/include/visual.hpp +%%DATADIR%%/include/vscsg.hpp +%%DATADIR%%/include/vsgeom2d.hpp +%%DATADIR%%/include/vsocc.hpp %%DATADIR%%/include/vssolution.hpp +%%DATADIR%%/include/vsstl.hpp %%DATADIR%%/include/writeuser.hpp @dirrm %%DATADIR%%/include @dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211221456.qAMEumPA002986>