Fix various package list problems:

1.) Remove directory "share/gnuplot/4.2/PostScript" during deinstallation.
2.) Prevent installation of "share/texmf-local/tex/latex/gnuplot" if
    LaTeX is available (because we don't want to depend on "tetex").
3.) Update package list of "gnuplot-nox11" for version 4.2.

Bump revision of both packages.

6 files changed, 36 insertions, 11 deletions

diff --git a/graphics/gnuplot-nox11/PLIST b/graphics/gnuplot-nox11/PLIST
index 0b9242ca228..7737904b893 100644
--- a/graphics/gnuplot-nox11/PLIST
+++ b/graphics/gnuplot-nox11/PLIST
@@ -1,10 +1,20 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/04 14:45:45 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/11/30 12:31:52 tron Exp $
 bin/gnuplot
 info/gnuplot.info
 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/PostScript
+@dirrm share/gnuplot/4.2
 @dirrm share/gnuplot
-@exec ${MKDIR} %D/libexec/gnuplot/4.0
-@dirrm libexec/gnuplot/4.0
+@dirrm libexec/gnuplot/4.2
 @dirrm libexec/gnuplot
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index e27623fee6d..b593785efda 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2007/11/30 07:13:18 cjs Exp $
-#
+# $NetBSD: Makefile,v 1.40 2007/11/30 12:31:52 tron Exp $
 
 SVR4_PKGNAME=		gplot
 CATEGORIES+=		x11
diff --git a/graphics/gnuplot/Makefile.common b/graphics/gnuplot/Makefile.common
index 1624dd1d286..212ff44e09f 100644
--- a/graphics/gnuplot/Makefile.common
+++ b/graphics/gnuplot/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.10 2007/11/30 07:13:18 cjs Exp $
-#
+# $NetBSD: Makefile.common,v 1.11 2007/11/30 12:31:52 tron Exp $
 
 DISTNAME=		gnuplot-4.2.2
+PKGREVISION=		1
 CATEGORIES+=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
 			ftp://ftp.ucc.ie/pub/gnuplot/ \
@@ -28,6 +28,7 @@ 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
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index 1bed00584ba..e80466b8bde 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/11/30 07:13:18 cjs Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/11/30 12:31:52 tron Exp $
 bin/gnuplot
 info/gnuplot.info
 lib/X11/app-defaults/Gnuplot.app-defaults
@@ -15,6 +15,7 @@ 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/PostScript
 @dirrm share/gnuplot/4.2
 @dirrm share/gnuplot
 @dirrm libexec/gnuplot/4.2
diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo
index d2539f8a969..eedad5068e1 100644
--- a/graphics/gnuplot/distinfo
+++ b/graphics/gnuplot/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2007/11/30 07:13:19 cjs Exp $
+$NetBSD: distinfo,v 1.10 2007/11/30 12:31:52 tron Exp $
 
 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
+SHA1 (patch-ab) = 96db3ecda621a20381d9905dc8faa0dbc71cc426
diff --git a/graphics/gnuplot/patches/patch-ab b/graphics/gnuplot/patches/patch-ab
new file mode 100644
index 00000000000..8fdaa0d0681
--- /dev/null
+++ b/graphics/gnuplot/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.8 2007/11/30 12:31:52 tron Exp $
+
+--- share/Makefile.in.orig	2007-08-31 07:35:05.000000000 +0100
++++ share/Makefile.in	2007-11-30 12:10:08.000000000 +0000
+@@ -189,7 +189,7 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign 1.2h
+ EXTRA_DIST = Gnuplot.app-defaults
+-SUBDIRS = LaTeX
++SUBDIRS = 
+ xresourcedir = $(libdir)/X11/app-defaults
+ xresource_DATA = Gnuplot.app-defaults
+ all: all-recursive