Update xscreensaver to 3.25.

Changes since 3.24:   * New hack, `nerverot'.
                      * Added BSD kernel panic to `bsod'.
                      * New version of `shadebobs'.
                      * New version of `petri'.
                      * Updated `webcollage' to handle recent Altavista URL
                        format changes; made it search the AP photo gallery.
                      * Revamped command-line options of `sonar' and made it
                        properly handle subnets.
                      * The `bubbles' hack can now trickle up or down the screen
.
                      * The `xsublim' hack can now read its text from programs.
                      * Support for GLE version 3 in `extrusion'.
                      * Fixed compilation problems in `maze'.
                      * Fixed a rare crash in `flow'.
                      * Fixes for minor installation problems.

6 files changed, 54 insertions, 47 deletions

diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 00b0f029573..173dc548911 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1 2000/06/03 19:07:30 fredb Exp $
+# $NetBSD: Makefile.common,v 1.2 2000/07/26 18:15:02 frueauf Exp $
 #
 
-DISTNAME=	xscreensaver-3.24
+DISTNAME=	xscreensaver-3.25
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
diff --git a/x11/xscreensaver/files/md5 b/x11/xscreensaver/files/md5
index 1ebe44da458..fcc09f3f605 100644
--- a/x11/xscreensaver/files/md5
+++ b/x11/xscreensaver/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.28 2000/06/02 19:45:01 fredb Exp $
+$NetBSD: md5,v 1.29 2000/07/26 18:15:03 frueauf Exp $
 
-MD5 (xscreensaver-3.24.tar.gz) = 9de6fb18edec39043af5caabebfb5b4a
+MD5 (xscreensaver-3.25.tar.gz) = e43a250ade865cc949940aa76531a089
diff --git a/x11/xscreensaver/files/patch-sum b/x11/xscreensaver/files/patch-sum
index c7f5c3fde45..f4aad1d0a19 100644
--- a/x11/xscreensaver/files/patch-sum
+++ b/x11/xscreensaver/files/patch-sum
@@ -1,7 +1,7 @@
 <<<<<<< patch-sum
 
-MD5 (patch-aa) = c0444fe88100cb9da17fcbfaef766615
+MD5 (patch-aa) = 0d7fd0cc903af85f30c6a8278a46b193
 MD5 (patch-ab) = 530442955a27ef2c6f5fd18cee2a4886
 MD5 (patch-ac) = 6295dd35cb6f56671981e6b07ce45a95
 MD5 (patch-ad) = 9594fe6c036f69b99730170e1c6bc0c0
-MD5 (patch-ae) = 938371282904d5f453b608acf14eef4a
+MD5 (patch-ae) = 38fc9574c3cc2812396694145fc16739
diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa
index 1d08ed819c5..64bb9170fee 100644
--- a/x11/xscreensaver/patches/patch-aa
+++ b/x11/xscreensaver/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2000/07/10 20:19:28 tron Exp $
+$NetBSD: patch-aa,v 1.8 2000/07/26 18:15:04 frueauf Exp $
 
---- driver/Makefile.in.orig	Mon Apr  3 11:04:08 2000
-+++ driver/Makefile.in	Mon Jul 10 22:05:33 2000
-@@ -140,8 +140,8 @@
+--- 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)
  
@@ -13,34 +13,38 @@ $NetBSD: patch-aa,v 1.7 2000/07/10 20:19:28 tron Exp $
  		  $(PASSWD_LIBS)
  
  CMD_LIBS	= $(LIBS) $(X_LIBS) \
-@@ -325,30 +325,30 @@
- install-gnome: screensaver-properties.desktop
- 	@if [ "$(GNOME_DATADIR)" != "" ]; then				     \
-           echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
--                          $(GNOME_CCDIR)/screensaver-properties.desktop    ; \
-+                          $(GNOME_CCDIR)/xscreensaver-properties.desktop    ; \
-                $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
--                          $(GNOME_CCDIR)/screensaver-properties.desktop    ; \
-+                          $(GNOME_CCDIR)/xscreensaver-properties.desktop    ; \
-           echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
--                       $(GNOME_PANELDIR)/screensaver-properties.desktop    ; \
-+                       $(GNOME_PANELDIR)/xscreensaver-properties.desktop    ; \
-                $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
--                       $(GNOME_PANELDIR)/screensaver-properties.desktop    ; \
-+                       $(GNOME_PANELDIR)/xscreensaver-properties.desktop    ; \
- 	fi
+@@ -328,17 +328,17 @@
+          lost2=""                                                            ;\
+          if [ "$(install_prefix)$(GNOME_DATADIR)" != "" ]; then               \
+            echo    $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
+-             $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop  ;\
++             $(install_prefix)$(GNOME_CCDIR)/xscreensaver-properties.desktop  ;\
+            if      $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
+-             $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop  ;\
++             $(install_prefix)$(GNOME_CCDIR)/xscreensaver-properties.desktop  ;\
+              then true                                                       ;\
+            else                                                               \
+              lost1="$(install_prefix)$(GNOME_CCDIR)"                         ;\
+            fi                                                                ;\
+            echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
+-                        $(GNOME_PANELDIR)/screensaver-properties.desktop     ;\
++                        $(GNOME_PANELDIR)/xscreensaver-properties.desktop     ;\
+            if   $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
+-       $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop     ;\
++       $(install_prefix)$(GNOME_PANELDIR)/xscreensaver-properties.desktop     ;\
+              then true                                                       ;\
+            else                                                               \
+              lost2="$(install_prefix)$(GNOME_PANELDIR)"                      ;\
+@@ -368,7 +368,7 @@
  
  uninstall-gnome:
- 	@if [ "$(GNOME_DATADIR)" != "" ]; then				      \
--	  echo rm -f $(GNOME_CCDIR)/screensaver-properties.desktop          ; \
--	       rm -f $(GNOME_CCDIR)/screensaver-properties.desktop          ; \
--	  echo rm -f $(GNOME_PANELDIR)/screensaver-properties.desktop       ; \
--	       rm -f $(GNOME_PANELDIR)/screensaver-properties.desktop       ; \
-+	  echo rm -f $(GNOME_CCDIR)/xscreensaver-properties.desktop         ; \
-+	       rm -f $(GNOME_CCDIR)/xscreensaver-properties.desktop         ; \
-+	  echo rm -f $(GNOME_PANELDIR)/xscreensaver-properties.desktop      ; \
-+	       rm -f $(GNOME_PANELDIR)/xscreensaver-properties.desktop      ; \
-         fi
+ 	@if [ "$(install_prefix)$(GNOME_DATADIR)" != "" ]; then		      \
+-          f=screensaver-properties.desktop                                   ;\
++          f=xscreensaver-properties.desktop                                   ;\
+           echo rm -f $(install_prefix)$(GNOME_CCDIR)/$$f                     ;\
+                rm -f $(install_prefix)$(GNOME_CCDIR)/$$f                     ;\
+           echo rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f                  ;\
+@@ -377,11 +377,11 @@
  
  install-kde:
  	@src="$(srcdir)/xscreensaver.kss" ;				      \
@@ -49,9 +53,9 @@ $NetBSD: patch-aa,v 1.7 2000/07/10 20:19:28 tron Exp $
 +	if true; then					      \
 +	  dir="$(bindir)" ;				      \
  	  dest="$$dir/xscreensaver.kss" ;				      \
--	  echo $(INSTALL_PROGRAM) $$src $$dest ;			      \
--	  if $(INSTALL_PROGRAM) $$src $$dest ; then			      \
-+	  echo $(BSD_INSTALL_SCRIPT) $$src $$dest ;			      \
+-	  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								      \
diff --git a/x11/xscreensaver/patches/patch-ae b/x11/xscreensaver/patches/patch-ae
index 8ba9588b578..9b3fbab786e 100644
--- a/x11/xscreensaver/patches/patch-ae
+++ b/x11/xscreensaver/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2000/04/24 14:57:49 hubertf Exp $
+$NetBSD: patch-ae,v 1.2 2000/07/26 18:15:04 frueauf Exp $
 
---- driver/xscreensaver.kss.orig	Mon Apr 24 08:10:02 2000
-+++ driver/xscreensaver.kss	Mon Apr 24 08:10:41 2000
+--- driver/xscreensaver.kss.orig	Mon Jul 17 08:24:09 2000
++++ driver/xscreensaver.kss	Tue Jul 25 23:27:47 2000
 @@ -1,4 +1,4 @@
 -#!/bin/bash -
 +#!/bin/sh -
@@ -38,12 +38,12 @@ $NetBSD: patch-ae,v 1.1 2000/04/24 14:57:49 hubertf Exp $
        while true; do
          ExitNow=$(grep -E -c unblanking\|already $TEMP_FILE)
          if [ $ExitNow != 0 ]; then
-@@ -108,12 +108,12 @@
-   PID_FILE=$HOME/.kss-install.pid.`hostname`
-   kill `cat $PID_FILE`                                  # Kill old screensaver 
+@@ -109,12 +109,12 @@
+     kill `cat $PID_FILE`                                # Kill old screensaver 
+   fi
    echo "$$" > $PID_FILE                                 # Write PID of this script
 -  /usr/X11R6/bin/xscreensaver -no-splash $timeout $lockmode $Nice &    # Start XScreenSaver daemon
-+  @PREFIX@/bin/xscreensaver -no-splash $timeout $lockmode $Nice &    # Start XScreenSaver daemon
++  @PREFIX@/xscreensaver -no-splash $timeout $lockmode $Nice &    # Start XScreenSaver daemon
    trap "kill $!" SIGTERM                                # Set these to kill the daemon
    trap "kill $!" SIGKILL
  
diff --git a/x11/xscreensaver/pkg/PLIST b/x11/xscreensaver/pkg/PLIST
index 0b23b8012f0..8d48cd6dc6f 100644
--- a/x11/xscreensaver/pkg/PLIST
+++ b/x11/xscreensaver/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2000/06/02 20:12:13 fredb Exp $
+@comment $NetBSD: PLIST,v 1.21 2000/07/26 18:15:05 frueauf Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -64,6 +64,7 @@ libexec/xscreensaver/moire2
 libexec/xscreensaver/morph3d
 libexec/xscreensaver/mountain
 libexec/xscreensaver/munch
+libexec/xscreensaver/nerverot
 libexec/xscreensaver/noseguy
 libexec/xscreensaver/pedal
 libexec/xscreensaver/penetrate
@@ -149,9 +150,11 @@ man/man1/lmorph.1
 man/man1/maze.1
 man/man1/moire.1
 man/man1/munch.1
+man/man1/nerverot.1
 man/man1/noseguy.1
 man/man1/pedal.1
 man/man1/penrose.1
+man/man1/petri.1
 man/man1/phosphor.1
 man/man1/pyro.1
 man/man1/qix.1