update to 4.6.0

changes:
- New syntax supporting multi-line blocks of code delimited by curly braces
     if (<cond>) { ... } else { ... }
     do for [<iteration-spec>] { ... }
     while (<cond>) { ... }
- Time formats can handle fractional seconds to microsecond precision.
- User-definable linetypes that can be used to establish a locally
  preferred default sequence of colors or dash/thickness/point styles.
- Statistical summary of the data to be plotted (new command "stats")
- New terminal drivers:  qt  context  epscairo  cairolatex
- Improved support for UTF-8, SJIS and other multi-byte encodings

pkgsrc change: added "qt4" and "wxwindows" options (not enabled
 by default)

7 files changed, 93 insertions, 79 deletions

diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 4f158773159..bacbe841fca 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2012/03/03 00:13:14 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2012/08/10 15:14:53 drochner Exp $
 
-DISTNAME=	gnuplot-4.4.4
-PKGREVISION=	2
+DISTNAME=	gnuplot-4.6.0
 CATEGORIES+=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
@@ -17,7 +16,7 @@ DISTINFO_FILE=		${.CURDIR}/../../graphics/gnuplot/distinfo
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		makeinfo pkg-config
+USE_TOOLS+=		makeinfo pkg-config gmake
 GNU_CONFIGURE=		yes
 #CONFIGURE_ARGS+=	--enable-history-file
 CONFIGURE_ARGS+=	--with-plot=${PREFIX}
@@ -25,6 +24,7 @@ CONFIGURE_ARGS+=	--without-latex
 CONFIGURE_ARGS+=	--without-lisp-files
 CONFIGURE_ARGS+=	--without-tutorial
 INFO_FILES=		yes
+USE_LANGUAGES=		c
 
 # Use BSD editline wherever possible:
 .include "../../mk/bsd.prefs.mk"
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index eebee551b94..45a315d76d6 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,33 +1,43 @@
-@comment $NetBSD: PLIST,v 1.14 2011/03/14 08:06:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2012/08/10 15:14:53 drochner Exp $
 bin/gnuplot
 info/gnuplot.info
-${PLIST.x11}libexec/gnuplot/4.4/gnuplot_x11
+${PLIST.qt4}libexec/gnuplot/4.6/gnuplot_qt
+${PLIST.x11}libexec/gnuplot/4.6/gnuplot_x11
 man/man1/gnuplot.1
-share/gnuplot/4.4/PostScript/8859-1.ps
-share/gnuplot/4.4/PostScript/8859-15.ps
-share/gnuplot/4.4/PostScript/8859-2.ps
-share/gnuplot/4.4/PostScript/8859-9.ps
-share/gnuplot/4.4/PostScript/aglfn.txt
-share/gnuplot/4.4/PostScript/cp1250.ps
-share/gnuplot/4.4/PostScript/cp1251.ps
-share/gnuplot/4.4/PostScript/cp437.ps
-share/gnuplot/4.4/PostScript/cp850.ps
-share/gnuplot/4.4/PostScript/cp852.ps
-share/gnuplot/4.4/PostScript/koi8r.ps
-share/gnuplot/4.4/PostScript/koi8u.ps
-share/gnuplot/4.4/PostScript/prologue.ps
-share/gnuplot/4.4/PostScript/utf-8.ps
-${PLIST.x11}share/gnuplot/4.4/app-defaults/Gnuplot
-share/gnuplot/4.4/gnuplot.gih
-share/gnuplot/4.4/js/README
-share/gnuplot/4.4/js/canvasmath.js
-share/gnuplot/4.4/js/canvastext.js
-share/gnuplot/4.4/js/gnuplot_common.js
-share/gnuplot/4.4/js/gnuplot_mouse.css
-share/gnuplot/4.4/js/gnuplot_mouse.js
-share/gnuplot/4.4/js/grid.png
-share/gnuplot/4.4/js/help.png
-share/gnuplot/4.4/js/nextzoom.png
-share/gnuplot/4.4/js/previouszoom.png
-share/gnuplot/4.4/js/textzoom.png
-share/gnuplot/4.4/lua/gnuplot-tikz.lua
+share/gnuplot/4.6/PostScript/8859-1.ps
+share/gnuplot/4.6/PostScript/8859-15.ps
+share/gnuplot/4.6/PostScript/8859-2.ps
+share/gnuplot/4.6/PostScript/8859-9.ps
+share/gnuplot/4.6/PostScript/aglfn.txt
+share/gnuplot/4.6/PostScript/cp1250.ps
+share/gnuplot/4.6/PostScript/cp1251.ps
+share/gnuplot/4.6/PostScript/cp437.ps
+share/gnuplot/4.6/PostScript/cp850.ps
+share/gnuplot/4.6/PostScript/cp852.ps
+share/gnuplot/4.6/PostScript/koi8r.ps
+share/gnuplot/4.6/PostScript/koi8u.ps
+share/gnuplot/4.6/PostScript/prologue.ps
+share/gnuplot/4.6/PostScript/utf-8.ps
+${PLIST.x11}share/gnuplot/4.6/app-defaults/Gnuplot
+share/gnuplot/4.6/colors_default.gp
+share/gnuplot/4.6/colors_mono.gp
+share/gnuplot/4.6/colors_podo.gp
+share/gnuplot/4.6/gnuplot.gih
+share/gnuplot/4.6/gnuplot.pdf
+share/gnuplot/4.6/gnuplotrc
+share/gnuplot/4.6/js/README
+share/gnuplot/4.6/js/canvasmath.js
+share/gnuplot/4.6/js/canvastext.js
+share/gnuplot/4.6/js/gnuplot_common.js
+share/gnuplot/4.6/js/gnuplot_dashedlines.js
+share/gnuplot/4.6/js/gnuplot_mouse.css
+share/gnuplot/4.6/js/gnuplot_mouse.js
+share/gnuplot/4.6/js/gnuplot_svg.js
+share/gnuplot/4.6/js/grid.png
+share/gnuplot/4.6/js/help.png
+share/gnuplot/4.6/js/nextzoom.png
+share/gnuplot/4.6/js/previouszoom.png
+share/gnuplot/4.6/js/textzoom.png
+share/gnuplot/4.6/lua/gnuplot-tikz.lua
+${PLIST.qt4}share/gnuplot/4.6/qt/qtgnuplot_fr.qm
+${PLIST.qt4}share/gnuplot/4.6/qt/qtgnuplot_ja.qm
diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo
index 13f41a530ea..16093acb8e3 100644
--- a/graphics/gnuplot/distinfo
+++ b/graphics/gnuplot/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.18 2011/11/30 11:00:50 drochner Exp $
+$NetBSD: distinfo,v 1.19 2012/08/10 15:14:53 drochner Exp $
 
-SHA1 (gnuplot-4.4.4.tar.gz) = d4f143eade1f8d8b27be44cbda431d37a71c6a31
-RMD160 (gnuplot-4.4.4.tar.gz) = 7e1d039c05c46fa38b53a3c4afbd328509da901d
-Size (gnuplot-4.4.4.tar.gz) = 3328278 bytes
-SHA1 (patch-aa) = a6f67cc9ef3dc1cac2dc5bd9d0ecc634b9b70a92
-SHA1 (patch-ac) = 36bbe7654e581d7323dfe2a0c358c0f99aae2c6f
+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 (patch-aa) = fa5981422c83d1467b0df8a7c36ce7b2439855f2
+SHA1 (patch-ac) = 271c107d7793d8817221474eca4b5da78abad9c9
 SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413
 SHA1 (patch-ae) = ce2a89ebcdcae1b1945563b48e6ebb6974d3a048
 SHA1 (patch-af) = e5672a05f88d0ba3c1471b379dd47cd1b274f8b1
-SHA1 (patch-ag) = 655d45419dc32f47b6984dc2135322363bced412
+SHA1 (patch-ag) = 0e649f1d0aed8befdb818b991a45dbfc0d2e1e7c
 SHA1 (patch-ah) = e4024ebbc039d7b5e741aa109259de6269b03765
diff --git a/graphics/gnuplot/options.mk b/graphics/gnuplot/options.mk
index 661c73efc00..e96d0fab988 100644
--- a/graphics/gnuplot/options.mk
+++ b/graphics/gnuplot/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.4 2011/04/29 11:41:07 obache Exp $
+# $NetBSD: options.mk,v 1.5 2012/08/10 15:14:54 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnuplot
-PKG_SUPPORTED_OPTIONS=	gd lua pdf x11
+PKG_SUPPORTED_OPTIONS=	gd lua pdf x11 qt4 wxwidgets
 PKG_SUGGESTED_OPTIONS=	gd x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	x11
+PLIST_VARS+=	x11 qt4
 
 .if !empty(PKG_OPTIONS:Mgd)
 .include "../../graphics/gd/buildlink3.mk"
@@ -30,3 +30,20 @@ PLIST.x11=	yes
 .else
 CONFIGURE_ARGS+=	--without-x
 .endif
+
+.if !empty(PKG_OPTIONS:Mqt4)
+USE_LANGUAGES+=	c++
+CONFIGURE_ARGS+=	--enable-qt
+PLIST.qt4=      yes
+.include "../../x11/qt4-libs/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=        --disable-qt
+.endif
+
+.if !empty(PKG_OPTIONS:Mwxwidgets)
+USE_LANGUAGES+= c++
+CONFIGURE_ARGS+=        --enable-wxwidgets
+.include "../../x11/wxGTK28/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=        --disable-wxwidgets
+.endif
diff --git a/graphics/gnuplot/patches/patch-aa b/graphics/gnuplot/patches/patch-aa
index 23d2ffb6cf6..15048a0c746 100644
--- a/graphics/gnuplot/patches/patch-aa
+++ b/graphics/gnuplot/patches/patch-aa
@@ -1,20 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2007/11/30 07:13:19 cjs Exp $
+$NetBSD: patch-aa,v 1.10 2012/08/10 15:14:54 drochner Exp $
 
---- src/stdfn.h.orig	2006-05-13 18:22:17.000000000 +0900
-+++ src/stdfn.h	2007-11-30 15:57:17.000000000 +0900
-@@ -261,6 +261,11 @@
- # define time_t long
- #endif
- 
-+/* <sys/time.h> may be needed for fd_set and/or some of the above */
-+#ifdef HAVE_SYS_TIME_H
-+# include <sys/time.h>
-+#endif
-+
- #if defined(PIPES) && (defined(VMS) || (defined(OSK) && defined(_ANSI_EXT))) || defined(PIPES) && defined(AMIGA_SC_6_1)
- FILE *popen __PROTO((char *, char *));
- int pclose __PROTO((FILE *));
-@@ -337,7 +342,7 @@
+--- src/stdfn.h.orig	2011-09-21 11:43:50.000000000 +0000
++++ src/stdfn.h
+@@ -349,7 +349,7 @@ size_t strnlen __PROTO((const char *str,
  #endif
  
  /* sleep delay time, where delay is a double value */
diff --git a/graphics/gnuplot/patches/patch-ac b/graphics/gnuplot/patches/patch-ac
index dbcb76e11e9..7496f5d4621 100644
--- a/graphics/gnuplot/patches/patch-ac
+++ b/graphics/gnuplot/patches/patch-ac
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.1 2009/09/14 18:52:03 asau Exp $
+$NetBSD: patch-ac,v 1.2 2012/08/10 15:14:54 drochner 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
+--- src/gp_hist.h.orig	2011-02-21 07:56:57.000000000 +0000
++++ src/gp_hist.h
+@@ -70,7 +70,7 @@ extern long int gnuplot_history_size;
+  * (almost) compatible readline replacement
   */
  #if defined(HAVE_LIBEDITLINE)
 -# include <editline/readline.h>
-+# include <readline/history.h>
++# include <readline/readline.h>
  #endif
  
  #if defined(READLINE) && !defined(HAVE_LIBREADLINE) && !defined(HAVE_LIBEDITLINE)
diff --git a/graphics/gnuplot/patches/patch-ag b/graphics/gnuplot/patches/patch-ag
index 804594d1ff6..fe7fb7edc54 100644
--- a/graphics/gnuplot/patches/patch-ag
+++ b/graphics/gnuplot/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.4 2011/03/14 08:06:53 adam Exp $
+$NetBSD: patch-ag,v 1.5 2012/08/10 15:14:54 drochner Exp $
 
 NetBSD editline keeps header files in "readline", not "editline".
 Same applies to DragonFly.
 
---- configure.orig	2010-09-23 04:22:39.000000000 +0000
+--- configure.orig	2012-03-08 04:35:17.000000000 +0000
 +++ configure
-@@ -7119,9 +7119,9 @@ fi
+@@ -8679,9 +8679,9 @@ fi
  
  $as_echo "#define HAVE_LIBEDITLINE 1" >>confdefs.h
  
@@ -17,13 +17,12 @@ Same applies to DragonFly.
  if test "x$ac_cv_header_editline_readline_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_EDITLINE_READLINE_H 1
-@@ -7662,7 +7662,9 @@ else
- 	 if test -d $withval/lib; then
- 	   LDFLAGS="$LDFLAGS -L$withval/lib"
- 	 fi
-+	if test "x$with_x" = xyes; then
- 	 TERMXLIBS="$X_LIBS -lXaw -lXmu -lXt -lXext -lX11"
-+	fi
- 	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pl_textangle in -lplot" >&5
- $as_echo_n "checking for pl_textangle in -lplot... " >&6; }
- if test "${ac_cv_lib_plot_pl_textangle+set}" = set; then :
+@@ -14772,7 +14774,7 @@ $as_echo "    tek40xx, tek410x, texdraw,
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ $as_echo "" >&6; }
+ 
+-if test "$with_bitmap_terminals" == yes; then
++if test "$with_bitmap_terminals" = yes; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result:   dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&5
+ $as_echo "  dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&6; }
+ else