[pkgsrc/trunk]: pkgsrc/graphics Fix packaging of gnuplot-nox11 by avoiding th...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/79fbfca9f269
branches:  trunk
changeset: 542232:79fbfca9f269
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Fri May 09 11:12:27 2008 +0000

description:
Fix packaging of gnuplot-nox11 by avoiding the installation of an
X11-specific file.

diffstat:

 graphics/gnuplot-nox11/Makefile   |   4 +++-
 graphics/gnuplot/distinfo         |   4 ++--
 graphics/gnuplot/patches/patch-ab |  27 +++++++++++++++++++++++----
 3 files changed, 28 insertions(+), 7 deletions(-)

diffs (70 lines):

diff -r 2d6c9d382b73 -r 79fbfca9f269 graphics/gnuplot-nox11/Makefile
--- a/graphics/gnuplot-nox11/Makefile   Fri May 09 10:51:45 2008 +0000
+++ b/graphics/gnuplot-nox11/Makefile   Fri May 09 11:12:27 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:34 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/05/09 11:12:27 jmmv Exp $
 #
 
 PKGNAME=               ${DISTNAME:C/-/-nox11-/}
@@ -9,6 +9,8 @@
 
 CONFIGURE_ARGS+=       --without-x
 
+INSTALL_ENV+=          INSTALL_XRESOURCE_DATA=no
+
 .include "../../graphics/gnuplot/Makefile.common"
 
 .include "../../graphics/plotutils-nox11/buildlink3.mk"
diff -r 2d6c9d382b73 -r 79fbfca9f269 graphics/gnuplot/distinfo
--- a/graphics/gnuplot/distinfo Fri May 09 10:51:45 2008 +0000
+++ b/graphics/gnuplot/distinfo Fri May 09 11:12:27 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2007/11/30 12:31:52 tron Exp $
+$NetBSD: distinfo,v 1.11 2008/05/09 11:12:27 jmmv 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
+SHA1 (patch-ab) = f6a377947e2c59d97aacf2715e4477642861b9e8
diff -r 2d6c9d382b73 -r 79fbfca9f269 graphics/gnuplot/patches/patch-ab
--- a/graphics/gnuplot/patches/patch-ab Fri May 09 10:51:45 2008 +0000
+++ b/graphics/gnuplot/patches/patch-ab Fri May 09 11:12:27 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2007/11/30 12:31:52 tron Exp $
+$NetBSD: patch-ab,v 1.9 2008/05/09 11:12:27 jmmv 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 @@
+--- share/Makefile.in.orig     2007-08-31 08:35:05.000000000 +0200
++++ share/Makefile.in
+@@ -189,7 +189,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign 1.2h
  EXTRA_DIST = Gnuplot.app-defaults
@@ -11,3 +11,22 @@
  xresourcedir = $(libdir)/X11/app-defaults
  xresource_DATA = Gnuplot.app-defaults
  all: all-recursive
+@@ -227,13 +227,15 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ uninstall-info-am:
+ install-xresourceDATA: $(xresource_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(xresourcedir)" || $(mkdir_p) "$(DESTDIR)$(xresourcedir)"
+-      @list='$(xresource_DATA)'; for p in $$list; do \
++      if test $${INSTALL_XRESOURCE_DATA:-yes} = yes; then \
++      test -z "$(xresourcedir)" || $(mkdir_p) "$(DESTDIR)$(xresourcedir)"; \
++      list='$(xresource_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(xresourceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xresourcedir)/$$f'"; \
+         $(xresourceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xresourcedir)/$$f"; \
+-      done
++      done; \
++      fi
+ 
+ uninstall-xresourceDATA:
+       @$(NORMAL_UNINSTALL)