3 files changed, 46 insertions, 17 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 9c58422ce6cc..3f6054e9bc93 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION=	5.06
+PORTVERSION=	5.07
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
 		http://dougbarton.us/Downloads/
@@ -33,7 +33,15 @@ CONFIGURE_ARGS=	--with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
 OPTIONS=	ALL_FORTUNES "Run fortune with -sa argument" off \
 		KERBEROS "Add support for kerberos" off \
 		PAM "Add support for pam authentication" off \
-		SETUID_HACKS "Install sonar hack suid so it can ping" off
+		SETUID_HACKS "Install sonar hack suid so it can ping" off \
+		SHEEP "Add extra port x11/electricsheep" off \
+		FIREF "Add extra port x11/fireflies" off \
+		XAOS1 "Add extra port graphics/xaos" off \
+		XDALI "Add extra port x11-clocks/xdaliclock" off \
+		XURTH "Add extra port astro/xearth" off \
+		XMOUN "Add extra port graphics/xmountains" off \
+		XPLAN "Add extra port astro/xplanet" off \
+		XSNOW "Add extra port x11/xsnow" off
 
 .include <bsd.port.pre.mk>
 
@@ -56,6 +64,31 @@ PLIST_SUB+=		PAM="@comment not installed: "
 CONFIGURE_ARGS+=	--with-setuid-hacks
 .endif
 
+.if defined(WITH_SHEEP)
+RUN_DEPENDS+=	electricsheep:${PORTSDIR}/x11/electricsheep
+.endif
+.if defined(WITH_FIREF)
+RUN_DEPENDS+=	${X11BASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
+.endif
+.if defined(WITH_XAOS1)
+RUN_DEPENDS+=	xaos:${PORTSDIR}/graphics/xaos
+.endif
+.if defined(WITH_XDALI)
+RUN_DEPENDS+=	xdaliclock:${PORTSDIR}/x11-clocks/xdaliclock
+.endif
+.if defined(WITH_XURTH)
+RUN_DEPENDS+=	xearth:${PORTSDIR}/astro/xearth
+.endif
+.if defined(WITH_XMOUN)
+RUN_DEPENDS+=	xmountains:${PORTSDIR}/graphics/xmountains
+.endif
+.if defined(WITH_XPLAN)
+RUN_DEPENDS+=	xplanet:${PORTSDIR}/astro/xplanet
+.endif
+.if defined(WITH_XSNOW)
+RUN_DEPENDS+=	xsnow:${PORTSDIR}/x11/xsnow
+.endif
+
 .undef HAVE_GNOME
 
 CONFIGURE_ENV=	X_CFLAGS=-I${LOCALBASE}/include/gnome-xml
@@ -115,7 +148,6 @@ pre-fetch:
 	@sleep 2
 .endif
 
-USE_DOS2UNIX=	hacks/glx/topblock.c
 post-patch:
 	@ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
 	@ ${SED} -e 's#-lpthread#${PTHREAD_LIBS}#g' \
@@ -136,6 +168,7 @@ post-patch:
 .endif
 
 post-install:
+	${INSTALL_DATA} ${FILESDIR}/*.xml ${DATADIR}/config/
 	@(if test -x ${LOCALBASE}/bin/xscreensaver-hacks/webcollage-helper; then \
 		${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \
 			${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 5bde7f3aa4b1..1071f1b0e3a4 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xscreensaver-5.06.tar.gz) = c6b2cab02aaea32684d37a9a76488e0f
-SHA256 (xscreensaver-5.06.tar.gz) = e7fb2f228caca0fed3181b0c88970f7bf501c385f8cdb4e152b34a0f43df38f6
-SIZE (xscreensaver-5.06.tar.gz) = 5486779
+MD5 (xscreensaver-5.07.tar.gz) = 55a12fcb5d3a7231c9850ef9d9f82918
+SHA256 (xscreensaver-5.07.tar.gz) = 8c50a74c07b1fffcbb20bd79e3ee92f1f52191e5a187433bb49964ccf94badb6
+SIZE (xscreensaver-5.07.tar.gz) = 5513131
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index ff91c56112b2..db71d490661a 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -219,7 +219,6 @@ bin/xscreensaver-hacks/xlyap
 bin/xscreensaver-hacks/xmatrix
 bin/xscreensaver-hacks/xrayswarm
 bin/xscreensaver-hacks/xspirograph
-bin/xscreensaver-hacks/xsublim
 bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
 %%PAM%%etc/pam.d/xscreensaver
@@ -260,7 +259,6 @@ 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
@@ -279,7 +277,6 @@ 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
@@ -287,7 +284,6 @@ 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
@@ -316,7 +312,6 @@ share/pixmaps/xscreensaver.xpm
 %%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
@@ -405,7 +400,6 @@ 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
@@ -438,18 +432,20 @@ 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/zoom.xml
+%%DATADIR%%/config/electricsheep.xml
+%%DATADIR%%/config/xaos.xml
+%%DATADIR%%/config/xdaliclock.xml
+%%DATADIR%%/config/xearth.xml
+%%DATADIR%%/config/xmountains.xml
+%%DATADIR%%/config/xplanet.xml
+%%DATADIR%%/config/xsnow.xml
 %%DATADIR%%/glade/screensaver-cmndln.png
 %%DATADIR%%/glade/screensaver-colorselector.png
 %%DATADIR%%/glade/screensaver-diagnostic.png