Update gnuplot to version 4.6.1.

Update a comment in patch-ag.
Remove the point patch for the "crash on first command when using editline",
since this problem is now fixed upstream.

Upstream changes relative to version 4.6.0:

* NEW syntax hints inside Emacs gnuplot-mode
* NEW support tabulation (set table) of pixel values from image plot styles
* NEW support tabulation of variable color column
* CHANGE emf output modified for better compatibility with MS Office programs
* CHANGE canvas terminal loads appropriate font file for UTF-8 encoding
* CHANGE skip execution of empty iteration loops in set and do commands
* CHANGE build scripts modified to accommodate automake 1.12
* CHANGE new policy: objects given in screen coords are not clipped to graph
* CHANGE Draw the z-axis label at a fixed distance to the left of the z-axis
* CHANGE "unset object N" succeeds even if there is currently no object N
* FIX margin space required for rotated axis tic labels
* FIX check for NaN values in binary input
* FIX backslash handling in enhanced text strings
* FIX cairo terminals sometimes lost the line segment before a polygon
* FIX interactive toggle of multiplots in svg
* FIX failure to balance {} if an input file did not end with a newline
* FIX strlen() and substring operators correctly handle UTF-8
* FIX initialization of history when configured --with-readline=bsd
* FIX set term cairolatex pdf mono
* FIX palette-related corruption in some cairolatex output
* FIX preserve number of active call arguments across a nested call command
* FIX wxt terminal mutex protecting execution of the command list
* FIX apply clipping to the interior fill of circles and ellipses
* FIX corruption of weights used for plotting with smooth acsplines
* FIX skip columnheader line when applying "every" filter
* FIX handle out-of-range pm3d values when cb axis is set to log scale
* FIX top/bottom color distinction in hidden3d when not using palette/RGB colors
* FIX allow toggling on/off of more than 10 plots in windows terminal
* FIX color printing from windows terminal
* FIX set term win font ",<size>"
* FIX incorrect return for acos(x) when imag(x) > 0 (bug present since v3.7)
      incorrect return for asin(x) when imag(x) > 0 (bug in 4.4.4, 4.6.0)
      incorrect asinh(x) when real(x) < 0 && imag(x) == 0 (bug in 4.4.4, 4.6.0)
* FIX keep sufficient precision in canvas and svg coords to report time in msec
* FIX the input buffer was not always extended correctly inside a { clause }
* FIX some cairolatex set_color requests were being ignored
* FIX calculated value of kernel density mean and sigma
* FIX emf terminal dashed line support

5 files changed, 17 insertions, 31 deletions

diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index ee8da06d049..2b00d511d9a 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2012/11/01 14:04:58 mlelstv Exp $
+# $NetBSD: Makefile,v 1.69 2012/11/07 19:22:04 he Exp $
 
-DISTNAME=	gnuplot-4.6.0
-PKGREVISION=	4
+DISTNAME=	gnuplot-4.6.1
 CATEGORIES+=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index 45a315d76d6..5357580971e 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.15 2012/08/10 15:14:53 drochner Exp $
+@comment $NetBSD: PLIST,v 1.16 2012/11/07 19:22:04 he Exp $
 bin/gnuplot
 info/gnuplot.info
 ${PLIST.qt4}libexec/gnuplot/4.6/gnuplot_qt
 ${PLIST.x11}libexec/gnuplot/4.6/gnuplot_x11
 man/man1/gnuplot.1
+share/emacs/site-lisp/gnuplot-eldoc.el
+share/emacs/site-lisp/gnuplot-eldoc.elc
 share/gnuplot/4.6/PostScript/8859-1.ps
 share/gnuplot/4.6/PostScript/8859-15.ps
 share/gnuplot/4.6/PostScript/8859-2.ps
diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo
index 075dbd3b733..ba7c49ab821 100644
--- a/graphics/gnuplot/distinfo
+++ b/graphics/gnuplot/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.20 2012/10/24 13:32:54 he Exp $
+$NetBSD: distinfo,v 1.21 2012/11/07 19:22:04 he Exp $
 
-SHA1 (gnuplot-4.6.0.tar.gz) = 9a43ae13546d97d4b174533ddac31a14e0edc9b2
-RMD160 (gnuplot-4.6.0.tar.gz) = 2c06500f45fb81850b45713a2cd0e38f0021b065
-Size (gnuplot-4.6.0.tar.gz) = 5017694 bytes
+SHA1 (gnuplot-4.6.1.tar.gz) = 1ea21a628223159b0297ae65fe8293afd5aab3c0
+RMD160 (gnuplot-4.6.1.tar.gz) = 2b6fb6c1f1ce60f0bac2cb9b496c45b073ce6bb2
+Size (gnuplot-4.6.1.tar.gz) = 4959670 bytes
 SHA1 (patch-aa) = fa5981422c83d1467b0df8a7c36ce7b2439855f2
 SHA1 (patch-ac) = 271c107d7793d8817221474eca4b5da78abad9c9
 SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413
 SHA1 (patch-ae) = ce2a89ebcdcae1b1945563b48e6ebb6974d3a048
 SHA1 (patch-af) = e5672a05f88d0ba3c1471b379dd47cd1b274f8b1
-SHA1 (patch-ag) = 0e649f1d0aed8befdb818b991a45dbfc0d2e1e7c
+SHA1 (patch-ag) = 8a27282ee0e9add193e3437e2f88dac149e40068
 SHA1 (patch-ah) = e4024ebbc039d7b5e741aa109259de6269b03765
-SHA1 (patch-src_command.c) = 0b09c2a58b60efe93b48c7457a50a59a7275c515
diff --git a/graphics/gnuplot/patches/patch-ag b/graphics/gnuplot/patches/patch-ag
index fe7fb7edc54..b86b0259299 100644
--- a/graphics/gnuplot/patches/patch-ag
+++ b/graphics/gnuplot/patches/patch-ag
@@ -1,11 +1,13 @@
-$NetBSD: patch-ag,v 1.5 2012/08/10 15:14:54 drochner Exp $
+$NetBSD: patch-ag,v 1.6 2012/11/07 19:22:05 he Exp $
 
 NetBSD editline keeps header files in "readline", not "editline".
 Same applies to DragonFly.
 
---- configure.orig	2012-03-08 04:35:17.000000000 +0000
+Also get rid of a non-portable "test ... ==" instance.
+
+--- configure.orig	2012-09-26 23:06:30.000000000 +0000
 +++ configure
-@@ -8679,9 +8679,9 @@ fi
+@@ -9197,9 +9197,9 @@ fi
  
  $as_echo "#define HAVE_LIBEDITLINE 1" >>confdefs.h
  
@@ -14,10 +16,10 @@ Same applies to DragonFly.
  do :
 -  ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
 +  ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
- if test "x$ac_cv_header_editline_readline_h" = x""yes; then :
+ if test "x$ac_cv_header_editline_readline_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_EDITLINE_READLINE_H 1
-@@ -14772,7 +14774,7 @@ $as_echo "    tek40xx, tek410x, texdraw,
+@@ -15340,7 +15340,7 @@ $as_echo "    tek40xx, tek410x, texdraw,
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
  $as_echo "" >&6; }
  
diff --git a/graphics/gnuplot/patches/patch-src_command.c b/graphics/gnuplot/patches/patch-src_command.c
deleted file mode 100644
index 2d60f30c449..00000000000
--- a/graphics/gnuplot/patches/patch-src_command.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_command.c,v 1.1 2012/10/24 13:32:54 he Exp $
-
-Avoid de-referencing a NULL pointer on the first command executed(!)
-
---- src/command.c.orig	2012-02-27 21:58:36.000000000 +0000
-+++ src/command.c
-@@ -2689,7 +2689,8 @@ rlgets(char *s, size_t n, const char *pr
- 	    /* deleting history entries does not work, so suppress adjacent 
- 	    duplicates only */
- 	    while (previous_history());
--	    if (strcmp(current_history()->line, line) != 0)
-+	    if (current_history() != NULL &&
-+		strcmp(current_history()->line, line) != 0)
- 		add_history(line);
- #  else /* builtin readline */
- 	    add_history(line);