4 files changed, 15 insertions, 27 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 835680b9ee83..0b5dd6049a9a 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION=	5.08
-PORTREVISION=	1
+PORTVERSION=	5.10
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
 		http://dougbarton.us/Downloads/
@@ -111,9 +110,9 @@ MAN6=	anemone.6 anemotaxis.6 antinspect.6 antmaze.6 antspotlight.6 \
 	fuzzyflakes.6 galaxy.6 gears.6 gflux.6 glblur.6 gleidescope.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 \
+	halo.6 helix.6 hopalong.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 \
+	jigsaw.6 juggler3d.6 julia.6 kaleidescope.6 klein.6 kumppa.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 \
@@ -131,7 +130,7 @@ MAN6=	anemone.6 anemotaxis.6 antinspect.6 antmaze.6 antspotlight.6 \
 	xanalogtv.6 xflame.6 xjack.6 xlyap.6 xmatrix.6 xrayswarm.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 photopile.6 \
+	lcdscrub.6 skytentacles.6 photopile.6 rubikblocks.6 surfaces.6 \
 	xscreensaver-gl-helper.6
 
 .if ${ARCH} == "amd64"
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index e8651d82237f..1c8c86cbd701 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xscreensaver-5.08.tar.gz) = 79dea708c915341f205e00318a699be9
-SHA256 (xscreensaver-5.08.tar.gz) = 638cb1455cd5fe0c95f53cf048b9b46f5b0ccce026c39246d0dc65ebb09ca9dd
-SIZE (xscreensaver-5.08.tar.gz) = 5466460
+MD5 (xscreensaver-5.10.tar.gz) = 0d7205f9da8e3f1b83bcda549d73a7c4
+SHA256 (xscreensaver-5.10.tar.gz) = 54edda032f9d1e0737fdc34a74c9f40ba9be944f687be6f155ec71cc4f09fe1f
+SIZE (xscreensaver-5.10.tar.gz) = 5561162
diff --git a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
index 4ff71e63e2d2..30e719540b40 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-12-27 23:33:15.000000000 -0800
-+++ driver/XScreenSaver.ad.in	2009-08-03 13:50:03.000000000 -0700
+--- driver/XScreenSaver.ad.in.orig	2009-09-07 21:53:15.000000000 -0700
++++ driver/XScreenSaver.ad.in	2009-09-15 02:10:42.000000000 -0700
 @@ -54,7 +54,7 @@
  *splashDuration:	0:00:05
  *visualID:		default
@@ -28,7 +28,7 @@
  				maze -root				    \n\
  @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
  				attraction -root			    \n\
-@@ -248,7 +260,6 @@
+@@ -246,7 +258,6 @@
  				xspirograph -root			    \n\
  @GL_KLUDGE@ GL: 				circuit -root				    \n\
  @GL_KLUDGE@ GL: 				dangerball -root			    \n\
@@ -36,16 +36,7 @@
  @GL_KLUDGE@ GL: 				engine -root				    \n\
  @GL_KLUDGE@ GL: 				flipscreen3d -root			    \n\
  @GL_KLUDGE@ GL: 				gltext -root				    \n\
-@@ -347,7 +358,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 +447,6 @@
+@@ -435,7 +446,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 4f15b885a104..3d9e5de133e9 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -94,8 +94,6 @@ bin/xscreensaver-hacks/halftone
 bin/xscreensaver-hacks/halo
 bin/xscreensaver-hacks/helix
 bin/xscreensaver-hacks/hopalong
-bin/xscreensaver-hacks/hyperball
-bin/xscreensaver-hacks/hypercube
 bin/xscreensaver-hacks/hypertorus
 bin/xscreensaver-hacks/hypnowheel
 bin/xscreensaver-hacks/ifs
@@ -105,7 +103,6 @@ bin/xscreensaver-hacks/interference
 bin/xscreensaver-hacks/intermomentary
 bin/xscreensaver-hacks/jigglypuff
 bin/xscreensaver-hacks/jigsaw
-bin/xscreensaver-hacks/juggle
 bin/xscreensaver-hacks/juggler3d
 bin/xscreensaver-hacks/julia
 bin/xscreensaver-hacks/kaleidescope
@@ -160,6 +157,7 @@ bin/xscreensaver-hacks/rocks
 bin/xscreensaver-hacks/rorschach
 bin/xscreensaver-hacks/rotzoomer
 bin/xscreensaver-hacks/rubik
+bin/xscreensaver-hacks/rubikblocks
 bin/xscreensaver-hacks/sballs
 bin/xscreensaver-hacks/shadebobs
 bin/xscreensaver-hacks/sierpinski
@@ -180,6 +178,7 @@ bin/xscreensaver-hacks/stonerview
 bin/xscreensaver-hacks/strange
 bin/xscreensaver-hacks/substrate
 bin/xscreensaver-hacks/superquadrics
+bin/xscreensaver-hacks/surfaces
 bin/xscreensaver-hacks/swirl
 bin/xscreensaver-hacks/tangram
 bin/xscreensaver-hacks/thornbird
@@ -297,8 +296,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/halo.xml
 %%DATADIR%%/config/helix.xml
 %%DATADIR%%/config/hopalong.xml
-%%DATADIR%%/config/hyperball.xml
-%%DATADIR%%/config/hypercube.xml
 %%DATADIR%%/config/hypertorus.xml
 %%DATADIR%%/config/hypnowheel.xml
 %%DATADIR%%/config/ifs.xml
@@ -308,7 +305,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/intermomentary.xml
 %%DATADIR%%/config/jigglypuff.xml
 %%DATADIR%%/config/jigsaw.xml
-%%DATADIR%%/config/juggle.xml
 %%DATADIR%%/config/juggler3d.xml
 %%DATADIR%%/config/julia.xml
 %%DATADIR%%/config/kaleidescope.xml
@@ -362,6 +358,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/rorschach.xml
 %%DATADIR%%/config/rotzoomer.xml
 %%DATADIR%%/config/rubik.xml
+%%DATADIR%%/config/rubikblocks.xml
 %%DATADIR%%/config/sballs.xml
 %%DATADIR%%/config/shadebobs.xml
 %%DATADIR%%/config/sierpinski.xml
@@ -382,6 +379,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/strange.xml
 %%DATADIR%%/config/substrate.xml
 %%DATADIR%%/config/superquadrics.xml
+%%DATADIR%%/config/surfaces.xml
 %%DATADIR%%/config/swirl.xml
 %%DATADIR%%/config/tangram.xml
 %%DATADIR%%/config/thornbird.xml