Update to xscreensaver-3.24: Updates and fixes to "maze", "critical",

"bsod", "xflame", "flow", "xteevee" and "webcollage"; added support
for Kerberos5 [if KERBEROS is set in /etc/mk.conf]; xscreensaver-demo
now installs itself into the Gnome Control Center [if USE_GNOME is set
in /etc/mk.conf]. The Screensaver panel in gnomecc now actually works!

5 files changed, 33 insertions, 23 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 39aedf07fb2..63d6ed3d0a0 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2000/04/24 14:57:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.42 2000/06/02 19:45:00 fredb Exp $
 #
 
-DISTNAME=	xscreensaver-3.23
+DISTNAME=	xscreensaver-3.24
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
@@ -13,15 +13,24 @@ DEPENDS+=	Mesa-*:../../graphics/Mesa
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--without-shadow --with-zippy=/usr/games/fortune \
-		--enable-subdir=${PREFIX}/libexec/xscreensaver
-CONFIGURE_ENV+=	INSTALL=/usr/bin/install
+CONFIGURE_ARGS+=--without-shadow
+CONFIGURE_ARGS+=--enable-subdir=${PREFIX}/libexec/xscreensaver
+CONFIGURE_ARGS+=--with-zippy=/usr/games/fortune
+CONFIGURE_ENV+=	INSTALL=${INSTALL}
 
 USE_X11BASE=	yes
 USE_MOTIF=	yes
 USE_PERL5=	yes
 USE_XAW=	yes
 
+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.prefs.mk"
 
 XAW_TYPE?=	3d
@@ -29,16 +38,15 @@ XAW_TYPE?=	3d
 .if (${OPSYS} == "NetBSD")
 .if defined(KERBEROS)
 CFLAGS+=	-I/usr/include/kerberosIV
-CONFIGURE_ARGS+=--with-kerberos=yes
+.else
+CONFIGURE_ARGS+=--without-kerberos
 .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
+.if defined(USE_GNOME)
+DEPENDS+=	control-center>=1.2.0:../../x11/controlcenter
+.else
+CONFIGURE_ARGS+=--without-gnome
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscreensaver/files/md5 b/x11/xscreensaver/files/md5
index 1a38124a656..1ebe44da458 100644
--- a/x11/xscreensaver/files/md5
+++ b/x11/xscreensaver/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.27 2000/02/01 02:00:14 wiz Exp $
+$NetBSD: md5,v 1.28 2000/06/02 19:45:01 fredb Exp $
 
-MD5 (xscreensaver-3.23.tar.gz) = 938f867f593274a3bb890a39d4a0c2a4
+MD5 (xscreensaver-3.24.tar.gz) = 9de6fb18edec39043af5caabebfb5b4a
diff --git a/x11/xscreensaver/files/patch-sum b/x11/xscreensaver/files/patch-sum
index 19080a67e95..8e28980963f 100644
--- a/x11/xscreensaver/files/patch-sum
+++ b/x11/xscreensaver/files/patch-sum
@@ -1,8 +1,8 @@
 <<<<<<< patch-sum
 
 MD5 (patch-aa) = edfc6af5d404a9f6f044aed60a87bc22
-MD5 (patch-ab) = 4b428289534e2956435b715f550a81bb
+MD5 (patch-ab) = 530442955a27ef2c6f5fd18cee2a4886
 MD5 (patch-ac) = 6295dd35cb6f56671981e6b07ce45a95
 MD5 (patch-ad) = 29fdfd0cb4bfe6c0a4e518180d41637a
 MD5 (patch-ae) = 938371282904d5f453b608acf14eef4a
-MD5 (patch-af) = 1a51e599609799fc5e77730826fa0767
+MD5 (patch-af) = ef147e61bccfbda229b198aade268a27
diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab
index 10e774bd131..8249084f33f 100644
--- a/x11/xscreensaver/patches/patch-ab
+++ b/x11/xscreensaver/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2000/02/01 02:00:14 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2000/06/02 19:45:01 fredb Exp $
 
---- ./hacks/Makefile.in.orig	Sun Jan 30 13:31:59 2000
-+++ ./hacks/Makefile.in	Tue Feb  1 02:34:20 2000
+--- 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@
@@ -11,10 +11,10 @@ $NetBSD: patch-ab,v 1.5 2000/02/01 02:00:14 wiz Exp $
  INSTALL_DATA	= @INSTALL_DATA@
  INSTALL_DIRS	= @INSTALL_DIRS@
  HACKDIR		= @HACKDIR@
-@@ -501,6 +500,11 @@
+@@ -501,6 +501,11 @@
  
- bsod:	 	bsod.o		$(HACK_OBJS) $(COL)
- 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS) $(XPM_LIBS)
+ 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
diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af
index 608e871b70f..0050a7148ec 100644
--- a/x11/xscreensaver/patches/patch-af
+++ b/x11/xscreensaver/patches/patch-af
@@ -1,3 +1,5 @@
+$NetBSD: patch-af,v 1.2 2000/06/02 19:45:01 fredb Exp $
+
 --- 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 @@