Update gnuplot to 4.0.0

Closes PR #25450 submitted by me.

Ok'ed wiz@/snj@/root (at) garbled.net

Thanks to xtraeme@ for fixing GD's X11 issues.

From the CHANGELOG:

 What's New
 ==========


 The list of changes is immense this time, so only the highlights
 can be given here.  For the full details, see the NEWS file or the
 ChangeLog, or look into the online version of the documentation at
 http://www.gnuplot.info/docs/gnuplot.html#What_is_New_in_Version_4.0
 You'll quite probably have to (re-)read large parts of the
 documentation to learn all the details that have changed.


 Major changes visible to users:
 -------------------------------


 o Global Command syntax change: instead of 'set no...' it's now
   'unset ...'.
 o Commands 'set data style', 'set function style' and 'set linestyle'
   changed to 'set style {data|function|line}, respectively.
 o Colour-coded plots in 3D and simulated 2D through the new 'pm3d'
   plotting style.
 o Boxes drawn by plotstyles 'boxes', 'candlesticks' and boxed errorbar
   styles can be filled with solid colors or hatch patterns.
 o New plot style 'with filledcurves' to fill an area defined by a curve
   in solid colour.
 o Windows, X11, OS/2 and GGI interactive graphical terminals now support
   interaction with the plot window by mouse and hotkeys.
 o The "enhanced" mode has been generalized from PostScript to some
   other terminal drivers.
 o 'set hidden3d' mode accepts non-grid data and hides them behind gridded
   surfaces plotted with them.
 o Several new terminal drivers: EMF, PDF, SVG, GGI, epslatex, aqua.
 o New function to query if a user-defined variable exists.
 o PNG and JPEG terminals using the GD library support libfreetype to
   use true-type fonts.
 o 'set label' can output a point symbol the comment refers to, and the
   text itself can be rotated by arbitrary angles (on some terminals).
 o The color of text elements can be changed.
 o 'set size ratio' now affects 3D plots, too.
 o The 'dgrid3d' can be switched between thin-plate splines and
   the older weighted averaging method, at compile time.
 o Some terminals now support 'koi8-r', ISO-Latin-2 and CP-852
   encoding of user input.
 o Windows gnuplot recognizes the Unix/X11 style '-persist' option,
   and supports changing linewidth by core gnuplot commands.
 o A native compilation option of gnuplot for Mac OS X is now part of
   the mainline source, using the 'aquaterm' driver [3].
 o Datafile comment character, column separator and decimal sign
   can be changed.
 o Arrows can be drawn with relative coordinates for the head, and the
   heads can be filled.
 o Allows 'set timefmt' independantly for each axis, and supports new
   '%s' format for seconds-since-1970 input.
 o Even more documentation misprints have been fixed, thanks to
   Shigeharu TAKENO


 Internal changes:
 -----------------


 o Reorganization of the entire source tree.
 o Broken into considerably more source files than before.
 o Large sets of related global variables have been collected into
   relatively few global data structures (the 'axis' array and a
   global 'key' data structure, e.g.).
 o The gnuplot_x11 driver no longer is installed in the PATH, to
   avoid confusion about it.
 o Scaling and ticking of time/date axes respects the fact that
   12 and 60 are not the same 10 or 100 much better.


 And, obviously, more bug fixes than could possibly fit into this
 narrow margin...

3 files changed, 17 insertions, 13 deletions

diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index f6879bab98f..47f60bedc2b 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2004/06/02 15:43:09 minskim Exp $
+# $NetBSD: Makefile,v 1.28 2004/06/25 17:08:13 adrianp Exp $
 #
 
-DISTNAME=		gnuplot-3.7.3
-PKGREVISION=		1
+DISTNAME=		gnuplot-4.0.0
 SVR4_PKGNAME=		gplot
 CATEGORIES=		graphics x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
@@ -10,8 +9,8 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
 			ftp://ftp.cc.monash.edu.au/pub/gnuplot/
 
 MAINTAINER=		root@garbled.net
-HOMEPAGE=		http://sourceforge.net/projects/gnuplot/
-COMMENT=		Gnuplot is a nice plotting utility
+HOMEPAGE=		http://gnuplot.sourceforge.net/
+COMMENT=		Portable interactive, function plotting utility
 
 CONFLICTS+=             gnuplot-nox11-[0-9]*
 
@@ -23,7 +22,8 @@ USE_BUILDLINK3=		YES
 USE_GNU_READLINE=	YES
 USE_X11=		YES
 
-INFO_FILES=	gnuplot.info
+USE_MAKEINFO=		YES
+INFO_FILES=		gnuplot.info
 
 CONFIGURE_ARGS+=	--with-pdf
 CONFIGURE_ARGS+=	--with-plot=${LOCALBASE}
@@ -31,6 +31,6 @@ CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../graphics/plotutils/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
 .include "../../print/pdflib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index 3639a116b61..3889a5649ff 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/17 23:37:12 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/06/25 17:08:13 adrianp Exp $
 bin/gnuplot
-bin/gnuplot_x11
+libexec/gnuplot/4.0/gnuplot_x11
 man/man1/gnuplot.1
-share/gnuplot.gih
+share/gnuplot/4.0/gnuplot.gih
+@dirrm share/gnuplot/4.0
+@dirrm share/gnuplot
+@dirrm libexec/gnuplot/4.0
+@dirrm libexec/gnuplot
diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo
index 9e1466bdf0f..b4b4a95468b 100644
--- a/graphics/gnuplot/distinfo
+++ b/graphics/gnuplot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/03/05 14:01:26 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/06/25 17:08:13 adrianp Exp $
 
-SHA1 (gnuplot-3.7.3.tar.gz) = 8e077efa1b6804020adfce62b4c5a1c391ca3d2d
-Size (gnuplot-3.7.3.tar.gz) = 1418889 bytes
+SHA1 (gnuplot-4.0.0.tar.gz) = a862bc311724c263aa1ef1c646291d73dc37c978
+Size (gnuplot-4.0.0.tar.gz) = 2160918 bytes