Update xscreensaver to 4.00:

* Redesigned xscreensaver-demo GUI: it now includes small-preview and
  per-hack configuration dialogs.
* Added three new modes of operation: One Screen Saver, Blank Screen,
  and Don't Blank (in addition to the historical Random Screen Saver).
* Configure now defaults to installing the hacks in
  <prefix>/lib/xscreensaver/ instead of <prefix>/bin/. (Most distros
  already did it this way.)
* New GL hacks, menger, engine, flipscreen3d.
* Made sierpinski3d be more colorful.
* New versions of xmatrix and nerverot.
* Fixed a bug in starwars that made the font be drawn with thin lines
  in -root mode.
* Fixed a bad colormap bug in crystal that could make subsequent hacks
  malfunction!
* Made gflux able to grab screen images (-mode grab).
* Updated webcollage for recent search engine changes.
* Removed most command-line options to xscreensaver: just edit the
  ~/.xscreensaver file instead.
* Improved behavior on multi-screen and Xinerama systems: the mouse
  now stays on the screen where the user left it, and the password and
  splash dialogs always appear on the screen that has the mouse.
* Made the splash dialog use more Gtk-like colors; made it have only
  two buttons, ``Settings'' and ``Help''.
* Made sonar understand .ssh/known_hosts2 format files, and be better
  about stripping out illegal addresses.

5 files changed, 182 insertions, 17 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 4418a95bd3d..35c2d7a0955 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.46 2001/02/17 17:07:23 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2002/02/09 21:12:56 wiz Exp $
 #
 
 COMMENT=	Screen saver and locker for the X window system
 
 CONFLICTS+=	xscreensaver-gnome-[0-9]*
 
-CONFIGURE_ARGS+=--without-gnome
+CONFIGURE_ARGS+=	--without-gnome
+CONFIGURE_ARGS+=	--with-configdir=${PREFIX}/libexec/xscreensaver/config
 
 .include "../../x11/xscreensaver/Makefile.common"
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index d530785a5cc..0992d1dcfad 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.21 2002/01/07 15:10:17 fredb Exp $
+# $NetBSD: Makefile.common,v 1.22 2002/02/09 21:12:56 wiz Exp $
 #
 
-DISTNAME=		xscreensaver-3.34
+DISTNAME=		xscreensaver-4.00
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE} \
 			ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/
@@ -20,7 +20,7 @@ EVAL_PREFIX+=		GTKDIR=gtk+
 EVAL_PREFIX+=		XPMDIR=xpm
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-subdir=${PREFIX}/libexec/xscreensaver
+CONFIGURE_ARGS+=	--with-hackdir=${PREFIX}/libexec/xscreensaver
 CONFIGURE_ARGS+=	--with-gl
 CONFIGURE_ARGS+=	--with-gtk=${GTKDIR}
 CONFIGURE_ARGS+=	--with-xpm=${XPMDIR}
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index 8f7a1c53935..40ca37013bc 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/07 15:10:17 fredb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/09 21:12:56 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -23,6 +23,146 @@ libexec/xscreensaver/cage
 libexec/xscreensaver/ccurve
 libexec/xscreensaver/circuit
 libexec/xscreensaver/compass
+libexec/xscreensaver/config/README
+libexec/xscreensaver/config/ant.xml
+libexec/xscreensaver/config/atlantis.xml
+libexec/xscreensaver/config/attraction.xml
+libexec/xscreensaver/config/blaster.xml
+libexec/xscreensaver/config/blitspin.xml
+libexec/xscreensaver/config/bouboule.xml
+libexec/xscreensaver/config/braid.xml
+libexec/xscreensaver/config/bsod.xml
+libexec/xscreensaver/config/bubble3d.xml
+libexec/xscreensaver/config/bubbles.xml
+libexec/xscreensaver/config/bumps.xml
+libexec/xscreensaver/config/cage.xml
+libexec/xscreensaver/config/ccurve.xml
+libexec/xscreensaver/config/circuit.xml
+libexec/xscreensaver/config/compass.xml
+libexec/xscreensaver/config/coral.xml
+libexec/xscreensaver/config/cosmos.xml
+libexec/xscreensaver/config/critical.xml
+libexec/xscreensaver/config/crystal.xml
+libexec/xscreensaver/config/cynosure.xml
+libexec/xscreensaver/config/dangerball.xml
+libexec/xscreensaver/config/decayscreen.xml
+libexec/xscreensaver/config/deco.xml
+libexec/xscreensaver/config/deluxe.xml
+libexec/xscreensaver/config/demon.xml
+libexec/xscreensaver/config/discrete.xml
+libexec/xscreensaver/config/distort.xml
+libexec/xscreensaver/config/drift.xml
+libexec/xscreensaver/config/electricsheep.xml
+libexec/xscreensaver/config/engine.xml
+libexec/xscreensaver/config/epicycle.xml
+libexec/xscreensaver/config/extrusion.xml
+libexec/xscreensaver/config/fadeplot.xml
+libexec/xscreensaver/config/flag.xml
+libexec/xscreensaver/config/flame.xml
+libexec/xscreensaver/config/flipscreen3d.xml
+libexec/xscreensaver/config/flow.xml
+libexec/xscreensaver/config/forest.xml
+libexec/xscreensaver/config/galaxy.xml
+libexec/xscreensaver/config/gears.xml
+libexec/xscreensaver/config/gflux.xml
+libexec/xscreensaver/config/glplanet.xml
+libexec/xscreensaver/config/gltext.xml
+libexec/xscreensaver/config/goban.xml
+libexec/xscreensaver/config/goop.xml
+libexec/xscreensaver/config/grav.xml
+libexec/xscreensaver/config/greynetic.xml
+libexec/xscreensaver/config/halo.xml
+libexec/xscreensaver/config/helix.xml
+libexec/xscreensaver/config/hopalong.xml
+libexec/xscreensaver/config/hyperball.xml
+libexec/xscreensaver/config/hypercube.xml
+libexec/xscreensaver/config/ifs.xml
+libexec/xscreensaver/config/imsmap.xml
+libexec/xscreensaver/config/interference.xml
+libexec/xscreensaver/config/jigsaw.xml
+libexec/xscreensaver/config/julia.xml
+libexec/xscreensaver/config/kaleidescope.xml
+libexec/xscreensaver/config/kumppa.xml
+libexec/xscreensaver/config/lament.xml
+libexec/xscreensaver/config/laser.xml
+libexec/xscreensaver/config/lightning.xml
+libexec/xscreensaver/config/lisa.xml
+libexec/xscreensaver/config/lissie.xml
+libexec/xscreensaver/config/lmorph.xml
+libexec/xscreensaver/config/loop.xml
+libexec/xscreensaver/config/maze.xml
+libexec/xscreensaver/config/menger.xml
+libexec/xscreensaver/config/moebius.xml
+libexec/xscreensaver/config/moire.xml
+libexec/xscreensaver/config/moire2.xml
+libexec/xscreensaver/config/molecule.xml
+libexec/xscreensaver/config/morph3d.xml
+libexec/xscreensaver/config/mountain.xml
+libexec/xscreensaver/config/munch.xml
+libexec/xscreensaver/config/nerverot.xml
+libexec/xscreensaver/config/noseguy.xml
+libexec/xscreensaver/config/pedal.xml
+libexec/xscreensaver/config/penetrate.xml
+libexec/xscreensaver/config/penrose.xml
+libexec/xscreensaver/config/petri.xml
+libexec/xscreensaver/config/phosphor.xml
+libexec/xscreensaver/config/pipes.xml
+libexec/xscreensaver/config/pulsar.xml
+libexec/xscreensaver/config/pyro.xml
+libexec/xscreensaver/config/qix.xml
+libexec/xscreensaver/config/rd-bomb.xml
+libexec/xscreensaver/config/ripples.xml
+libexec/xscreensaver/config/rocks.xml
+libexec/xscreensaver/config/rorschach.xml
+libexec/xscreensaver/config/rotor.xml
+libexec/xscreensaver/config/rotzoomer.xml
+libexec/xscreensaver/config/rubik.xml
+libexec/xscreensaver/config/shadebobs.xml
+libexec/xscreensaver/config/sierpinski.xml
+libexec/xscreensaver/config/sierpinski3d.xml
+libexec/xscreensaver/config/slidescreen.xml
+libexec/xscreensaver/config/slip.xml
+libexec/xscreensaver/config/sonar.xml
+libexec/xscreensaver/config/speedmine.xml
+libexec/xscreensaver/config/sphere.xml
+libexec/xscreensaver/config/sphereEversion.xml
+libexec/xscreensaver/config/spiral.xml
+libexec/xscreensaver/config/spotlight.xml
+libexec/xscreensaver/config/sproingies.xml
+libexec/xscreensaver/config/squiral.xml
+libexec/xscreensaver/config/ssystem.xml
+libexec/xscreensaver/config/stairs.xml
+libexec/xscreensaver/config/starfish.xml
+libexec/xscreensaver/config/starwars.xml
+libexec/xscreensaver/config/stonerview.xml
+libexec/xscreensaver/config/strange.xml
+libexec/xscreensaver/config/superquadrics.xml
+libexec/xscreensaver/config/swirl.xml
+libexec/xscreensaver/config/t3d.xml
+libexec/xscreensaver/config/triangle.xml
+libexec/xscreensaver/config/truchet.xml
+libexec/xscreensaver/config/vermiculate.xml
+libexec/xscreensaver/config/vidwhacker.xml
+libexec/xscreensaver/config/vines.xml
+libexec/xscreensaver/config/wander.xml
+libexec/xscreensaver/config/webcollage.xml
+libexec/xscreensaver/config/whirlwindwarp.xml
+libexec/xscreensaver/config/whirlygig.xml
+libexec/xscreensaver/config/worm.xml
+libexec/xscreensaver/config/xaos.xml
+libexec/xscreensaver/config/xdaliclock.xml
+libexec/xscreensaver/config/xearth.xml
+libexec/xscreensaver/config/xfishtank.xml
+libexec/xscreensaver/config/xflame.xml
+libexec/xscreensaver/config/xjack.xml
+libexec/xscreensaver/config/xlyap.xml
+libexec/xscreensaver/config/xmatrix.xml
+libexec/xscreensaver/config/xmountains.xml
+libexec/xscreensaver/config/xrayswarm.xml
+libexec/xscreensaver/config/xsnow.xml
+libexec/xscreensaver/config/xspirograph.xml
+libexec/xscreensaver/config/xteevee.xml
+libexec/xscreensaver/config/zoom.xml
 libexec/xscreensaver/coral
 libexec/xscreensaver/critical
 libexec/xscreensaver/crystal
@@ -35,11 +175,13 @@ libexec/xscreensaver/demon
 libexec/xscreensaver/discrete
 libexec/xscreensaver/distort
 libexec/xscreensaver/drift
+libexec/xscreensaver/engine
 libexec/xscreensaver/epicycle
 libexec/xscreensaver/extrusion
 libexec/xscreensaver/fadeplot
 libexec/xscreensaver/flag
 libexec/xscreensaver/flame
+libexec/xscreensaver/flipscreen3d
 libexec/xscreensaver/flow
 libexec/xscreensaver/forest
 libexec/xscreensaver/galaxy
@@ -70,6 +212,7 @@ libexec/xscreensaver/lissie
 libexec/xscreensaver/lmorph
 libexec/xscreensaver/loop
 libexec/xscreensaver/maze
+libexec/xscreensaver/menger
 libexec/xscreensaver/moebius
 libexec/xscreensaver/moire
 libexec/xscreensaver/moire2
@@ -211,14 +354,15 @@ man/man1/xflame.1
 man/man1/xjack.1
 man/man1/xlyap.1
 man/man1/xmatrix.1
-man/man1/xscreensaver.1
-man/man1/xscreensaver-demo.1
 man/man1/xscreensaver-command.1
-man/man1/xscreensaver-getimage.1
+man/man1/xscreensaver-demo.1
 man/man1/xscreensaver-getimage-file.1
 man/man1/xscreensaver-getimage-video.1
+man/man1/xscreensaver-getimage.1
 man/man1/xscreensaver-gl-helper.1
+man/man1/xscreensaver.1
 man/man1/xsublim.1
 man/man1/xteevee.1
 man/man1/zoom.1
+@dirrm libexec/xscreensaver/config
 @dirrm libexec/xscreensaver
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 3c2df2caa2c..019b6ae91e8 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2002/01/07 15:10:17 fredb Exp $
+$NetBSD: distinfo,v 1.8 2002/02/09 21:12:56 wiz Exp $
 
-SHA1 (xscreensaver-3.34.tar.gz) = 520af3b1e459e5afb07f42216976137b1593ea4d
-Size (xscreensaver-3.34.tar.gz) = 1661812 bytes
-SHA1 (patch-aa) = 887e2cd79dc0f55c8b2aedaaa341631ccf59094f
+SHA1 (xscreensaver-4.00.tar.gz) = f930b6c8b36a26ebc92457ed2772e1a78a2e309b
+Size (xscreensaver-4.00.tar.gz) = 1855130 bytes
+SHA1 (patch-aa) = d0499f6557e1977da73b0b6b5e433f263e0e2084
 SHA1 (patch-ab) = fe0c6c387ce5956c7851f8e1f31777961b8bd69a
+SHA1 (patch-ac) = ddd2749353222b161e54ede3d0f482f775052464
 SHA1 (patch-ae) = c3e7ddffb2caab5c545b0834c93238455852dea6
diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa
index 6dd69ce21e2..fd1bafdc7fd 100644
--- a/x11/xscreensaver/patches/patch-aa
+++ b/x11/xscreensaver/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2001/10/24 14:05:48 tron Exp $
+$NetBSD: patch-aa,v 1.14 2002/02/09 21:12:57 wiz Exp $
 
---- configure.orig	Mon Jun  4 01:43:39 2001
-+++ configure	Wed Oct 24 15:59:51 2001
-@@ -1531,7 +1531,7 @@
+--- configure.orig	Wed Jan  2 09:15:22 2002
++++ configure
+@@ -1536,7 +1536,7 @@
  # implement the "install-strip" target properly (strip executables,
  # but do not try to strip scripts.)
  #
@@ -11,3 +11,22 @@ $NetBSD: patch-aa,v 1.13 2001/10/24 14:05:48 tron Exp $
  
  # random libc stuff
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+@@ -3790,15 +3790,15 @@
+   # there must be a better way than this...
+   if test -z "`echo $with_configdir | sed 's@^/.*@@'`" ; then
+     # absolute path
+-    CONFIGDIR=$with_configdir
++    HACK_CONF_DIR=$with_configdir
+   else
+     # relative path
+-    CONFIGDIR="\${exec_prefix}$with_configdir"
++    HACK_CONF_DIR="\${exec_prefix}$with_configdir"
+   fi
+ fi
+ 
+ # canonicalize slashes.
+-CONFIGDIR=`echo "${CONFIGDIR}" | sed 's@/$@@;s@//*@/@g'`
++HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@/$@@;s@//*@/@g'`
+ 
+ 
+