4 files changed, 37 insertions, 62 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 3f6054e9bc93..0182002a69fc 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION=	5.07
+PORTVERSION=	5.08
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
 		http://dougbarton.us/Downloads/
@@ -100,38 +100,38 @@ MAN1=	xscreensaver-command.1 xscreensaver-demo.1 \
 MAN6=	anemone.6 anemotaxis.6 antinspect.6 antmaze.6 antspotlight.6 \
 	apollonian.6 apple2.6 atlantis.6 attraction.6 atunnel.6 barcode.6 \
 	blaster.6 blinkbox.6 blitspin.6 blocktube.6 boing.6 bouboule.6 \
-	bouncingcow.6 boxed.6 boxfit.6 braid.6 bsod.6 bubble3d.6 bubbles.6 \
+	bouncingcow.6 boxed.6 boxfit.6 braid.6 bsod.6 bubble3d.6 \
 	bumps.6 cage.6 carousel.6 ccurve.6 celtic.6 circuit.6 cloudlife.6 \
-	compass.6 coral.6 crackberg.6 critical.6 crystal.6 cube21.6 \
+	compass.6 coral.6 crackberg.6 crystal.6 cube21.6 \
 	cubenetic.6 cubestorm.6 cynosure.6 dangerball.6 decayscreen.6 deco.6 \
 	deluxe.6 demon.6 discrete.6 distort.6 drift.6 endgame.6 engine.6 \
 	epicycle.6 eruption.6 euler2d.6 extrusion.6 fadeplot.6 fiberlamp.6 \
-	fireworkx.6 flag.6 flame.6 flipflop.6 flipscreen3d.6 fliptext.6 flow.6 \
-	fluidballs.6 flurry.6 flyingtoasters.6 fontglide.6 forest.6 \
+	fireworkx.6 flame.6 flipflop.6 flipscreen3d.6 fliptext.6 flow.6 \
+	fluidballs.6 flurry.6 flyingtoasters.6 fontglide.6 \
 	fuzzyflakes.6 galaxy.6 gears.6 gflux.6 glblur.6 gleidescope.6 \
-	glforestfire.6 glhanoi.6 glknots.6 glmatrix.6 glplanet.6 glschool.6 \
+	glhanoi.6 glknots.6 glmatrix.6 glplanet.6 glschool.6 \
 	glslideshow.6 glsnake.6 gltext.6 goop.6 grav.6 greynetic.6 halftone.6 \
 	halo.6 helix.6 hopalong.6 hyperball.6 hypercube.6 hypertorus.6 ifs.6 \
 	imsmap.6 interaggregate.6 interference.6 intermomentary.6 jigglypuff.6 \
 	jigsaw.6 juggle.6 juggler3d.6 julia.6 kaleidescope.6 klein.6 kumppa.6 \
-	lament.6 laser.6 lavalite.6 lightning.6 lisa.6 lissie.6 ljlatest.6 \
-	lmorph.6 loop.6 maze.6 memscroller.6 menger.6 metaballs.6 mirrorblob.6 \
-	mismunch.6 moebius.6 moire.6 moire2.6 molecule.6 morph3d.6 mountain.6 \
+	lament.6 lavalite.6 ljlatest.6 \
+	loop.6 maze.6 memscroller.6 menger.6 metaballs.6 mirrorblob.6 \
+	moebius.6 moire.6 moire2.6 molecule.6 morph3d.6 mountain.6 \
 	munch.6 nerverot.6 noof.6 noseguy.6 pacman.6 pedal.6 penetrate.6 \
 	penrose.6 petri.6 phosphor.6 piecewise.6 pinion.6 pipes.6 polyhedra.6 \
 	polyominoes.6 polytopes.6 pong.6 providence.6 pulsar.6 pyro.6 qix.6 \
-	queens.6 rd-bomb.6 ripples.6 rocks.6 rorschach.6 rotor.6 rotzoomer.6 \
+	queens.6 rd-bomb.6 ripples.6 rocks.6 rorschach.6 rotzoomer.6 \
 	rubik.6 sballs.6 shadebobs.6 sierpinski.6 sierpinski3d.6 slidescreen.6 \
-	slip.6 sonar.6 speedmine.6 sphere.6 spheremonics.6 spiral.6 \
+	slip.6 sonar.6 speedmine.6 spheremonics.6 \
 	spotlight.6 sproingies.6 squiral.6 stairs.6 starfish.6 \
 	starwars.6 stonerview.6 strange.6 substrate.6 superquadrics.6 \
-	swirl.6 t3d.6 tangram.6 thornbird.6 timetunnel.6 topblock.6 \
-	triangle.6 truchet.6 twang.6 vermiculate.6 vidwhacker.6 vines.6 \
-	wander.6 webcollage.6 whirlwindwarp.6 whirlygig.6 worm.6 wormhole.6 \
+	swirl.6 tangram.6 thornbird.6 timetunnel.6 topblock.6 \
+	triangle.6 truchet.6 twang.6 vermiculate.6 vidwhacker.6 \
+	wander.6 webcollage.6 whirlwindwarp.6 wormhole.6 \
 	xanalogtv.6 xflame.6 xjack.6 xlyap.6 xmatrix.6 xrayswarm.6 \
-	xspirograph.6 xsublim.6 zoom.6 cwaves.6 glcells.6 voronoi.6 \
+	xspirograph.6 zoom.6 cwaves.6 glcells.6 voronoi.6 \
 	abstractile.6 moebiusgears.6 lockward.6 cubicgrid.6 hypnowheel.6 \
-	lcdscrub.6 skytentacles.6 \
+	lcdscrub.6 skytentacles.6 photopile.6 \
 	xscreensaver-gl-helper.6
 
 .if ${ARCH} == "amd64"
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 1071f1b0e3a4..e8651d82237f 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xscreensaver-5.07.tar.gz) = 55a12fcb5d3a7231c9850ef9d9f82918
-SHA256 (xscreensaver-5.07.tar.gz) = 8c50a74c07b1fffcbb20bd79e3ee92f1f52191e5a187433bb49964ccf94badb6
-SIZE (xscreensaver-5.07.tar.gz) = 5513131
+MD5 (xscreensaver-5.08.tar.gz) = 79dea708c915341f205e00318a699be9
+SHA256 (xscreensaver-5.08.tar.gz) = 638cb1455cd5fe0c95f53cf048b9b46f5b0ccce026c39246d0dc65ebb09ca9dd
+SIZE (xscreensaver-5.08.tar.gz) = 5466460
diff --git a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
index b62de00beb8f..92474002e8a6 100644
--- a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
+++ b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
@@ -1,5 +1,5 @@
---- driver/XScreenSaver.ad.in.orig	2008-08-10 21:50:05.000000000 -0700
-+++ driver/XScreenSaver.ad.in	2008-08-12 01:41:05.000000000 -0700
+--- driver/XScreenSaver.ad.in.orig	2008-12-27 23:33:15.000000000 -0800
++++ driver/XScreenSaver.ad.in	2008-12-28 22:33:55.000000000 -0800
 @@ -54,7 +54,7 @@
  *splashDuration:	0:00:05
  *visualID:		default
@@ -9,7 +9,7 @@
  
  *textMode:		file
  *textLiteral:		XScreenSaver
-@@ -150,6 +150,19 @@
+@@ -151,6 +151,19 @@
  ! screen savers interactively.
  !
  *programs:								      \
@@ -26,10 +26,10 @@
 +                                  -label -origin moon			    \n\
 +-				xsnow -bg SkyBlue3 -solidbg		    \n\
 +@GL_KLUDGE@ GL:					fireflies -root                             \n\
- -				sphere -root				    \n\
+ 				maze -root				    \n\
  @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
- -				worm -root				    \n\
-@@ -262,7 +275,6 @@
+ 				attraction -root			    \n\
+@@ -248,7 +261,6 @@
  				xspirograph -root			    \n\
  @GL_KLUDGE@ GL: 				circuit -root				    \n\
  @GL_KLUDGE@ GL: 				dangerball -root			    \n\
@@ -37,7 +37,16 @@
  @GL_KLUDGE@ GL: 				engine -root				    \n\
  @GL_KLUDGE@ GL: 				flipscreen3d -root			    \n\
  @GL_KLUDGE@ GL: 				gltext -root				    \n\
-@@ -452,7 +464,6 @@
+@@ -347,7 +359,7 @@
+ @GL_KLUDGE@ GL: 				voronoi -root				    \n\
+ @GL_KLUDGE@ GL: 				hypnowheel -root			    \n\
+ -				lcdscrub -root				    \n\
+-@GL_KLUDGE@ GL: 				photopile -root				    \n\
++- GL: 				photopile -root				    \n\
+ @GL_KLUDGE@ GL: 				skytentacles -root			    \n
+ 
+ 
+@@ -436,7 +448,6 @@
  *hacks.cwaves.name:         CWaves
  *hacks.dangerball.name:     DangerBall
  *hacks.decayscreen.name:    DecayScreen
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index db71d490661a..50675b9f1681 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -29,7 +29,6 @@ bin/xscreensaver-hacks/boxfit
 bin/xscreensaver-hacks/braid
 bin/xscreensaver-hacks/bsod
 bin/xscreensaver-hacks/bubble3d
-bin/xscreensaver-hacks/bubbles
 bin/xscreensaver-hacks/bumps
 bin/xscreensaver-hacks/cage
 bin/xscreensaver-hacks/carousel
@@ -40,7 +39,6 @@ bin/xscreensaver-hacks/cloudlife
 bin/xscreensaver-hacks/compass
 bin/xscreensaver-hacks/coral
 bin/xscreensaver-hacks/crackberg
-bin/xscreensaver-hacks/critical
 bin/xscreensaver-hacks/crystal
 bin/xscreensaver-hacks/cube21
 bin/xscreensaver-hacks/cubenetic
@@ -65,7 +63,6 @@ bin/xscreensaver-hacks/extrusion
 bin/xscreensaver-hacks/fadeplot
 bin/xscreensaver-hacks/fiberlamp
 bin/xscreensaver-hacks/fireworkx
-bin/xscreensaver-hacks/flag
 bin/xscreensaver-hacks/flame
 bin/xscreensaver-hacks/flipflop
 bin/xscreensaver-hacks/flipscreen3d
@@ -75,7 +72,6 @@ bin/xscreensaver-hacks/fluidballs
 bin/xscreensaver-hacks/flurry
 bin/xscreensaver-hacks/flyingtoasters
 bin/xscreensaver-hacks/fontglide
-bin/xscreensaver-hacks/forest
 bin/xscreensaver-hacks/fuzzyflakes
 bin/xscreensaver-hacks/galaxy
 bin/xscreensaver-hacks/gears
@@ -83,7 +79,6 @@ bin/xscreensaver-hacks/gflux
 bin/xscreensaver-hacks/glblur
 bin/xscreensaver-hacks/glcells
 bin/xscreensaver-hacks/gleidescope
-bin/xscreensaver-hacks/glforestfire
 bin/xscreensaver-hacks/glhanoi
 bin/xscreensaver-hacks/glknots
 bin/xscreensaver-hacks/glmatrix
@@ -117,14 +112,9 @@ bin/xscreensaver-hacks/kaleidescope
 bin/xscreensaver-hacks/klein
 bin/xscreensaver-hacks/kumppa
 bin/xscreensaver-hacks/lament
-bin/xscreensaver-hacks/laser
 bin/xscreensaver-hacks/lavalite
 bin/xscreensaver-hacks/lcdscrub
-bin/xscreensaver-hacks/lightning
-bin/xscreensaver-hacks/lisa
-bin/xscreensaver-hacks/lissie
 bin/xscreensaver-hacks/ljlatest
-bin/xscreensaver-hacks/lmorph
 bin/xscreensaver-hacks/lockward
 bin/xscreensaver-hacks/loop
 bin/xscreensaver-hacks/m6502
@@ -133,7 +123,6 @@ bin/xscreensaver-hacks/memscroller
 bin/xscreensaver-hacks/menger
 bin/xscreensaver-hacks/metaballs
 bin/xscreensaver-hacks/mirrorblob
-bin/xscreensaver-hacks/mismunch
 bin/xscreensaver-hacks/moebius
 bin/xscreensaver-hacks/moebiusgears
 bin/xscreensaver-hacks/moire
@@ -151,6 +140,7 @@ bin/xscreensaver-hacks/penetrate
 bin/xscreensaver-hacks/penrose
 bin/xscreensaver-hacks/petri
 bin/xscreensaver-hacks/phosphor
+bin/xscreensaver-hacks/photopile
 bin/xscreensaver-hacks/piecewise
 bin/xscreensaver-hacks/pinion
 bin/xscreensaver-hacks/pipes
@@ -168,7 +158,6 @@ bin/xscreensaver-hacks/rd-bomb
 bin/xscreensaver-hacks/ripples
 bin/xscreensaver-hacks/rocks
 bin/xscreensaver-hacks/rorschach
-bin/xscreensaver-hacks/rotor
 bin/xscreensaver-hacks/rotzoomer
 bin/xscreensaver-hacks/rubik
 bin/xscreensaver-hacks/sballs
@@ -180,9 +169,7 @@ bin/xscreensaver-hacks/slidescreen
 bin/xscreensaver-hacks/slip
 bin/xscreensaver-hacks/sonar
 bin/xscreensaver-hacks/speedmine
-bin/xscreensaver-hacks/sphere
 bin/xscreensaver-hacks/spheremonics
-bin/xscreensaver-hacks/spiral
 bin/xscreensaver-hacks/spotlight
 bin/xscreensaver-hacks/sproingies
 bin/xscreensaver-hacks/squiral
@@ -194,7 +181,6 @@ bin/xscreensaver-hacks/strange
 bin/xscreensaver-hacks/substrate
 bin/xscreensaver-hacks/superquadrics
 bin/xscreensaver-hacks/swirl
-bin/xscreensaver-hacks/t3d
 bin/xscreensaver-hacks/tangram
 bin/xscreensaver-hacks/thornbird
 bin/xscreensaver-hacks/timetunnel
@@ -204,13 +190,10 @@ bin/xscreensaver-hacks/truchet
 bin/xscreensaver-hacks/twang
 bin/xscreensaver-hacks/vermiculate
 bin/xscreensaver-hacks/vidwhacker
-bin/xscreensaver-hacks/vines
 bin/xscreensaver-hacks/voronoi
 bin/xscreensaver-hacks/wander
 bin/xscreensaver-hacks/webcollage
 bin/xscreensaver-hacks/whirlwindwarp
-bin/xscreensaver-hacks/whirlygig
-bin/xscreensaver-hacks/worm
 bin/xscreensaver-hacks/wormhole
 bin/xscreensaver-hacks/xanalogtv
 bin/xscreensaver-hacks/xflame
@@ -249,7 +232,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/braid.xml
 %%DATADIR%%/config/bsod.xml
 %%DATADIR%%/config/bubble3d.xml
-%%DATADIR%%/config/bubbles.xml
 %%DATADIR%%/config/bumps.xml
 %%DATADIR%%/config/cage.xml
 %%DATADIR%%/config/carousel.xml
@@ -260,7 +242,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/compass.xml
 %%DATADIR%%/config/coral.xml
 %%DATADIR%%/config/crackberg.xml
-%%DATADIR%%/config/critical.xml
 %%DATADIR%%/config/crystal.xml
 %%DATADIR%%/config/cube21.xml
 %%DATADIR%%/config/cubenetic.xml
@@ -285,7 +266,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/fadeplot.xml
 %%DATADIR%%/config/fiberlamp.xml
 %%DATADIR%%/config/fireworkx.xml
-%%DATADIR%%/config/flag.xml
 %%DATADIR%%/config/flame.xml
 %%DATADIR%%/config/flipflop.xml
 %%DATADIR%%/config/flipscreen3d.xml
@@ -295,7 +275,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/flurry.xml
 %%DATADIR%%/config/flyingtoasters.xml
 %%DATADIR%%/config/fontglide.xml
-%%DATADIR%%/config/forest.xml
 %%DATADIR%%/config/fuzzyflakes.xml
 %%DATADIR%%/config/galaxy.xml
 %%DATADIR%%/config/gears.xml
@@ -303,7 +282,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/glblur.xml
 %%DATADIR%%/config/glcells.xml
 %%DATADIR%%/config/gleidescope.xml
-%%DATADIR%%/config/glforestfire.xml
 %%DATADIR%%/config/glhanoi.xml
 %%DATADIR%%/config/glknots.xml
 %%DATADIR%%/config/glmatrix.xml
@@ -337,13 +315,8 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/klein.xml
 %%DATADIR%%/config/kumppa.xml
 %%DATADIR%%/config/lament.xml
-%%DATADIR%%/config/laser.xml
 %%DATADIR%%/config/lavalite.xml
 %%DATADIR%%/config/lcdscrub.xml
-%%DATADIR%%/config/lightning.xml
-%%DATADIR%%/config/lisa.xml
-%%DATADIR%%/config/lissie.xml
-%%DATADIR%%/config/lmorph.xml
 %%DATADIR%%/config/lockward.xml
 %%DATADIR%%/config/loop.xml
 %%DATADIR%%/config/m6502.xml
@@ -352,7 +325,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/menger.xml
 %%DATADIR%%/config/metaballs.xml
 %%DATADIR%%/config/mirrorblob.xml
-%%DATADIR%%/config/mismunch.xml
 %%DATADIR%%/config/moebius.xml
 %%DATADIR%%/config/moebiusgears.xml
 %%DATADIR%%/config/moire.xml
@@ -370,6 +342,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/penrose.xml
 %%DATADIR%%/config/petri.xml
 %%DATADIR%%/config/phosphor.xml
+%%DATADIR%%/config/photopile.xml
 %%DATADIR%%/config/piecewise.xml
 %%DATADIR%%/config/pinion.xml
 %%DATADIR%%/config/pipes.xml
@@ -387,7 +360,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/ripples.xml
 %%DATADIR%%/config/rocks.xml
 %%DATADIR%%/config/rorschach.xml
-%%DATADIR%%/config/rotor.xml
 %%DATADIR%%/config/rotzoomer.xml
 %%DATADIR%%/config/rubik.xml
 %%DATADIR%%/config/sballs.xml
@@ -399,9 +371,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/slip.xml
 %%DATADIR%%/config/sonar.xml
 %%DATADIR%%/config/speedmine.xml
-%%DATADIR%%/config/sphere.xml
 %%DATADIR%%/config/spheremonics.xml
-%%DATADIR%%/config/spiral.xml
 %%DATADIR%%/config/spotlight.xml
 %%DATADIR%%/config/sproingies.xml
 %%DATADIR%%/config/squiral.xml
@@ -413,7 +383,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/substrate.xml
 %%DATADIR%%/config/superquadrics.xml
 %%DATADIR%%/config/swirl.xml
-%%DATADIR%%/config/t3d.xml
 %%DATADIR%%/config/tangram.xml
 %%DATADIR%%/config/thornbird.xml
 %%DATADIR%%/config/timetunnel.xml
@@ -423,13 +392,10 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/twang.xml
 %%DATADIR%%/config/vermiculate.xml
 %%DATADIR%%/config/vidwhacker.xml
-%%DATADIR%%/config/vines.xml
 %%DATADIR%%/config/voronoi.xml
 %%DATADIR%%/config/wander.xml
 %%DATADIR%%/config/webcollage.xml
 %%DATADIR%%/config/whirlwindwarp.xml
-%%DATADIR%%/config/whirlygig.xml
-%%DATADIR%%/config/worm.xml
 %%DATADIR%%/config/wormhole.xml
 %%DATADIR%%/config/xanalogtv.xml
 %%DATADIR%%/config/xflame.xml