diff options
| author | dholland <dholland@pkgsrc.org> | 2008-07-27 16:47:46 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2008-07-27 16:47:46 +0000 |
| commit | 26b1f6a38fdc992406a7db2fbb93815827907165 (patch) | |
| tree | 6d22198c0514399a52522a9182fd05e7d81427da /sysutils/lavaps | |
| parent | d83a2305f0bc827d87d762ccd4471823b5a55b79 (diff) | |
| download | pkgsrc-26b1f6a38fdc992406a7db2fbb93815827907165.tar.gz | |
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 (limited to 'sysutils/lavaps')
| -rw-r--r-- | sysutils/lavaps/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/lavaps/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/lavaps/patches/patch-ah | 31 |
3 files changed, 40 insertions, 2 deletions
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile index 97a86e55c63..af233b87923 100644 --- a/sysutils/lavaps/Makefile +++ b/sysutils/lavaps/Makefile @@ -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 @@ MAINTAINER= pkgsrc-users@NetBSD.org 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 @@ CONFIGURE_ARGS+=--with-tcltk \ --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 --git a/sysutils/lavaps/distinfo b/sysutils/lavaps/distinfo index e8c4aefc2b3..50c4038c8b9 100644 --- a/sysutils/lavaps/distinfo +++ b/sysutils/lavaps/distinfo @@ -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-ad) = 520a4cc7bbafcca8cab50d0f92aed2a333e4da72 SHA1 (patch-ae) = 82b0d0161eeef941f868b20282b9a7743be89461 SHA1 (patch-af) = de66e431cdf61697d16df1f6e21d5f65390b845f SHA1 (patch-ag) = 59a691ec3ef98b2becae78f5ec05586ec400698e +SHA1 (patch-ah) = a2f8439e44674438cde037c41cbcc14897f42f86 diff --git a/sysutils/lavaps/patches/patch-ah b/sysutils/lavaps/patches/patch-ah new file mode 100644 index 00000000000..ebc7ef293bf --- /dev/null +++ b/sysutils/lavaps/patches/patch-ah @@ -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. |