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)

3 files changed, 22 insertions, 35 deletions

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