Update x11/xscreensaver to 5.29.

From the changelog:

5.29    * Downgraded to Xcode 5.0.2 to make it possible to build savers
          that will still run on 10.6 and 10.7.  Sigh.
        * Updated `webcollage' for recent changes.

5.28    * Fixed some compilation problems and intermittent crashes.
        * Turned off the OSX 10.6 enable_gc hack. It didn't work.

5.27    * New hacks, `tessellimage' and `projectiveplane'.
        * Added support for pthreads, because Dave Odell is a madman.
        * Updated `webcollage' for recent changes.
        * Minor iOS tweaks to the `analogtv' hacks.
        * X11: Don't assume Suspend = 0 implies "No DPMS".
        * Minor updates to `boxed' and `klein'.
        * Fixed possible crash in `apple2', `noseguy', `xmatrix', `shadebobs'.
        * Fixed possible crash in OSX preferences.
        * OSX Performance improvements.
        * Plugged some leaks.

5.26    * More auto-updater tweaks.

5.25    * Try harder to bypass Quarrantine and Gatekeeper in OSX installer.
        * Some files were missing from the tarball.

5.24    * Added "Automatically check for updates" option on OSX.
        * Updated feed-loading for recent Flickr changes.
        * Updated `webcollage' for recent Google changes.
        * Added Instagram and Bing as `webcollage' image sources.
        * Updated to latest autoconf.
        * Bug fixes.

5.23    * New hack, `geodesic'.
        * iOS and OSX: huge XCopyArea performance improvements.
        * More heuristics for using RSS feeds as image sources.
        * Improved Wikipedia parser.
        * Updated `webcollage' for recent Flickr changes.
        * Added Android to `bsod'.
        * OSX: Added a real installer.
        * iOS and OSX: fixed a font-metrics bug.
        * iOS: Fixed aspect ratio bug in non-rotating apps when launched in
          landscape mode.
        * Made `quasicrystal' work on weak graphics cards.
        * iOS: fixed `ifs'.
        * Better compression on icons, plists and XML files: smaller
          distribution and installation footprint.
        * Reverted that DEACTIVATE change. Bad idea.
        * `Phosphor' now supports amber as well as green.

8 files changed, 355 insertions, 37 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index c3b39898ba9..5f19551e38d 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2014/05/29 23:38:20 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2014/08/12 15:57:13 hauke Exp $
 
 COMMENT=	Screen saver and locker for the X window system
 
@@ -8,10 +8,10 @@ CONFLICTS+=	xscreensaver-gnome<4.14
 .include "options.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-PKGREVISION=	1
+#PKGREVISION=	1
 
 CONFIGURE_ARGS+=	--without-gtk
-CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_PREFIX.libxml2}
+#CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-configdir=${PREFIX}/libexec/xscreensaver/config
 
 EGDIR=			${PREFIX}/share/examples/xscreensaver
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index ace572654ad..72ecd61d9ed 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.113 2013/07/22 14:24:17 drochner Exp $
+# $NetBSD: Makefile.common,v 1.114 2014/08/12 15:57:13 hauke Exp $
 #
 # used by x11/xscreensaver/Makefile
 # used by x11/xscreensaver-demo/Makefile
@@ -6,7 +6,7 @@
 # When updating the package,
 # please check kdeartwork3 -- it installs some extra
 # files depending on which screensavers it finds.
-DISTNAME=		xscreensaver-5.22
+DISTNAME=		xscreensaver-5.29
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE}
 
@@ -22,9 +22,10 @@ USE_TOOLS+=		msgfmt perl
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-hackdir=${PREFIX}/libexec/xscreensaver
 CONFIGURE_ARGS+=	--with-jpeg=${JPEGBASE}
-CONFIGURE_ARGS+=	--with-zippy=/usr/games/fortune
+#CONFIGURE_ARGS+=	--with-zippy=/usr/games/fortune
 
 CONFIGURE_ARGS+=	--without-motif
+CONFIGURE_ARGS+=	--with-pthread
 
 CONFIGURE_ENV+=		ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
 CONFIGURE_ENV+=		ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
@@ -70,5 +71,6 @@ INSTALL_MAKE_FLAGS=	install_prefix=${DESTDIR}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index 4e8e5dc881b..7c5e6173055 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,52 +1,89 @@
-@comment $NetBSD: PLIST,v 1.39 2013/07/22 14:24:17 drochner Exp $
+@comment $NetBSD: PLIST,v 1.40 2014/08/12 15:57:14 hauke Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
 bin/xscreensaver-getimage-file
 bin/xscreensaver-getimage-video
+bin/xscreensaver-gl-helper
 bin/xscreensaver-text
 lib/X11/app-defaults/XScreenSaver
 libexec/xscreensaver/abstractile
 libexec/xscreensaver/anemone
 libexec/xscreensaver/anemotaxis
+libexec/xscreensaver/antinspect
+libexec/xscreensaver/antmaze
+libexec/xscreensaver/antspotlight
 libexec/xscreensaver/apollonian
 libexec/xscreensaver/apple2
+libexec/xscreensaver/atlantis
 libexec/xscreensaver/attraction
+libexec/xscreensaver/atunnel
 libexec/xscreensaver/barcode
 libexec/xscreensaver/blaster
+libexec/xscreensaver/blinkbox
 libexec/xscreensaver/blitspin
+libexec/xscreensaver/blocktube
+libexec/xscreensaver/boing
 libexec/xscreensaver/bouboule
+libexec/xscreensaver/bouncingcow
+libexec/xscreensaver/boxed
 libexec/xscreensaver/boxfit
 libexec/xscreensaver/braid
 libexec/xscreensaver/bsod
+libexec/xscreensaver/bubble3d
 libexec/xscreensaver/bumps
+libexec/xscreensaver/cage
+libexec/xscreensaver/carousel
 libexec/xscreensaver/ccurve
 libexec/xscreensaver/celtic
+libexec/xscreensaver/circuit
 libexec/xscreensaver/cloudlife
+libexec/xscreensaver/companioncube
 libexec/xscreensaver/compass
 libexec/xscreensaver/config/README
 libexec/xscreensaver/config/abstractile.xml
 libexec/xscreensaver/config/anemone.xml
 libexec/xscreensaver/config/anemotaxis.xml
+libexec/xscreensaver/config/antinspect.xml
+libexec/xscreensaver/config/antmaze.xml
+libexec/xscreensaver/config/antspotlight.xml
 libexec/xscreensaver/config/apollonian.xml
 libexec/xscreensaver/config/apple2.xml
+libexec/xscreensaver/config/atlantis.xml
 libexec/xscreensaver/config/attraction.xml
+libexec/xscreensaver/config/atunnel.xml
 libexec/xscreensaver/config/barcode.xml
 libexec/xscreensaver/config/blaster.xml
+libexec/xscreensaver/config/blinkbox.xml
 libexec/xscreensaver/config/blitspin.xml
+libexec/xscreensaver/config/blocktube.xml
+libexec/xscreensaver/config/boing.xml
 libexec/xscreensaver/config/bouboule.xml
+libexec/xscreensaver/config/bouncingcow.xml
+libexec/xscreensaver/config/boxed.xml
 libexec/xscreensaver/config/boxfit.xml
 libexec/xscreensaver/config/braid.xml
 libexec/xscreensaver/config/bsod.xml
+libexec/xscreensaver/config/bubble3d.xml
 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/companioncube.xml
 libexec/xscreensaver/config/compass.xml
 libexec/xscreensaver/config/coral.xml
+libexec/xscreensaver/config/crackberg.xml
 libexec/xscreensaver/config/crystal.xml
+libexec/xscreensaver/config/cube21.xml
+libexec/xscreensaver/config/cubenetic.xml
+libexec/xscreensaver/config/cubestorm.xml
+libexec/xscreensaver/config/cubicgrid.xml
 libexec/xscreensaver/config/cwaves.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
@@ -54,18 +91,40 @@ libexec/xscreensaver/config/demon.xml
 libexec/xscreensaver/config/discrete.xml
 libexec/xscreensaver/config/distort.xml
 libexec/xscreensaver/config/drift.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
 libexec/xscreensaver/config/fiberlamp.xml
 libexec/xscreensaver/config/fireworkx.xml
 libexec/xscreensaver/config/flame.xml
+libexec/xscreensaver/config/flipflop.xml
+libexec/xscreensaver/config/flipscreen3d.xml
+libexec/xscreensaver/config/fliptext.xml
 libexec/xscreensaver/config/flow.xml
 libexec/xscreensaver/config/fluidballs.xml
+libexec/xscreensaver/config/flurry.xml
+libexec/xscreensaver/config/flyingtoasters.xml
 libexec/xscreensaver/config/fontglide.xml
 libexec/xscreensaver/config/fuzzyflakes.xml
 libexec/xscreensaver/config/galaxy.xml
+libexec/xscreensaver/config/gears.xml
+libexec/xscreensaver/config/geodesic.xml
+libexec/xscreensaver/config/gflux.xml
+libexec/xscreensaver/config/glblur.xml
+libexec/xscreensaver/config/glcells.xml
+libexec/xscreensaver/config/gleidescope.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/goop.xml
 libexec/xscreensaver/config/grav.xml
 libexec/xscreensaver/config/greynetic.xml
@@ -73,26 +132,44 @@ libexec/xscreensaver/config/halftone.xml
 libexec/xscreensaver/config/halo.xml
 libexec/xscreensaver/config/helix.xml
 libexec/xscreensaver/config/hexadrop.xml
+libexec/xscreensaver/config/hilbert.xml
 libexec/xscreensaver/config/hopalong.xml
+libexec/xscreensaver/config/hypertorus.xml
+libexec/xscreensaver/config/hypnowheel.xml
 libexec/xscreensaver/config/ifs.xml
 libexec/xscreensaver/config/imsmap.xml
 libexec/xscreensaver/config/interaggregate.xml
 libexec/xscreensaver/config/interference.xml
 libexec/xscreensaver/config/intermomentary.xml
+libexec/xscreensaver/config/jigglypuff.xml
+libexec/xscreensaver/config/jigsaw.xml
+libexec/xscreensaver/config/juggler3d.xml
 libexec/xscreensaver/config/julia.xml
 libexec/xscreensaver/config/kaleidescope.xml
+libexec/xscreensaver/config/kaleidocycle.xml
+libexec/xscreensaver/config/klein.xml
 libexec/xscreensaver/config/kumppa.xml
+libexec/xscreensaver/config/lament.xml
+libexec/xscreensaver/config/lavalite.xml
 libexec/xscreensaver/config/lcdscrub.xml
+libexec/xscreensaver/config/lockward.xml
 libexec/xscreensaver/config/loop.xml
 libexec/xscreensaver/config/m6502.xml
 libexec/xscreensaver/config/maze.xml
 libexec/xscreensaver/config/memscroller.xml
+libexec/xscreensaver/config/menger.xml
 libexec/xscreensaver/config/metaballs.xml
+libexec/xscreensaver/config/mirrorblob.xml
+libexec/xscreensaver/config/moebius.xml
+libexec/xscreensaver/config/moebiusgears.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/noof.xml
 libexec/xscreensaver/config/noseguy.xml
 libexec/xscreensaver/config/pacman.xml
 libexec/xscreensaver/config/pedal.xml
@@ -100,34 +177,64 @@ libexec/xscreensaver/config/penetrate.xml
 libexec/xscreensaver/config/penrose.xml
 libexec/xscreensaver/config/petri.xml
 libexec/xscreensaver/config/phosphor.xml
+libexec/xscreensaver/config/photopile.xml
 libexec/xscreensaver/config/piecewise.xml
+libexec/xscreensaver/config/pinion.xml
+libexec/xscreensaver/config/pipes.xml
+libexec/xscreensaver/config/polyhedra.xml
 libexec/xscreensaver/config/polyominoes.xml
+libexec/xscreensaver/config/polytopes.xml
 libexec/xscreensaver/config/pong.xml
 libexec/xscreensaver/config/popsquares.xml
+libexec/xscreensaver/config/projectiveplane.xml
+libexec/xscreensaver/config/providence.xml
+libexec/xscreensaver/config/pulsar.xml
 libexec/xscreensaver/config/pyro.xml
 libexec/xscreensaver/config/qix.xml
+libexec/xscreensaver/config/quasicrystal.xml
+libexec/xscreensaver/config/queens.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/rotzoomer.xml
+libexec/xscreensaver/config/rubik.xml
+libexec/xscreensaver/config/rubikblocks.xml
+libexec/xscreensaver/config/sballs.xml
 libexec/xscreensaver/config/shadebobs.xml
 libexec/xscreensaver/config/sierpinski.xml
+libexec/xscreensaver/config/sierpinski3d.xml
+libexec/xscreensaver/config/skytentacles.xml
 libexec/xscreensaver/config/slidescreen.xml
 libexec/xscreensaver/config/slip.xml
+libexec/xscreensaver/config/sonar.xml
 libexec/xscreensaver/config/speedmine.xml
+libexec/xscreensaver/config/spheremonics.xml
 libexec/xscreensaver/config/spotlight.xml
+libexec/xscreensaver/config/sproingies.xml
 libexec/xscreensaver/config/squiral.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/substrate.xml
+libexec/xscreensaver/config/superquadrics.xml
+libexec/xscreensaver/config/surfaces.xml
 libexec/xscreensaver/config/swirl.xml
+libexec/xscreensaver/config/tangram.xml
+libexec/xscreensaver/config/tessellimage.xml
 libexec/xscreensaver/config/thornbird.xml
+libexec/xscreensaver/config/timetunnel.xml
+libexec/xscreensaver/config/topblock.xml
 libexec/xscreensaver/config/triangle.xml
+libexec/xscreensaver/config/tronbit.xml
 libexec/xscreensaver/config/truchet.xml
 libexec/xscreensaver/config/twang.xml
+libexec/xscreensaver/config/unknownpleasures.xml
 libexec/xscreensaver/config/vermiculate.xml
 libexec/xscreensaver/config/vidwhacker.xml
+libexec/xscreensaver/config/voronoi.xml
 libexec/xscreensaver/config/wander.xml
 libexec/xscreensaver/config/whirlwindwarp.xml
 libexec/xscreensaver/config/wormhole.xml
@@ -140,9 +247,15 @@ libexec/xscreensaver/config/xrayswarm.xml
 libexec/xscreensaver/config/xspirograph.xml
 libexec/xscreensaver/config/zoom.xml
 libexec/xscreensaver/coral
+libexec/xscreensaver/crackberg
 libexec/xscreensaver/crystal
+libexec/xscreensaver/cube21
+libexec/xscreensaver/cubenetic
+libexec/xscreensaver/cubestorm
+libexec/xscreensaver/cubicgrid
 libexec/xscreensaver/cwaves
 libexec/xscreensaver/cynosure
+libexec/xscreensaver/dangerball
 libexec/xscreensaver/decayscreen
 libexec/xscreensaver/deco
 libexec/xscreensaver/deluxe
@@ -150,18 +263,40 @@ libexec/xscreensaver/demon
 libexec/xscreensaver/discrete
 libexec/xscreensaver/distort
 libexec/xscreensaver/drift
+libexec/xscreensaver/endgame
+libexec/xscreensaver/engine
 libexec/xscreensaver/epicycle
 libexec/xscreensaver/eruption
 libexec/xscreensaver/euler2d
+libexec/xscreensaver/extrusion
 libexec/xscreensaver/fadeplot
 libexec/xscreensaver/fiberlamp
 libexec/xscreensaver/fireworkx
 libexec/xscreensaver/flame
+libexec/xscreensaver/flipflop
+libexec/xscreensaver/flipscreen3d
+libexec/xscreensaver/fliptext
 libexec/xscreensaver/flow
 libexec/xscreensaver/fluidballs
+libexec/xscreensaver/flurry
+libexec/xscreensaver/flyingtoasters
 libexec/xscreensaver/fontglide
 libexec/xscreensaver/fuzzyflakes
 libexec/xscreensaver/galaxy
+libexec/xscreensaver/gears
+libexec/xscreensaver/geodesic
+libexec/xscreensaver/gflux
+libexec/xscreensaver/glblur
+libexec/xscreensaver/glcells
+libexec/xscreensaver/gleidescope
+libexec/xscreensaver/glhanoi
+libexec/xscreensaver/glknots
+libexec/xscreensaver/glmatrix
+libexec/xscreensaver/glplanet
+libexec/xscreensaver/glschool
+libexec/xscreensaver/glslideshow
+libexec/xscreensaver/glsnake
+libexec/xscreensaver/gltext
 libexec/xscreensaver/goop
 libexec/xscreensaver/grav
 libexec/xscreensaver/greynetic
@@ -169,27 +304,45 @@ libexec/xscreensaver/halftone
 libexec/xscreensaver/halo
 libexec/xscreensaver/helix
 libexec/xscreensaver/hexadrop
+libexec/xscreensaver/hilbert
 libexec/xscreensaver/hopalong
+libexec/xscreensaver/hypertorus
+libexec/xscreensaver/hypnowheel
 libexec/xscreensaver/ifs
 libexec/xscreensaver/imsmap
 libexec/xscreensaver/interaggregate
 libexec/xscreensaver/interference
 libexec/xscreensaver/intermomentary
+libexec/xscreensaver/jigglypuff
+libexec/xscreensaver/jigsaw
+libexec/xscreensaver/juggler3d
 libexec/xscreensaver/julia
 libexec/xscreensaver/kaleidescope
+libexec/xscreensaver/kaleidocycle
+libexec/xscreensaver/klein
 libexec/xscreensaver/kumppa
+libexec/xscreensaver/lament
+libexec/xscreensaver/lavalite
 libexec/xscreensaver/lcdscrub
 libexec/xscreensaver/ljlatest
+libexec/xscreensaver/lockward
 libexec/xscreensaver/loop
 libexec/xscreensaver/m6502
 libexec/xscreensaver/maze
 libexec/xscreensaver/memscroller
+libexec/xscreensaver/menger
 libexec/xscreensaver/metaballs
+libexec/xscreensaver/mirrorblob
+libexec/xscreensaver/moebius
+libexec/xscreensaver/moebiusgears
 libexec/xscreensaver/moire
 libexec/xscreensaver/moire2
+libexec/xscreensaver/molecule
+libexec/xscreensaver/morph3d
 libexec/xscreensaver/mountain
 libexec/xscreensaver/munch
 libexec/xscreensaver/nerverot
+libexec/xscreensaver/noof
 libexec/xscreensaver/noseguy
 libexec/xscreensaver/pacman
 libexec/xscreensaver/pedal
@@ -197,34 +350,64 @@ libexec/xscreensaver/penetrate
 libexec/xscreensaver/penrose
 libexec/xscreensaver/petri
 libexec/xscreensaver/phosphor
+libexec/xscreensaver/photopile
 libexec/xscreensaver/piecewise
+libexec/xscreensaver/pinion
+libexec/xscreensaver/pipes
+libexec/xscreensaver/polyhedra
 libexec/xscreensaver/polyominoes
+libexec/xscreensaver/polytopes
 libexec/xscreensaver/pong
 libexec/xscreensaver/popsquares
+libexec/xscreensaver/projectiveplane
+libexec/xscreensaver/providence
+libexec/xscreensaver/pulsar
 libexec/xscreensaver/pyro
 libexec/xscreensaver/qix
+libexec/xscreensaver/quasicrystal
+libexec/xscreensaver/queens
 libexec/xscreensaver/rd-bomb
 libexec/xscreensaver/ripples
 libexec/xscreensaver/rocks
 libexec/xscreensaver/rorschach
 libexec/xscreensaver/rotzoomer
+libexec/xscreensaver/rubik
+libexec/xscreensaver/rubikblocks
+libexec/xscreensaver/sballs
 libexec/xscreensaver/shadebobs
 libexec/xscreensaver/sierpinski
+libexec/xscreensaver/sierpinski3d
+libexec/xscreensaver/skytentacles
 libexec/xscreensaver/slidescreen
 libexec/xscreensaver/slip
+libexec/xscreensaver/sonar
 libexec/xscreensaver/speedmine
+libexec/xscreensaver/spheremonics
 libexec/xscreensaver/spotlight
+libexec/xscreensaver/sproingies
 libexec/xscreensaver/squiral
+libexec/xscreensaver/stairs
 libexec/xscreensaver/starfish
+libexec/xscreensaver/starwars
+libexec/xscreensaver/stonerview
 libexec/xscreensaver/strange
 libexec/xscreensaver/substrate
+libexec/xscreensaver/superquadrics
+libexec/xscreensaver/surfaces
 libexec/xscreensaver/swirl
+libexec/xscreensaver/tangram
+libexec/xscreensaver/tessellimage
 libexec/xscreensaver/thornbird
+libexec/xscreensaver/timetunnel
+libexec/xscreensaver/topblock
 libexec/xscreensaver/triangle
+libexec/xscreensaver/tronbit
 libexec/xscreensaver/truchet
 libexec/xscreensaver/twang
+libexec/xscreensaver/unknownpleasures
 libexec/xscreensaver/vermiculate
 libexec/xscreensaver/vidwhacker
+libexec/xscreensaver/voronoi
 libexec/xscreensaver/wander
 libexec/xscreensaver/whirlwindwarp
 libexec/xscreensaver/wormhole
@@ -245,25 +428,46 @@ man/man1/xscreensaver.1
 man/man6/abstractile.6
 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/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/companioncube.6
 man/man6/compass.6
 man/man6/coral.6
+man/man6/crackberg.6
 man/man6/crystal.6
+man/man6/cube21.6
+man/man6/cubenetic.6
+man/man6/cubestorm.6
+man/man6/cubicgrid.6
 man/man6/cwaves.6
 man/man6/cynosure.6
+man/man6/dangerball.6
 man/man6/decayscreen.6
 man/man6/deco.6
 man/man6/deluxe.6
@@ -271,18 +475,40 @@ 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/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/fuzzyflakes.6
 man/man6/galaxy.6
+man/man6/gears.6
+man/man6/geodesic.6
+man/man6/gflux.6
+man/man6/glblur.6
+man/man6/glcells.6
+man/man6/gleidescope.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
@@ -290,26 +516,44 @@ man/man6/halftone.6
 man/man6/halo.6
 man/man6/helix.6
 man/man6/hexadrop.6
+man/man6/hilbert.6
 man/man6/hopalong.6
+man/man6/hypertorus.6
+man/man6/hypnowheel.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/juggler3d.6
 man/man6/julia.6
 man/man6/kaleidescope.6
+man/man6/kaleidocycle.6
+man/man6/klein.6
 man/man6/kumppa.6
+man/man6/lament.6
+man/man6/lavalite.6
 man/man6/lcdscrub.6
 man/man6/ljlatest.6
+man/man6/lockward.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/moebius.6
+man/man6/moebiusgears.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
@@ -317,33 +561,63 @@ man/man6/penetrate.6
 man/man6/penrose.6
 man/man6/petri.6
 man/man6/phosphor.6
+man/man6/photopile.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/projectiveplane.6
+man/man6/providence.6
+man/man6/pulsar.6
 man/man6/pyro.6
 man/man6/qix.6
+man/man6/quasicrystal.6
+man/man6/queens.6
 man/man6/rd-bomb.6
 man/man6/ripples.6
 man/man6/rocks.6
 man/man6/rorschach.6
 man/man6/rotzoomer.6
+man/man6/rubik.6
+man/man6/rubikblocks.6
+man/man6/sballs.6
 man/man6/shadebobs.6
 man/man6/sierpinski.6
+man/man6/sierpinski3d.6
+man/man6/skytentacles.6
 man/man6/slidescreen.6
 man/man6/slip.6
+man/man6/sonar.6
 man/man6/speedmine.6
+man/man6/spheremonics.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/surfaces.6
 man/man6/swirl.6
+man/man6/tangram.6
+man/man6/tessellimage.6
 man/man6/thornbird.6
+man/man6/timetunnel.6
+man/man6/topblock.6
 man/man6/triangle.6
+man/man6/tronbit.6
 man/man6/truchet.6
 man/man6/twang.6
+man/man6/unknownpleasures.6
 man/man6/vermiculate.6
 man/man6/vidwhacker.6
+man/man6/voronoi.6
 man/man6/wander.6
 man/man6/whirlwindwarp.6
 man/man6/wormhole.6
@@ -353,6 +627,7 @@ 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/zoom.6
 share/examples/xscreensaver/pam.d/xscreensaver-NetBSD
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 2abc143ad56..37746588c04 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,16 +1,18 @@
-$NetBSD: distinfo,v 1.65 2013/11/11 13:07:23 obache Exp $
+$NetBSD: distinfo,v 1.66 2014/08/12 15:57:14 hauke Exp $
 
-SHA1 (xscreensaver-5.22.tar.gz) = b1d7f97d9b60d9c68c0f3e019cad885f5c7bd6ec
-RMD160 (xscreensaver-5.22.tar.gz) = b05b7ed5fd4a6ef2ca770ff4784c6ea54435dd6b
-Size (xscreensaver-5.22.tar.gz) = 7411666 bytes
+SHA1 (xscreensaver-5.29.tar.gz) = a27a10c6eed024c458e927ee0dc1e6cb306d3335
+RMD160 (xscreensaver-5.29.tar.gz) = fcd526611e9ad25c329458682c4cec31612724b9
+Size (xscreensaver-5.29.tar.gz) = 8774562 bytes
 SHA1 (patch-Makefile.in) = 34d363c48cc2ef28edb158fce3c8830b56ad1be6
 SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979
 SHA1 (patch-ab) = a5c15ee8c0427ed5feae6196a11a6d84ba58b5c7
-SHA1 (patch-ac) = 3bd2652cb0eabaffe4494e9aca8fe2df9f9e0388
-SHA1 (patch-ad) = 45f739d70e2b4d96f491aa35ded3c9edfb745e18
+SHA1 (patch-ac) = 5788371702f6db3db39e1795d3a6350fd8fb21ff
+SHA1 (patch-ad) = 33e41981d9b703dcec0df9f238a5e440d1401dff
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
 SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5
 SHA1 (patch-aj) = dd88d037ae3c73f33512ab24714afe8ea5756a29
 SHA1 (patch-ak) = e296e59bec9a11ddab8412751e91395b869686d1
 SHA1 (patch-al) = 0c1ceba4bea29026298d1d1903f32f2a14958c8a
+SHA1 (patch-hacks_Makefile.in) = 204bea1a7d9e5396397d6d7acf8ac7733e10dc6e
+SHA1 (patch-hacks_memscroller.c) = eff919398127266c906f0ebd7d22872ca2699874
diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
index f73605a120b..ad2be5051d4 100644
--- a/x11/xscreensaver/patches/patch-ac
+++ b/x11/xscreensaver/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.23 2010/05/17 16:35:03 drochner Exp $
+$NetBSD: patch-ac,v 1.24 2014/08/12 15:57:14 hauke Exp $
 
---- configure.orig	2010-04-13 20:37:06.000000000 +0000
+--- configure.orig	2014-06-08 21:43:53.000000000 +0000
 +++ configure
-@@ -3651,6 +3651,9 @@ $as_echo "$ac_cv_gcc_accepts_no_cpp_prec
+@@ -4408,6 +4408,9 @@ $as_echo "$ac_cv_gcc_accepts_no_cpp_prec
     ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp"
    fi
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.23 2010/05/17 16:35:03 drochner Exp $
  if test -n "$GCC"; then
  
    case "$host" in
-@@ -3711,6 +3714,7 @@ $as_echo "Disabling C++ comments in ANSI
+@@ -4468,6 +4471,7 @@ $as_echo "Disabling C++ comments in ANSI
  #     CC="$CC -Wp,-lang-c89"
     fi
    fi
@@ -20,25 +20,25 @@ $NetBSD: patch-ac,v 1.23 2010/05/17 16:35:03 drochner Exp $
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -8329,7 +8333,7 @@ _ACEOF
+@@ -7568,7 +7572,7 @@ _ACEOF
  
  
  
 -ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
 +ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt ru sk sv vi wa zh_CN zh_TW"
- 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
-@@ -14227,7 +14231,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
+ 
+    for ac_header in locale.h
+ do :
+@@ -10793,7 +10797,7 @@ if ${ac_cv_lib_krb4_krb_get_tf_realm+:} 
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lkrb4  $LIBS"
-+LIBS="-lkrb -lcrypto -lroken -lcom_err  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -14318,7 +14322,7 @@ $as_echo "$as_me: WARNING: Cannot find c
++LIBS="-lkrb4 -lcrypto -lroken -lcom_err $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -10851,7 +10855,7 @@ $as_echo "$as_me: WARNING: Cannot find c
      # from Matt Knopp <mhat@infocalypse.netlag.com>
      # (who got it from amu@mit.edu)
  
@@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.23 2010/05/17 16:35:03 drochner Exp $
  
      # jwz: MacOS X uses -lkrb5, but not -lcrypt
  
-@@ -15524,7 +15528,7 @@ fi
+@@ -11612,7 +11616,7 @@ fi
  #
  if test "$enable_locking" = yes ; then
    case "$host" in
@@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.23 2010/05/17 16:35:03 drochner Exp $
        need_setuid=yes
      ;;
    esac
-@@ -15958,11 +15962,7 @@ $as_echo "$ac_cv_gtk_config_libs" >&6; }
+@@ -12131,11 +12135,7 @@ $as_echo "$ac_cv_gtk_config_libs" >&6; }
    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 5cecffef408..7bfab01ec2f 100644
--- a/x11/xscreensaver/patches/patch-ad
+++ b/x11/xscreensaver/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.22 2010/11/29 18:04:35 drochner Exp $
+$NetBSD: patch-ad,v 1.23 2014/08/12 15:57:14 hauke Exp $
 
---- driver/Makefile.in.orig	2010-09-15 10:10:53.000000000 +0000
+--- driver/Makefile.in.orig	2014-06-08 21:43:53.000000000 +0000
 +++ driver/Makefile.in
-@@ -207,7 +207,7 @@ PDF2JPEG_LIBS	= -framework Cocoa
+@@ -205,7 +205,7 @@ PDF2JPEG_LIBS	= -framework Cocoa
  SAVER_LIBS	= $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
  		  $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
  		  -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
@@ -11,16 +11,16 @@ $NetBSD: patch-ad,v 1.22 2010/11/29 18:04:35 drochner Exp $
  
  CMD_LIBS	= $(LIBS) $(X_LIBS) \
  		  $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
-@@ -229,7 +229,7 @@ HDRS		= XScreenSaver_ad.h XScreenSaver_X
+@@ -226,7 +226,7 @@ SCRIPTS		= $(SCRIPTS_1) @SCRIPTS_OSX@
+ HDRS		= XScreenSaver_ad.h XScreenSaver_Xm_ad.h \
  		  xscreensaver.h prefs.h remote.h exec.h \
- 		  demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
  		  demo-Gtk-conf.h auth.h mlstring.h types.h
 -MEN_1		= xscreensaver.man xscreensaver-demo.man \
 +MEN_1		= xscreensaver.man \
  		  xscreensaver-command.man \
  		  xscreensaver-text.man \
  		  xscreensaver-getimage.man \
-@@ -260,7 +260,7 @@ all: $(EXES) $(EXES2)
+@@ -257,7 +257,7 @@ all: $(EXES) $(EXES2)
  tests: $(TEST_EXES)
  
  install:   install-program   install-ad    install-scripts \
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.22 2010/11/29 18:04:35 drochner Exp $
  uninstall: uninstall-program uninstall-ad  \
  	   uninstall-gnome   uninstall-man uninstall-xml  
  
-@@ -295,7 +295,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
@@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.22 2010/11/29 18:04:35 drochner Exp $
  		    xscreensaver-getimage @EXES_OSX@ ; do	           \
  	  echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
  	       $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
-@@ -494,7 +494,7 @@ install-pam:
+@@ -491,7 +491,7 @@ install-pam: xscreensaver.pam
  
  # screensaver-properties.desktop
  # into /usr/share/applications/
diff --git a/x11/xscreensaver/patches/patch-hacks_Makefile.in b/x11/xscreensaver/patches/patch-hacks_Makefile.in
new file mode 100644
index 00000000000..3ba065e5bb9
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-hacks_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-hacks_Makefile.in,v 1.1 2014/08/12 15:57:14 hauke Exp $
+
+--- hacks/Makefile.in.orig	2014-06-08 21:43:53.000000000 +0000
++++ hacks/Makefile.in
+@@ -671,7 +671,7 @@ truchet:	 truchet.o	$(HACK_OBJS) $(COL)
+ 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)
+ 
+ bsod:	 	bsod.o		$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM)
+-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(XPM_LIBS)
++	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(XPM_LIBS) $(THRL)
+ 
+ apple2:	 	apple2.o apple2-main.o	$(HACK_OBJS) $(ATV) $(GRAB) $(TEXT)
+ 	$(CC_HACK) -o $@ $@.o	apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS) $(THRL)
diff --git a/x11/xscreensaver/patches/patch-hacks_memscroller.c b/x11/xscreensaver/patches/patch-hacks_memscroller.c
new file mode 100644
index 00000000000..bf09141314c
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-hacks_memscroller.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-hacks_memscroller.c,v 1.1 2014/08/12 15:57:14 hauke Exp $
+
+--- hacks/memscroller.c.orig	2014-05-31 00:56:20.000000000 +0000
++++ hacks/memscroller.c
+@@ -301,6 +301,11 @@ open_file (state *st)
+ }
+ #endif
+ 
++#ifdef HAVE_SBRK  /* re-get it each time through */
++#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) ) /* gcc >= 4.2 */
++#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++#  endif
++#endif
+ 
+ static unsigned int
+ more_bits (state *st, scroller *sc)
+@@ -349,9 +354,6 @@ more_bits (state *st, scroller *sc)
+          from earlier days before the advent of virtual memory management."
+             -- sbrk(2) man page on MacOS
+        */
+-#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
+-#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+-#  endif
+       himem = ((unsigned char *) sbrk(0)) - (2 * sizeof(void *));
+ # endif
+