summaryrefslogtreecommitdiff
path: root/x11/xscreensaver/patches/patch-ae
blob: 695b03dcd9306cb56c8d5cd92ac2201ac3305efc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
$NetBSD: patch-ae,v 1.3 2001/02/08 05:57:53 fredb Exp $

--- driver/xscreensaver.kss.orig	Wed Jan 31 19:06:02 2001
+++ driver/xscreensaver.kss	Wed Feb  7 23:31:02 2001
@@ -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/xflame -delay 1 -window-id $1 &    # Start new preview 
+      @PREFIX@/libexec/xscreensaver/xflame -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
@@ -109,12 +109,12 @@
     kill `cat $PID_FILE`                                # Kill old screensaver 
   fi
   echo "$$" > $PID_FILE                                 # Write PID of this script
-  /usr/X11R6/bin/xscreensaver -no-splash $timeout $lockmode $Nice &    # Start XScreenSaver daemon
+  @PREFIX@/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.