diff options
| author | jmmv <jmmv@pkgsrc.org> | 2008-05-09 11:12:27 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2008-05-09 11:12:27 +0000 |
| commit | 8d96ffdffeb14922182cc22ebb2da41ea58ed954 (patch) | |
| tree | 86844356ab8ab3259f6c5c5327654ca29c39b868 /graphics | |
| parent | b38d1505b9774b311af836d8aa3a3a0529a1463e (diff) | |
| download | pkgsrc-8d96ffdffeb14922182cc22ebb2da41ea58ed954.tar.gz | |
Fix packaging of gnuplot-nox11 by avoiding the installation of an
X11-specific file.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gnuplot-nox11/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gnuplot/distinfo | 4 | ||||
| -rw-r--r-- | graphics/gnuplot/patches/patch-ab | 27 |
3 files changed, 28 insertions, 7 deletions
diff --git a/graphics/gnuplot-nox11/Makefile b/graphics/gnuplot-nox11/Makefile index a556f97ed38..74c912f96ab 100644 --- a/graphics/gnuplot-nox11/Makefile +++ b/graphics/gnuplot-nox11/Makefile @@ -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 @@ CONFLICTS+= gnuplot-[0-9]* CONFIGURE_ARGS+= --without-x +INSTALL_ENV+= INSTALL_XRESOURCE_DATA=no + .include "../../graphics/gnuplot/Makefile.common" .include "../../graphics/plotutils-nox11/buildlink3.mk" diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo index eedad5068e1..7358671e758 100644 --- a/graphics/gnuplot/distinfo +++ b/graphics/gnuplot/distinfo @@ -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 --git a/graphics/gnuplot/patches/patch-ab b/graphics/gnuplot/patches/patch-ab index 8fdaa0d0681..9e16039d3b7 100644 --- a/graphics/gnuplot/patches/patch-ab +++ b/graphics/gnuplot/patches/patch-ab @@ -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 @@ $NetBSD: patch-ab,v 1.8 2007/11/30 12:31:52 tron Exp $ 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) |