diff options
| -rw-r--r-- | x11/xscreensaver/Makefile.common | 6 | ||||
| -rw-r--r-- | x11/xscreensaver/files/md5 | 4 | ||||
| -rw-r--r-- | x11/xscreensaver/files/patch-sum | 8 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-aa | 31 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ab | 25 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ac | 13 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ad | 13 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ae | 10 |
8 files changed, 13 insertions, 97 deletions
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 5689549aa7a..166c3cb291e 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.11 2000/10/17 05:44:47 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2001/02/08 05:57:52 fredb Exp $ # -DISTNAME= xscreensaver-3.25 +DISTNAME= xscreensaver-3.28 CATEGORIES= x11 MASTER_SITES= ${HOMEPAGE} \ ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/ @@ -28,7 +28,9 @@ CONFIGURE_ARGS+= --without-motif CONFIGURE_ARGS+= --without-shadow CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune CONFIGURE_ENV+= INSTALL=/usr/bin/install +CONFIGURE_ENV+= X_PRE_LIBS=-lXt CONFIGURE_ENV+= ac_cv_x_app_defaults="${X11PREFIX}/lib/X11/app-defaults" +MAKE_ENV+= KDEDIR=${X11PREFIX} FILESDIR= ${.CURDIR}/../../x11/xscreensaver/files PATCHDIR= ${.CURDIR}/../../x11/xscreensaver/patches diff --git a/x11/xscreensaver/files/md5 b/x11/xscreensaver/files/md5 index fcc09f3f605..32e8385a6c6 100644 --- a/x11/xscreensaver/files/md5 +++ b/x11/xscreensaver/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.29 2000/07/26 18:15:03 frueauf Exp $ +$NetBSD: md5,v 1.30 2001/02/08 05:57:53 fredb Exp $ -MD5 (xscreensaver-3.25.tar.gz) = e43a250ade865cc949940aa76531a089 +MD5 (xscreensaver-3.28.tar.gz) = 184bcb5a8a15454faa8fb0f0c5ab641e diff --git a/x11/xscreensaver/files/patch-sum b/x11/xscreensaver/files/patch-sum index b65537f5d74..21f50e00ace 100644 --- a/x11/xscreensaver/files/patch-sum +++ b/x11/xscreensaver/files/patch-sum @@ -1,7 +1,3 @@ -$NetBSD: patch-sum,v 1.16 2000/09/10 18:00:22 fredb Exp $ +$NetBSD: patch-sum,v 1.17 2001/02/08 05:57:53 fredb Exp $ -MD5 (patch-aa) = 1bcba723997c8e828a4e844b2c0e029c -MD5 (patch-ab) = 530442955a27ef2c6f5fd18cee2a4886 -MD5 (patch-ac) = 6295dd35cb6f56671981e6b07ce45a95 -MD5 (patch-ad) = 9594fe6c036f69b99730170e1c6bc0c0 -MD5 (patch-ae) = 38fc9574c3cc2812396694145fc16739 +MD5 (patch-ae) = 65766e3803160d2a8a277b98a763978a diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa deleted file mode 100644 index d8f21df6b1f..00000000000 --- a/x11/xscreensaver/patches/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2000/09/10 18:00:21 fredb Exp $ - ---- driver/Makefile.in.orig Wed Jul 19 09:37:22 2000 -+++ driver/Makefile.in Tue Jul 25 23:23:19 2000 -@@ -141,8 +141,8 @@ - DEMO_SRCS = prefs.c remote.c $(DEMO_UTIL_SRCS) - DEMO_OBJS = prefs.o remote.o $(DEMO_UTIL_OBJS) - --SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) \ -- $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ -+SAVER_LIBS = $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) -lXt \ -+ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) \ - $(PASSWD_LIBS) - - CMD_LIBS = $(LIBS) $(X_LIBS) \ -@@ -377,11 +377,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_SCRIPT) $$src $$dest ; \ -- if $(INSTALL_SCRIPT) $$src $$dest ; then \ -+ echo $(BSD_INSTALL_SCRIPT) $$src $$dest ; \ -+ if $(BSD_INSTALL_SCRIPT) $$src $$dest ; then \ - true ; \ - else \ - e=echo ; \ diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab deleted file mode 100644 index 8249084f33f..00000000000 --- a/x11/xscreensaver/patches/patch-ab +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2000/06/02 19:45:01 fredb Exp $ - ---- hacks/Makefile.in.orig Mon Apr 3 04:04:17 2000 -+++ hacks/Makefile.in Fri Jun 2 07:53:12 2000 -@@ -30,7 +30,7 @@ - SHELL = /bin/sh - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_DIRS = @INSTALL_DIRS@ - HACKDIR = @HACKDIR@ -@@ -501,6 +501,11 @@ - - bsod: bsod.o $(HACK_OBJS) $(GRAB) - $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB) $(HACK_LIBS) $(XPM_LIBS) $(GRAB_LIBS) -+ -+.if ($(MACHINE_ARCH) == arm32) -+distort.o: distort.c -+ $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS:S/-O2//) $(X_CFLAGS) $< -+.endif - - distort: distort.o $(HACK_OBJS) $(GRAB) $(SHM) - $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB) $(SHM) $(HACK_LIBS) $(GRAB_LIBS) diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac deleted file mode 100644 index 18d817fec37..00000000000 --- a/x11/xscreensaver/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 1999/11/14 17:24:33 frueauf Exp $ - ---- hacks/glx/Makefile.in.orig Sun Nov 14 16:36:29 1999 -+++ hacks/glx/Makefile.in Sun Nov 14 16:38:24 1999 -@@ -41,7 +41,7 @@ - # Note: see comment in ../../driver/Makefile.in for explanation of X_LIBS, etc. - # - HACK_PRE = $(LIBS) $(X_LIBS) --HACK_POST = $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) -lm -+HACK_POST = -lXt $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm - HACK_POST2 = @GL_LIBS@ @HACK_LIBS@ $(HACK_POST) - HACK_LIBS = $(HACK_PRE) $(HACK_POST2) - XPM_LIBS = $(HACK_PRE) @XPM_LIBS@ $(HACK_POST2) diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad deleted file mode 100644 index 5eee5f34532..00000000000 --- a/x11/xscreensaver/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2000/07/10 19:45:05 tron Exp $ - ---- hacks/webcollage.orig Thu Dec 9 12:47:14 1999 -+++ hacks/webcollage Mon Jan 31 02:10:28 2000 -@@ -91,7 +91,7 @@ - my $urls_only_p = 0; - my $delay = 0; - --my $wordlist = "/usr/dict/words"; -+my $wordlist = "/usr/share/dict/words"; - - if (!-r $wordlist) { - $wordlist = "/usr/share/lib/dict/words"; # irix diff --git a/x11/xscreensaver/patches/patch-ae b/x11/xscreensaver/patches/patch-ae index 9b3fbab786e..695b03dcd93 100644 --- a/x11/xscreensaver/patches/patch-ae +++ b/x11/xscreensaver/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.2 2000/07/26 18:15:04 frueauf Exp $ +$NetBSD: patch-ae,v 1.3 2001/02/08 05:57:53 fredb Exp $ ---- driver/xscreensaver.kss.orig Mon Jul 17 08:24:09 2000 -+++ driver/xscreensaver.kss Tue Jul 25 23:27:47 2000 +--- 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 - @@ -12,8 +12,8 @@ $NetBSD: patch-ae,v 1.2 2000/07/26 18:15:04 frueauf Exp $ # 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 +- /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 |