Update xscreensaver to 3.20 and fix the patch-fuzz stuff.

Changes since 3.19:   * Added new hack `ripples' and `sierpinski3d'.
                      * Made `xscreensaver-command -exit' be silent when no
                        screen saver was running (instead of complaining.)
                      * Made `webcollage' and `vidwhacker' use `xloadimage'
                        when available (in addition to `xli' and `xv'.)
                      * Improved memory usage in `petri' and gave it a hard
                        cap on how much memory it can allocate.
                      * Added `-watch' option to `xscreensaver-command'.
                      * Made `xscreensaver-demo' come up with the
                        most-recently-run hack selected by default.
                      * Rewrote the Gtk version of `xscreensaver-demo'.
                        It's a lot easier to use now.
                      * Extended the format of the programs list in the
                        .xscreensaver file, for the benefit of the new
                        capabilities of `xscreensaver-demo'.
                        NOTE: you might want to delete your ~/.xscreensaver
                        file and allow it to be re-created!  The old one
                        should still work, but xscreensaver-demo won't be as
                        pretty.
Changes since 3.18:   * Fixed gcc dependencies in `bumps' and `ccurve'.
                      * New hack, `extrusion'.
                      * Some of the web sites that `webcollage' was using as
                        its sources changed formats; tweaked it to understand
                        the current layouts.
                      * Added typeahead in the password dialog: if the screen
                        is locked, and you unlock it by typing a character,
                        that key will be automatically inserted in the
                        password dialog (unless it is Return, Enter, Space,
                        or a non-printing key like Shift.)
                      * Made `xmatrix' take a `-small' option, since some
                        folks with tiny screens prefer a smaller font.

4 files changed, 16 insertions, 11 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index d07648c4ee0..eb3c55d889b 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 1999/10/25 11:13:57 frueauf Exp $
+# $NetBSD: Makefile,v 1.36 1999/11/14 17:24:32 frueauf Exp $
 #
 
-DISTNAME=	xscreensaver-3.18
+DISTNAME=	xscreensaver-3.20
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
diff --git a/x11/xscreensaver/files/md5 b/x11/xscreensaver/files/md5
index 5d267a3edf9..619171bca2e 100644
--- a/x11/xscreensaver/files/md5
+++ b/x11/xscreensaver/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.23 1999/10/18 11:41:45 frueauf Exp $
+$NetBSD: md5,v 1.24 1999/11/14 17:24:33 frueauf Exp $
 
-MD5 (xscreensaver-3.18.tar.gz) = bf9223029ce826a324e8e2c8526e0351
+MD5 (xscreensaver-3.20.tar.gz) = 6f4cff53da00a95c9cce9bbc48aab406
diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
index 5fad1813098..18d817fec37 100644
--- a/x11/xscreensaver/patches/patch-ac
+++ b/x11/xscreensaver/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 1999/01/05 11:34:39 frueauf Exp $
+$NetBSD: patch-ac,v 1.2 1999/11/14 17:24:33 frueauf Exp $
 
---- hacks/glx/Makefile.in-orig	Sun Nov 22 09:00:58 1998
-+++ hacks/glx/Makefile.in	Tue Jan  5 02:26:15 1999
+--- 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_LIBS	= $(HACK_PRE)            @GL_LIBS@ @HACK_LIBS@ $(HACK_POST)
- XPM_LIBS	= $(HACK_PRE) @XPM_LIBS@ @GL_LIBS@ @HACK_LIBS@ $(HACK_POST)
- 
+ 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/pkg/PLIST b/x11/xscreensaver/pkg/PLIST
index ddd97d3edd8..d28eb2b9b07 100644
--- a/x11/xscreensaver/pkg/PLIST
+++ b/x11/xscreensaver/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 1999/10/18 11:41:46 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.18 1999/11/14 17:24:34 frueauf Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -75,12 +75,14 @@ libexec/xscreensaver/pulsar
 libexec/xscreensaver/pyro
 libexec/xscreensaver/qix
 libexec/xscreensaver/rd-bomb
+libexec/xscreensaver/ripples
 libexec/xscreensaver/rocks
 libexec/xscreensaver/rorschach
 libexec/xscreensaver/rotor
 libexec/xscreensaver/rubik
 libexec/xscreensaver/shadebobs
 libexec/xscreensaver/sierpinski
+libexec/xscreensaver/sierpinski3d
 libexec/xscreensaver/slidescreen
 libexec/xscreensaver/slip
 libexec/xscreensaver/sonar
@@ -118,6 +120,7 @@ man/man1/bubbles.1
 man/man1/critical.1
 man/man1/decayscreen.1
 man/man1/deco.1
+man/man1/distort.1
 man/man1/drift.1
 man/man1/epicycle.1
 man/man1/flag.1
@@ -147,6 +150,7 @@ man/man1/munch.1
 man/man1/noseguy.1
 man/man1/pedal.1
 man/man1/penrose.1
+man/man1/phosphor.1
 man/man1/pyro.1
 man/man1/qix.1
 man/man1/rd-bomb.1
@@ -169,6 +173,7 @@ man/man1/vines.1
 man/man1/webcollage.1
 man/man1/xjack.1
 man/man1/xlyap.1
+man/man1/xmatrix.1
 man/man1/xroger.1
 man/man1/xscreensaver-command.1
 man/man1/xscreensaver-demo.1