diff options
Diffstat (limited to 'x11/xscreensaver')
| -rw-r--r-- | x11/xscreensaver/Makefile | 10 | ||||
| -rw-r--r-- | x11/xscreensaver/files/patch-sum | 2 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ae | 55 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-af | 18 |
4 files changed, 84 insertions, 1 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 7c91404a2e9..39aedf07fb2 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2000/02/01 17:45:29 frueauf Exp $ +# $NetBSD: Makefile,v 1.41 2000/04/24 14:57:48 hubertf Exp $ # DISTNAME= xscreensaver-3.23 @@ -33,4 +33,12 @@ CONFIGURE_ARGS+=--with-kerberos=yes .endif .endif +post-patch: + cd ${WRKSRC}/driver ; \ + f=xscreensaver.kss ; \ + [ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \ + ${SED} \ + -e 's|@PREFIX@|${PREFIX}|g' \ + <xscreensaver.kss.BAK >xscreensaver.kss + .include "../../mk/bsd.pkg.mk" diff --git a/x11/xscreensaver/files/patch-sum b/x11/xscreensaver/files/patch-sum index fd5906ac092..19080a67e95 100644 --- a/x11/xscreensaver/files/patch-sum +++ b/x11/xscreensaver/files/patch-sum @@ -4,3 +4,5 @@ MD5 (patch-aa) = edfc6af5d404a9f6f044aed60a87bc22 MD5 (patch-ab) = 4b428289534e2956435b715f550a81bb MD5 (patch-ac) = 6295dd35cb6f56671981e6b07ce45a95 MD5 (patch-ad) = 29fdfd0cb4bfe6c0a4e518180d41637a +MD5 (patch-ae) = 938371282904d5f453b608acf14eef4a +MD5 (patch-af) = 1a51e599609799fc5e77730826fa0767 diff --git a/x11/xscreensaver/patches/patch-ae b/x11/xscreensaver/patches/patch-ae new file mode 100644 index 00000000000..8ba9588b578 --- /dev/null +++ b/x11/xscreensaver/patches/patch-ae @@ -0,0 +1,55 @@ +$NetBSD: patch-ae,v 1.1 2000/04/24 14:57:49 hubertf Exp $ + +--- driver/xscreensaver.kss.orig Mon Apr 24 08:10:02 2000 ++++ driver/xscreensaver.kss Mon Apr 24 08:10:41 2000 +@@ -1,4 +1,4 @@ +-#!/bin/bash - ++#!/bin/sh - + + # script - "xscreensaver.kss" + # +@@ -40,15 +40,15 @@ + # 2) Hack xscreensaver to accept alternate setup files, and create one on + # the fly here. + shift +- /usr/X11R6/lib/xscreensaver/xroger -delay 1 -window-id $1 & # Start new preview ++ @PREFIX@/lib/xscreensaver/xroger -delay 1 -window-id $1 & # Start new preview + echo "$!" > $HOME/.kss-preview$1.pid.`hostname` # Write PID + wait $! # Wait for it to get killed + exit + ;; + + -setup) +- /usr/X11R6/bin/xscreensaver -no-splash & # daemon must be started +- /usr/X11R6/bin/xscreensaver-demo # or the setup will produce ++ @PREFIX@/bin/xscreensaver -no-splash & # daemon must be started ++ @PREFIX@/bin/xscreensaver-demo # or the setup will produce + kill $! # a warning. + exit + ;; +@@ -57,8 +57,8 @@ + # I was unable to grep stdout because xscreensaver nabs it. But I was able + # to output it to a file, and grep the file. + TEMP_FILE=/tmp/xsc.$RANDOM +- /usr/X11R6/bin/xscreensaver -no-splash -verbose -no-capture-stderr 2> $TEMP_FILE & +- /usr/X11R6/bin/xscreensaver-command -activate ++ @PREFIX@/bin/xscreensaver -no-splash -verbose -no-capture-stderr 2> $TEMP_FILE & ++ @PREFIX@/bin/xscreensaver-command -activate + while true; do + ExitNow=$(grep -E -c unblanking\|already $TEMP_FILE) + if [ $ExitNow != 0 ]; then +@@ -108,12 +108,12 @@ + PID_FILE=$HOME/.kss-install.pid.`hostname` + kill `cat $PID_FILE` # Kill old screensaver + echo "$$" > $PID_FILE # Write PID of this script +- /usr/X11R6/bin/xscreensaver -no-splash $timeout $lockmode $Nice & # Start XScreenSaver daemon ++ @PREFIX@/bin/xscreensaver -no-splash $timeout $lockmode $Nice & # Start XScreenSaver daemon + trap "kill $!" SIGTERM # Set these to kill the daemon + trap "kill $!" SIGKILL + + # KDE sends SIGUSER1 to indicate the user has hit the "lock" button. +- trap "/usr/X11R6/bin/xscreensaver-command -lock" SIGUSR1 ++ trap "@PREFIX@/bin/xscreensaver-command -lock" SIGUSR1 + + wait $! # Do not exit, just wait for signals. + diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af new file mode 100644 index 00000000000..608e871b70f --- /dev/null +++ b/x11/xscreensaver/patches/patch-af @@ -0,0 +1,18 @@ +--- driver/Makefile.in.orig Mon Apr 24 08:24:39 2000 ++++ driver/Makefile.in Mon Apr 24 08:48:07 2000 +@@ -317,11 +317,11 @@ + + install-kde: + @src="$(srcdir)/xscreensaver.kss" ; \ +- if [ "$$KDEDIR" != "" ]; then \ +- dir="$(install_prefix)$$KDEDIR/bin" ; \ ++ if true; then \ ++ dir="$(bindir)" ; \ + dest="$$dir/xscreensaver.kss" ; \ +- echo $(INSTALL_PROGRAM) $$src $$dest ; \ +- if $(INSTALL_PROGRAM) $$src $$dest ; then \ ++ echo $(BSD_INSTALL_SCRIPT) $$src $$dest ; \ ++ if $(BSD_INSTALL_SCRIPT) $$src $$dest ; then \ + true ; \ + else \ + e=echo ; \ |