Upgrade to 4.23, which contains the usual round of bugfixes, and a few

new screensaver programs. Also, this version removes one screensaver
program, "it's boring."

Update a hardcoded /usr/X11R6 in configure [1]

Remove some code added in this version to driver/timers.c that causes
problems for me, and reportedly for other FreeBSD users. After discussion
with Jamie, he will likely remove or comment out this code in the next
release, so use sed to delete the lines rather than add a short-lived patch.

Submitted by:	[1] kris, fix derived from xscreensaver-gnome

3 files changed, 19 insertions, 6 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index e4cec7e4fc82..07a4530d24ae 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION=	4.22
+PORTVERSION=	4.23
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
 		http://dougbarton.us/Downloads/
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+=	--with-setuid-hacks
 
 CONFIGURE_ENV=	X_CFLAGS=-I${LOCALBASE}/include/gnome-xml
 
-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 \
@@ -74,6 +74,7 @@ MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	antinspect.1 fuzzyflakes.1 polyhedra.1 providence.1 memscroller.1 \
 	boing.1 boxfit.1 carousel.1 fiberlamp.1 fireworkx.1 fliptext.1 intermomentary.1 \
 	pinion.1 substrate.1 antmaze.1 crackberg.1 interaggregate.1 tangram.1 \
+	celtic.1 cube21.1 glhanoi.1 juggler3d.1 timetunnel.1 \
 	xscreensaver-command.1 xscreensaver-demo.1 xscreensaver-text.1 \
 	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
 	xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1
@@ -96,7 +97,11 @@ post-patch:
 	@ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
 	@ ${SED} -e 's#-lpthread#${PTHREAD_LIBS}#g' \
 		-e 's#malloc.h#stdlib.h#g' \
+		-e 's#/usr/X11R6#${X11BASE}#g' \
 		${WRKSRC}/configure.Patched > ${WRKSRC}/configure
+	${CP} ${WRKSRC}/driver/timers.c ${WRKSRC}/driver/timers.c.presed
+	${SED} 334,344d ${WRKSRC}/driver/timers.c.presed > \
+		${WRKSRC}/driver/timers.c
 
 post-install:
 	@(if test -x ${X11BASE}/bin/xscreensaver-hacks/webcollage-helper; then \
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 6f9e1e553121..409798aa5138 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/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/pkg-plist b/x11/xscreensaver/pkg-plist
index 22803e5129c9..6fbdecc62b2f 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/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
@@ -211,7 +215,6 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/README
 %%DATADIR%%/config/anemone.xml
 %%DATADIR%%/config/anemotaxis.xml
-%%DATADIR%%/config/ant.xml
 %%DATADIR%%/config/antinspect.xml
 %%DATADIR%%/config/antmaze.xml
 %%DATADIR%%/config/antspotlight.xml
@@ -238,6 +241,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/cage.xml
 %%DATADIR%%/config/carousel.xml
 %%DATADIR%%/config/ccurve.xml
+%%DATADIR%%/config/celtic.xml
 %%DATADIR%%/config/circuit.xml
 %%DATADIR%%/config/cloudlife.xml
 %%DATADIR%%/config/compass.xml
@@ -245,6 +249,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/crackberg.xml
 %%DATADIR%%/config/critical.xml
 %%DATADIR%%/config/crystal.xml
+%%DATADIR%%/config/cube21.xml
 %%DATADIR%%/config/cubenetic.xml
 %%DATADIR%%/config/cubestorm.xml
 %%DATADIR%%/config/cynosure.xml
@@ -283,6 +288,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/glblur.xml
 %%DATADIR%%/config/gleidescope.xml
 %%DATADIR%%/config/glforestfire.xml
+%%DATADIR%%/config/glhanoi.xml
 %%DATADIR%%/config/glknots.xml
 %%DATADIR%%/config/glmatrix.xml
 %%DATADIR%%/config/glplanet.xml
@@ -307,6 +313,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/jigglypuff.xml
 %%DATADIR%%/config/jigsaw.xml
 %%DATADIR%%/config/juggle.xml
+%%DATADIR%%/config/juggler3d.xml
 %%DATADIR%%/config/julia.xml
 %%DATADIR%%/config/kaleidescope.xml
 %%DATADIR%%/config/klein.xml
@@ -386,6 +393,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/t3d.xml
 %%DATADIR%%/config/tangram.xml
 %%DATADIR%%/config/thornbird.xml
+%%DATADIR%%/config/timetunnel.xml
 %%DATADIR%%/config/triangle.xml
 %%DATADIR%%/config/truchet.xml
 %%DATADIR%%/config/twang.xml