[pkgsrc/trunk]: pkgsrc/graphics Fix various package list problems:

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c57dd81b16e1
branches:  trunk
changeset: 535924:c57dd81b16e1
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Nov 30 12:31:52 2007 +0000

description:
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.

diffstat:

 graphics/gnuplot-nox11/PLIST      |  20 +++++++++++++++-----
 graphics/gnuplot/Makefile         |   3 +--
 graphics/gnuplot/Makefile.common  |   5 +++--
 graphics/gnuplot/PLIST            |   3 ++-
 graphics/gnuplot/distinfo         |   3 ++-
 graphics/gnuplot/patches/patch-ab |  13 +++++++++++++
 6 files changed, 36 insertions(+), 11 deletions(-)

diffs (106 lines):

diff -r 6d2f11001713 -r c57dd81b16e1 graphics/gnuplot-nox11/PLIST
--- a/graphics/gnuplot-nox11/PLIST      Fri Nov 30 12:02:07 2007 +0000
+++ b/graphics/gnuplot-nox11/PLIST      Fri Nov 30 12:31:52 2007 +0000
@@ -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 -r 6d2f11001713 -r c57dd81b16e1 graphics/gnuplot/Makefile
--- a/graphics/gnuplot/Makefile Fri Nov 30 12:02:07 2007 +0000
+++ b/graphics/gnuplot/Makefile Fri Nov 30 12:31:52 2007 +0000
@@ -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 -r 6d2f11001713 -r c57dd81b16e1 graphics/gnuplot/Makefile.common
--- a/graphics/gnuplot/Makefile.common  Fri Nov 30 12:02:07 2007 +0000
+++ b/graphics/gnuplot/Makefile.common  Fri Nov 30 12:31:52 2007 +0000
@@ -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+=       --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 -r 6d2f11001713 -r c57dd81b16e1 graphics/gnuplot/PLIST
--- a/graphics/gnuplot/PLIST    Fri Nov 30 12:02:07 2007 +0000
+++ b/graphics/gnuplot/PLIST    Fri Nov 30 12:31:52 2007 +0000
@@ -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/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 -r 6d2f11001713 -r c57dd81b16e1 graphics/gnuplot/distinfo
--- a/graphics/gnuplot/distinfo Fri Nov 30 12:02:07 2007 +0000
+++ b/graphics/gnuplot/distinfo Fri Nov 30 12:31:52 2007 +0000
@@ -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 -r 6d2f11001713 -r c57dd81b16e1 graphics/gnuplot/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gnuplot/patches/patch-ab Fri Nov 30 12:31:52 2007 +0000
@@ -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