[pkgsrc/trunk]: pkgsrc/sysutils/lavaps Prevent this from trying to install a ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/13ca6c001551
branches:  trunk
changeset: 545155:13ca6c001551
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Jul 27 16:47:46 2008 +0000

description:
Prevent this from trying to install a GConf schema file into the root
directory. PKGREVISION++.

If you installed this since the previous update, you may want to check
for and delete /lavaps.schemas.

diffstat:

 sysutils/lavaps/Makefile         |   8 +++++++-
 sysutils/lavaps/distinfo         |   3 ++-
 sysutils/lavaps/patches/patch-ah |  31 +++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diffs (81 lines):

diff -r 70bf396f92fa -r 13ca6c001551 sysutils/lavaps/Makefile
--- a/sysutils/lavaps/Makefile  Sun Jul 27 16:45:06 2008 +0000
+++ b/sysutils/lavaps/Makefile  Sun Jul 27 16:47:46 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2008/07/21 02:55:34 dholland Exp $
+# $NetBSD: Makefile,v 1.29 2008/07/27 16:47:46 dholland Exp $
 #
 
 DISTNAME=      lavaps-2.7
+PKGREVISION=   1
 CATEGORIES=    sysutils x11
 MASTER_SITES=  http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 
@@ -9,6 +10,8 @@
 HOMEPAGE=      http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 COMMENT=       Lava lamp of currently running processes
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES= c c++
 USE_TOOLS+=    perl
 
@@ -18,6 +21,9 @@
                --with-tk-ver=8.4.18 \
                --with-tcltk-lib-suffix-type=nodot
 
+# prevents the GConf schema from going into / when building the tcl/tk version
+MAKE_ENV+=     PKGSRC_INSTALL_SCHEMAS=no
+
 BUILDLINK_DEPMETHOD.libXt?=    build
 
 .include "../../x11/tk/buildlink3.mk"
diff -r 70bf396f92fa -r 13ca6c001551 sysutils/lavaps/distinfo
--- a/sysutils/lavaps/distinfo  Sun Jul 27 16:45:06 2008 +0000
+++ b/sysutils/lavaps/distinfo  Sun Jul 27 16:47:46 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2008/07/21 02:55:34 dholland Exp $
+$NetBSD: distinfo,v 1.9 2008/07/27 16:47:46 dholland Exp $
 
 SHA1 (lavaps-2.7.tar.gz) = 5fb788359e22f80842423f211d42d8ebe2c58236
 RMD160 (lavaps-2.7.tar.gz) = 286530bca67f9d324c0edfc2def6d6b2a6f24255
@@ -10,3 +10,4 @@
 SHA1 (patch-ae) = 82b0d0161eeef941f868b20282b9a7743be89461
 SHA1 (patch-af) = de66e431cdf61697d16df1f6e21d5f65390b845f
 SHA1 (patch-ag) = 59a691ec3ef98b2becae78f5ec05586ec400698e
+SHA1 (patch-ah) = a2f8439e44674438cde037c41cbcc14897f42f86
diff -r 70bf396f92fa -r 13ca6c001551 sysutils/lavaps/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/lavaps/patches/patch-ah  Sun Jul 27 16:47:46 2008 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-ah,v 1.1 2008/07/27 16:47:46 dholland Exp $
+
+--- src/Makefile.in~   2004-12-24 21:42:03.000000000 -0500
++++ src/Makefile.in    2008-07-27 12:36:30.000000000 -0400
+@@ -471,20 +471,22 @@
+ install-schemaDATA: $(schema_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(schemadir)" || $(mkdir_p) "$(DESTDIR)$(schemadir)"
+-      @list='$(schema_DATA)'; for p in $$list; do \
++      @if [ "$PKGSRC_INSTALL_SCHEMAS" = "yes" ]; then \
++       list='$(schema_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+         echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \
+         $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \
+-      done
++      done; fi
+ 
+ uninstall-schemaDATA:
+       @$(NORMAL_UNINSTALL)
+-      @list='$(schema_DATA)'; for p in $$list; do \
++      @if [ "$PKGSRC_INSTALL_SCHEMAS" = "yes" ]; then \
++       list='$(schema_DATA)'; for p in $$list; do \
+         f=$(am__strip_dir) \
+         echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \
+         rm -f "$(DESTDIR)$(schemadir)/$$f"; \
+-      done
++      done; fi
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.