<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f69076e0b017d99a1da22c431646d1ed7676291e">https://github.com/macports/macports-ports/commit/f69076e0b017d99a1da22c431646d1ed7676291e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f69076e0b017d99a1da22c431646d1ed7676291e
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Fri Apr 7 23:35:39 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> gnuplot: update to version 5.0.6
</span>---
math/gnuplot/Portfile | 12 +-
math/gnuplot/files/patch-configure.diff | 21 +--
math/gnuplot/files/patch-upstream-linewidth.diff | 148 ---------------------
.../files/patch-upstream-src-hidden3d.c.diff | 23 ----
4 files changed, 5 insertions(+), 199 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnuplot/Portfile b/math/gnuplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9670052..8b53787 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnuplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gnuplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,7 @@ PortGroup xcodeversion 1.0
</span> PortGroup wxWidgets 1.0
name gnuplot
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.0.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.0.6
</span> categories math science
# the license has some inconvenient requirements that we're not meeting
# to be allowed to distribute binaries
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +29,8 @@ homepage http://gnuplot.sourceforge.net/
</span> master_sites sourceforge:project/gnuplot/gnuplot/${version}
dist_subdir ${name}/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 928acb77e084fbe62babfd6c33af0ec15577dad7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 25f3e0bf192e01115c580f278c3725d7a569eb848786e12b455a3fda70312053
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3c0d36c4b497aa28866265aa2760b63671ee5584 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460
</span>
depends_build path:bin/pkg-config:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,10 +50,7 @@ depends_lib port:expat \
</span> minimum_xcodeversions \
{9 3.1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-upstream-src-hidden3d.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-upstream-linewidth.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-src-qtterminal-qt_conversion.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.diff
</span>
configure.args --with-caca=${prefix} \
--with-gd=${prefix} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnuplot/files/patch-configure.diff b/math/gnuplot/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3199be3..5dc6b73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnuplot/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gnuplot/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.orig
+++ configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14757,6 +14757,7 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14762,6 +14762,7 @@ fi
</span> if test "${enable_qt_ok}" = yes \
|| test "${enable_wxwidgets_ok}" = yes \
|| test "$GGI_SUPPORT" = yes \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,22 +8,3 @@
</span> || test "$no_x" != yes; then
enable_mouse=yes;
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# --- configure.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# +++ configure.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# @@ -1076,7 +1076,7 @@ if test "${enable_wxwidgets_ok}" = yes ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# AC_FUNC_FORK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# dnl Check for gtk (raise/lower tweaks)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - PKG_CHECK_MODULES(GTK, [gtk+-2.0], have_gtk=yes, have_gtk=no)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# + PKG_CHECK_MODULES(GTK, [gtk+-2.0], have_gtk=no, have_gtk=no)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if test "${have_gtk}" = yes ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# AC_DEFINE(HAVE_GTK, 1, [Define to use gtk/gdk tweaks])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# WX_CXXFLAGS="$WX_CXXFLAGS $GTK_CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# @@ -1273,6 +1273,7 @@ dnl build mouse support if any mouse-requiring terminal is selected
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if test "${enable_qt_ok}" = yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# || test "${enable_wxwidgets_ok}" = yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# || test "$GGI_SUPPORT" = yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# + || test "$with_caca" = yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# || test "$no_x" != yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# enable_mouse=yes;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnuplot/files/patch-upstream-linewidth.diff b/math/gnuplot/files/patch-upstream-linewidth.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index be775c6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnuplot/files/patch-upstream-linewidth.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,148 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://sourceforge.net/p/gnuplot/feature-requests/459/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/qtterminal/qt_term.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/qtterminal/qt_term.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -164,6 +164,7 @@ static int qt_optionWidth = 640;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int qt_optionHeight = 480;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int qt_optionFontSize = 9;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static double qt_optionDashLength = 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static double qt_optionLineWidth = 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Encapsulates all Qt options that have a constructor and destructor. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct QtOption {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -797,7 +798,7 @@ void qt_pointsize(double ptsize)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void qt_linewidth(double lw)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qt->out << GELineWidth << lw;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qt->out << GELineWidth << lw * qt_optionLineWidth;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int qt_text_angle(int angle)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1224,6 +1225,7 @@ enum QT_id {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_DASH,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_DASHLENGTH,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_SOLID,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QT_LINEWIDTH,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_OTHER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1246,6 +1248,8 @@ static struct gen_table qt_opts[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"dashl$ength", QT_DASHLENGTH},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"dl", QT_DASHLENGTH},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"solid", QT_SOLID},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"linew$idth", QT_LINEWIDTH},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"lw", QT_LINEWIDTH},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, QT_OTHER}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1268,6 +1272,7 @@ void qt_options()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool set_widget = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool set_dash = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool set_dashlength = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool set_linewidth = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int previous_WindowId = qt_optionWindowId;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1385,6 +1390,10 @@ void qt_options()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // qt_optionDash = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c_token++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case QT_LINEWIDTH:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SETCHECKDUP(set_linewidth);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qt_optionLineWidth = real_expression();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case QT_OTHER:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt_optionWindowId = int_expression();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1435,6 +1444,7 @@ void qt_options()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (set_enhanced) termOptions += qt_optionEnhanced ? " enhanced" : " noenhanced";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- termOptions += " font \"" + fontSettings + '"';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (set_linewidth) termOptions += " linewidth " + QString::number(qt_optionLineWidth);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (set_dashlength) termOptions += " dashlength " + QString::number(qt_optionDashLength);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (set_widget) termOptions += " widget \"" + qt_option->Widget + '"';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (set_persist) termOptions += qt_optionPersist ? " persist" : " nopersist";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- term/aquaterm.trm.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ term/aquaterm.trm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -250,6 +250,16 @@ AQUA_options()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (equals(c_token, "lw") || almost_equals(c_token, "linew$idth")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ c_token++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (END_OF_COMMAND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int_error(c_token, "expecting line width");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AQUA_LineWidth = real_expression();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (AQUA_LineWidth < 0.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AQUA_LineWidth = 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (equals(c_token, "dl") || almost_equals(c_token, "dashl$ength")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c_token++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (END_OF_COMMAND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -295,6 +305,8 @@ AQUA_options()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AQUA_dashedlines?"dashed":"solid");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (AQUA_dashedlines)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sprintf(&(term_options[strlen(term_options)]), " dl %3.1f", AQUA_dashlength_factor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (AQUA_LineWidth != 1.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sprintf(&(term_options[strlen(term_options)]), " linewidth %3.1f", AQUA_LineWidth);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static NSString*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -675,6 +687,7 @@ AQUA_boxfill(int style, unsigned int x1, unsigned int y1, unsigned int width, un
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TERM_PUBLIC void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AQUA_linewidth(double linewidth)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ linewidth *= AQUA_LineWidth;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [adapter setLinewidth:linewidth];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -960,7 +973,7 @@ TERM_TABLE_START(aqua_driver)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AQUA_text_angle,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AQUA_justify_text, AQUA_point, do_arrow, AQUA_set_font,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AQUA_pointsize,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TERM_CAN_MULTIPLOT|TERM_NO_OUTPUTFILE|TERM_CAN_DASH|TERM_POLYGON_PIXELS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ TERM_CAN_MULTIPLOT|TERM_NO_OUTPUTFILE|TERM_CAN_DASH|TERM_POLYGON_PIXELS|TERM_LINEWIDTH,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AQUA_suspend, AQUA_resume,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AQUA_boxfill, AQUA_linewidth
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_MOUSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -998,6 +1011,7 @@ START_HELP(aqua)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " Syntax:",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " set terminal aqua {<n>} {title \"<wintitle>\"} {size <x> <y>}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " {font \"<fontname>{,<fontsize>}\"}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+" {linewidth <lw>}\"}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " {{no}enhanced} {solid|dashed} {dl <dashlength>}}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " where <n> is the number of the window to draw in (default is 0),",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- term/qt.trm.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ term/qt.trm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,7 @@ TERM_TABLE_START (qt_driver)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt_text_angle, qt_justify_text,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt_point, do_arrow, qt_set_font,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt_pointsize,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TERM_CAN_MULTIPLOT|TERM_NO_OUTPUTFILE|TERM_ALPHA_CHANNEL|TERM_CAN_DASH|TERM_ENHANCED_TEXT|TERM_POLYGON_PIXELS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ TERM_CAN_MULTIPLOT|TERM_NO_OUTPUTFILE|TERM_ALPHA_CHANNEL|TERM_CAN_DASH|TERM_ENHANCED_TEXT|TERM_POLYGON_PIXELS|TERM_LINEWIDTH,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0 /* suspend */, 0 /* resume */, qt_fillbox, qt_linewidth
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_MOUSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- , qt_waitforinput, qt_put_tmptext, qt_set_ruler, qt_set_cursor, qt_set_clipboard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,7 +94,7 @@ START_HELP(qt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " {position <x>,<y>}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " {title \"title\"}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " {font <font>} {{no}enhanced}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--" {dashlength <dl>}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+" {linewidth <lw>} {dashlength <dl>}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " {{no}persist} {{no}raise} {{no}ctrl}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " {close}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " {widget <id>}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- term/wxt.trm.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ term/wxt.trm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -470,7 +470,7 @@ TERM_TABLE_START (wxt_driver)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxt_text_angle, wxt_justify_text,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxt_point, do_arrow, wxt_set_font,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxt_pointsize,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TERM_CAN_MULTIPLOT|TERM_NO_OUTPUTFILE|TERM_ALPHA_CHANNEL|TERM_CAN_DASH|TERM_FONTSCALE|TERM_ENHANCED_TEXT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ TERM_CAN_MULTIPLOT|TERM_NO_OUTPUTFILE|TERM_ALPHA_CHANNEL|TERM_CAN_DASH|TERM_FONTSCALE|TERM_ENHANCED_TEXT|TERM_LINEWIDTH,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxt_text /* suspend */, 0 /* resume */, wxt_fillbox, wxt_linewidth
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_MOUSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- , wxt_waitforinput, wxt_put_tmptext, wxt_set_ruler, wxt_set_cursor, wxt_set_clipboard
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnuplot/files/patch-upstream-src-hidden3d.c.diff b/math/gnuplot/files/patch-upstream-src-hidden3d.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2a24227..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnuplot/files/patch-upstream-src-hidden3d.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/53509
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://sourceforge.net/p/gnuplot/bugs/1904/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/hidden3d.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hidden3d.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1116,14 +1116,15 @@ build_networks(struct surface_points *plots, int pcount)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nv += 2 * nverts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ne += nverts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case DOTS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- this_plot->lp_properties.flags |= LP_SHOW_POINTS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- this_plot->lp_properties.p_type = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case IMAGE:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case RGBIMAGE:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case RGBA_IMAGE:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Ignore these */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case DOTS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this_plot->lp_properties.flags |= LP_SHOW_POINTS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this_plot->lp_properties.p_type = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* fall through */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case POINTSTYLE:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* treat all remaining ones like 'points' */
</span></pre><pre style='margin:0'>
</pre>