Upgrade to 4.2.2. New features:

    * New plot styles
          o Histogram
          o Label plots
          o Image data
          o Filled curves
          o Vectors
    * Input from binary data files
    * New plot elements
          o RGB colors
          o Arbitrary rectangles
    * String handling
          o String and text data read from datafiles
          o User-defined string variables, operators, and functions
    * Macros
    * Auto-layout of multiple plots on a page
    * Internal variables
    * New or revised terminal drivers
          o wxt
          o emf
          o gif, jpeg, png
          o postscript
          o ai
          o epslatex, pslatex, pstex
          o windows
    * Canvas size

5 files changed, 33 insertions, 23 deletions

diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 2dae37f577e..e27623fee6d 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2007/02/22 19:26:34 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2007/11/30 07:13:18 cjs Exp $
 #
 
-PKGREVISION=		7
 SVR4_PKGNAME=		gplot
 CATEGORIES+=		x11
 
diff --git a/graphics/gnuplot/Makefile.common b/graphics/gnuplot/Makefile.common
index 00cdf13cd6e..1624dd1d286 100644
--- a/graphics/gnuplot/Makefile.common
+++ b/graphics/gnuplot/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.9 2007/02/01 12:15:38 drochner Exp $
+# $NetBSD: Makefile.common,v 1.10 2007/11/30 07:13:18 cjs Exp $
 #
 
-DISTNAME=		gnuplot-4.0.0
+DISTNAME=		gnuplot-4.2.2
 CATEGORIES+=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
 			ftp://ftp.ucc.ie/pub/gnuplot/ \
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index fa201e67b4b..1bed00584ba 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,10 +1,21 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/04 14:45:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/11/30 07:13:18 cjs Exp $
 bin/gnuplot
 info/gnuplot.info
-libexec/gnuplot/4.0/gnuplot_x11
+lib/X11/app-defaults/Gnuplot.app-defaults
+libexec/gnuplot/4.2/gnuplot_x11
 man/man1/gnuplot.1
-share/gnuplot/4.0/gnuplot.gih
-@dirrm share/gnuplot/4.0
+share/gnuplot/4.2/PostScript/8859-1.ps
+share/gnuplot/4.2/PostScript/8859-15.ps
+share/gnuplot/4.2/PostScript/8859-2.ps
+share/gnuplot/4.2/PostScript/cp1250.ps
+share/gnuplot/4.2/PostScript/cp437.ps
+share/gnuplot/4.2/PostScript/cp850.ps
+share/gnuplot/4.2/PostScript/cp852.ps
+share/gnuplot/4.2/PostScript/koi8r.ps
+share/gnuplot/4.2/PostScript/koi8u.ps
+share/gnuplot/4.2/PostScript/prologue.ps
+share/gnuplot/4.2/gnuplot.gih
+@dirrm share/gnuplot/4.2
 @dirrm share/gnuplot
-@dirrm libexec/gnuplot/4.0
+@dirrm libexec/gnuplot/4.2
 @dirrm libexec/gnuplot
diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo
index 137ed20f38d..d2539f8a969 100644
--- a/graphics/gnuplot/distinfo
+++ b/graphics/gnuplot/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2007/02/01 12:15:38 drochner Exp $
+$NetBSD: distinfo,v 1.9 2007/11/30 07:13:19 cjs Exp $
 
-SHA1 (gnuplot-4.0.0.tar.gz) = a862bc311724c263aa1ef1c646291d73dc37c978
-RMD160 (gnuplot-4.0.0.tar.gz) = 7b1fc84c161c132c776269b6e9a49abd29251a18
-Size (gnuplot-4.0.0.tar.gz) = 2160918 bytes
-SHA1 (patch-aa) = cb1cba419a22b9d0dabf5ec80422b62a278aee32
+SHA1 (gnuplot-4.2.2.tar.gz) = 991db8024f04e8cad300804bc2661e358fdcf348
+RMD160 (gnuplot-4.2.2.tar.gz) = 7364d283718d89c05652d7c25a841154caa2efd8
+Size (gnuplot-4.2.2.tar.gz) = 2832174 bytes
+SHA1 (patch-aa) = a6f67cc9ef3dc1cac2dc5bd9d0ecc634b9b70a92
diff --git a/graphics/gnuplot/patches/patch-aa b/graphics/gnuplot/patches/patch-aa
index 50c6e3cbd5e..23d2ffb6cf6 100644
--- a/graphics/gnuplot/patches/patch-aa
+++ b/graphics/gnuplot/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.8 2007/02/01 12:15:39 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2007/11/30 07:13:19 cjs Exp $
 
---- src/stdfn.h.orig	2004-04-13 19:24:01.000000000 +0200
-+++ src/stdfn.h
-@@ -258,6 +258,11 @@ extern char *sys_errlist[];
- # include <time.h>
+--- 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 */
@@ -11,10 +11,10 @@ $NetBSD: patch-aa,v 1.8 2007/02/01 12:15:39 drochner Exp $
 +# include <sys/time.h>
 +#endif
 +
- #ifndef HAVE_TIME_T_IN_TIME_H
- # define time_t long
- #endif
-@@ -324,7 +329,7 @@ int gp_strnicmp __PROTO((const char *, c
+ #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 @@
  #endif
  
  /* sleep delay time, where delay is a double value */