Update xscreensaver to 3.21.

Changes since 3.20:   * Tweaked the xscreensaver-demo UI (Gtk only.)
                      * Fixed a few visual selection bugs.  I think the proper
                        GL visual should be used with nVidia systems now.
                      * Made the Makefiles obey $install_prefix.
                      * Made the `xscreensaver.spec' file able to generate both
                        GL and non-GL packages simultaniously.

4 files changed, 16 insertions, 24 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index eb3c55d889b..bcf5d1bb394 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 1999/11/14 17:24:32 frueauf Exp $
+# $NetBSD: Makefile,v 1.37 1999/11/21 16:49:11 frueauf Exp $
 #
 
-DISTNAME=	xscreensaver-3.20
+DISTNAME=	xscreensaver-3.21
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
diff --git a/x11/xscreensaver/files/md5 b/x11/xscreensaver/files/md5
index 619171bca2e..134f9ba950d 100644
--- a/x11/xscreensaver/files/md5
+++ b/x11/xscreensaver/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.24 1999/11/14 17:24:33 frueauf Exp $
+$NetBSD: md5,v 1.25 1999/11/21 16:49:12 frueauf Exp $
 
-MD5 (xscreensaver-3.20.tar.gz) = 6f4cff53da00a95c9cce9bbc48aab406
+MD5 (xscreensaver-3.21.tar.gz) = 9509c698f0926e35495aea3529ca163a
diff --git a/x11/xscreensaver/files/patch-sum b/x11/xscreensaver/files/patch-sum
index ee3df411c3c..c6a41f466d9 100644
--- a/x11/xscreensaver/files/patch-sum
+++ b/x11/xscreensaver/files/patch-sum
@@ -1,6 +1,6 @@
 <<<<<<< patch-sum
 
 MD5 (patch-aa) = 613fc83aaf712d88e2116bb1f78ddbe4
-MD5 (patch-ab) = 457c85e399ba0aa02266e9d3bc77336c
+MD5 (patch-ab) = 98d6c4eda01c34b1670f477cf1ecc2fd
 MD5 (patch-ac) = 6295dd35cb6f56671981e6b07ce45a95
 MD5 (patch-ad) = 14a6de743f1b7b8f35fb4f30cc1c7ab4
diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab
index 59c7843fa20..801291fc2a4 100644
--- a/x11/xscreensaver/patches/patch-ab
+++ b/x11/xscreensaver/patches/patch-ab
@@ -1,28 +1,20 @@
-$NetBSD: patch-ab,v 1.3 1999/11/21 13:14:21 tron Exp $
+$NetBSD: patch-ab,v 1.4 1999/11/21 16:49:12 frueauf Exp $
 
---- hacks/Makefile.in.orig	Fri Nov 12 11:46:28 1999
-+++ hacks/Makefile.in	Sun Nov 21 12:47:32 1999
-@@ -42,7 +42,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) -lXext -lX11 $(X_EXTRA_LIBS) -lm
- HACK_LIBS	= $(HACK_PRE)            @HACK_LIBS@ $(HACK_POST)
- XPM_LIBS	= $(HACK_PRE) @XPM_LIBS@ @HACK_LIBS@ $(HACK_POST)
- XLOCK_LIBS	= $(HACK_LIBS)
-@@ -185,8 +185,8 @@
+--- hacks/Makefile.in.orig	Fri Nov 19 03:49:27 1999
++++ hacks/Makefile.in	Sun Nov 21 17:44:36 1999
+@@ -189,9 +189,9 @@
  	  else								\
  	    p=$(srcdir)/$$program ;					\
  	  fi ;								\
--	  echo $(INSTALL_PROGRAM) $$p $(HACKDIR)/$$program ;		\
--	  $(INSTALL_PROGRAM) $$p $(HACKDIR)/$$program ;			\
-+	  echo $(INSTALL) -c -o root -g wheel -m 555 $$p $(HACKDIR)/$$program ;		\
-+	  $(INSTALL) -c -o root -g wheel -m 555 $$p $(HACKDIR)/$$program ;			\
+-	  echo $(INSTALL_PROGRAM) $$p					\
++	  echo $(INSTALL) -c -o root -g wheel -m 555 $$p		\
+ 	    $(install_prefix)$(HACKDIR)/$$program ;			\
+-	  $(INSTALL_PROGRAM) $$p					\
++	  $(INSTALL) -c -o root -g wheel -m 555 $$p			\
+ 	    $(install_prefix)$(HACKDIR)/$$program ;			\
  	done
  
- munge-scripts: $(SCRIPTS)
-@@ -489,6 +489,11 @@
+@@ -499,6 +499,11 @@
  
  bsod:	 	bsod.o		$(HACK_OBJS) $(COL)
  	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS) $(XPM_LIBS)