Update to 4.23. See http://www.jwz.org/xscreensaver/changelog.html for the

list of fixes and new hacks.

6 files changed, 29 insertions, 68 deletions

diff --git a/x11/xscreensaver-gnome-hacks/Makefile b/x11/xscreensaver-gnome-hacks/Makefile
index ccd51c38fcc9..498b0b1490e5 100644
--- a/x11/xscreensaver-gnome-hacks/Makefile
+++ b/x11/xscreensaver-gnome-hacks/Makefile
@@ -20,7 +20,7 @@ OPTIONS=	ALL_FORTUNES "Enable support for all fortunes" off
 
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-nodriver
 
-MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
+MAN1=	anemone.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	blitspin.1 bouboule.1 boxed.1 braid.1 bsod.1 bubble3d.1 bubbles.1 \
 	bumps.1 cage.1 ccurve.1 circuit.1 compass.1 coral.1 critical.1 \
 	crystal.1 cubenetic.1 cynosure.1 dangerball.1 decayscreen.1 deco.1 \
@@ -51,7 +51,8 @@ MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	mismunch.1 noof.1 pacman.1 wormhole.1 antinspect.1 fuzzyflakes.1\
 	polyhedra.1 anemotaxis.1 providence.1 memscroller.1 fireworkx.1 \
 	intermomentary.1 pinion.1 substrate.1 boing.1 boxfit.1 carousel.1 \
-	antmaze.1 crackberg.1 interaggregate.1 tangram.1 \
+	antmaze.1 crackberg.1 interaggregate.1 tangram.1 celtic.1 \
+	cube21.1 glhanoi.1 juggler3d.1 timetunnel.1 \
 	fiberlamp.1 fliptext.1 xscreensaver-gl-helper.1
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/xscreensaver-gnome-hacks/pkg-plist b/x11/xscreensaver-gnome-hacks/pkg-plist
index 1f8cfe01a26d..f0fab121cb77 100644
--- a/x11/xscreensaver-gnome-hacks/pkg-plist
+++ b/x11/xscreensaver-gnome-hacks/pkg-plist
@@ -1,7 +1,6 @@
 bin/xscreensaver-gl-helper
 bin/xscreensaver-hacks/anemone
 bin/xscreensaver-hacks/anemotaxis
-bin/xscreensaver-hacks/ant
 bin/xscreensaver-hacks/antinspect
 bin/xscreensaver-hacks/antmaze
 bin/xscreensaver-hacks/antspotlight
@@ -28,6 +27,7 @@ bin/xscreensaver-hacks/bumps
 bin/xscreensaver-hacks/cage
 bin/xscreensaver-hacks/carousel
 bin/xscreensaver-hacks/ccurve
+bin/xscreensaver-hacks/celtic
 bin/xscreensaver-hacks/circuit
 bin/xscreensaver-hacks/cloudlife
 bin/xscreensaver-hacks/compass
@@ -35,6 +35,7 @@ bin/xscreensaver-hacks/coral
 bin/xscreensaver-hacks/crackberg
 bin/xscreensaver-hacks/critical
 bin/xscreensaver-hacks/crystal
+bin/xscreensaver-hacks/cube21
 bin/xscreensaver-hacks/cubenetic
 bin/xscreensaver-hacks/cubestorm
 bin/xscreensaver-hacks/cynosure
@@ -73,6 +74,7 @@ bin/xscreensaver-hacks/gflux
 bin/xscreensaver-hacks/glblur
 bin/xscreensaver-hacks/gleidescope
 bin/xscreensaver-hacks/glforestfire
+bin/xscreensaver-hacks/glhanoi
 bin/xscreensaver-hacks/glknots
 bin/xscreensaver-hacks/glmatrix
 bin/xscreensaver-hacks/glplanet
@@ -97,6 +99,7 @@ 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
 bin/xscreensaver-hacks/klein
@@ -177,6 +180,7 @@ bin/xscreensaver-hacks/swirl
 bin/xscreensaver-hacks/t3d
 bin/xscreensaver-hacks/tangram
 bin/xscreensaver-hacks/thornbird
+bin/xscreensaver-hacks/timetunnel
 bin/xscreensaver-hacks/triangle
 bin/xscreensaver-hacks/truchet
 bin/xscreensaver-hacks/twang
@@ -202,7 +206,6 @@ bin/xscreensaver-hacks/xteevee
 bin/xscreensaver-hacks/zoom
 share/xscreensaver/config/anemone.xml
 share/xscreensaver/config/anemotaxis.xml
-share/xscreensaver/config/ant.xml
 share/xscreensaver/config/antinspect.xml
 share/xscreensaver/config/antmaze.xml
 share/xscreensaver/config/antspotlight.xml
@@ -229,6 +232,7 @@ share/xscreensaver/config/bumps.xml
 share/xscreensaver/config/cage.xml
 share/xscreensaver/config/carousel.xml
 share/xscreensaver/config/ccurve.xml
+share/xscreensaver/config/celtic.xml
 share/xscreensaver/config/circuit.xml
 share/xscreensaver/config/cloudlife.xml
 share/xscreensaver/config/compass.xml
@@ -236,6 +240,7 @@ share/xscreensaver/config/coral.xml
 share/xscreensaver/config/crackberg.xml
 share/xscreensaver/config/critical.xml
 share/xscreensaver/config/crystal.xml
+share/xscreensaver/config/cube21.xml
 share/xscreensaver/config/cubenetic.xml
 share/xscreensaver/config/cubestorm.xml
 share/xscreensaver/config/cynosure.xml
@@ -274,6 +279,7 @@ share/xscreensaver/config/gflux.xml
 share/xscreensaver/config/glblur.xml
 share/xscreensaver/config/gleidescope.xml
 share/xscreensaver/config/glforestfire.xml
+share/xscreensaver/config/glhanoi.xml
 share/xscreensaver/config/glknots.xml
 share/xscreensaver/config/glmatrix.xml
 share/xscreensaver/config/glplanet.xml
@@ -298,6 +304,7 @@ 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
 share/xscreensaver/config/klein.xml
@@ -377,6 +384,7 @@ share/xscreensaver/config/swirl.xml
 share/xscreensaver/config/t3d.xml
 share/xscreensaver/config/tangram.xml
 share/xscreensaver/config/thornbird.xml
+share/xscreensaver/config/timetunnel.xml
 share/xscreensaver/config/triangle.xml
 share/xscreensaver/config/truchet.xml
 share/xscreensaver/config/twang.xml
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 669210744410..10e5980e08ad 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	xscreensaver-gnome
-PORTVERSION=	4.22
+PORTVERSION=	4.23
 PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
@@ -38,7 +38,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 OPTIONS?=	PAM "Pluggable Authentication Module support" off \
 		ALL_FORTUNES "Enable support for all fortunes" off
 
-MAN1?=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
+MAN1?=	anemone.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	blitspin.1 bouboule.1 boxed.1 braid.1 bsod.1 bubble3d.1 bubbles.1 \
 	bumps.1 cage.1 ccurve.1 circuit.1 compass.1 coral.1 critical.1 \
 	crystal.1 cubenetic.1 cynosure.1 dangerball.1 decayscreen.1 deco.1 \
@@ -69,7 +69,8 @@ MAN1?=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	mismunch.1 noof.1 pacman.1 wormhole.1 antinspect.1 fuzzyflakes.1\
 	polyhedra.1 anemotaxis.1 providence.1 memscroller.1 fireworkx.1 \
 	intermomentary.1 pinion.1 substrate.1 boing.1 boxfit.1 carousel.1 \
-	antmaze.1 crackberg.1 interaggregate.1 tangram.1 \
+	antmaze.1 crackberg.1 interaggregate.1 tangram.1 celtic.1 \
+	cube21.1 glhanoi.1 juggler3d.1 timetunnel.1 \
 	fiberlamp.1 fliptext.1 xscreensaver-text.1 \
 	xscreensaver-command.1 xscreensaver-demo.1 \
 	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
diff --git a/x11/xscreensaver-gnome/distinfo b/x11/xscreensaver-gnome/distinfo
index 6f9e1e553121..409798aa5138 100644
--- a/x11/xscreensaver-gnome/distinfo
+++ b/x11/xscreensaver-gnome/distinfo
@@ -1,2 +1,2 @@
-MD5 (xscreensaver-4.22.tar.gz) = 9f37c428f034e581026e243445378195
-SIZE (xscreensaver-4.22.tar.gz) = 4620066
+MD5 (xscreensaver-4.23.tar.gz) = 27491d117a8f7ae57d1fdf5f15d61ac6
+SIZE (xscreensaver-4.23.tar.gz) = 4939070
diff --git a/x11/xscreensaver-gnome/files/patch-hacks_glx_antmaze.c b/x11/xscreensaver-gnome/files/patch-hacks_glx_antmaze.c
deleted file mode 100644
index dc67f38d966f..000000000000
--- a/x11/xscreensaver-gnome/files/patch-hacks_glx_antmaze.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- hacks/glx/antmaze.c.orig	Sun Jun 26 16:22:35 2005
-+++ hacks/glx/antmaze.c	Sun Jun 26 16:26:02 2005
-@@ -975,6 +975,7 @@ void update_ants(void) {
- 
-   /* fade out */
-   if(fadeoutspeed < -0.00001) {
-+    GLfloat df[4];
- 
-     if(fadeout <= 0.0) {
-       /* switch boards: rebuild old board, increment current */
-@@ -985,20 +986,27 @@ void update_ants(void) {
-     
-     fadeout += fadeoutspeed;
- 
--    GLfloat df[4] = {0.8*fadeout, 0.8*fadeout, 0.8*fadeout, 1.0};
-+    df[0] = 0.8*fadeout;
-+    df[1] = 0.8*fadeout;
-+    df[2] = 0.8*fadeout;
-+    df[3] = 1.0;
-     glLightfv(GL_LIGHT0, GL_DIFFUSE, df);
-     glLightfv(GL_LIGHT1, GL_DIFFUSE, df);
-   }
- 
-   /* fade in */
-   if(fadeoutspeed > 0.0001) {
-+    GLfloat df[4];
-     fadeout += fadeoutspeed;
-     if(fadeout >= 1.0) {
-       fadeout = 1.0;
-       fadeoutspeed = 0.0;
-       entroducing = 12;
-     }
--    GLfloat df[4] = {0.8*fadeout, 0.8*fadeout, 0.8*fadeout, 1.0};
-+    df[0] = 0.8*fadeout;
-+    df[1] = 0.8*fadeout;
-+    df[2] = 0.8*fadeout;
-+    df[3] = 1.0;
-     glLightfv(GL_LIGHT0, GL_DIFFUSE, df);
-     glLightfv(GL_LIGHT1, GL_DIFFUSE, df);    
-   }
-@@ -1160,6 +1168,7 @@ void update_ants(void) {
-       double dx = antpath[i][part[i]][0] - antposition[i][0];
-       double dz = - antpath[i][part[i]][1] + antposition[i][1];
-       double theta, ideal;
-+      double dt;
- 
-       if(dz > EPSILON)
- 	theta = atan(dz/dx);
-@@ -1171,7 +1180,7 @@ void update_ants(void) {
- 	ideal += Pi;
- 
-       /* compute correction */
--      double dt = sign(ideal) * min(fabs(ideal), PI/90.0);
-+      dt = sign(ideal) * min(fabs(ideal), PI/90.0);
-       antdirection[i] += dt;
-       if(antdirection[i] > 2.0*PI)
- 	antdirection[i] = 0.0;
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 5388bf7d59e7..ceb4a9534228 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -7,7 +7,6 @@ bin/xscreensaver-getimage-video
 bin/xscreensaver-gl-helper
 bin/xscreensaver-hacks/anemone
 bin/xscreensaver-hacks/anemotaxis
-bin/xscreensaver-hacks/ant
 bin/xscreensaver-hacks/antinspect
 bin/xscreensaver-hacks/antmaze
 bin/xscreensaver-hacks/antspotlight
@@ -34,6 +33,7 @@ bin/xscreensaver-hacks/bumps
 bin/xscreensaver-hacks/cage
 bin/xscreensaver-hacks/carousel
 bin/xscreensaver-hacks/ccurve
+bin/xscreensaver-hacks/celtic
 bin/xscreensaver-hacks/circuit
 bin/xscreensaver-hacks/cloudlife
 bin/xscreensaver-hacks/compass
@@ -41,6 +41,7 @@ bin/xscreensaver-hacks/coral
 bin/xscreensaver-hacks/crackberg
 bin/xscreensaver-hacks/critical
 bin/xscreensaver-hacks/crystal
+bin/xscreensaver-hacks/cube21
 bin/xscreensaver-hacks/cubenetic
 bin/xscreensaver-hacks/cubestorm
 bin/xscreensaver-hacks/cynosure
@@ -79,6 +80,7 @@ bin/xscreensaver-hacks/gflux
 bin/xscreensaver-hacks/glblur
 bin/xscreensaver-hacks/gleidescope
 bin/xscreensaver-hacks/glforestfire
+bin/xscreensaver-hacks/glhanoi
 bin/xscreensaver-hacks/glknots
 bin/xscreensaver-hacks/glmatrix
 bin/xscreensaver-hacks/glplanet
@@ -103,6 +105,7 @@ 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
 bin/xscreensaver-hacks/klein
@@ -183,6 +186,7 @@ bin/xscreensaver-hacks/swirl
 bin/xscreensaver-hacks/t3d
 bin/xscreensaver-hacks/tangram
 bin/xscreensaver-hacks/thornbird
+bin/xscreensaver-hacks/timetunnel
 bin/xscreensaver-hacks/triangle
 bin/xscreensaver-hacks/truchet
 bin/xscreensaver-hacks/twang
@@ -244,7 +248,6 @@ share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
 share/xscreensaver/config/README
 share/xscreensaver/config/anemone.xml
 share/xscreensaver/config/anemotaxis.xml
-share/xscreensaver/config/ant.xml
 share/xscreensaver/config/antinspect.xml
 share/xscreensaver/config/antmaze.xml
 share/xscreensaver/config/antspotlight.xml
@@ -270,6 +273,7 @@ share/xscreensaver/config/bubbles.xml
 share/xscreensaver/config/bumps.xml
 share/xscreensaver/config/cage.xml
 share/xscreensaver/config/carousel.xml
+share/xscreensaver/config/celtic.xml
 share/xscreensaver/config/ccurve.xml
 share/xscreensaver/config/circuit.xml
 share/xscreensaver/config/cloudlife.xml
@@ -278,6 +282,7 @@ share/xscreensaver/config/coral.xml
 share/xscreensaver/config/crackberg.xml
 share/xscreensaver/config/critical.xml
 share/xscreensaver/config/crystal.xml
+share/xscreensaver/config/cube21.xml
 share/xscreensaver/config/cubenetic.xml
 share/xscreensaver/config/cubestorm.xml
 share/xscreensaver/config/cynosure.xml
@@ -316,6 +321,7 @@ share/xscreensaver/config/gflux.xml
 share/xscreensaver/config/glblur.xml
 share/xscreensaver/config/gleidescope.xml
 share/xscreensaver/config/glforestfire.xml
+share/xscreensaver/config/glhanoi.xml
 share/xscreensaver/config/glknots.xml
 share/xscreensaver/config/glmatrix.xml
 share/xscreensaver/config/glplanet.xml
@@ -340,6 +346,7 @@ 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
 share/xscreensaver/config/klein.xml
@@ -419,6 +426,7 @@ share/xscreensaver/config/swirl.xml
 share/xscreensaver/config/t3d.xml
 share/xscreensaver/config/tangram.xml
 share/xscreensaver/config/thornbird.xml
+share/xscreensaver/config/timetunnel.xml
 share/xscreensaver/config/triangle.xml
 share/xscreensaver/config/truchet.xml
 share/xscreensaver/config/twang.xml