Update to 5.00:

Changes since 4.24:   * Ported to MacOS X! (10.4.0 or newer)
                      * API change: instead of providing a single screenhack()
                        function that does not return, screen savers using the
                        screenhack.h framework must now provide "init" and
                        "draw one frame" functions instead.  All bundled savers
                        have been updated; third-party patches will need work.
                      * All image-loading happens asynchronously.
                      * xscreensaver-getimage-file caches the contents of the
                        image directory for a few hours, so consecutive runs
                        won't have to re-list the whole directory tree.
                      * New hacks, `topblock' and `glschool'.
                      * Removed `xteevee' (superceded by `xanalogtv').
                      * Added variable-sized puzzle pieces to `jigsaw'.
                      * Changes to the defaults and command-line options of
                        many hacks to make the .xml files more consistent.
                      * Reap zombies in `glslideshow' and `carousel'.
                      * `sonar' works without setuid on OSX (dgram icmp).
                      * `xmatrix -mode pipe' displays the text of a subprocess.
                      * `endgame' has higher resolution chess-piece models.
                      * `webcollage' takes a -directory option to get images
                        from a local directory.
Changes since 4.23:   * New versions of `cube21', `glsnake', `celtic'.
                      * Backed out a DPMS-related patch that cause desktop
                        flickering with some X servers.
                      * Fixed startup crash in getgroups() when running setuid.
                      * Default to not displaying stderr on the saver window.
                      * Fixed bad free() in "Documentation" button.
                      * Don't try to run hacks that aren't installed.
                      * Minor fixes to various XML config files and man pages.
Changes since 4.22:   * New hacks, `glhanoi', `cube21', `timetunnel',
                        `juggler3d', and `celtic'.
                      * New versions of `tangram', `webcollage', `hypertorus',
                        `polytopes', and `ripples'.
                      * `sonar' is now quiet about unresolvable hosts.
                      * Minor corrections to BASIC code in `apple2'.
                      * Don't install `ant' by default, since there is some
                        Java tool of that name, which was causing confusion.
                        And also it's boring.
                      * Made screen grabbing work again on MacOS 10.4.2.
                      * No longer prints bogus warnings about ClientMessages
                        intended for the window manager.
                      * Ignore unprintable characters in passwd entry field.
                      * Fixed yet another cross-host-display image-loading
                        endian problem.
                      * `xscreensaver-command -watch' and `-time' now work
                        on 64-bit machines.

13 files changed, 273 insertions, 325 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 34ef5279a30..e886497b54d 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2006/05/21 15:19:31 jlam Exp $
+# $NetBSD: Makefile,v 1.80 2006/07/18 18:40:36 wiz Exp $
 
 COMMENT=	Screen saver and locker for the X window system
-PKGREVISION=	5
 
 CONFLICTS+=	xscreensaver-gnome<4.14
 # man/man1/barcode.1
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 2797c237020..a574b461ad7 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.89 2006/06/15 13:31:30 wiz Exp $
+# $NetBSD: Makefile.common,v 1.90 2006/07/18 18:40:36 wiz Exp $
 #
 
-DISTNAME=		xscreensaver-4.22
+DISTNAME=		xscreensaver-5.00
 CATEGORIES=		x11
-MASTER_SITES=		ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/ \
-			${HOMEPAGE}
+MASTER_SITES=		${HOMEPAGE}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.jwz.org/xscreensaver/
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index 76e13c24f09..75e013135b5 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2006/05/21 15:19:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.30 2006/07/18 18:40:36 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -9,7 +9,6 @@ bin/xscreensaver-text
 lib/X11/app-defaults/XScreenSaver
 libexec/xscreensaver/anemone
 libexec/xscreensaver/anemotaxis
-libexec/xscreensaver/ant
 libexec/xscreensaver/antinspect
 libexec/xscreensaver/antmaze
 libexec/xscreensaver/antspotlight
@@ -36,13 +35,13 @@ libexec/xscreensaver/bumps
 libexec/xscreensaver/cage
 libexec/xscreensaver/carousel
 libexec/xscreensaver/ccurve
+libexec/xscreensaver/celtic
 libexec/xscreensaver/circuit
 libexec/xscreensaver/cloudlife
 libexec/xscreensaver/compass
 libexec/xscreensaver/config/README
 libexec/xscreensaver/config/anemone.xml
 libexec/xscreensaver/config/anemotaxis.xml
-libexec/xscreensaver/config/ant.xml
 libexec/xscreensaver/config/antinspect.xml
 libexec/xscreensaver/config/antmaze.xml
 libexec/xscreensaver/config/antspotlight.xml
@@ -69,13 +68,16 @@ libexec/xscreensaver/config/bumps.xml
 libexec/xscreensaver/config/cage.xml
 libexec/xscreensaver/config/carousel.xml
 libexec/xscreensaver/config/ccurve.xml
+libexec/xscreensaver/config/celtic.xml
 libexec/xscreensaver/config/circuit.xml
 libexec/xscreensaver/config/cloudlife.xml
 libexec/xscreensaver/config/compass.xml
 libexec/xscreensaver/config/coral.xml
+libexec/xscreensaver/config/cosmos.xml
 libexec/xscreensaver/config/crackberg.xml
 libexec/xscreensaver/config/critical.xml
 libexec/xscreensaver/config/crystal.xml
+libexec/xscreensaver/config/cube21.xml
 libexec/xscreensaver/config/cubenetic.xml
 libexec/xscreensaver/config/cubestorm.xml
 libexec/xscreensaver/config/cynosure.xml
@@ -87,6 +89,7 @@ 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/endgame.xml
 libexec/xscreensaver/config/engine.xml
 libexec/xscreensaver/config/epicycle.xml
@@ -95,6 +98,7 @@ libexec/xscreensaver/config/euler2d.xml
 libexec/xscreensaver/config/extrusion.xml
 libexec/xscreensaver/config/fadeplot.xml
 libexec/xscreensaver/config/fiberlamp.xml
+libexec/xscreensaver/config/fireflies.xml
 libexec/xscreensaver/config/fireworkx.xml
 libexec/xscreensaver/config/flag.xml
 libexec/xscreensaver/config/flame.xml
@@ -114,12 +118,15 @@ libexec/xscreensaver/config/gflux.xml
 libexec/xscreensaver/config/glblur.xml
 libexec/xscreensaver/config/gleidescope.xml
 libexec/xscreensaver/config/glforestfire.xml
+libexec/xscreensaver/config/glhanoi.xml
 libexec/xscreensaver/config/glknots.xml
 libexec/xscreensaver/config/glmatrix.xml
 libexec/xscreensaver/config/glplanet.xml
+libexec/xscreensaver/config/glschool.xml
 libexec/xscreensaver/config/glslideshow.xml
 libexec/xscreensaver/config/glsnake.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
@@ -138,6 +145,7 @@ libexec/xscreensaver/config/intermomentary.xml
 libexec/xscreensaver/config/jigglypuff.xml
 libexec/xscreensaver/config/jigsaw.xml
 libexec/xscreensaver/config/juggle.xml
+libexec/xscreensaver/config/juggler3d.xml
 libexec/xscreensaver/config/julia.xml
 libexec/xscreensaver/config/kaleidescope.xml
 libexec/xscreensaver/config/klein.xml
@@ -201,6 +209,7 @@ 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/spheremonics.xml
 libexec/xscreensaver/config/spiral.xml
 libexec/xscreensaver/config/spotlight.xml
@@ -217,6 +226,8 @@ libexec/xscreensaver/config/swirl.xml
 libexec/xscreensaver/config/t3d.xml
 libexec/xscreensaver/config/tangram.xml
 libexec/xscreensaver/config/thornbird.xml
+libexec/xscreensaver/config/timetunnel.xml
+libexec/xscreensaver/config/topblock.xml
 libexec/xscreensaver/config/triangle.xml
 libexec/xscreensaver/config/truchet.xml
 libexec/xscreensaver/config/twang.xml
@@ -229,18 +240,23 @@ libexec/xscreensaver/config/whirlygig.xml
 libexec/xscreensaver/config/worm.xml
 libexec/xscreensaver/config/wormhole.xml
 libexec/xscreensaver/config/xanalogtv.xml
+libexec/xscreensaver/config/xaos.xml
+libexec/xscreensaver/config/xdaliclock.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/xplanet.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/crackberg
 libexec/xscreensaver/critical
 libexec/xscreensaver/crystal
+libexec/xscreensaver/cube21
 libexec/xscreensaver/cubenetic
 libexec/xscreensaver/cubestorm
 libexec/xscreensaver/cynosure
@@ -279,9 +295,11 @@ libexec/xscreensaver/gflux
 libexec/xscreensaver/glblur
 libexec/xscreensaver/gleidescope
 libexec/xscreensaver/glforestfire
+libexec/xscreensaver/glhanoi
 libexec/xscreensaver/glknots
 libexec/xscreensaver/glmatrix
 libexec/xscreensaver/glplanet
+libexec/xscreensaver/glschool
 libexec/xscreensaver/glslideshow
 libexec/xscreensaver/glsnake
 libexec/xscreensaver/gltext
@@ -303,6 +321,7 @@ libexec/xscreensaver/intermomentary
 libexec/xscreensaver/jigglypuff
 libexec/xscreensaver/jigsaw
 libexec/xscreensaver/juggle
+libexec/xscreensaver/juggler3d
 libexec/xscreensaver/julia
 libexec/xscreensaver/kaleidescope
 libexec/xscreensaver/klein
@@ -383,6 +402,8 @@ libexec/xscreensaver/swirl
 libexec/xscreensaver/t3d
 libexec/xscreensaver/tangram
 libexec/xscreensaver/thornbird
+libexec/xscreensaver/timetunnel
+libexec/xscreensaver/topblock
 libexec/xscreensaver/triangle
 libexec/xscreensaver/truchet
 libexec/xscreensaver/twang
@@ -402,213 +423,217 @@ libexec/xscreensaver/xmatrix
 libexec/xscreensaver/xrayswarm
 libexec/xscreensaver/xspirograph
 libexec/xscreensaver/xsublim
-libexec/xscreensaver/xteevee
 libexec/xscreensaver/zoom
-man/man1/anemone.1
-man/man1/anemotaxis.1
-man/man1/ant.1
-man/man1/antinspect.1
-man/man1/antmaze.1
-man/man1/antspotlight.1
-man/man1/apollonian.1
-man/man1/apple2.1
-man/man1/atlantis.1
-man/man1/attraction.1
-man/man1/atunnel.1
-man/man1/barcode.1
-man/man1/blaster.1
-man/man1/blinkbox.1
-man/man1/blitspin.1
-man/man1/blocktube.1
-man/man1/boing.1
-man/man1/bouboule.1
-man/man1/bouncingcow.1
-man/man1/boxed.1
-man/man1/boxfit.1
-man/man1/braid.1
-man/man1/bsod.1
-man/man1/bubble3d.1
-man/man1/bubbles.1
-man/man1/bumps.1
-man/man1/cage.1
-man/man1/carousel.1
-man/man1/ccurve.1
-man/man1/circuit.1
-man/man1/cloudlife.1
-man/man1/compass.1
-man/man1/coral.1
-man/man1/crackberg.1
-man/man1/critical.1
-man/man1/crystal.1
-man/man1/cubenetic.1
-man/man1/cubestorm.1
-man/man1/cynosure.1
-man/man1/dangerball.1
-man/man1/decayscreen.1
-man/man1/deco.1
-man/man1/deluxe.1
-man/man1/demon.1
-man/man1/discrete.1
-man/man1/distort.1
-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
-man/man1/fiberlamp.1
-man/man1/fireworkx.1
-man/man1/flag.1
-man/man1/flame.1
-man/man1/flipflop.1
-man/man1/flipscreen3d.1
-man/man1/fliptext.1
-man/man1/flow.1
-man/man1/fluidballs.1
-man/man1/flurry.1
-man/man1/flyingtoasters.1
-man/man1/fontglide.1
-man/man1/forest.1
-man/man1/fuzzyflakes.1
-man/man1/galaxy.1
-man/man1/gears.1
-man/man1/gflux.1
-man/man1/glblur.1
-man/man1/gleidescope.1
-man/man1/glforestfire.1
-man/man1/glknots.1
-man/man1/glmatrix.1
-man/man1/glplanet.1
-man/man1/glslideshow.1
-man/man1/glsnake.1
-man/man1/gltext.1
-man/man1/goop.1
-man/man1/grav.1
-man/man1/greynetic.1
-man/man1/halftone.1
-man/man1/halo.1
-man/man1/helix.1
-man/man1/hopalong.1
-man/man1/hyperball.1
-man/man1/hypercube.1
-man/man1/hypertorus.1
-man/man1/ifs.1
-man/man1/imsmap.1
-man/man1/interaggregate.1
-man/man1/interference.1
-man/man1/intermomentary.1
-man/man1/jigglypuff.1
-man/man1/jigsaw.1
-man/man1/juggle.1
-man/man1/julia.1
-man/man1/kaleidescope.1
-man/man1/klein.1
-man/man1/kumppa.1
-man/man1/lament.1
-man/man1/laser.1
-man/man1/lavalite.1
-man/man1/lightning.1
-man/man1/lisa.1
-man/man1/lissie.1
-man/man1/ljlatest.1
-man/man1/lmorph.1
-man/man1/loop.1
-man/man1/maze.1
-man/man1/memscroller.1
-man/man1/menger.1
-man/man1/metaballs.1
-man/man1/mirrorblob.1
-man/man1/mismunch.1
-man/man1/moebius.1
-man/man1/moire.1
-man/man1/moire2.1
-man/man1/molecule.1
-man/man1/morph3d.1
-man/man1/mountain.1
-man/man1/munch.1
-man/man1/nerverot.1
-man/man1/noof.1
-man/man1/noseguy.1
-man/man1/pacman.1
-man/man1/pedal.1
-man/man1/penetrate.1
-man/man1/penrose.1
-man/man1/petri.1
-man/man1/phosphor.1
-man/man1/piecewise.1
-man/man1/pinion.1
-man/man1/pipes.1
-man/man1/polyhedra.1
-man/man1/polyominoes.1
-man/man1/polytopes.1
-man/man1/pong.1
-man/man1/providence.1
-man/man1/pulsar.1
-man/man1/pyro.1
-man/man1/qix.1
-man/man1/queens.1
-man/man1/rd-bomb.1
-man/man1/ripples.1
-man/man1/rocks.1
-man/man1/rorschach.1
-man/man1/rotor.1
-man/man1/rotzoomer.1
-man/man1/rubik.1
-man/man1/sballs.1
-man/man1/shadebobs.1
-man/man1/sierpinski.1
-man/man1/sierpinski3d.1
-man/man1/slidescreen.1
-man/man1/slip.1
-man/man1/sonar.1
-man/man1/speedmine.1
-man/man1/sphere.1
-man/man1/spheremonics.1
-man/man1/spiral.1
-man/man1/spotlight.1
-man/man1/sproingies.1
-man/man1/squiral.1
-man/man1/stairs.1
-man/man1/starfish.1
-man/man1/starwars.1
-man/man1/stonerview.1
-man/man1/strange.1
-man/man1/substrate.1
-man/man1/superquadrics.1
-man/man1/swirl.1
-man/man1/t3d.1
-man/man1/tangram.1
-man/man1/thornbird.1
-man/man1/triangle.1
-man/man1/truchet.1
-man/man1/twang.1
-man/man1/vermiculate.1
-man/man1/vidwhacker.1
-man/man1/vines.1
-man/man1/wander.1
-man/man1/whirlwindwarp.1
-man/man1/whirlygig.1
-man/man1/worm.1
-man/man1/wormhole.1
-man/man1/xanalogtv.1
-man/man1/xflame.1
-man/man1/xjack.1
-man/man1/xlyap.1
-man/man1/xmatrix.1
-man/man1/xrayswarm.1
 man/man1/xscreensaver-command.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-text.1
 man/man1/xscreensaver.1
-man/man1/xspirograph.1
-man/man1/xsublim.1
-man/man1/xteevee.1
-man/man1/zoom.1
+man/man6/anemone.6
+man/man6/anemotaxis.6
+man/man6/antinspect.6
+man/man6/antmaze.6
+man/man6/antspotlight.6
+man/man6/apollonian.6
+man/man6/apple2.6
+man/man6/atlantis.6
+man/man6/attraction.6
+man/man6/atunnel.6
+man/man6/barcode.6
+man/man6/blaster.6
+man/man6/blinkbox.6
+man/man6/blitspin.6
+man/man6/blocktube.6
+man/man6/boing.6
+man/man6/bouboule.6
+man/man6/bouncingcow.6
+man/man6/boxed.6
+man/man6/boxfit.6
+man/man6/braid.6
+man/man6/bsod.6
+man/man6/bubble3d.6
+man/man6/bubbles.6
+man/man6/bumps.6
+man/man6/cage.6
+man/man6/carousel.6
+man/man6/ccurve.6
+man/man6/celtic.6
+man/man6/circuit.6
+man/man6/cloudlife.6
+man/man6/compass.6
+man/man6/coral.6
+man/man6/crackberg.6
+man/man6/critical.6
+man/man6/crystal.6
+man/man6/cube21.6
+man/man6/cubenetic.6
+man/man6/cubestorm.6
+man/man6/cynosure.6
+man/man6/dangerball.6
+man/man6/decayscreen.6
+man/man6/deco.6
+man/man6/deluxe.6
+man/man6/demon.6
+man/man6/discrete.6
+man/man6/distort.6
+man/man6/drift.6
+man/man6/endgame.6
+man/man6/engine.6
+man/man6/epicycle.6
+man/man6/eruption.6
+man/man6/euler2d.6
+man/man6/extrusion.6
+man/man6/fadeplot.6
+man/man6/fiberlamp.6
+man/man6/fireworkx.6
+man/man6/flag.6
+man/man6/flame.6
+man/man6/flipflop.6
+man/man6/flipscreen3d.6
+man/man6/fliptext.6
+man/man6/flow.6
+man/man6/fluidballs.6
+man/man6/flurry.6
+man/man6/flyingtoasters.6
+man/man6/fontglide.6
+man/man6/forest.6
+man/man6/fuzzyflakes.6
+man/man6/galaxy.6
+man/man6/gears.6
+man/man6/gflux.6
+man/man6/glblur.6
+man/man6/gleidescope.6
+man/man6/glforestfire.6
+man/man6/glhanoi.6
+man/man6/glknots.6
+man/man6/glmatrix.6
+man/man6/glplanet.6
+man/man6/glschool.6
+man/man6/glslideshow.6
+man/man6/glsnake.6
+man/man6/gltext.6
+man/man6/goop.6
+man/man6/grav.6
+man/man6/greynetic.6
+man/man6/halftone.6
+man/man6/halo.6
+man/man6/helix.6
+man/man6/hopalong.6
+man/man6/hyperball.6
+man/man6/hypercube.6
+man/man6/hypertorus.6
+man/man6/ifs.6
+man/man6/imsmap.6
+man/man6/interaggregate.6
+man/man6/interference.6
+man/man6/intermomentary.6
+man/man6/jigglypuff.6
+man/man6/jigsaw.6
+man/man6/juggle.6
+man/man6/juggler3d.6
+man/man6/julia.6
+man/man6/kaleidescope.6
+man/man6/klein.6
+man/man6/kumppa.6
+man/man6/lament.6
+man/man6/laser.6
+man/man6/lavalite.6
+man/man6/lightning.6
+man/man6/lisa.6
+man/man6/lissie.6
+man/man6/ljlatest.6
+man/man6/lmorph.6
+man/man6/loop.6
+man/man6/maze.6
+man/man6/memscroller.6
+man/man6/menger.6
+man/man6/metaballs.6
+man/man6/mirrorblob.6
+man/man6/mismunch.6
+man/man6/moebius.6
+man/man6/moire.6
+man/man6/moire2.6
+man/man6/molecule.6
+man/man6/morph3d.6
+man/man6/mountain.6
+man/man6/munch.6
+man/man6/nerverot.6
+man/man6/noof.6
+man/man6/noseguy.6
+man/man6/pacman.6
+man/man6/pedal.6
+man/man6/penetrate.6
+man/man6/penrose.6
+man/man6/petri.6
+man/man6/phosphor.6
+man/man6/piecewise.6
+man/man6/pinion.6
+man/man6/pipes.6
+man/man6/polyhedra.6
+man/man6/polyominoes.6
+man/man6/polytopes.6
+man/man6/pong.6
+man/man6/providence.6
+man/man6/pulsar.6
+man/man6/pyro.6
+man/man6/qix.6
+man/man6/queens.6
+man/man6/rd-bomb.6
+man/man6/ripples.6
+man/man6/rocks.6
+man/man6/rorschach.6
+man/man6/rotor.6
+man/man6/rotzoomer.6
+man/man6/rubik.6
+man/man6/sballs.6
+man/man6/shadebobs.6
+man/man6/sierpinski.6
+man/man6/sierpinski3d.6
+man/man6/slidescreen.6
+man/man6/slip.6
+man/man6/sonar.6
+man/man6/speedmine.6
+man/man6/sphere.6
+man/man6/spheremonics.6
+man/man6/spiral.6
+man/man6/spotlight.6
+man/man6/sproingies.6
+man/man6/squiral.6
+man/man6/stairs.6
+man/man6/starfish.6
+man/man6/starwars.6
+man/man6/stonerview.6
+man/man6/strange.6
+man/man6/substrate.6
+man/man6/superquadrics.6
+man/man6/swirl.6
+man/man6/t3d.6
+man/man6/tangram.6
+man/man6/thornbird.6
+man/man6/timetunnel.6
+man/man6/topblock.6
+man/man6/triangle.6
+man/man6/truchet.6
+man/man6/twang.6
+man/man6/vermiculate.6
+man/man6/vidwhacker.6
+man/man6/vines.6
+man/man6/wander.6
+man/man6/whirlwindwarp.6
+man/man6/whirlygig.6
+man/man6/worm.6
+man/man6/wormhole.6
+man/man6/xanalogtv.6
+man/man6/xflame.6
+man/man6/xjack.6
+man/man6/xlyap.6
+man/man6/xmatrix.6
+man/man6/xrayswarm.6
+man/man6/xscreensaver-gl-helper.6
+man/man6/xspirograph.6
+man/man6/xsublim.6
+man/man6/zoom.6
 share/locale/da/LC_MESSAGES/xscreensaver.mo
 share/locale/de/LC_MESSAGES/xscreensaver.mo
 share/locale/es/LC_MESSAGES/xscreensaver.mo
diff --git a/x11/xscreensaver/PLIST.webcollage b/x11/xscreensaver/PLIST.webcollage
index 5dc22c33140..a2e68ef5833 100644
--- a/x11/xscreensaver/PLIST.webcollage
+++ b/x11/xscreensaver/PLIST.webcollage
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.webcollage,v 1.1 2006/05/14 18:55:50 wiz Exp $
+@comment $NetBSD: PLIST.webcollage,v 1.2 2006/07/18 18:40:36 wiz Exp $
 libexec/xscreensaver/config/webcollage.xml
 libexec/xscreensaver/webcollage
-man/man1/webcollage.1
+man/man6/webcollage.6
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index fe34cd5c25d..d4b4a7f13b0 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.48 2006/05/21 23:31:14 jlam Exp $
+$NetBSD: distinfo,v 1.49 2006/07/18 18:40:36 wiz Exp $
 
-SHA1 (xscreensaver-4.22.tar.gz) = f40db41ef221f7ed42c39e77007ce05b4f846306
-RMD160 (xscreensaver-4.22.tar.gz) = bf93e368d5e6f98ba383a908708a59f1a428aece
-Size (xscreensaver-4.22.tar.gz) = 4620066 bytes
-SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326
-SHA1 (patch-ab) = 9582449e1c80d2896170f953db1a8ce03f3bc998
-SHA1 (patch-ac) = 01c8d516f3e5e8d8aeed69609fcc899f6a3196a1
-SHA1 (patch-ad) = 47af5f7895d06d3ce9016a8810388b821f9671ff
+SHA1 (xscreensaver-5.00.tar.gz) = 631eb0414112b2db2e62e2ab5a984726d61696d2
+RMD160 (xscreensaver-5.00.tar.gz) = 7630ff42cfd24557cf1459902ddc6256004fc938
+Size (xscreensaver-5.00.tar.gz) = 5263478 bytes
+SHA1 (patch-aa) = e9081bc1b18d6906fcda3d652df9954092b93a84
+SHA1 (patch-ab) = d49a0854e40d6e0dcd9dfcec9c4007d0dd62dfdb
+SHA1 (patch-ac) = 258161b29cdd951d2c7421433f0786c1595e52b6
+SHA1 (patch-ad) = 5d0e3fe79d0161897cf945ca4f2a2178342d3ba5
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
-SHA1 (patch-af) = 2340efe0cf677a20c336570b24374d675f5cd6eb
+SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
 SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114
-SHA1 (patch-ah) = 0140ee63471e050b9f5962e8cda24ea1e047c21b
-SHA1 (patch-ai) = 16ed0c23367c79c04d2d89ffcbb260575b0d1e9f
diff --git a/x11/xscreensaver/options.mk b/x11/xscreensaver/options.mk
index e644d85a9c7..c732abb4336 100644
--- a/x11/xscreensaver/options.mk
+++ b/x11/xscreensaver/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2006/05/14 18:55:50 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2006/07/18 18:40:36 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xscreensaver
 PKG_SUPPORTED_OPTIONS=	pam xscreensaver-webcollage
@@ -16,5 +16,5 @@ PLIST_SRC=	PLIST.webcollage PLIST
 post-install:
 	${RM} ${PREFIX}/libexec/xscreensaver/config/webcollage.xml
 	${RM} ${PREFIX}/libexec/xscreensaver/webcollage
-	${RM} ${PREFIX}/man/man1/webcollage.1
+	${RM} ${PREFIX}/man/man6/webcollage.6
 .endif
diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa
index fc3cb4ea3f0..821f9e5b409 100644
--- a/x11/xscreensaver/patches/patch-aa
+++ b/x11/xscreensaver/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.23 2002/10/28 22:37:10 wiz Exp $
+$NetBSD: patch-aa,v 1.24 2006/07/18 18:40:36 wiz Exp $
 
---- config.guess.orig	Mon Sep  9 10:33:43 2002
+--- config.guess.orig	2005-07-13 15:44:55.000000000 +0000
 +++ config.guess
-@@ -402,6 +402,9 @@ EOF
+@@ -409,6 +409,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
      powerpc:machten:*:*)
  	echo powerpc-apple-machten${UNAME_RELEASE}
  	exit 0 ;;
diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab
index cd1d464da29..acf2f790883 100644
--- a/x11/xscreensaver/patches/patch-ab
+++ b/x11/xscreensaver/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.16 2006/05/21 23:31:14 jlam Exp $
+$NetBSD: patch-ab,v 1.17 2006/07/18 18:40:36 wiz Exp $
 
---- configure.in.orig	2005-06-04 15:50:54.000000000 -0400
+--- configure.in.orig	2006-05-23 22:07:00.000000000 +0000
 +++ configure.in
-@@ -1160,7 +1160,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PA
+@@ -1171,7 +1171,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PA
  		   generated code.])
  AC_SUBST(GETTEXT_PACKAGE)
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.16 2006/05/21 23:31:14 jlam Exp $
  AM_GLIB_GNU_GETTEXT
  MKINSTALLDIRS="$INSTALL_DIRS"
  
-@@ -1950,7 +1950,7 @@ if test "$enable_locking" = yes -a "$wit
+@@ -1937,7 +1937,7 @@ if test "$enable_locking" = yes -a "$wit
      # from Matt Knopp <mhat@infocalypse.netlag.com>
      # (who got it from amu@mit.edu)
  
diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
index e800f531818..2f866966493 100644
--- a/x11/xscreensaver/patches/patch-ac
+++ b/x11/xscreensaver/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.16 2006/05/21 23:31:14 jlam Exp $
+$NetBSD: patch-ac,v 1.17 2006/07/18 18:40:36 wiz Exp $
 
---- configure.orig	2005-06-22 21:02:21.000000000 -0400
+--- configure.orig	2006-05-23 23:01:32.000000000 +0000
 +++ configure
-@@ -2856,6 +2856,9 @@ echo "${ECHO_T}Turning on SGI compiler w
+@@ -2872,6 +2872,9 @@ echo "${ECHO_T}Turning on SGI compiler w
      esac
    fi
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.16 2006/05/21 23:31:14 jlam Exp $
  if test -n "$GCC"; then
     if test -n "$GCC"; then
     echo "$as_me:$LINENO: checking whether gcc accepts -std" >&5
-@@ -2902,6 +2905,7 @@ echo "${ECHO_T}Disabling C++ comments in
+@@ -2918,6 +2921,7 @@ echo "${ECHO_T}Disabling C++ comments in
       CC="$CC -Wp,-lang-c89"
     fi
    fi
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.16 2006/05/21 23:31:14 jlam Exp $
  
  if test -n "$GCC"; then
     if test -n "$GCC"; then
-@@ -7307,7 +7311,7 @@ _ACEOF
+@@ -7434,7 +7438,7 @@ _ACEOF
  
  
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.16 2006/05/21 23:31:14 jlam Exp $
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-@@ -12972,7 +12976,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
+@@ -13073,7 +13077,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.16 2006/05/21 23:31:14 jlam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13062,7 +13066,7 @@ echo "$as_me: WARNING: Cannot find compa
+@@ -13163,7 +13167,7 @@ echo "$as_me: WARNING: Cannot find compa
      # from Matt Knopp <mhat@infocalypse.netlag.com>
      # (who got it from amu@mit.edu)
  
@@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.16 2006/05/21 23:31:14 jlam Exp $
  
      # jwz: MacOS X uses -lkrb5, but not -lcrypt
  
-@@ -14699,11 +14703,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" >
+@@ -14800,11 +14804,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" >
    ac_gtk_config_libs=$ac_cv_gtk_config_libs
  
    GTK_EXTRA_OBJS=""
diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad
index 3d1946124b3..1c0ce6fb341 100644
--- a/x11/xscreensaver/patches/patch-ad
+++ b/x11/xscreensaver/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.19 2005/09/18 23:26:01 wiz Exp $
+$NetBSD: patch-ad,v 1.20 2006/07/18 18:40:36 wiz Exp $
 
---- driver/Makefile.in.orig	2005-06-23 01:02:23.000000000 +0000
+--- driver/Makefile.in.orig	2006-05-23 23:01:35.000000000 +0000
 +++ driver/Makefile.in
-@@ -222,7 +222,7 @@ HDRS		= XScreenSaver_ad.h XScreenSaver_X
- 		  xscreensaver.h prefs.h remote.h \
+@@ -226,7 +226,7 @@ HDRS		= XScreenSaver_ad.h XScreenSaver_X
+ 		  xscreensaver.h prefs.h remote.h exec.h \
  		  demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
  		  demo-Gtk-conf.h
 -MEN_1		= xscreensaver.man xscreensaver-demo.man \
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.19 2005/09/18 23:26:01 wiz Exp $
  		  xscreensaver-command.man \
  		  xscreensaver-text.man \
  		  xscreensaver-getimage.man \
-@@ -253,7 +253,7 @@ all: $(EXES) $(EXES2)
+@@ -257,7 +257,7 @@ all: $(EXES) $(EXES2)
  tests: $(TEST_EXES)
  
  install:   install-program   install-ad    install-scripts \
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.19 2005/09/18 23:26:01 wiz Exp $
  uninstall: uninstall-program uninstall-ad  \
  	   uninstall-gnome   uninstall-man uninstall-xml  
  
-@@ -288,7 +288,7 @@ install-program: $(EXES)
+@@ -292,7 +292,7 @@ install-program: $(EXES)
  	fi ;								      \
  	echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ;    \
  	$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.19 2005/09/18 23:26:01 wiz Exp $
  		    xscreensaver-getimage @EXES_OSX@ ; do	           \
  	  echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
  	       $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
-@@ -482,7 +482,7 @@ install-pam:
+@@ -489,7 +489,7 @@ install-pam:
  
  # screensaver-properties.desktop
  # into /usr/share/applications/
@@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.19 2005/09/18 23:26:01 wiz Exp $
  	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
  	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
  	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
-@@ -514,7 +514,7 @@ install-gnome:: $(LOGO)
+@@ -521,7 +521,7 @@ install-gnome:: $(LOGO)
  # ../utils/images/screensaver-*.png
  # into /usr/share/xscreensaver/glade/
  install-gnome::
@@ -47,7 +47,7 @@ $NetBSD: patch-ad,v 1.19 2005/09/18 23:26:01 wiz Exp $
             if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then               \
               echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"         ;\
                    $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"         ;\
-@@ -531,7 +531,7 @@ install-gnome::
+@@ -538,7 +538,7 @@ install-gnome::
  # xscreensaver-demo.glade2
  # into /usr/share/xscreensaver/glade/
  install-gnome:: xscreensaver-demo.glade2
diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af
index b16cba1ab0c..f91d70dee1f 100644
--- a/x11/xscreensaver/patches/patch-af
+++ b/x11/xscreensaver/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.13 2003/12/18 13:49:17 atatat Exp $
+$NetBSD: patch-af,v 1.14 2006/07/18 18:40:36 wiz Exp $
 
 Make the password dialogue banner display the netbsd PKGREVISION
 number, if there was one.
 
---- driver/xscreensaver.c.orig	2003-10-07 04:59:40.000000000 -0400
+--- driver/xscreensaver.c.orig	2006-05-17 23:35:54.000000000 +0000
 +++ driver/xscreensaver.c
-@@ -478,9 +478,13 @@ set_version_string (saver_info *si, int 
+@@ -448,9 +448,13 @@ set_version_string (saver_info *si, int 
        *s = '_';
    }
  
diff --git a/x11/xscreensaver/patches/patch-ah b/x11/xscreensaver/patches/patch-ah
deleted file mode 100644
index 84e532bbb6e..00000000000
--- a/x11/xscreensaver/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2005/07/12 09:43:06 wiz Exp $
-
---- po/de.po.orig	2005-07-12 11:22:29.000000000 +0200
-+++ po/de.po
-@@ -1764,7 +1764,7 @@ msgstr "Schimmerndes Wasser"
- msgid "Shy"
- msgstr "Zurückhaltend"
- 
--# CHECK - unklar, ob's überall passt
-+# CHECK - unklar, ob's überall passt
- #: hacks/config/atlantis.xml.h:14 hacks/config/cage.xml.h:5
- #: hacks/config/extrusion.xml.h:12 hacks/config/gears.xml.h:8
- #: hacks/config/glblur.xml.h:15 hacks/config/glplanet.xml.h:9
diff --git a/x11/xscreensaver/patches/patch-ai b/x11/xscreensaver/patches/patch-ai
deleted file mode 100644
index c0782734865..00000000000
--- a/x11/xscreensaver/patches/patch-ai
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/07/17 17:39:57 kristerw Exp $
-
---- hacks/glx/antmaze.c.orig	Sun Jul 17 19:21:59 2005
-+++ hacks/glx/antmaze.c	Sun Jul 17 19:28:25 2005
-@@ -975,6 +975,7 @@
- 
-   /* fade out */
-   if(fadeoutspeed < -0.00001) {
-+    GLfloat df[4];
- 
-     if(fadeout <= 0.0) {
-       /* switch boards: rebuild old board, increment current */
-@@ -985,20 +986,27 @@
-     
-     fadeout += fadeoutspeed;
- 
--    GLfloat df[4] = {0.8*fadeout, 0.8*fadeout, 0.8*fadeout, 1.0};
-+    df[0] = 0.8*fadeout;
-+    df[1] = 0.8*fadeout;
-+    df[2] = 0.8*fadeout;
-+    df[3] = 1.0;
-     glLightfv(GL_LIGHT0, GL_DIFFUSE, df);
-     glLightfv(GL_LIGHT1, GL_DIFFUSE, df);
-   }
- 
-   /* fade in */
-   if(fadeoutspeed > 0.0001) {
-+    GLfloat df[4];
-     fadeout += fadeoutspeed;
-     if(fadeout >= 1.0) {
-       fadeout = 1.0;
-       fadeoutspeed = 0.0;
-       entroducing = 12;
-     }
--    GLfloat df[4] = {0.8*fadeout, 0.8*fadeout, 0.8*fadeout, 1.0};
-+    df[0] = 0.8*fadeout;
-+    df[1] = 0.8*fadeout; 
-+    df[2] = 0.8*fadeout; 
-+    df[3] = 1.0;
-     glLightfv(GL_LIGHT0, GL_DIFFUSE, df);
-     glLightfv(GL_LIGHT1, GL_DIFFUSE, df);    
-   }
-@@ -1159,7 +1167,7 @@
-       /* difference */
-       double dx = antpath[i][part[i]][0] - antposition[i][0];
-       double dz = - antpath[i][part[i]][1] + antposition[i][1];
--      double theta, ideal;
-+      double theta, ideal, dt;
- 
-       if(dz > EPSILON)
- 	theta = atan(dz/dx);
-@@ -1171,7 +1179,7 @@
- 	ideal += Pi;
- 
-       /* compute correction */
--      double dt = sign(ideal) * min(fabs(ideal), PI/90.0);
-+      dt = sign(ideal) * min(fabs(ideal), PI/90.0);
-       antdirection[i] += dt;
-       if(antdirection[i] > 2.0*PI)
- 	antdirection[i] = 0.0;