update xscreensaver to 3.22.

Changes since 3.21:   * Fixed some bugs in xscreensaver-demo.
                      * Rewrote the Motif version of xscreensaver-demo to
                        match the new Gtk version.
                      * The Athena toolkit is no longer supported.
XXX: depends on lesstif>=0.89.9 (or motif), but dependency is handled
indirectly by USE_MOTIF... how to handle this?

5 files changed, 15 insertions, 15 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index bcf5d1bb394..20d4bb477e8 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 1999/11/21 16:49:11 frueauf Exp $
+# $NetBSD: Makefile,v 1.38 2000/02/01 00:50:45 wiz Exp $
 #
 
-DISTNAME=	xscreensaver-3.21
+DISTNAME=	xscreensaver-3.22
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
diff --git a/x11/xscreensaver/files/md5 b/x11/xscreensaver/files/md5
index 134f9ba950d..3e28bffd21c 100644
--- a/x11/xscreensaver/files/md5
+++ b/x11/xscreensaver/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.25 1999/11/21 16:49:12 frueauf Exp $
+$NetBSD: md5,v 1.26 2000/02/01 00:50:47 wiz Exp $
 
-MD5 (xscreensaver-3.21.tar.gz) = 9509c698f0926e35495aea3529ca163a
+MD5 (xscreensaver-3.22.tar.gz) = 10d7848554a9fb64b522aee944ef42ab
diff --git a/x11/xscreensaver/files/patch-sum b/x11/xscreensaver/files/patch-sum
index c6a41f466d9..0fb748beffe 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-aa) = edfc6af5d404a9f6f044aed60a87bc22
 MD5 (patch-ab) = 98d6c4eda01c34b1670f477cf1ecc2fd
 MD5 (patch-ac) = 6295dd35cb6f56671981e6b07ce45a95
-MD5 (patch-ad) = 14a6de743f1b7b8f35fb4f30cc1c7ab4
+MD5 (patch-ad) = 29fdfd0cb4bfe6c0a4e518180d41637a
diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa
index e0ef49cc9e7..a09babfd887 100644
--- a/x11/xscreensaver/patches/patch-aa
+++ b/x11/xscreensaver/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.3 1999/06/02 07:44:17 frueauf Exp $
+$NetBSD: patch-aa,v 1.4 2000/02/01 00:50:47 wiz Exp $
 
---- driver/Makefile.in.orig	Tue Jun  1 03:59:21 1999
-+++ driver/Makefile.in	Wed Jun  2 08:41:52 1999
-@@ -138,8 +138,8 @@
- DEMO_SRCS	= prefs.c remote.c $(DEMO_UTIL_SRCS) demo.c
+--- ./driver/Makefile.in.orig	Thu Dec  9 13:29:41 1999
++++ ./driver/Makefile.in	Mon Jan 31 02:10:27 2000
+@@ -136,8 +136,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) \
diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad
index 3268204ea85..25f6d921177 100644
--- a/x11/xscreensaver/patches/patch-ad
+++ b/x11/xscreensaver/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 1999/07/23 16:01:28 frueauf Exp $
+$NetBSD: patch-ad,v 1.2 2000/02/01 00:50:48 wiz Exp $
 
---- hacks/webcollage-orig	Fri Jul 16 07:20:44 1999
-+++ hacks/webcollage	Wed Jul 21 22:33:52 1999
-@@ -76,7 +76,7 @@
+--- ./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;