3 files changed, 55 insertions, 50 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 4179f43bd09a..b8d85ffe30df 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION=	4.24
-PORTREVISION=	1
+PORTVERSION=	5.00
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
 		http://dougbarton.us/Downloads/
@@ -47,41 +46,44 @@ CONFIGURE_ARGS+=	--with-setuid-hacks
 
 CONFIGURE_ENV=	X_CFLAGS=-I${LOCALBASE}/include/gnome-xml
 
-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 \
-	deluxe.1 demon.1 discrete.1 distort.1 drift.1 engine.1 epicycle.1 \
-	euler2d.1 extrusion.1 fadeplot.1 flag.1 flame.1 flipscreen3d.1 flow.1 \
-	fluidballs.1 forest.1 galaxy.1 gears.1 gflux.1 glforestfire.1 \
-	glplanet.1 glsnake.1 gltext.1 goop.1 grav.1 greynetic.1 halo.1 helix.1 \
-	hopalong.1 hyperball.1 hypercube.1 ifs.1 imsmap.1 interference.1 \
-	jigsaw.1 juggle.1 julia.1 kaleidescope.1 kumppa.1 lament.1 laser.1 \
-	lavalite.1 lightning.1 lisa.1 lissie.1 lmorph.1 loop.1 maze.1 menger.1 \
-	moebius.1 moire.1 moire2.1 molecule.1 morph3d.1 mountain.1 munch.1 \
-	nerverot.1 noseguy.1 pedal.1 penetrate.1 penrose.1 petri.1 phosphor.1 \
-	pipes.1 polyominoes.1 pulsar.1 pyro.1 qix.1 queens.1 rd-bomb.1 \
-	ripples.1 rocks.1 rorschach.1 rotor.1 rotzoomer.1 rubik.1 sballs.1 \
-	shadebobs.1 sierpinski.1 sierpinski3d.1 slidescreen.1 slip.1 sonar.1 \
-	speedmine.1 sphere.1 spheremonics.1 spiral.1 spotlight.1 sproingies.1 \
-	squiral.1 stairs.1 starfish.1 starwars.1 stonerview.1 strange.1 \
-	superquadrics.1 swirl.1 t3d.1 thornbird.1 triangle.1 truchet.1 twang.1 \
-	vermiculate.1 vidwhacker.1 vines.1 wander.1 webcollage.1 \
-	whirlwindwarp.1 whirlygig.1 worm.1 xflame.1 xjack.1 xlyap.1 \
-	xmatrix.1 xrayswarm.1 xspirograph.1 xsublim.1 xteevee.1 zoom.1 \
-	endgame.1 glblur.1 halftone.1 barcode.1 eruption.1 flurry.1 metaballs.1 \
-	atunnel.1 piecewise.1 bouncingcow.1 flyingtoasters.1 glslideshow.1 \
-	jigglypuff.1 klein.1 cloudlife.1 hypertorus.1 glmatrix.1 cubestorm.1 \
-	glknots.1 blocktube.1 flipflop.1 antspotlight.1 polytopes.1 ljlatest.1 \
-	apple2.1 blinkbox.1 fontglide.1 gleidescope.1 mirrorblob.1 pong.1 \
-	xanalogtv.1 mismunch.1 noof.1 pacman.1 wormhole.1 anemotaxis.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 \
+MAN1=	xscreensaver-command.1 xscreensaver-demo.1 \
 	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
-	xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1
+	xscreensaver-getimage.1 xscreensaver-text.1 xscreensaver.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 \
+	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 \
+	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 \
+	fuzzyflakes.6 galaxy.6 gears.6 gflux.6 glblur.6 gleidescope.6 \
+	glforestfire.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 \
+	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 \
+	rubik.6 sballs.6 shadebobs.6 sierpinski.6 sierpinski3d.6 slidescreen.6 \
+	slip.6 sonar.6 speedmine.6 sphere.6 spheremonics.6 spiral.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 \
+	xanalogtv.6 xflame.6 xjack.6 xlyap.6 xmatrix.6 xrayswarm.6 \
+	xspirograph.6 xsublim.6 zoom.6 \
+	xscreensaver-gl-helper.6
 
 .if ${ARCH} == "amd64"
 CFLAGS+=	-O0
@@ -95,15 +97,6 @@ pre-fetch:
 	@${ECHO} '    and cd ../xscreensaver-gnome.'
 	@${ECHO} ''
 	@sleep 2
-.if defined(XS_WITH_ALL_FORTUNES) || defined(XS_WITH_SETUID_HACKS)
-	@${ECHO} ""
-	@${ECHO} "************************************************"
-	@${ECHO} " Support for the old XS_WITH_* options has been"
-	@${ECHO} "    removed in favor of the OPTIONS method."
-	@${ECHO} "************************************************"
-	@${ECHO} ""
-	@sleep 5
-.endif
 .endif
 
 post-patch:
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 8b6b616cd6fd..51de09758769 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xscreensaver-4.24.tar.gz) = 174b6a7cebd892c1a6c2d56bf5ac5af6
-SHA256 (xscreensaver-4.24.tar.gz) = 73140a9f209921543a6562442b5d68801883b3fff3b6be751bec934f4b456474
-SIZE (xscreensaver-4.24.tar.gz) = 4936993
+MD5 (xscreensaver-5.00.tar.gz) = 2c26877fb0acd508b9a726dce6a77f78
+SHA256 (xscreensaver-5.00.tar.gz) = 976e888bead1185ce3116a92df2829f9fe93061d0539f5d8036ca0ddc016d80f
+SIZE (xscreensaver-5.00.tar.gz) = 5263478
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 6fbdecc62b2f..385917c0a9ad 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -84,6 +84,7 @@ bin/xscreensaver-hacks/glhanoi
 bin/xscreensaver-hacks/glknots
 bin/xscreensaver-hacks/glmatrix
 bin/xscreensaver-hacks/glplanet
+bin/xscreensaver-hacks/glschool
 bin/xscreensaver-hacks/glslideshow
 bin/xscreensaver-hacks/glsnake
 bin/xscreensaver-hacks/gltext
@@ -187,6 +188,7 @@ bin/xscreensaver-hacks/t3d
 bin/xscreensaver-hacks/tangram
 bin/xscreensaver-hacks/thornbird
 bin/xscreensaver-hacks/timetunnel
+bin/xscreensaver-hacks/topblock
 bin/xscreensaver-hacks/triangle
 bin/xscreensaver-hacks/truchet
 bin/xscreensaver-hacks/twang
@@ -207,7 +209,6 @@ bin/xscreensaver-hacks/xmatrix
 bin/xscreensaver-hacks/xrayswarm
 bin/xscreensaver-hacks/xspirograph
 bin/xscreensaver-hacks/xsublim
-bin/xscreensaver-hacks/xteevee
 bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
 lib/X11/app-defaults/XScreenSaver
@@ -246,6 +247,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/cloudlife.xml
 %%DATADIR%%/config/compass.xml
 %%DATADIR%%/config/coral.xml
+%%DATADIR%%/config/cosmos.xml
 %%DATADIR%%/config/crackberg.xml
 %%DATADIR%%/config/critical.xml
 %%DATADIR%%/config/crystal.xml
@@ -262,6 +264,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/distort.xml
 %%DATADIR%%/config/drift.xml
 %%DATADIR%%/config/endgame.xml
+%%DATADIR%%/config/electricsheep.xml
 %%DATADIR%%/config/engine.xml
 %%DATADIR%%/config/epicycle.xml
 %%DATADIR%%/config/eruption.xml
@@ -269,6 +272,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/extrusion.xml
 %%DATADIR%%/config/fadeplot.xml
 %%DATADIR%%/config/fiberlamp.xml
+%%DATADIR%%/config/fireflies.xml
 %%DATADIR%%/config/fireworkx.xml
 %%DATADIR%%/config/flag.xml
 %%DATADIR%%/config/flame.xml
@@ -292,9 +296,11 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/glknots.xml
 %%DATADIR%%/config/glmatrix.xml
 %%DATADIR%%/config/glplanet.xml
+%%DATADIR%%/config/glschool.xml
 %%DATADIR%%/config/glslideshow.xml
 %%DATADIR%%/config/glsnake.xml
 %%DATADIR%%/config/gltext.xml
+%%DATADIR%%/config/goban.xml
 %%DATADIR%%/config/goop.xml
 %%DATADIR%%/config/grav.xml
 %%DATADIR%%/config/greynetic.xml
@@ -377,6 +383,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/sonar.xml
 %%DATADIR%%/config/speedmine.xml
 %%DATADIR%%/config/sphere.xml
+%%DATADIR%%/config/sphereeversion.xml
 %%DATADIR%%/config/spheremonics.xml
 %%DATADIR%%/config/spiral.xml
 %%DATADIR%%/config/spotlight.xml
@@ -394,6 +401,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/tangram.xml
 %%DATADIR%%/config/thornbird.xml
 %%DATADIR%%/config/timetunnel.xml
+%%DATADIR%%/config/topblock.xml
 %%DATADIR%%/config/triangle.xml
 %%DATADIR%%/config/truchet.xml
 %%DATADIR%%/config/twang.xml
@@ -407,13 +415,17 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/worm.xml
 %%DATADIR%%/config/wormhole.xml
 %%DATADIR%%/config/xanalogtv.xml
+%%DATADIR%%/config/xaos.xml
+%%DATADIR%%/config/xdaliclock.xml
 %%DATADIR%%/config/xflame.xml
 %%DATADIR%%/config/xjack.xml
 %%DATADIR%%/config/xlyap.xml
 %%DATADIR%%/config/xmatrix.xml
+%%DATADIR%%/config/xmountains.xml
+%%DATADIR%%/config/xplanet.xml
 %%DATADIR%%/config/xrayswarm.xml
+%%DATADIR%%/config/xsnow.xml
 %%DATADIR%%/config/xspirograph.xml
-%%DATADIR%%/config/xteevee.xml
 %%DATADIR%%/config/zoom.xml
 %%DATADIR%%/glade/screensaver-cmndln.png
 %%DATADIR%%/glade/screensaver-colorselector.png