diff options
| author | wiz <wiz@pkgsrc.org> | 2005-04-04 09:14:45 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-04-04 09:14:45 +0000 |
| commit | 0c4138e0f397aa359e5497063d099618a17e6135 (patch) | |
| tree | 8113cbace67d6efd6bc876af2c69615cfc11f5c6 | |
| parent | cf9b2908194b63dae427fdf96c4439cb308bc599 (diff) | |
| download | pkgsrc-0c4138e0f397aa359e5497063d099618a17e6135.tar.gz | |
Avoid installing files to /xscreensaver.
Patch from Kouichirou Hiratsuka (thanks!).
If you installed xscreensaver after 4.21, ``rm -r /xscreensaver''.
Sorry.
| -rw-r--r-- | x11/xscreensaver/distinfo | 4 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ad | 28 |
2 files changed, 25 insertions, 7 deletions
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 6642e4ae2b1..d014dc3949a 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.40 2005/03/24 13:55:42 wiz Exp $ +$NetBSD: distinfo,v 1.41 2005/04/04 09:14:45 wiz Exp $ SHA1 (xscreensaver-4.21.tar.gz) = 2f6aa051a2f9e9f041133c0a60746e830228f09b RMD160 (xscreensaver-4.21.tar.gz) = ae31d5e57ce9e2eece3dfba424af9ebab2c12993 @@ -6,7 +6,7 @@ Size (xscreensaver-4.21.tar.gz) = 4519828 bytes SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326 SHA1 (patch-ab) = b67eccd08776b212935959447a27662da1e54ae3 SHA1 (patch-ac) = e4711dc13810555071150268eb26b848f8eb1987 -SHA1 (patch-ad) = a93850f81e2692ff90bedc7b0257b8d0a4c7ff3f +SHA1 (patch-ad) = 30fd2f7a73ec902134cdfa7b7c1f320c41ac2a2b SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 SHA1 (patch-af) = 2340efe0cf677a20c336570b24374d675f5cd6eb SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114 diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad index 4dbcdc62dea..a52ba5690f5 100644 --- a/x11/xscreensaver/patches/patch-ad +++ b/x11/xscreensaver/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.14 2005/03/24 13:55:42 wiz Exp $ +$NetBSD: patch-ad,v 1.15 2005/04/04 09:14:45 wiz Exp $ ---- driver/Makefile.in.orig 2005-03-21 08:18:18.000000000 +0100 -+++ driver/Makefile.in -@@ -288,7 +288,7 @@ install-program: $(EXES) +--- driver/Makefile.in.orig 2005-03-21 16:18:18.000000000 +0900 ++++ driver/Makefile.in 2005-04-03 20:09:35.000000000 +0900 +@@ -288,7 +288,7 @@ fi ; \ echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \ $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.14 2005/03/24 13:55:42 wiz Exp $ xscreensaver-getimage @EXES_OSX@ ; do \ echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ -@@ -464,7 +464,7 @@ install-pam: +@@ -464,7 +464,7 @@ # screensaver-properties.desktop # into /usr/share/applications/ @@ -20,3 +20,21 @@ $NetBSD: patch-ad,v 1.14 2005/03/24 13:55:42 wiz Exp $ @if [ "$(GTK_DATADIR)" != "" ]; then \ if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ +@@ -496,7 +496,7 @@ + # ../utils/images/screensaver-*.png + # into /usr/share/xscreensaver/glade/ + install-gnome:: +- @if [ "$(GTK_GLADEDIR)" != "" ]; then \ ++ @if [ "$(GTK_DATADIR)" != "" -a "$(GTK_GLADEDIR)" != "" ]; then \ + if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ +@@ -513,7 +513,7 @@ + # xscreensaver-demo.glade2 + # into /usr/share/xscreensaver/glade/ + install-gnome:: xscreensaver-demo.glade2 +- @if [ "$(GTK_GLADEDIR)" != "" ]; then \ ++ @if [ "$(GTK_DATADIR)" != "" -a "$(GTK_GLADEDIR)" != "" ]; then \ + if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ |