Update to 5.09.

5 files changed, 20 insertions, 12 deletions

diff --git a/x11/xscreensaver-gnome-hacks/Makefile b/x11/xscreensaver-gnome-hacks/Makefile
index 7f7afc08829e..610895bf458d 100644
--- a/x11/xscreensaver-gnome-hacks/Makefile
+++ b/x11/xscreensaver-gnome-hacks/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xscreensaver-gnome-hacks
-PORTREVISION=	1
+PORTREVISION=	0
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Screensaver modules for use with xscreensaver and gnome-screensaver
diff --git a/x11/xscreensaver-gnome-hacks/pkg-plist b/x11/xscreensaver-gnome-hacks/pkg-plist
index ed4aa546d2b6..38668059d328 100644
--- a/x11/xscreensaver-gnome-hacks/pkg-plist
+++ b/x11/xscreensaver-gnome-hacks/pkg-plist
@@ -103,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
@@ -158,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
@@ -178,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
@@ -302,7 +303,6 @@ share/xscreensaver/config/interference.xml
 share/xscreensaver/config/intermomentary.xml
 share/xscreensaver/config/jigglypuff.xml
 share/xscreensaver/config/jigsaw.xml
-share/xscreensaver/config/juggle.xml
 share/xscreensaver/config/juggler3d.xml
 share/xscreensaver/config/julia.xml
 share/xscreensaver/config/kaleidescope.xml
@@ -356,6 +356,7 @@ share/xscreensaver/config/rocks.xml
 share/xscreensaver/config/rorschach.xml
 share/xscreensaver/config/rotzoomer.xml
 share/xscreensaver/config/rubik.xml
+share/xscreensaver/config/rubikblocks.xml
 share/xscreensaver/config/sballs.xml
 share/xscreensaver/config/shadebobs.xml
 share/xscreensaver/config/sierpinski.xml
@@ -376,6 +377,7 @@ share/xscreensaver/config/stonerview.xml
 share/xscreensaver/config/strange.xml
 share/xscreensaver/config/substrate.xml
 share/xscreensaver/config/superquadrics.xml
+share/xscreensaver/config/surfaces.xml
 share/xscreensaver/config/swirl.xml
 share/xscreensaver/config/tangram.xml
 share/xscreensaver/config/thornbird.xml
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 9cfc527a2705..ab11e5b8b157 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME?=	xscreensaver-gnome
-PORTVERSION=	5.08
-PORTREVISION?=	1
+PORTVERSION=	5.09
+PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -64,7 +64,7 @@ MAN6?=	anemone.6 anemotaxis.6 antinspect.6 antmaze.6 antspotlight.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 \
+	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 \
@@ -82,7 +82,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 \
+	lcdscrub.6 skytentacles.6 rubikblocks.6 surfaces.6 \
 	xscreensaver-gl-helper.6
 
 .include <bsd.port.pre.mk>
@@ -130,6 +130,10 @@ post-patch:
 	    	${WRKSRC}/driver/Makefile.in
 .endif
 
+pre-build:
+	@(cd ${WRKSRC}/hacks && ./m6502.sh m6502.h images/m6502/*.asm)
+	@(cd ${WRKSRC}/hacks/glx && ./molecules.sh molecules.h ../images/molecules/*.pdb)
+
 pre-install:
 .if defined(WITH_PAM)
 	@${CP} ${WRKDIR}/xscreensaver.pam ${WRKSRC}/driver/xscreensaver.pam
diff --git a/x11/xscreensaver-gnome/distinfo b/x11/xscreensaver-gnome/distinfo
index e8651d82237f..691f1a110382 100644
--- a/x11/xscreensaver-gnome/distinfo
+++ b/x11/xscreensaver-gnome/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.09.tar.gz) = f4d5070eb9f240f4d812f1c80cc32213
+SHA256 (xscreensaver-5.09.tar.gz) = 7014333779fcd70492b098d1ff9f217aaac75f4a2022751ea30d43e242d8cd9e
+SIZE (xscreensaver-5.09.tar.gz) = 5549665
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 75771d4b2196..31dd4f4fc906 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -105,7 +105,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 +159,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 +180,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
@@ -338,7 +339,6 @@ share/xscreensaver/config/interference.xml
 share/xscreensaver/config/intermomentary.xml
 share/xscreensaver/config/jigglypuff.xml
 share/xscreensaver/config/jigsaw.xml
-share/xscreensaver/config/juggle.xml
 share/xscreensaver/config/juggler3d.xml
 share/xscreensaver/config/julia.xml
 share/xscreensaver/config/kaleidescope.xml
@@ -392,6 +392,7 @@ share/xscreensaver/config/rocks.xml
 share/xscreensaver/config/rorschach.xml
 share/xscreensaver/config/rotzoomer.xml
 share/xscreensaver/config/rubik.xml
+share/xscreensaver/config/rubikblocks.xml
 share/xscreensaver/config/sballs.xml
 share/xscreensaver/config/shadebobs.xml
 share/xscreensaver/config/sierpinski.xml
@@ -412,6 +413,7 @@ share/xscreensaver/config/stonerview.xml
 share/xscreensaver/config/strange.xml
 share/xscreensaver/config/substrate.xml
 share/xscreensaver/config/superquadrics.xml
+share/xscreensaver/config/surfaces.xml
 share/xscreensaver/config/swirl.xml
 share/xscreensaver/config/tangram.xml
 share/xscreensaver/config/thornbird.xml