5 files changed, 241 insertions, 66 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 395dadcf5293..f8e2e24bd630 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -2,23 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	xscreensaver
-PORTVERSION=	5.22
-PORTREVISION=	3
+PORTVERSION=	5.26
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Save your screen while you entertain your cat
 
-LIB_DEPENDS=	gle.4:${PORTSDIR}/graphics/gle \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		glade-2.0.0:${PORTSDIR}/devel/libglade2
+LIB_DEPENDS=	libgle.so:${PORTSDIR}/graphics/gle \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \
+		libxml2.so:${PORTSDIR}/textproc/libxml2 \
+		libglade-2.0.so:${PORTSDIR}/devel/libglade2
 
 RUN_DEPENDS=	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
 		giftopnm:${PORTSDIR}/graphics/netpbm
 
+DESTDIRNAME=	install_prefix
 
 CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
 
@@ -46,7 +46,6 @@ XMOUN_DESC=	Add extra port graphics/xmountains
 XPLAN_DESC=	Add extra port astro/xplanet
 XSNOW_DESC=	Add extra port x11/xsnow
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MKERBEROS}
@@ -89,48 +88,6 @@ RUN_DEPENDS+=	xsnow:${PORTSDIR}/x11/xsnow
 
 .undef HAVE_GNOME
 
-MAN1=	xscreensaver-command.1 xscreensaver-demo.1 \
-	xscreensaver-getimage-file.1 xscreensaver-getimage-video.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 \
-	bumps.6 cage.6 carousel.6 ccurve.6 celtic.6 circuit.6 cloudlife.6 \
-	compass.6 coral.6 crackberg.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 flame.6 flipflop.6 flipscreen3d.6 fliptext.6 flow.6 \
-	fluidballs.6 flurry.6 flyingtoasters.6 fontglide.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 hexadrop.6 hopalong.6 hypertorus.6 ifs.6 \
-	imsmap.6 interaggregate.6 interference.6 intermomentary.6 jigglypuff.6 \
-	jigsaw.6 juggler3d.6 julia.6 kaleidocycle.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 \
-	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 \
-	quasicrystal.6 queens.6 rd-bomb.6 ripples.6 rocks.6 rorschach.6 \
-	rotzoomer.6 rubik.6 sballs.6 shadebobs.6 sierpinski.6 sierpinski3d.6 \
-	slidescreen.6 slip.6 sonar.6 speedmine.6 spheremonics.6 \
-	spotlight.6 sproingies.6 squiral.6 stairs.6 starfish.6 \
-	starwars.6 stonerview.6 strange.6 substrate.6 superquadrics.6 \
-	swirl.6 tangram.6 thornbird.6 timetunnel.6 topblock.6 \
-	triangle.6 truchet.6 twang.6 unknownpleasures.6 vermiculate.6 \
-	vidwhacker.6 wander.6 webcollage.6 whirlwindwarp.6 wormhole.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 rubikblocks.6 surfaces.6 \
-	companioncube.6 hilbert.6 tronbit.6 \
-	xscreensaver-gl-helper.6
-
 SUB_FILES=	xscreensaver-blank.desktop xscreensaver-lock.desktop \
 		xscreensaver-start.desktop xscreensaver-stop.desktop
 
@@ -153,11 +110,11 @@ post-patch:
 .endif
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/x*.xml ${DATADIR}/config/
+	${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/
 	@(if test -x ${LOCALBASE}/bin/xscreensaver-hacks/webcollage-helper; then \
 		${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \
 			${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \
 			${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi)
-	${INSTALL_DATA} ${WRKDIR}/*.desktop ${PREFIX}/share/applications/
+	${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/
 
 .include <bsd.port.mk>
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 1e197eeb1f94..3342e5703737 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xscreensaver-5.22.tar.gz) = 47b703ed22dce46a08f11ddd7d67d52e4f7ad8df844bdf956431069a0db36797
-SIZE (xscreensaver-5.22.tar.gz) = 7411666
+SHA256 (xscreensaver-5.26.tar.gz) = 2ca4dc66e11947396124d1f87dd2787e0d8dd8dd1ada8871b3d8df40fb4f1b55
+SIZE (xscreensaver-5.26.tar.gz) = 8760550
diff --git a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
index 30e719540b40..a932659e5ddb 100644
--- a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
+++ b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- driver/XScreenSaver.ad.in.orig	2013-12-09 12:01:40.000000000 +0100
++++ driver/XScreenSaver.ad.in	2013-12-17 19:34:28.222008084 +0100
+@@ -56,7 +56,7 @@
  *splashDuration:	0:00:05
  *visualID:		default
  *captureStderr: 	True
@@ -9,7 +9,16 @@
  
  *textMode:		file
  *textLiteral:		XScreenSaver
-@@ -151,6 +151,18 @@
+@@ -122,7 +122,7 @@
+ 
+ ! The format used for printing the date and time in the password dialog box
+ ! (see the strftime(3) manual page for details.)
+-*dateFormat:		%d-%b-%y (%a); %I:%M %p
++*dateFormat:		%Y-%m-%d %H:%M:%S
+ ! To show the time only:
+ ! *dateFormat:		%I:%M %p
+ ! For 24 hour time:
+@@ -156,6 +156,18 @@
  ! screen savers interactively.
  !
  *programs:								      \
@@ -28,7 +37,7 @@
  				maze -root				    \n\
  @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
  				attraction -root			    \n\
-@@ -246,7 +258,6 @@
+@@ -251,7 +263,6 @@
  				xspirograph -root			    \n\
  @GL_KLUDGE@ GL: 				circuit -root				    \n\
  @GL_KLUDGE@ GL: 				dangerball -root			    \n\
@@ -36,7 +45,7 @@
  @GL_KLUDGE@ GL: 				engine -root				    \n\
  @GL_KLUDGE@ GL: 				flipscreen3d -root			    \n\
  @GL_KLUDGE@ GL: 				gltext -root				    \n\
-@@ -435,7 +446,6 @@
+@@ -449,7 +460,6 @@
  *hacks.cwaves.name:         CWaves
  *hacks.dangerball.name:     DangerBall
  *hacks.decayscreen.name:    DecayScreen
diff --git a/x11/xscreensaver/files/patch-hacks__config__sonar.xml b/x11/xscreensaver/files/patch-hacks__config__sonar.xml
index 4cb3478565f1..9a81c0bc85f2 100644
--- a/x11/xscreensaver/files/patch-hacks__config__sonar.xml
+++ b/x11/xscreensaver/files/patch-hacks__config__sonar.xml
@@ -1,5 +1,5 @@
---- hacks/config/sonar.xml.orig	2012-07-02 12:25:48.000000000 -0700
-+++ hacks/config/sonar.xml	2012-07-04 15:29:38.000000000 -0700
+--- hacks/config/sonar.xml.orig	2013-12-04 23:42:00.000000000 +0100
++++ hacks/config/sonar.xml	2013-12-09 12:29:34.301395635 +0100
 @@ -29,7 +29,7 @@
  
       <option id="ssh" _label="Ping known SSH hosts"      arg-set="-ping /etc/hosts,$HOME/.ssh/known_hosts,$HOME/.ssh/known_hosts2"/>
@@ -9,13 +9,12 @@
  
       <option id="sim" _label="Simulation (don't ping)"   arg-set="-ping simulation"/>
      </select>
-@@ -74,8 +74,7 @@
+@@ -76,6 +76,8 @@
  
  Alternately, it can run a simulation that doesn't involve hosts.
  
--(If pinging doesn't work on Linux, you may need to make the executable
--be setuid.)
 +To ping, use the port build option to install this suid.
- 
++
  http://en.wikipedia.org/wiki/Ping#History
  
+ Written by Jamie Zawinski and Stephen Martin; 1998.
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 56ede55755c4..fafa67fc528b 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -212,6 +212,216 @@ bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
 %%PAM%%etc/pam.d/xscreensaver
 lib/X11/app-defaults/XScreenSaver
+man/man1/xscreensaver-command.1.gz
+man/man1/xscreensaver-demo.1.gz
+man/man1/xscreensaver-getimage-file.1.gz
+man/man1/xscreensaver-getimage-video.1.gz
+man/man1/xscreensaver-getimage.1.gz
+man/man1/xscreensaver-text.1.gz
+man/man1/xscreensaver.1.gz
+man/man6/abstractile.6.gz
+man/man6/anemone.6.gz
+man/man6/anemotaxis.6.gz
+man/man6/antinspect.6.gz
+man/man6/antmaze.6.gz
+man/man6/antspotlight.6.gz
+man/man6/apollonian.6.gz
+man/man6/apple2.6.gz
+man/man6/atlantis.6.gz
+man/man6/attraction.6.gz
+man/man6/atunnel.6.gz
+man/man6/barcode.6.gz
+man/man6/blaster.6.gz
+man/man6/blinkbox.6.gz
+man/man6/blitspin.6.gz
+man/man6/blocktube.6.gz
+man/man6/boing.6.gz
+man/man6/bouboule.6.gz
+man/man6/bouncingcow.6.gz
+man/man6/boxed.6.gz
+man/man6/boxfit.6.gz
+man/man6/braid.6.gz
+man/man6/bsod.6.gz
+man/man6/bubble3d.6.gz
+man/man6/bumps.6.gz
+man/man6/cage.6.gz
+man/man6/carousel.6.gz
+man/man6/ccurve.6.gz
+man/man6/celtic.6.gz
+man/man6/circuit.6.gz
+man/man6/cloudlife.6.gz
+man/man6/companioncube.6.gz
+man/man6/compass.6.gz
+man/man6/coral.6.gz
+man/man6/crackberg.6.gz
+man/man6/crystal.6.gz
+man/man6/cube21.6.gz
+man/man6/cubenetic.6.gz
+man/man6/cubestorm.6.gz
+man/man6/cubicgrid.6.gz
+man/man6/cwaves.6.gz
+man/man6/cynosure.6.gz
+man/man6/dangerball.6.gz
+man/man6/decayscreen.6.gz
+man/man6/deco.6.gz
+man/man6/deluxe.6.gz
+man/man6/demon.6.gz
+man/man6/discrete.6.gz
+man/man6/distort.6.gz
+man/man6/drift.6.gz
+man/man6/endgame.6.gz
+man/man6/engine.6.gz
+man/man6/epicycle.6.gz
+man/man6/eruption.6.gz
+man/man6/euler2d.6.gz
+man/man6/extrusion.6.gz
+man/man6/fadeplot.6.gz
+man/man6/fiberlamp.6.gz
+man/man6/fireworkx.6.gz
+man/man6/flame.6.gz
+man/man6/flipflop.6.gz
+man/man6/flipscreen3d.6.gz
+man/man6/fliptext.6.gz
+man/man6/flow.6.gz
+man/man6/fluidballs.6.gz
+man/man6/flurry.6.gz
+man/man6/flyingtoasters.6.gz
+man/man6/fontglide.6.gz
+man/man6/fuzzyflakes.6.gz
+man/man6/galaxy.6.gz
+man/man6/gears.6.gz
+man/man6/gflux.6.gz
+man/man6/glblur.6.gz
+man/man6/glcells.6.gz
+man/man6/gleidescope.6.gz
+man/man6/glhanoi.6.gz
+man/man6/glknots.6.gz
+man/man6/glmatrix.6.gz
+man/man6/glplanet.6.gz
+man/man6/glschool.6.gz
+man/man6/glslideshow.6.gz
+man/man6/glsnake.6.gz
+man/man6/gltext.6.gz
+man/man6/goop.6.gz
+man/man6/grav.6.gz
+man/man6/greynetic.6.gz
+man/man6/halftone.6.gz
+man/man6/halo.6.gz
+man/man6/helix.6.gz
+man/man6/hexadrop.6.gz
+man/man6/hilbert.6.gz
+man/man6/hopalong.6.gz
+man/man6/hypertorus.6.gz
+man/man6/hypnowheel.6.gz
+man/man6/ifs.6.gz
+man/man6/imsmap.6.gz
+man/man6/interaggregate.6.gz
+man/man6/interference.6.gz
+man/man6/intermomentary.6.gz
+man/man6/jigglypuff.6.gz
+man/man6/jigsaw.6.gz
+man/man6/juggler3d.6.gz
+man/man6/julia.6.gz
+man/man6/kaleidescope.6.gz
+man/man6/kaleidocycle.6.gz
+man/man6/klein.6.gz
+man/man6/kumppa.6.gz
+man/man6/lament.6.gz
+man/man6/lavalite.6.gz
+man/man6/lcdscrub.6.gz
+man/man6/ljlatest.6.gz
+man/man6/lockward.6.gz
+man/man6/loop.6.gz
+man/man6/maze.6.gz
+man/man6/memscroller.6.gz
+man/man6/menger.6.gz
+man/man6/metaballs.6.gz
+man/man6/mirrorblob.6.gz
+man/man6/moebius.6.gz
+man/man6/moebiusgears.6.gz
+man/man6/moire.6.gz
+man/man6/moire2.6.gz
+man/man6/molecule.6.gz
+man/man6/morph3d.6.gz
+man/man6/mountain.6.gz
+man/man6/munch.6.gz
+man/man6/nerverot.6.gz
+man/man6/noof.6.gz
+man/man6/noseguy.6.gz
+man/man6/pacman.6.gz
+man/man6/pedal.6.gz
+man/man6/penetrate.6.gz
+man/man6/penrose.6.gz
+man/man6/petri.6.gz
+man/man6/phosphor.6.gz
+man/man6/photopile.6.gz
+man/man6/piecewise.6.gz
+man/man6/pinion.6.gz
+man/man6/pipes.6.gz
+man/man6/polyhedra.6.gz
+man/man6/polyominoes.6.gz
+man/man6/polytopes.6.gz
+man/man6/pong.6.gz
+man/man6/providence.6.gz
+man/man6/pulsar.6.gz
+man/man6/pyro.6.gz
+man/man6/qix.6.gz
+man/man6/quasicrystal.6.gz
+man/man6/queens.6.gz
+man/man6/rd-bomb.6.gz
+man/man6/ripples.6.gz
+man/man6/rocks.6.gz
+man/man6/rorschach.6.gz
+man/man6/rotzoomer.6.gz
+man/man6/rubik.6.gz
+man/man6/rubikblocks.6.gz
+man/man6/sballs.6.gz
+man/man6/shadebobs.6.gz
+man/man6/sierpinski.6.gz
+man/man6/sierpinski3d.6.gz
+man/man6/skytentacles.6.gz
+man/man6/slidescreen.6.gz
+man/man6/slip.6.gz
+man/man6/sonar.6.gz
+man/man6/speedmine.6.gz
+man/man6/spheremonics.6.gz
+man/man6/spotlight.6.gz
+man/man6/sproingies.6.gz
+man/man6/squiral.6.gz
+man/man6/stairs.6.gz
+man/man6/starfish.6.gz
+man/man6/starwars.6.gz
+man/man6/stonerview.6.gz
+man/man6/strange.6.gz
+man/man6/substrate.6.gz
+man/man6/superquadrics.6.gz
+man/man6/surfaces.6.gz
+man/man6/swirl.6.gz
+man/man6/tangram.6.gz
+man/man6/thornbird.6.gz
+man/man6/timetunnel.6.gz
+man/man6/topblock.6.gz
+man/man6/triangle.6.gz
+man/man6/tronbit.6.gz
+man/man6/truchet.6.gz
+man/man6/twang.6.gz
+man/man6/unknownpleasures.6.gz
+man/man6/vermiculate.6.gz
+man/man6/vidwhacker.6.gz
+man/man6/voronoi.6.gz
+man/man6/wander.6.gz
+man/man6/webcollage.6.gz
+man/man6/whirlwindwarp.6.gz
+man/man6/wormhole.6.gz
+man/man6/xanalogtv.6.gz
+man/man6/xflame.6.gz
+man/man6/xjack.6.gz
+man/man6/xlyap.6.gz
+man/man6/xmatrix.6.gz
+man/man6/xrayswarm.6.gz
+man/man6/xscreensaver-gl-helper.6.gz
+man/man6/xspirograph.6.gz
+man/man6/zoom.6.gz
 share/applications/xscreensaver-blank.desktop
 share/applications/xscreensaver-lock.desktop
 share/applications/xscreensaver-properties.desktop