fix build on solaris 9

make opengl an option (on by default)
from PR#43047

10 files changed, 343 insertions, 268 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 10aa1e2761a..4244c3f903f 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.88 2010/02/11 18:16:21 drochner Exp $
+# $NetBSD: Makefile,v 1.89 2010/05/08 16:53:06 tez Exp $
 
+PKGREVISION=	1
 COMMENT=	Screen saver and locker for the X window system
 
 CONFLICTS+=	xscreensaver-gnome<4.14
@@ -7,6 +8,8 @@ CONFLICTS+=	xscreensaver-gnome<4.14
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
+.include "options.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_PREFIX.libxml2}
@@ -15,9 +18,6 @@ CONFIGURE_ARGS+=	--with-configdir=${PREFIX}/libexec/xscreensaver/config
 EGDIR=			${PREFIX}/share/examples/xscreensaver
 MESSAGE_SUBST+=		EGDIR=${EGDIR:Q}
 
-.include "options.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-
 # Remove useless locale files that have no translations in them.
 post-extract:
 	cd ${WRKSRC}/po && ${RM} -f ca.po pt_BR.po
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 36fb396085a..19f8150e65b 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.100 2010/02/11 18:16:21 drochner Exp $
+# $NetBSD: Makefile.common,v 1.101 2010/05/08 16:53:06 tez Exp $
 #
 
 # When updating the package,
@@ -19,8 +19,6 @@ USE_TOOLS+=		msgfmt perl
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-hackdir=${PREFIX}/libexec/xscreensaver
-CONFIGURE_ARGS+=	--with-gl
-CONFIGURE_ARGS+=	--with-gle
 CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_PREFIX.jpeg}
 CONFIGURE_ARGS+=	--with-zippy=/usr/games/fortune
 
@@ -66,6 +64,5 @@ GCC_REQD+=		2.95.3
 INSTALL_MAKE_FLAGS=	install_prefix=${DESTDIR}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/gle/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index 4b07e021fdf..74efe8d4622 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,87 +1,52 @@
-@comment $NetBSD: PLIST,v 1.36 2010/02/11 18:16:21 drochner Exp $
+@comment $NetBSD: PLIST,v 1.37 2010/05/08 16:53:06 tez 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/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/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
@@ -89,8 +54,6 @@ 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
@@ -99,29 +62,11 @@ 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/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
@@ -129,41 +74,25 @@ libexec/xscreensaver/config/halftone.xml
 libexec/xscreensaver/config/halo.xml
 libexec/xscreensaver/config/helix.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/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
@@ -171,59 +100,34 @@ 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/providence.xml
-libexec/xscreensaver/config/pulsar.xml
 libexec/xscreensaver/config/pyro.xml
 libexec/xscreensaver/config/qix.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/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
 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
@@ -236,15 +140,9 @@ 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
@@ -252,39 +150,18 @@ 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/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
@@ -292,42 +169,26 @@ libexec/xscreensaver/halftone
 libexec/xscreensaver/halo
 libexec/xscreensaver/helix
 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/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
@@ -335,59 +196,34 @@ 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/providence
-libexec/xscreensaver/pulsar
 libexec/xscreensaver/pyro
 libexec/xscreensaver/qix
-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/thornbird
-libexec/xscreensaver/timetunnel
-libexec/xscreensaver/topblock
 libexec/xscreensaver/triangle
 libexec/xscreensaver/truchet
 libexec/xscreensaver/twang
 libexec/xscreensaver/vermiculate
 libexec/xscreensaver/vidwhacker
-libexec/xscreensaver/voronoi
 libexec/xscreensaver/wander
 libexec/xscreensaver/whirlwindwarp
 libexec/xscreensaver/wormhole
@@ -408,45 +244,25 @@ 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/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
@@ -454,39 +270,18 @@ 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/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
@@ -494,41 +289,25 @@ man/man6/halftone.6
 man/man6/halo.6
 man/man6/helix.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/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
@@ -536,58 +315,33 @@ 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/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/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/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/voronoi.6
 man/man6/wander.6
 man/man6/whirlwindwarp.6
 man/man6/wormhole.6
@@ -597,7 +351,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/zoom.6
 share/examples/xscreensaver/pam.d/xscreensaver-NetBSD
diff --git a/x11/xscreensaver/PLIST.opengl b/x11/xscreensaver/PLIST.opengl
new file mode 100644
index 00000000000..8039ca526c0
--- /dev/null
+++ b/x11/xscreensaver/PLIST.opengl
@@ -0,0 +1,248 @@
+@comment $NetBSD: PLIST.opengl,v 1.1 2010/05/08 16:53:06 tez Exp $
+bin/xscreensaver-gl-helper
+libexec/xscreensaver/antinspect
+libexec/xscreensaver/antmaze
+libexec/xscreensaver/antspotlight
+libexec/xscreensaver/atlantis
+libexec/xscreensaver/atunnel
+libexec/xscreensaver/blinkbox
+libexec/xscreensaver/blocktube
+libexec/xscreensaver/boing
+libexec/xscreensaver/bouncingcow
+libexec/xscreensaver/boxed
+libexec/xscreensaver/bubble3d
+libexec/xscreensaver/cage
+libexec/xscreensaver/carousel
+libexec/xscreensaver/circuit
+libexec/xscreensaver/config/antinspect.xml
+libexec/xscreensaver/config/antmaze.xml
+libexec/xscreensaver/config/antspotlight.xml
+libexec/xscreensaver/config/atlantis.xml
+libexec/xscreensaver/config/atunnel.xml
+libexec/xscreensaver/config/blinkbox.xml
+libexec/xscreensaver/config/blocktube.xml
+libexec/xscreensaver/config/boing.xml
+libexec/xscreensaver/config/bouncingcow.xml
+libexec/xscreensaver/config/boxed.xml
+libexec/xscreensaver/config/bubble3d.xml
+libexec/xscreensaver/config/cage.xml
+libexec/xscreensaver/config/carousel.xml
+libexec/xscreensaver/config/circuit.xml
+libexec/xscreensaver/config/crackberg.xml
+libexec/xscreensaver/config/cube21.xml
+libexec/xscreensaver/config/cubenetic.xml
+libexec/xscreensaver/config/cubestorm.xml
+libexec/xscreensaver/config/cubicgrid.xml
+libexec/xscreensaver/config/dangerball.xml
+libexec/xscreensaver/config/endgame.xml
+libexec/xscreensaver/config/engine.xml
+libexec/xscreensaver/config/flipflop.xml
+libexec/xscreensaver/config/flipscreen3d.xml
+libexec/xscreensaver/config/fliptext.xml
+libexec/xscreensaver/config/flurry.xml
+libexec/xscreensaver/config/flyingtoasters.xml
+libexec/xscreensaver/config/gears.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/hypertorus.xml
+libexec/xscreensaver/config/hypnowheel.xml
+libexec/xscreensaver/config/jigglypuff.xml
+libexec/xscreensaver/config/jigsaw.xml
+libexec/xscreensaver/config/juggler3d.xml
+libexec/xscreensaver/config/klein.xml
+libexec/xscreensaver/config/lament.xml
+libexec/xscreensaver/config/lavalite.xml
+libexec/xscreensaver/config/lockward.xml
+libexec/xscreensaver/config/menger.xml
+libexec/xscreensaver/config/mirrorblob.xml
+libexec/xscreensaver/config/moebius.xml
+libexec/xscreensaver/config/moebiusgears.xml
+libexec/xscreensaver/config/molecule.xml
+libexec/xscreensaver/config/morph3d.xml
+libexec/xscreensaver/config/noof.xml
+libexec/xscreensaver/config/photopile.xml
+libexec/xscreensaver/config/pinion.xml
+libexec/xscreensaver/config/pipes.xml
+libexec/xscreensaver/config/polyhedra.xml
+libexec/xscreensaver/config/polytopes.xml
+libexec/xscreensaver/config/providence.xml
+libexec/xscreensaver/config/pulsar.xml
+libexec/xscreensaver/config/queens.xml
+libexec/xscreensaver/config/rubik.xml
+libexec/xscreensaver/config/rubikblocks.xml
+libexec/xscreensaver/config/sballs.xml
+libexec/xscreensaver/config/sierpinski3d.xml
+libexec/xscreensaver/config/skytentacles.xml
+libexec/xscreensaver/config/sonar.xml
+libexec/xscreensaver/config/spheremonics.xml
+libexec/xscreensaver/config/sproingies.xml
+libexec/xscreensaver/config/stairs.xml
+libexec/xscreensaver/config/starwars.xml
+libexec/xscreensaver/config/stonerview.xml
+libexec/xscreensaver/config/superquadrics.xml
+libexec/xscreensaver/config/surfaces.xml
+libexec/xscreensaver/config/tangram.xml
+libexec/xscreensaver/config/timetunnel.xml
+libexec/xscreensaver/config/topblock.xml
+libexec/xscreensaver/config/voronoi.xml
+libexec/xscreensaver/crackberg
+libexec/xscreensaver/cube21
+libexec/xscreensaver/cubenetic
+libexec/xscreensaver/cubestorm
+libexec/xscreensaver/cubicgrid
+libexec/xscreensaver/dangerball
+libexec/xscreensaver/endgame
+libexec/xscreensaver/engine
+libexec/xscreensaver/extrusion
+libexec/xscreensaver/flipflop
+libexec/xscreensaver/flipscreen3d
+libexec/xscreensaver/fliptext
+libexec/xscreensaver/flurry
+libexec/xscreensaver/flyingtoasters
+libexec/xscreensaver/gears
+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/hypertorus
+libexec/xscreensaver/hypnowheel
+libexec/xscreensaver/jigglypuff
+libexec/xscreensaver/jigsaw
+libexec/xscreensaver/juggler3d
+libexec/xscreensaver/klein
+libexec/xscreensaver/lament
+libexec/xscreensaver/lavalite
+libexec/xscreensaver/lockward
+libexec/xscreensaver/menger
+libexec/xscreensaver/mirrorblob
+libexec/xscreensaver/moebius
+libexec/xscreensaver/moebiusgears
+libexec/xscreensaver/molecule
+libexec/xscreensaver/morph3d
+libexec/xscreensaver/noof
+libexec/xscreensaver/photopile
+libexec/xscreensaver/pinion
+libexec/xscreensaver/pipes
+libexec/xscreensaver/polyhedra
+libexec/xscreensaver/polytopes
+libexec/xscreensaver/providence
+libexec/xscreensaver/pulsar
+libexec/xscreensaver/queens
+libexec/xscreensaver/rubik
+libexec/xscreensaver/rubikblocks
+libexec/xscreensaver/sballs
+libexec/xscreensaver/sierpinski3d
+libexec/xscreensaver/skytentacles
+libexec/xscreensaver/sonar
+libexec/xscreensaver/spheremonics
+libexec/xscreensaver/sproingies
+libexec/xscreensaver/stairs
+libexec/xscreensaver/starwars
+libexec/xscreensaver/stonerview
+libexec/xscreensaver/superquadrics
+libexec/xscreensaver/surfaces
+libexec/xscreensaver/tangram
+libexec/xscreensaver/timetunnel
+libexec/xscreensaver/topblock
+libexec/xscreensaver/voronoi
+man/man6/antinspect.6
+man/man6/antmaze.6
+man/man6/antspotlight.6
+man/man6/atlantis.6
+man/man6/atunnel.6
+man/man6/blinkbox.6
+man/man6/blocktube.6
+man/man6/boing.6
+man/man6/bouncingcow.6
+man/man6/boxed.6
+man/man6/bubble3d.6
+man/man6/cage.6
+man/man6/carousel.6
+man/man6/circuit.6
+man/man6/crackberg.6
+man/man6/cube21.6
+man/man6/cubenetic.6
+man/man6/cubestorm.6
+man/man6/cubicgrid.6
+man/man6/dangerball.6
+man/man6/endgame.6
+man/man6/engine.6
+man/man6/extrusion.6
+man/man6/flipflop.6
+man/man6/flipscreen3d.6
+man/man6/fliptext.6
+man/man6/flurry.6
+man/man6/flyingtoasters.6
+man/man6/gears.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/hypertorus.6
+man/man6/hypnowheel.6
+man/man6/jigglypuff.6
+man/man6/jigsaw.6
+man/man6/juggler3d.6
+man/man6/klein.6
+man/man6/lament.6
+man/man6/lavalite.6
+man/man6/lockward.6
+man/man6/menger.6
+man/man6/mirrorblob.6
+man/man6/moebius.6
+man/man6/moebiusgears.6
+man/man6/molecule.6
+man/man6/morph3d.6
+man/man6/noof.6
+man/man6/photopile.6
+man/man6/pinion.6
+man/man6/pipes.6
+man/man6/polyhedra.6
+man/man6/polytopes.6
+man/man6/providence.6
+man/man6/pulsar.6
+man/man6/queens.6
+man/man6/rubik.6
+man/man6/rubikblocks.6
+man/man6/sballs.6
+man/man6/sierpinski3d.6
+man/man6/skytentacles.6
+man/man6/sonar.6
+man/man6/spheremonics.6
+man/man6/sproingies.6
+man/man6/stairs.6
+man/man6/starwars.6
+man/man6/stonerview.6
+man/man6/superquadrics.6
+man/man6/surfaces.6
+man/man6/tangram.6
+man/man6/timetunnel.6
+man/man6/topblock.6
+man/man6/voronoi.6
+man/man6/xscreensaver-gl-helper.6
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index c85c3e5c18e..dd691b15fb9 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.55 2010/02/11 18:16:22 drochner Exp $
+$NetBSD: distinfo,v 1.56 2010/05/08 16:53:06 tez Exp $
 
 SHA1 (xscreensaver-5.10.tar.gz) = d8379928de2e6e86cc7b17d75150daafe57e93c4
 RMD160 (xscreensaver-5.10.tar.gz) = 6c437ef89969a0bf886f27b2430b53a431146b20
 Size (xscreensaver-5.10.tar.gz) = 5561162 bytes
 SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979
-SHA1 (patch-ab) = 77d41e44143f94297375d5497a0ddd4298e9510f
+SHA1 (patch-ab) = a4abfe0b769d528fda56968801c49e622d2c3424
 SHA1 (patch-ac) = d575520bbe7d2ba2363a19620576b12d7110c19d
 SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
 SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5
+SHA1 (patch-aj) = 09c06207549ab5adf286dcf04e48a900f1ea9e1e
+SHA1 (patch-ak) = 8b48c63575f6d186a65131586737ba31e3b91953
+SHA1 (patch-al) = 1a9b3ba359aecc30539a194c893abb7c35c66a31
diff --git a/x11/xscreensaver/options.mk b/x11/xscreensaver/options.mk
index 68687ae5abb..15f615754eb 100644
--- a/x11/xscreensaver/options.mk
+++ b/x11/xscreensaver/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2009/07/07 17:28:04 joerg Exp $
+# $NetBSD: options.mk,v 1.6 2010/05/08 16:53:06 tez Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xscreensaver
-PKG_SUPPORTED_OPTIONS=	pam xscreensaver-webcollage
+PKG_SUPPORTED_OPTIONS=	pam webcollage opengl gdk-pixbuf
+PKG_SUGGESTED_OPTIONS=	opengl
 
 .include "../../mk/bsd.options.mk"
 
@@ -19,8 +20,9 @@ CONFIGURE_ARGS+=	--without-pam
 #CONFIGURE_ARGS+=	--without-shadow
 .endif
 
-.if !empty(PKG_OPTIONS:Mxscreensaver-webcollage)
-PLIST_SRC=	PLIST.webcollage PLIST
+PLIST_SRC=	PLIST
+.if !empty(PKG_OPTIONS:Mwebcollage)
+PLIST_SRC+=	PLIST.webcollage
 .else
 post-install: delwebcollage
 delwebcollage:
@@ -28,3 +30,20 @@ delwebcollage:
 	rm ${DESTDIR}${PREFIX}/libexec/xscreensaver/webcollage
 	rm ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/webcollage.6
 .endif
+
+.if !empty(PKG_OPTIONS:Mopengl)
+PLIST_SRC+=		PLIST.opengl
+CONFIGURE_ARGS+=	--with-gl
+CONFIGURE_ARGS+=	--with-gle
+.include "../../graphics/gle/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-gl
+CONFIGURE_ARGS+=	--without-gle
+.endif
+
+.if !empty(PKG_OPTIONS:Mgdk-pixbuf)
+CONFIGURE_ARGS+=	--with-pixbuf
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-pixbuf
+.endif
diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab
index ce2b48bcef9..71657136bfa 100644
--- a/x11/xscreensaver/patches/patch-ab
+++ b/x11/xscreensaver/patches/patch-ab
@@ -1,8 +1,15 @@
-$NetBSD: patch-ab,v 1.18 2009/01/14 13:29:15 drochner Exp $
-
---- configure.in.orig	2008-12-27 22:12:27.000000000 +0100
-+++ configure.in
-@@ -1185,7 +1185,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PA
+--- configure.in.orig	Wed Sep  2 23:38:35 2009
++++ configure.in	Mon Mar 22 14:26:20 2010
+@@ -1148,7 +1148,7 @@
+ AC_GETTIMEOFDAY_ARGS
+ AC_CHECK_FUNCS(select fcntl uname nice setpriority getcwd getwd putenv sbrk)
+ AC_CHECK_FUNCS(sigaction syslog realpath setrlimit)
+-AC_CHECK_FUNCS(setlocale)
++AC_CHECK_FUNCS(setlocale sqrtf)
+ AC_CHECK_ICMP
+ AC_CHECK_ICMPHDR
+ AC_CHECK_HEADERS(crypt.h sys/select.h)
+@@ -1194,7 +1194,7 @@
  		   generated code.])
  AC_SUBST(GETTEXT_PACKAGE)
  
@@ -11,7 +18,7 @@ $NetBSD: patch-ab,v 1.18 2009/01/14 13:29:15 drochner Exp $
  AM_GLIB_GNU_GETTEXT
  MKINSTALLDIRS="$INSTALL_DIRS"
  
-@@ -1995,7 +1995,7 @@ if test "$enable_locking" = yes -a "$wit
+@@ -2017,7 +2017,7 @@
      # from Matt Knopp <mhat@infocalypse.netlag.com>
      # (who got it from amu@mit.edu)
  
diff --git a/x11/xscreensaver/patches/patch-aj b/x11/xscreensaver/patches/patch-aj
new file mode 100644
index 00000000000..115e39fd16a
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.3 2010/05/08 16:53:06 tez Exp $
+
+--- hacks/fireworkx.c.orig	Mon Mar 22 14:35:24 2010
++++ hacks/fireworkx.c	Mon Mar 22 14:36:56 2010
+@@ -231,7 +231,11 @@
+   f++;
+   s += f->flash/(1+(f->cx - x)*(f->cx - x)+(f->cy - y)*(f->cy - y));
+ 
++#ifdef HAVE_SQRTF
+   l = sqrtf(s);
++#else
++  l = sqrt(s);
++#endif
+ 
+   t = l + sim[0];
+   dim[0] = (t > 255 ? 255 : t);	
diff --git a/x11/xscreensaver/patches/patch-ak b/x11/xscreensaver/patches/patch-ak
new file mode 100644
index 00000000000..c6441497827
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-ak
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.1 2010/05/08 16:53:06 tez Exp $
+
+--- hacks/m6502.c.orig	Mon Mar 22 15:24:30 2010
++++ hacks/m6502.c	Mon Mar 22 15:27:33 2010
+@@ -12,7 +12,11 @@
+  * Created: 07-May-2007 
+  */
+ 
++#if defined(HAVE_STDINT_H)
+ #include <stdint.h> 
++#elif defined(HAVE_INTTYPES_H)
++#include <inttypes.h>
++#endif
+ #include <string.h>
+ #include "screenhack.h"
+ #include "analogtv.h"
diff --git a/x11/xscreensaver/patches/patch-al b/x11/xscreensaver/patches/patch-al
new file mode 100644
index 00000000000..87b8160bee5
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-al
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.1 2010/05/08 16:53:06 tez Exp $
+
+--- hacks/asm6502.c.orig	Mon Mar 22 16:06:34 2010
++++ hacks/asm6502.c	Mon Mar 22 16:07:18 2010
+@@ -31,7 +31,11 @@
+ #include <assert.h>
+ #include <ctype.h>
+ #include <math.h>
++#if defined(HAVE_STDINT_H)
+ #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++#include <inttypes.h>
++#endif
+ #include <unistd.h>
+ 
+ #include "asm6502.h"