From 3aa28a2c85c4d92197d3d93ca4cd0a22ca784dfc Mon Sep 17 00:00:00 2001 From: stephen Date: Sun, 10 Mar 2019 18:59:10 +0000 Subject: - Crashfix patch. - Bump portrevision. PR: 236443 Submitted by: rsmith@xs4all.nl --- cad/netgen/Makefile | 2 +- cad/netgen/files/patch-configure | 4 ++-- cad/netgen/files/patch-libsrc_csg_Makefile.am | 2 +- cad/netgen/files/patch-libsrc_csg_Makefile.in | 2 +- cad/netgen/files/patch-libsrc_visualization_Makefile.in | 4 ++-- cad/netgen/files/patch-ng_Makefile.am | 2 +- cad/netgen/files/patch-ng_Makefile.in | 2 +- cad/netgen/files/patch-ng_drawing.tcl | 11 +++++++++++ cad/netgen/files/patch-nglib_Makefile.in | 2 +- 9 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 cad/netgen/files/patch-ng_drawing.tcl (limited to 'cad/netgen') diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile index af384b47f5f9..e258657169f5 100644 --- a/cad/netgen/Makefile +++ b/cad/netgen/Makefile @@ -3,7 +3,7 @@ PORTNAME= netgen PORTVERSION= 5.3.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= cad MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION:C|\.[[:digit:]]+$||}/ diff --git a/cad/netgen/files/patch-configure b/cad/netgen/files/patch-configure index 9d86a92f1797..eed74a6729eb 100644 --- a/cad/netgen/files/patch-configure +++ b/cad/netgen/files/patch-configure @@ -1,6 +1,6 @@ --- configure.orig 2014-10-06 11:04:36 UTC +++ configure -@@ -9219,7 +9219,7 @@ $as_echo_n "checking whether the $compil +@@ -9219,7 +9219,7 @@ $as_echo_n "checking whether the $compiler linker ($LD hardcode_minus_L=no hardcode_shlibpath_var=unsupported inherit_rpath=no @@ -45,7 +45,7 @@ else ld_shlibs=no fi -@@ -10142,7 +10142,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > +@@ -10142,7 +10142,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } hardcode_direct_absolute=yes if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' diff --git a/cad/netgen/files/patch-libsrc_csg_Makefile.am b/cad/netgen/files/patch-libsrc_csg_Makefile.am index b84607274fde..80f0b9b74e50 100644 --- a/cad/netgen/files/patch-libsrc_csg_Makefile.am +++ b/cad/netgen/files/patch-libsrc_csg_Makefile.am @@ -1,6 +1,6 @@ --- libsrc/csg/Makefile.am.orig 2014-08-29 09:54:06 UTC +++ libsrc/csg/Makefile.am -@@ -5,7 +5,7 @@ polyhedra.hpp specpoin.hpp csg.hpp expli +@@ -5,7 +5,7 @@ polyhedra.hpp specpoin.hpp csg.hpp explicitcurve2d.hpp revolution.hpp spline3d.hpp vscsg.hpp diff --git a/cad/netgen/files/patch-libsrc_csg_Makefile.in b/cad/netgen/files/patch-libsrc_csg_Makefile.in index 935bcd6a722f..d74c5b35226b 100644 --- a/cad/netgen/files/patch-libsrc_csg_Makefile.in +++ b/cad/netgen/files/patch-libsrc_csg_Makefile.in @@ -1,6 +1,6 @@ --- libsrc/csg/Makefile.in.orig 2014-10-06 11:04:37 UTC +++ libsrc/csg/Makefile.in -@@ -285,7 +285,7 @@ meshsurf.hpp solid.hpp triapprox.hpp csg +@@ -285,7 +285,7 @@ meshsurf.hpp solid.hpp triapprox.hpp csgeom.hpp edgefl polyhedra.hpp specpoin.hpp csg.hpp explicitcurve2d.hpp identify.hpp \ revolution.hpp spline3d.hpp vscsg.hpp diff --git a/cad/netgen/files/patch-libsrc_visualization_Makefile.in b/cad/netgen/files/patch-libsrc_visualization_Makefile.in index b80144856eb6..db9bfd5ead9c 100644 --- a/cad/netgen/files/patch-libsrc_visualization_Makefile.in +++ b/cad/netgen/files/patch-libsrc_visualization_Makefile.in @@ -1,6 +1,6 @@ ---- libsrc/visualization/Makefile.in.orig 2016-04-21 11:00:04 UTC +--- libsrc/visualization/Makefile.in.orig 2014-10-06 11:04:37 UTC +++ libsrc/visualization/Makefile.in -@@ -275,7 +275,7 @@ noinst_HEADERS = meshdoc.hpp mvdraw.hpp +@@ -275,7 +275,7 @@ noinst_HEADERS = meshdoc.hpp mvdraw.hpp vispar.hpp \ visual.hpp vssolution.hpp include_HEADERS = soldata.hpp diff --git a/cad/netgen/files/patch-ng_Makefile.am b/cad/netgen/files/patch-ng_Makefile.am index 3cdff48ff077..83615716f1f9 100644 --- a/cad/netgen/files/patch-ng_Makefile.am +++ b/cad/netgen/files/patch-ng_Makefile.am @@ -8,7 +8,7 @@ if NGGUI -@@ -22,7 +22,7 @@ netgen_LDADD = $(top_builddir)/libsrc/vi +@@ -22,7 +22,7 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/li $(top_builddir)/libsrc/csg/libcsg.la \ $(top_builddir)/libsrc/interface/libinterface.la \ $(top_builddir)/libsrc/meshing/libmesh.la \ diff --git a/cad/netgen/files/patch-ng_Makefile.in b/cad/netgen/files/patch-ng_Makefile.in index 41618b4ffb4d..408b46564cbc 100644 --- a/cad/netgen/files/patch-ng_Makefile.in +++ b/cad/netgen/files/patch-ng_Makefile.in @@ -9,7 +9,7 @@ netgen_SOURCES = demoview.cpp ngappinit.cpp onetcl.cpp parallelfunc.cpp ngpkg.cpp demoview.hpp parallelfunc.hpp togl_1_7.h @NGMKL_TRUE@MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_def # -lpardiso500-GNU472-X86-64 -lgfortran -@@ -312,7 +312,7 @@ netgen_LDADD = $(top_builddir)/libsrc/vi +@@ -312,7 +312,7 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/li $(top_builddir)/libsrc/csg/libcsg.la \ $(top_builddir)/libsrc/interface/libinterface.la \ $(top_builddir)/libsrc/meshing/libmesh.la \ diff --git a/cad/netgen/files/patch-ng_drawing.tcl b/cad/netgen/files/patch-ng_drawing.tcl new file mode 100644 index 000000000000..afead34a95d5 --- /dev/null +++ b/cad/netgen/files/patch-ng_drawing.tcl @@ -0,0 +1,11 @@ +--- ng/drawing.tcl.orig 2019-03-10 18:49:31 UTC ++++ ng/drawing.tcl +@@ -11,7 +11,7 @@ set oldmousey 0 + # use this one for Togl 2.0 + # if {[catch {togl .ndraw -width 400 -height 300 -rgba true -double true -depth true -privatecmap false -stereo false -indirect true -create init -display draw -reshape reshape }] } { + +-if {[catch {togl .ndraw -width 400 -height 300 -rgba true -double true -depth true -privatecmap false -stereo false -indirect true }] } { puts "no OpenGL" ++if {[catch {togl .ndraw -width 400 -height 300 -rgba true -double true -depth true -privatecmap false -stereo false -indirect false }] } { puts "no OpenGL" + } { + # + pack .ndraw -expand true -fill both -padx 10 -pady 10 diff --git a/cad/netgen/files/patch-nglib_Makefile.in b/cad/netgen/files/patch-nglib_Makefile.in index 93610c5c7daf..5c88a3d70bd0 100644 --- a/cad/netgen/files/patch-nglib_Makefile.in +++ b/cad/netgen/files/patch-nglib_Makefile.in @@ -1,6 +1,6 @@ --- nglib/Makefile.in.orig 2014-10-06 11:04:37 UTC +++ nglib/Makefile.in -@@ -129,7 +129,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM +@@ -129,7 +129,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -- cgit