Update to 4.07:

* New hacks, `flurry', `metaballs', `eruption', `popsquares', and `barcode'.
* Minor updates to `maze' for high density mazes.
* Added double buffering to `fluidballs' and `whirlygig'.
* Bug fixes for running xscreensaver to a remote XFree86 display
  (which nobody would ever do...)
* Updated `webcollage' (faster Alta Vista searching.)
* Updated `glplanet' so the sun sets in the west.
* Updated `sproingies' with smooth, unsegmented surfaces.
* Fixed Perl version-sensitivity in `xscreensaver-getimage-file'.
* Fixed GTK2 scrolling bug in `xscreensaver-demo'.

5 files changed, 34 insertions, 8 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 9569e102bb2..60c192601e6 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2003/02/11 11:24:09 markd Exp $
+# $NetBSD: Makefile,v 1.55 2003/02/15 10:48:26 wiz Exp $
 #
 
-PKGREVISION=	3
 COMMENT=	Screen saver and locker for the X window system
 
 CONFLICTS+=	xscreensaver-gnome-[0-9]*
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index ea844f36e97..0a4eef523c7 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.43 2003/02/11 11:24:10 markd Exp $
+# $NetBSD: Makefile.common,v 1.44 2003/02/15 10:48:26 wiz Exp $
 #
 
-DISTNAME=		xscreensaver-4.06
+DISTNAME=		xscreensaver-4.07
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE} \
 			ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index aebb09146a0..f1d34b71fdf 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2002/10/28 22:37:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/02/15 10:48:26 wiz Exp $
 @comment bin/screensaver-properties-capplet
 bin/xscreensaver
 bin/xscreensaver-command
@@ -14,6 +14,7 @@ libexec/xscreensaver/ant
 libexec/xscreensaver/apollonian
 libexec/xscreensaver/atlantis
 libexec/xscreensaver/attraction
+libexec/xscreensaver/barcode
 libexec/xscreensaver/blaster
 libexec/xscreensaver/blitspin
 libexec/xscreensaver/bouboule
@@ -33,6 +34,7 @@ libexec/xscreensaver/config/ant.xml
 libexec/xscreensaver/config/apollonian.xml
 libexec/xscreensaver/config/atlantis.xml
 libexec/xscreensaver/config/attraction.xml
+libexec/xscreensaver/config/barcode.xml
 libexec/xscreensaver/config/blaster.xml
 libexec/xscreensaver/config/blitspin.xml
 libexec/xscreensaver/config/bouboule.xml
@@ -64,6 +66,7 @@ libexec/xscreensaver/config/electricsheep.xml
 libexec/xscreensaver/config/endgame.xml
 libexec/xscreensaver/config/engine.xml
 libexec/xscreensaver/config/epicycle.xml
+libexec/xscreensaver/config/eruption.xml
 libexec/xscreensaver/config/euler2d.xml
 libexec/xscreensaver/config/extrusion.xml
 libexec/xscreensaver/config/fadeplot.xml
@@ -72,6 +75,7 @@ libexec/xscreensaver/config/flame.xml
 libexec/xscreensaver/config/flipscreen3d.xml
 libexec/xscreensaver/config/flow.xml
 libexec/xscreensaver/config/fluidballs.xml
+libexec/xscreensaver/config/flurry.xml
 libexec/xscreensaver/config/forest.xml
 libexec/xscreensaver/config/galaxy.xml
 libexec/xscreensaver/config/gears.xml
@@ -109,6 +113,7 @@ libexec/xscreensaver/config/lmorph.xml
 libexec/xscreensaver/config/loop.xml
 libexec/xscreensaver/config/maze.xml
 libexec/xscreensaver/config/menger.xml
+libexec/xscreensaver/config/metaballs.xml
 libexec/xscreensaver/config/moebius.xml
 libexec/xscreensaver/config/moire.xml
 libexec/xscreensaver/config/moire2.xml
@@ -125,6 +130,7 @@ libexec/xscreensaver/config/petri.xml
 libexec/xscreensaver/config/phosphor.xml
 libexec/xscreensaver/config/pipes.xml
 libexec/xscreensaver/config/polyominoes.xml
+libexec/xscreensaver/config/popsquares.xml
 libexec/xscreensaver/config/pulsar.xml
 libexec/xscreensaver/config/pyro.xml
 libexec/xscreensaver/config/qix.xml
@@ -202,6 +208,7 @@ libexec/xscreensaver/drift
 libexec/xscreensaver/endgame
 libexec/xscreensaver/engine
 libexec/xscreensaver/epicycle
+libexec/xscreensaver/eruption
 libexec/xscreensaver/euler2d
 libexec/xscreensaver/extrusion
 libexec/xscreensaver/fadeplot
@@ -210,6 +217,7 @@ libexec/xscreensaver/flame
 libexec/xscreensaver/flipscreen3d
 libexec/xscreensaver/flow
 libexec/xscreensaver/fluidballs
+libexec/xscreensaver/flurry
 libexec/xscreensaver/forest
 libexec/xscreensaver/galaxy
 libexec/xscreensaver/gears
@@ -246,6 +254,7 @@ libexec/xscreensaver/lmorph
 libexec/xscreensaver/loop
 libexec/xscreensaver/maze
 libexec/xscreensaver/menger
+libexec/xscreensaver/metaballs
 libexec/xscreensaver/moebius
 libexec/xscreensaver/moire
 libexec/xscreensaver/moire2
@@ -262,6 +271,7 @@ libexec/xscreensaver/petri
 libexec/xscreensaver/phosphor
 libexec/xscreensaver/pipes
 libexec/xscreensaver/polyominoes
+libexec/xscreensaver/popsquares
 libexec/xscreensaver/pulsar
 libexec/xscreensaver/pyro
 libexec/xscreensaver/qix
@@ -322,6 +332,7 @@ man/man1/ant.1
 man/man1/apollonian.1
 man/man1/atlantis.1
 man/man1/attraction.1
+man/man1/barcode.1
 man/man1/blaster.1
 man/man1/blitspin.1
 man/man1/bouboule.1
@@ -351,6 +362,7 @@ man/man1/drift.1
 man/man1/endgame.1
 man/man1/engine.1
 man/man1/epicycle.1
+man/man1/eruption.1
 man/man1/euler2d.1
 man/man1/extrusion.1
 man/man1/fadeplot.1
@@ -359,6 +371,7 @@ man/man1/flame.1
 man/man1/flipscreen3d.1
 man/man1/flow.1
 man/man1/fluidballs.1
+man/man1/flurry.1
 man/man1/forest.1
 man/man1/galaxy.1
 man/man1/gears.1
@@ -395,6 +408,7 @@ man/man1/lmorph.1
 man/man1/loop.1
 man/man1/maze.1
 man/man1/menger.1
+man/man1/metaballs.1
 man/man1/moebius.1
 man/man1/moire.1
 man/man1/moire2.1
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index db95a231816..f0fcaeb1b14 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.22 2002/12/14 02:34:03 salo Exp $
+$NetBSD: distinfo,v 1.23 2003/02/15 10:48:26 wiz Exp $
 
-SHA1 (xscreensaver-4.06.tar.gz) = ba2c14d632ee5d876e1d2b580e6aa6d67b813119
-Size (xscreensaver-4.06.tar.gz) = 3209164 bytes
+SHA1 (xscreensaver-4.07.tar.gz) = 4c81d11681194b93d1be6e6e0e459574624d6680
+Size (xscreensaver-4.07.tar.gz) = 3242535 bytes
 SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326
 SHA1 (patch-ab) = 5d6f368c6f007ac66a3346ba80fe38a8781e03f2
 SHA1 (patch-ac) = 574251635e4046c43a9e368aee84e8fc72a5480b
 SHA1 (patch-ad) = 64cd7a683da1afea599d1e8b8dffd951243c9d9b
+SHA1 (patch-ae) = e68e964b218418af4ba0886ddbf0e1aeabea3e15
diff --git a/x11/xscreensaver/patches/patch-ae b/x11/xscreensaver/patches/patch-ae
new file mode 100644
index 00000000000..7afa1ad39b4
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.6 2003/02/15 10:48:27 wiz Exp $
+
+--- hacks/glx/flurry.c.orig	Mon Feb  3 11:48:30 2003
++++ hacks/glx/flurry.c
+@@ -103,7 +103,6 @@ ModStruct   flurry_description = {
+ #endif
+ 
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
+ 
+ #include "flurry.h"
+