diff options
| author | Stephen Montgomery-Smith <stephen@FreeBSD.org> | 2012-11-22 14:56:47 +0000 |
|---|---|---|
| committer | Stephen Montgomery-Smith <stephen@FreeBSD.org> | 2012-11-22 14:56:47 +0000 |
| commit | 8a529b7eb06879c663336a2d50d5ecb5e8f11824 (patch) | |
| tree | 4c676aee5c9042fc1ec440ecbc34302ff4c83f5a /cad/netgen/files | |
| parent | Enable zlib support. (diff) | |
- Update to 5.0.0.
- Set OCC option off: cad/opencascade port needs updating before this works.
Feature safe: yes
Diffstat (limited to 'cad/netgen/files')
| -rw-r--r-- | cad/netgen/files/patch-ng_Makefile.am | 22 | ||||
| -rw-r--r-- | cad/netgen/files/patch-ng_Makefile.in | 20 | ||||
| -rw-r--r-- | cad/netgen/files/patch-ng_onetcl.cpp | 11 |
3 files changed, 21 insertions, 32 deletions
diff --git a/cad/netgen/files/patch-ng_Makefile.am b/cad/netgen/files/patch-ng_Makefile.am index 2050bc4835af..3a057bf40748 100644 --- a/cad/netgen/files/patch-ng_Makefile.am +++ b/cad/netgen/files/patch-ng_Makefile.am @@ -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 diff --git a/cad/netgen/files/patch-ng_Makefile.in b/cad/netgen/files/patch-ng_Makefile.in index 14e039e8a582..9216f7b9bd55 100644 --- a/cad/netgen/files/patch-ng_Makefile.in +++ b/cad/netgen/files/patch-ng_Makefile.in @@ -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 diff --git a/cad/netgen/files/patch-ng_onetcl.cpp b/cad/netgen/files/patch-ng_onetcl.cpp deleted file mode 100644 index 94877f1c15ab..000000000000 --- a/cad/netgen/files/patch-ng_onetcl.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ng/onetcl.cpp.orig 2010-06-08 09:26:24.000000000 +0700 -+++ ng/onetcl.cpp 2010-06-08 09:26:48.000000000 +0700 -@@ -16,7 +16,7 @@ - " set ngdir $env(NETGENDIR) \n",\ - "}\n",\ - "if { [string length $ngdir] == 0 } {\n",\ --" set ngdir \".\" \n",\ -+" set ngdir \"/usr/local/bin\" \n",\ - "}\n",\ - "\n",\ - "\n",\ |