. Update to 5.2.2.

. Remove most options and configure unconditional support for them.
  This is now a full featured port of gnuplot.  If there is enough
  interest then I'll creating a 'gnuplot-lite' port for a minimalist
  version.

3 files changed, 139 insertions, 17 deletions

diff --git a/math/gnuplot/files/patch-configure b/math/gnuplot/files/patch-configure
new file mode 100644
index 000000000000..246bcdf65f8b
--- /dev/null
+++ b/math/gnuplot/files/patch-configure
@@ -0,0 +1,117 @@
+--- configure.orig	2017-11-23 11:59:30.644837000 -0800
++++ configure	2017-11-23 12:01:09.450617000 -0800
+@@ -11246,12 +11246,12 @@
+         pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.3" 2>/dev/null`
++  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-5.3" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11264,12 +11264,12 @@
+         pkg_cv_LUA_LIBS="$LUA_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.3" 2>/dev/null`
++  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-5.3" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11288,9 +11288,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.3"`
++	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.3"`
+         else
+-	        LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.3"`
++	        LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.3"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LUA_PKG_ERRORS" >&5
+@@ -11739,7 +11739,7 @@
+ 	LUA_LIBS=$pkg_cv_LUA_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	LUA=lua5.3
++	LUA=lua53
+ fi
+ elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -11754,12 +11754,12 @@
+         pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.3" 2>/dev/null`
++  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-5.3" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11772,12 +11772,12 @@
+         pkg_cv_LUA_LIBS="$LUA_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.3" 2>/dev/null`
++  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-5.3" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11796,9 +11796,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.3"`
++	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.3"`
+         else
+-	        LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.3"`
++	        LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.3"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LUA_PKG_ERRORS" >&5
+@@ -12247,7 +12247,7 @@
+ 	LUA_LIBS=$pkg_cv_LUA_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	LUA=lua5.3
++	LUA=lua53
+ fi
+ else
+ 	LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
+@@ -12290,7 +12290,7 @@
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' lua lua5.3 lua5.2 lua5.1; do
++for ac_lib in '' lua lua53 lua5.2 lua5.1; do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
+   else
diff --git a/math/gnuplot/files/patch-docs-Makefile.in b/math/gnuplot/files/patch-docs-Makefile.in
index e509815ac6bc..e74d90814353 100644
--- a/math/gnuplot/files/patch-docs-Makefile.in
+++ b/math/gnuplot/files/patch-docs-Makefile.in
@@ -1,6 +1,15 @@
---- docs/Makefile.in.orig	2016-10-09 17:24:51 UTC
-+++ docs/Makefile.in
-@@ -927,15 +927,15 @@ groff: grotxt grodvi grops
+--- docs/Makefile.in.orig	2017-11-06 10:23:52.000000000 -0800
++++ docs/Makefile.in	2017-11-23 12:14:18.710252000 -0800
+@@ -907,7 +907,7 @@
+ $(GNUPLOT_EXE):
+ 	( cd ../src ; $(MAKE) gnuplot$(EXEEXT) )
+ @BUILD_LUA_TRUE@$(LUA_HELP): $(top_srcdir)/term/lua/gnuplot-tikz.lua
+-@BUILD_LUA_TRUE@	$(AM_V_GEN) $(LUA) $< termhelp > $@
++@BUILD_LUA_TRUE@	$(AM_V_GEN) $(LUA) $(top_srcdir)/term/lua/gnuplot-tikz.lua termhelp > $@
+ 
+ allterm.h: $(CORETERM) $(LUA_HELP)
+ 	$(AM_V_GEN) for e in `egrep "^[ 	]*START_HELP" $(CORETERM) |\
+@@ -933,15 +933,15 @@
  
  grotxt: gnuplot.txt
  gnuplot.txt: gnuplot.ms $(srcdir)/titlepag.ms
@@ -19,17 +28,3 @@
  
  ### doc2xxx dependencies
  gnuplot.ms: doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc
-@@ -1077,11 +1077,11 @@ wxhelp/wgnuplot.html: doc2wxhtml$(EXEEXT
- 	$(AM_V_GEN) ./doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/
- 
- doc2wxhtml$(EXEEXT): wxhelp/doc2html.o termdoc.o xref.o $(SRC_VERSION_O)
--	$(AM_V_CCLD) $(LINK) $^
-+	$(AM_V_CCLD) $(LINK) wxhelp/doc2html.o termdoc.o xref.o $(SRC_VERSION_O)
- 
- wxhelp/doc2html.o: $(srcdir)/windows/doc2html.c $(BUILT_SOURCES)
- 	$(AM_V_AT)[ -d wxhelp ] || mkdir wxhelp
--	$(AM_V_CC) $(COMPILE) -c -o $@ -I.. -DALL_TERM_DOC -DWXHELP $<
-+	$(AM_V_CC) $(COMPILE) -c -o $@ -I.. -DALL_TERM_DOC -DWXHELP $(srcdir)/windows/doc2html.c
- 
- # HBB FIXME 2015-06-28: this is how the above really should be handled, but it causes
- # problems with the way automake handles its 'subdir-objects' option.
diff --git a/math/gnuplot/files/patch-src-command.c b/math/gnuplot/files/patch-src-command.c
new file mode 100644
index 000000000000..1f55428c3b1c
--- /dev/null
+++ b/math/gnuplot/files/patch-src-command.c
@@ -0,0 +1,10 @@
+--- src/command.c.orig	2017-11-01 18:12:31.201708000 -0700
++++ src/command.c	2017-11-01 18:13:03.695758000 -0700
+@@ -119,6 +119,7 @@
+ 
+ #ifndef _Windows
+ # include "help.h"
++# include <sys/wait.h>
+ #endif /* _Windows */
+ 
+ #ifdef _Windows