Wed Nov 7 19:22:05 2012 UTC ()
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


(he)
diff -r1.68 -r1.69 pkgsrc/graphics/gnuplot/Makefile
diff -r1.15 -r1.16 pkgsrc/graphics/gnuplot/PLIST
diff -r1.20 -r1.21 pkgsrc/graphics/gnuplot/distinfo
diff -r1.5 -r1.6 pkgsrc/graphics/gnuplot/patches/patch-ag
diff -r1.1 -r0 pkgsrc/graphics/gnuplot/patches/patch-src_command.c
cvs diff -r1.68 -r1.69 pkgsrc/graphics/gnuplot/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gnuplot/Makefile 2012/11/01 14:04:58 1.68
+++ pkgsrc/graphics/gnuplot/Makefile 2012/11/07 19:22:04 1.69
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.68 2012/11/01 14:04:58 mlelstv Exp $ 1# $NetBSD: Makefile,v 1.69 2012/11/07 19:22:04 he Exp $
2 2
3DISTNAME= gnuplot-4.6.0 3DISTNAME= gnuplot-4.6.1
4PKGREVISION= 4 
5CATEGORIES+= graphics 4CATEGORIES+= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://gnuplot.sourceforge.net/ 8HOMEPAGE= http://gnuplot.sourceforge.net/
10COMMENT= Portable interactive, function plotting utility 9COMMENT= Portable interactive, function plotting utility
11 10
12CONFLICTS+= gnuplot-nox11-[0-9]* 11CONFLICTS+= gnuplot-nox11-[0-9]*
13 12
14PATCHDIR= ${.CURDIR}/../../graphics/gnuplot/patches 13PATCHDIR= ${.CURDIR}/../../graphics/gnuplot/patches
15DISTINFO_FILE= ${.CURDIR}/../../graphics/gnuplot/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../graphics/gnuplot/distinfo
16 15
17PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
cvs diff -r1.15 -r1.16 pkgsrc/graphics/gnuplot/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/gnuplot/PLIST 2012/08/10 15:14:53 1.15
+++ pkgsrc/graphics/gnuplot/PLIST 2012/11/07 19:22:04 1.16
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1@comment $NetBSD: PLIST,v 1.15 2012/08/10 15:14:53 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.16 2012/11/07 19:22:04 he Exp $
2bin/gnuplot 2bin/gnuplot
3info/gnuplot.info 3info/gnuplot.info
4${PLIST.qt4}libexec/gnuplot/4.6/gnuplot_qt 4${PLIST.qt4}libexec/gnuplot/4.6/gnuplot_qt
5${PLIST.x11}libexec/gnuplot/4.6/gnuplot_x11 5${PLIST.x11}libexec/gnuplot/4.6/gnuplot_x11
6man/man1/gnuplot.1 6man/man1/gnuplot.1
 7share/emacs/site-lisp/gnuplot-eldoc.el
 8share/emacs/site-lisp/gnuplot-eldoc.elc
7share/gnuplot/4.6/PostScript/8859-1.ps 9share/gnuplot/4.6/PostScript/8859-1.ps
8share/gnuplot/4.6/PostScript/8859-15.ps 10share/gnuplot/4.6/PostScript/8859-15.ps
9share/gnuplot/4.6/PostScript/8859-2.ps 11share/gnuplot/4.6/PostScript/8859-2.ps
10share/gnuplot/4.6/PostScript/8859-9.ps 12share/gnuplot/4.6/PostScript/8859-9.ps
11share/gnuplot/4.6/PostScript/aglfn.txt 13share/gnuplot/4.6/PostScript/aglfn.txt
12share/gnuplot/4.6/PostScript/cp1250.ps 14share/gnuplot/4.6/PostScript/cp1250.ps
13share/gnuplot/4.6/PostScript/cp1251.ps 15share/gnuplot/4.6/PostScript/cp1251.ps
14share/gnuplot/4.6/PostScript/cp437.ps 16share/gnuplot/4.6/PostScript/cp437.ps
15share/gnuplot/4.6/PostScript/cp850.ps 17share/gnuplot/4.6/PostScript/cp850.ps
16share/gnuplot/4.6/PostScript/cp852.ps 18share/gnuplot/4.6/PostScript/cp852.ps
17share/gnuplot/4.6/PostScript/koi8r.ps 19share/gnuplot/4.6/PostScript/koi8r.ps
18share/gnuplot/4.6/PostScript/koi8u.ps 20share/gnuplot/4.6/PostScript/koi8u.ps
19share/gnuplot/4.6/PostScript/prologue.ps 21share/gnuplot/4.6/PostScript/prologue.ps
cvs diff -r1.20 -r1.21 pkgsrc/graphics/gnuplot/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/gnuplot/distinfo 2012/10/24 13:32:54 1.20
+++ pkgsrc/graphics/gnuplot/distinfo 2012/11/07 19:22:04 1.21
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
1$NetBSD: distinfo,v 1.20 2012/10/24 13:32:54 he Exp $ 1$NetBSD: distinfo,v 1.21 2012/11/07 19:22:04 he Exp $
2 2
3SHA1 (gnuplot-4.6.0.tar.gz) = 9a43ae13546d97d4b174533ddac31a14e0edc9b2 3SHA1 (gnuplot-4.6.1.tar.gz) = 1ea21a628223159b0297ae65fe8293afd5aab3c0
4RMD160 (gnuplot-4.6.0.tar.gz) = 2c06500f45fb81850b45713a2cd0e38f0021b065 4RMD160 (gnuplot-4.6.1.tar.gz) = 2b6fb6c1f1ce60f0bac2cb9b496c45b073ce6bb2
5Size (gnuplot-4.6.0.tar.gz) = 5017694 bytes 5Size (gnuplot-4.6.1.tar.gz) = 4959670 bytes
6SHA1 (patch-aa) = fa5981422c83d1467b0df8a7c36ce7b2439855f2 6SHA1 (patch-aa) = fa5981422c83d1467b0df8a7c36ce7b2439855f2
7SHA1 (patch-ac) = 271c107d7793d8817221474eca4b5da78abad9c9 7SHA1 (patch-ac) = 271c107d7793d8817221474eca4b5da78abad9c9
8SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413 8SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413
9SHA1 (patch-ae) = ce2a89ebcdcae1b1945563b48e6ebb6974d3a048 9SHA1 (patch-ae) = ce2a89ebcdcae1b1945563b48e6ebb6974d3a048
10SHA1 (patch-af) = e5672a05f88d0ba3c1471b379dd47cd1b274f8b1 10SHA1 (patch-af) = e5672a05f88d0ba3c1471b379dd47cd1b274f8b1
11SHA1 (patch-ag) = 0e649f1d0aed8befdb818b991a45dbfc0d2e1e7c 11SHA1 (patch-ag) = 8a27282ee0e9add193e3437e2f88dac149e40068
12SHA1 (patch-ah) = e4024ebbc039d7b5e741aa109259de6269b03765 12SHA1 (patch-ah) = e4024ebbc039d7b5e741aa109259de6269b03765
13SHA1 (patch-src_command.c) = 0b09c2a58b60efe93b48c7457a50a59a7275c515 
cvs diff -r1.5 -r1.6 pkgsrc/graphics/gnuplot/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/graphics/gnuplot/patches/Attic/patch-ag 2012/08/10 15:14:54 1.5
+++ pkgsrc/graphics/gnuplot/patches/Attic/patch-ag 2012/11/07 19:22:05 1.6
@@ -1,28 +1,30 @@ @@ -1,28 +1,30 @@
1$NetBSD: patch-ag,v 1.5 2012/08/10 15:14:54 drochner Exp $ 1$NetBSD: patch-ag,v 1.6 2012/11/07 19:22:05 he Exp $
2 2
3NetBSD editline keeps header files in "readline", not "editline". 3NetBSD editline keeps header files in "readline", not "editline".
4Same applies to DragonFly. 4Same applies to DragonFly.
5 5
6--- configure.orig 2012-03-08 04:35:17.000000000 +0000 6Also get rid of a non-portable "test ... ==" instance.
 7
 8--- configure.orig 2012-09-26 23:06:30.000000000 +0000
7+++ configure 9+++ configure
8@@ -8679,9 +8679,9 @@ fi 10@@ -9197,9 +9197,9 @@ fi
9  11
10 $as_echo "#define HAVE_LIBEDITLINE 1" >>confdefs.h 12 $as_echo "#define HAVE_LIBEDITLINE 1" >>confdefs.h
11  13
12- for ac_header in editline/readline.h 14- for ac_header in editline/readline.h
13+ for ac_header in readline/readline.h 15+ for ac_header in readline/readline.h
14 do : 16 do :
15- ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default" 17- ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
16+ ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default" 18+ ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
17 if test "x$ac_cv_header_editline_readline_h" = x""yes; then : 19 if test "x$ac_cv_header_editline_readline_h" = xyes; then :
18 cat >>confdefs.h <<_ACEOF 20 cat >>confdefs.h <<_ACEOF
19 #define HAVE_EDITLINE_READLINE_H 1 21 #define HAVE_EDITLINE_READLINE_H 1
20@@ -14772,7 +14774,7 @@ $as_echo " tek40xx, tek410x, texdraw, 22@@ -15340,7 +15340,7 @@ $as_echo " tek40xx, tek410x, texdraw,
21 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 23 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
22 $as_echo "" >&6; } 24 $as_echo "" >&6; }
23  25
24-if test "$with_bitmap_terminals" == yes; then 26-if test "$with_bitmap_terminals" == yes; then
25+if test "$with_bitmap_terminals" = yes; then 27+if test "$with_bitmap_terminals" = yes; then
26 { $as_echo "$as_me:${as_lineno-$LINENO}: result: dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&5 28 { $as_echo "$as_me:${as_lineno-$LINENO}: result: dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&5
27 $as_echo " dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&6; } 29 $as_echo " dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&6; }
28 else 30 else
File Deleted: pkgsrc/graphics/gnuplot/patches/Attic/patch-src_command.c