Fri May 9 11:12:27 2008 UTC ()
Fix packaging of gnuplot-nox11 by avoiding the installation of an
X11-specific file.


(jmmv)
diff -r1.10 -r1.11 pkgsrc/graphics/gnuplot/distinfo
diff -r1.13 -r1.14 pkgsrc/graphics/gnuplot-nox11/Makefile
diff -r1.8 -r1.9 pkgsrc/graphics/gnuplot/patches/patch-ab
cvs diff -r1.10 -r1.11 pkgsrc/graphics/gnuplot/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/gnuplot/distinfo 2007/11/30 12:31:52 1.10
+++ pkgsrc/graphics/gnuplot/distinfo 2008/05/09 11:12:27 1.11
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.10 2007/11/30 12:31:52 tron Exp $ 1$NetBSD: distinfo,v 1.11 2008/05/09 11:12:27 jmmv Exp $
2 2
3SHA1 (gnuplot-4.2.2.tar.gz) = 991db8024f04e8cad300804bc2661e358fdcf348 3SHA1 (gnuplot-4.2.2.tar.gz) = 991db8024f04e8cad300804bc2661e358fdcf348
4RMD160 (gnuplot-4.2.2.tar.gz) = 7364d283718d89c05652d7c25a841154caa2efd8 4RMD160 (gnuplot-4.2.2.tar.gz) = 7364d283718d89c05652d7c25a841154caa2efd8
5Size (gnuplot-4.2.2.tar.gz) = 2832174 bytes 5Size (gnuplot-4.2.2.tar.gz) = 2832174 bytes
6SHA1 (patch-aa) = a6f67cc9ef3dc1cac2dc5bd9d0ecc634b9b70a92 6SHA1 (patch-aa) = a6f67cc9ef3dc1cac2dc5bd9d0ecc634b9b70a92
7SHA1 (patch-ab) = 96db3ecda621a20381d9905dc8faa0dbc71cc426 7SHA1 (patch-ab) = f6a377947e2c59d97aacf2715e4477642861b9e8
cvs diff -r1.13 -r1.14 pkgsrc/graphics/gnuplot-nox11/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gnuplot-nox11/Attic/Makefile 2007/02/22 19:26:34 1.13
+++ pkgsrc/graphics/gnuplot-nox11/Attic/Makefile 2008/05/09 11:12:27 1.14
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.14 2008/05/09 11:12:27 jmmv Exp $
2# 2#
3 3
4PKGNAME= ${DISTNAME:C/-/-nox11-/} 4PKGNAME= ${DISTNAME:C/-/-nox11-/}
5PKGREVISION= 6 5PKGREVISION= 6
6SVR4_PKGNAME= gplot 6SVR4_PKGNAME= gplot
7 7
8CONFLICTS+= gnuplot-[0-9]* 8CONFLICTS+= gnuplot-[0-9]*
9 9
10CONFIGURE_ARGS+= --without-x 10CONFIGURE_ARGS+= --without-x
11 11
 12INSTALL_ENV+= INSTALL_XRESOURCE_DATA=no
 13
12.include "../../graphics/gnuplot/Makefile.common" 14.include "../../graphics/gnuplot/Makefile.common"
13 15
14.include "../../graphics/plotutils-nox11/buildlink3.mk" 16.include "../../graphics/plotutils-nox11/buildlink3.mk"
15.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/graphics/gnuplot/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/gnuplot/patches/Attic/patch-ab 2007/11/30 12:31:52 1.8
+++ pkgsrc/graphics/gnuplot/patches/Attic/patch-ab 2008/05/09 11:12:27 1.9
@@ -1,13 +1,32 @@ @@ -1,13 +1,32 @@
1$NetBSD: patch-ab,v 1.8 2007/11/30 12:31:52 tron Exp $ 1$NetBSD: patch-ab,v 1.9 2008/05/09 11:12:27 jmmv Exp $
2 2
3--- share/Makefile.in.orig 2007-08-31 07:35:05.000000000 +0100 3--- share/Makefile.in.orig 2007-08-31 08:35:05.000000000 +0200
4+++ share/Makefile.in 2007-11-30 12:10:08.000000000 +0000 4+++ share/Makefile.in
5@@ -189,7 +189,7 @@ 5@@ -189,7 +189,7 @@ sysconfdir = @sysconfdir@
6 target_alias = @target_alias@ 6 target_alias = @target_alias@
7 AUTOMAKE_OPTIONS = foreign 1.2h 7 AUTOMAKE_OPTIONS = foreign 1.2h
8 EXTRA_DIST = Gnuplot.app-defaults 8 EXTRA_DIST = Gnuplot.app-defaults
9-SUBDIRS = LaTeX 9-SUBDIRS = LaTeX
10+SUBDIRS =  10+SUBDIRS =
11 xresourcedir = $(libdir)/X11/app-defaults 11 xresourcedir = $(libdir)/X11/app-defaults
12 xresource_DATA = Gnuplot.app-defaults 12 xresource_DATA = Gnuplot.app-defaults
13 all: all-recursive 13 all: all-recursive
 14@@ -227,13 +227,15 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
 15 uninstall-info-am:
 16 install-xresourceDATA: $(xresource_DATA)
 17 @$(NORMAL_INSTALL)
 18- test -z "$(xresourcedir)" || $(mkdir_p) "$(DESTDIR)$(xresourcedir)"
 19- @list='$(xresource_DATA)'; for p in $$list; do \
 20+ if test $${INSTALL_XRESOURCE_DATA:-yes} = yes; then \
 21+ test -z "$(xresourcedir)" || $(mkdir_p) "$(DESTDIR)$(xresourcedir)"; \
 22+ list='$(xresource_DATA)'; for p in $$list; do \
 23 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 24 f=$(am__strip_dir) \
 25 echo " $(xresourceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xresourcedir)/$$f'"; \
 26 $(xresourceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xresourcedir)/$$f"; \
 27- done
 28+ done; \
 29+ fi
 30
 31 uninstall-xresourceDATA:
 32 @$(NORMAL_UNINSTALL)