Update to gnuplot 4.2.5.

pkgsrc changes: use NetBSD libedit where possible.


New features, changes and fixes in gnuplot version 4.2.5
===========================================================
* NEW ./configure --with-readline=bsd to use libedit rather than libreadline
* NEW command line option -e "command list"
* NEW 'set xtics rangelimit' allows creation of range/frame plots
* NEW "set view equal_axes xy{z}" does for 3D what "set size square" does for 2D.
* CHANGE updated svg terminal driver (back-ported from 4.3 CVS branch)
* CHANGE fillstyle empty really is consistently empty (not fill-with-background)
* CHANGE warn that some options to 'set datafile binary' are not implemented
* CHANGE handling of custom palette when postscript mode is set to "monochrome"
* CHANGE allow Z axis label in 3D plots to be rotated
* CHANGE do not save or restore axis tick labels that were read from a data file
* FIX interpolatation for pm3d surfaces given by both z and colour coordinates
* FIX infinite loop if axis tick increment is on the order of machine precision
* FIX initialize x11 enhanced text mode to use most recently requested font
* FIX emf handling of enhanced text at non-zero angle
* FIX 3D plots with fixed zrange were clipping against xmax rather than zmax
* FIX handling of uninitialized variables in fit "via" command
* FIX pm3d depthorder was ignoring interpolation setting
* FIX assignment of fill patterns to boxes in columnstacked histograms
* FIX Reserve room for user tic labels even if the format for autoticks is ""
* FIX bug in 4.2.4 that gave twice the requested left/right margin width


New features, changes and fixes in gnuplot version 4.2.4
===========================================================
* NEW add support for enhanced text mode in the emf terminal driver
* NEW builtin functions 'strftime' and 'strptime'
* NEW set absolute plot margins in screen coordinates
* NEW "nocontours" keyword for splot
* NEW "undefine foo" clears previously defined user variable foo
* NEW allow contouring of pm3d surfaces
* NEW allow color by z value ("palette z") in 2D plots
* NEW "pause mouse close" waits until the plot window is closed
* FIX The documentation says that "set size ratio" is ignored in 3D. Make it so.
* FIX Do not re-quantize time tics interval explicitly set by user
* FIX (gd post) don't segfault on very long font names
* FIX allow variable color from input file for "with boxes", "with vectors"
* FIX don't run off the end of "set format" commands
* FIX Fix discontinuity in piecewise approximation of inverse error function
* FIX discard out of range vectors in the bitmap terminals (pbm, epson, etc)
* FIX 2nd colour in the colour box for negative palette in postscript
* FIX insure palette is initialized before any objects are drawn
* FIX wxt terminal was not obeying "set palette maxcolors"
* FIX Histograms did not correctly honor 'set style user increment'
* FIX Avoid segfault if tic labels are requested from a non-existent data column
* FIX emf terminal - allow fractional linewidth (fixes 0-length dash problem)
* FIX post terminal - fix parsing error for palfuncparam
* FIX post terminal - escape {} chars in enhanced text mode
* FIX clip "splot with labels" against plot boundaries in 2D mode
* CHANGE try harder to autotitle columns in using specs with expressions
* CHANGE gd.trm: use dynamically-allocated TTF font names
* CHANGE x11: more finely sampled color palette for PM3D
* CHANGE cgm: switch to using web_color_rgbs; approximate RGB colors
* CHANGE fig: more point types, 4.2-style font and size syntax for "set term"
* CHANGE emf: separate dashlength option (don't use linewidth for dashlength)
* CHANGE stacked histograms grow upward for values > 0, downward for values < 0
* CHANGE 'pause mouse button1' (or button2) does not disable zooming
* CHANGE built-in readline tries to recognize <home> and <end> keys

9 files changed, 112 insertions, 23 deletions

diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 3d2f30c5a95..dc41312bad4 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2009/08/26 20:22:51 sno Exp $
+# $NetBSD: Makefile,v 1.47 2009/09/14 18:52:03 asau Exp $
 
-PKGREVISION=		3
-SVR4_PKGNAME=		gplot
 CATEGORIES+=		x11
 
 CONFLICTS+=		gnuplot-nox11-[0-9]*
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 .include "../../graphics/gnuplot/Makefile.common"
 
 .include "../../graphics/plotutils/buildlink3.mk"
diff --git a/graphics/gnuplot/Makefile.common b/graphics/gnuplot/Makefile.common
index f52fd5c48fe..0362675700c 100644
--- a/graphics/gnuplot/Makefile.common
+++ b/graphics/gnuplot/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.15 2008/12/01 11:56:18 obache Exp $
+# $NetBSD: Makefile.common,v 1.16 2009/09/14 18:52:03 asau Exp $
 
 # used by ../../graphics/gnuplot-nox11
 
-DISTNAME=		gnuplot-4.2.3
+DISTNAME=		gnuplot-4.2.5
 CATEGORIES+=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
@@ -14,10 +14,9 @@ PATCHDIR=		${.CURDIR}/../../graphics/gnuplot/patches
 DISTINFO_FILE=		${.CURDIR}/../../graphics/gnuplot/distinfo
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
-# because of missing rl_complete_with_tilde_expansion and rl_terminal_name
-USE_GNU_READLINE=	YES
 
 USE_TOOLS+=		makeinfo
 INFO_FILES=		# PLIST
@@ -25,10 +24,19 @@ INFO_FILES=		# PLIST
 CONFIGURE_ARGS+=	--with-pdf
 CONFIGURE_ARGS+=	--enable-history-file
 CONFIGURE_ARGS+=	--with-plot=${PREFIX:Q}
-CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 CONFIGURE_ARGS+=	--without-lisp-files
 CONFIGURE_ARGS+=	--without-tutorial
 
+# Use BSD editline wherever possible:
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+=	--with-readline=bsd
+.include "../../mk/curses.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 .include "../../devel/readline/buildlink3.mk"
+.endif
+
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../print/pdflib/buildlink3.mk"
diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo
index 5d9974e6dce..bdc5530607c 100644
--- a/graphics/gnuplot/distinfo
+++ b/graphics/gnuplot/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.12 2008/05/15 20:22:02 drochner Exp $
+$NetBSD: distinfo,v 1.13 2009/09/14 18:52:03 asau Exp $
 
-SHA1 (gnuplot-4.2.3.tar.gz) = 9f6239ef69ac5a6d68f40dc797f8a0b35b80f491
-RMD160 (gnuplot-4.2.3.tar.gz) = b4692db884c9da2f0d160f33f53c3d2aba65f36e
-Size (gnuplot-4.2.3.tar.gz) = 2840611 bytes
+SHA1 (gnuplot-4.2.5.tar.gz) = e7ad6afc1ca7b39a512a18f2dc6f2bcda9bf9128
+RMD160 (gnuplot-4.2.5.tar.gz) = 79ab74627d66c2eff6d69276c1556acca89ec6dd
+Size (gnuplot-4.2.5.tar.gz) = 2873303 bytes
 SHA1 (patch-aa) = a6f67cc9ef3dc1cac2dc5bd9d0ecc634b9b70a92
-SHA1 (patch-ab) = 066d4c0282c8c36b66a823d3a2a1c578428bf029
+SHA1 (patch-ab) = f64716b79fbdab9b85fb7df89c9c24a6db313d26
+SHA1 (patch-ac) = 36bbe7654e581d7323dfe2a0c358c0f99aae2c6f
+SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413
+SHA1 (patch-ae) = 622630495587a963fe713ca18d871b5b51aafadc
+SHA1 (patch-af) = 02a661965a9af633f9a4dc6ef74f8ad312610362
+SHA1 (patch-ag) = b3d3e7e0799dcba09c8c9794db2677e58c070c0a
diff --git a/graphics/gnuplot/patches/patch-ab b/graphics/gnuplot/patches/patch-ab
index b5ebc1ff31b..3a73d0a4f22 100644
--- a/graphics/gnuplot/patches/patch-ab
+++ b/graphics/gnuplot/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.10 2008/05/15 20:22:02 drochner Exp $
+$NetBSD: patch-ab,v 1.11 2009/09/14 18:52:03 asau Exp $
 
---- share/Makefile.in.orig	2008-03-08 21:06:28.000000000 +0100
-+++ share/Makefile.in
-@@ -189,7 +189,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- share/Makefile.in.orig	2009-03-29 00:24:51.000000000 +0300
++++ share/Makefile.in	2009-09-14 16:20:30.000000000 +0400
+@@ -193,7 +193,7 @@
+ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign 1.2h
  EXTRA_DIST = Gnuplot.app-defaults
 -SUBDIRS = LaTeX
@@ -11,11 +11,11 @@ $NetBSD: patch-ab,v 1.10 2008/05/15 20:22:02 drochner Exp $
  appdefaultdir = $(libdir)/X11/app-defaults
  APPDEFAULTFILES = Gnuplot
  appdefault_DATA = $(APPDEFAULTFILES)
-@@ -229,13 +229,15 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- uninstall-info-am:
+@@ -232,13 +232,15 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-appdefaultDATA: $(appdefault_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
+-	test -z "$(appdefaultdir)" || $(MKDIR_P) "$(DESTDIR)$(appdefaultdir)"
 -	@list='$(appdefault_DATA)'; for p in $$list; do \
 +	if test $${INSTALL_XRESOURCE_DATA:-yes} = yes; then \
 +	test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"; \
diff --git a/graphics/gnuplot/patches/patch-ac b/graphics/gnuplot/patches/patch-ac
new file mode 100644
index 00000000000..dbcb76e11e9
--- /dev/null
+++ b/graphics/gnuplot/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2009/09/14 18:52:03 asau Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
+Same applies to DragonFly.
+
+--- src/gp_hist.h.orig	2008-12-15 07:18:36.000000000 +0300
++++ src/gp_hist.h	2009-09-14 17:12:18.000000000 +0400
+@@ -70,7 +70,7 @@
+  * (almost) compatible readline relacement
+  */
+ #if defined(HAVE_LIBEDITLINE)
+-# include <editline/readline.h>
++# include <readline/history.h>
+ #endif
+ 
+ #if defined(READLINE) && !defined(HAVE_LIBREADLINE) && !defined(HAVE_LIBEDITLINE)
diff --git a/graphics/gnuplot/patches/patch-ad b/graphics/gnuplot/patches/patch-ad
new file mode 100644
index 00000000000..1b6824c13be
--- /dev/null
+++ b/graphics/gnuplot/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2009/09/14 18:52:03 asau Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
+Same applies to DragonFly.
+
+--- src/readline.h.orig	2008-12-15 07:18:36.000000000 +0300
++++ src/readline.h	2009-09-14 17:16:14.000000000 +0400
+@@ -51,7 +51,7 @@
+ # include <readline/readline.h>
+ #endif
+ #if defined(HAVE_LIBEDITLINE)
+-# include <editline/readline.h>
++# include <readline/readline.h>
+ #endif
+ 
+ #if defined(HAVE_LIBEDITLINE)
diff --git a/graphics/gnuplot/patches/patch-ae b/graphics/gnuplot/patches/patch-ae
new file mode 100644
index 00000000000..1eb759cdff0
--- /dev/null
+++ b/graphics/gnuplot/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2009/09/14 18:52:03 asau Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
+Same applies to DragonFly.
+
+--- src/plot.c.orig	2008-12-15 07:18:36.000000000 +0300
++++ src/plot.c	2009-09-14 17:22:09.000000000 +0400
+@@ -120,7 +120,7 @@
+ /* BSD editline
+ */
+ #ifdef HAVE_LIBEDITLINE
+-# include <editline/readline.h>
++# include <readline/readline.h>
+ #endif
+ 
+ /* enable gnuplot history with readline */
diff --git a/graphics/gnuplot/patches/patch-af b/graphics/gnuplot/patches/patch-af
new file mode 100644
index 00000000000..db632d2f504
--- /dev/null
+++ b/graphics/gnuplot/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 2009/09/14 18:52:03 asau Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
+Same applies to DragonFly.
+
+--- configure.in.orig	2009-03-15 06:39:15.000000000 +0300
++++ configure.in	2009-09-14 17:35:06.000000000 +0400
+@@ -305,7 +305,7 @@
+       if test "$ac_cv_lib_edit_readline" = yes; then
+         AC_DEFINE(HAVE_LIBEDITLINE,1,
+                 [ Define if you are using the BSD editline library. ])
+-        AC_CHECK_HEADERS(editline/readline.h,,
++        AC_CHECK_HEADERS(readline/readline.h,,
+           AC_MSG_WARN([found BSD editline library but not readline.h please add path to readline.h to CPPFLAGS in Makefile]))
+ 
+         if test "$enable_history_file" = yes; then
diff --git a/graphics/gnuplot/patches/patch-ag b/graphics/gnuplot/patches/patch-ag
new file mode 100644
index 00000000000..a38b18be492
--- /dev/null
+++ b/graphics/gnuplot/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2009/09/14 18:52:03 asau Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
+Same applies to DragonFly.
+
+--- configure.orig	2009-09-14 17:37:45.000000000 +0400
++++ configure	2009-09-14 17:37:54.000000000 +0400
+@@ -9178,7 +9178,7 @@
+ _ACEOF
+ 
+ 
+-for ac_header in editline/readline.h
++for ac_header in readline/readline.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then