Update to version 5.15 28-Sep-2011

New hacks, hilbert, companioncube and tronbit.
Image-manipulating hacks can now load from RSS or Atom feeds,
        imageDirectory may contain a URL.
Updated webcollage for recent search engine changes.
photopile sped up.
New molecule in molecule.

For port:

Add dependencies on www/p5-libwww and graphics/netpbm for
webcollage and vidwhacker. Add a tiny patch to vidwhacker.

Install the xscreensaver-properties.desktop file, it's useful
for more than gnome (e.g., XFCE).

4 files changed, 20 insertions, 37 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 7889873ea03c..7df96997d421 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:    xscreensaver
-# Date created:         10 July 1995
-# Whom:                 dom@myrddin.demon.co.uk
+# New ports collection makefile for:	xscreensaver
+# Date created:				10 July 1995
+# Whom:					dom@myrddin.demon.co.uk
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION=	5.14
+PORTVERSION=	5.15
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
 		http://dougbarton.us/Downloads/
@@ -20,6 +20,9 @@ LIB_DEPENDS=	gle.4:${PORTSDIR}/graphics/gle \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		glade-2.0.0:${PORTSDIR}/devel/libglade2
 
+RUN_DEPENDS=	${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
+		giftopnm:${PORTSDIR}/graphics/netpbm
+
 MAKE_JOBS_SAFE=	yes
 
 USE_XORG=	xpm
@@ -126,6 +129,7 @@ MAN6=	anemone.6 anemotaxis.6 antinspect.6 antmaze.6 antspotlight.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
 
 .if ${ARCH} == "amd64"
@@ -138,6 +142,9 @@ post-patch:
 		-e 's#malloc.h#stdlib.h#g' \
 		-e 's#/usr/X11R6#${LOCALBASE}#g' \
 		${WRKSRC}/configure.Patched > ${WRKSRC}/configure
+	@ ${CP} ${WRKSRC}/hacks/vidwhacker ${WRKSRC}/hacks/vidwhacker.presed
+	@ ${SED} -e '329s#.*#      $$fn = "$$imagedir/$$fn";#' \
+	    ${WRKSRC}/hacks/vidwhacker.presed > ${WRKSRC}/hacks/vidwhacker
 .if defined(WITH_PAM)
 .for f in driver/passwd-pam.c driver/xscreensaver.man
 	@ ${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index b6c2015ab2ba..b453dbe8ae27 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xscreensaver-5.14.tar.gz) = 3eea040f452e17572177840566eb880b259ee5a970444f3a4ae178db18ebf023
-SIZE (xscreensaver-5.14.tar.gz) = 5925175
+SHA256 (xscreensaver-5.15.tar.gz) = 4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d
+SIZE (xscreensaver-5.15.tar.gz) = 5977594
diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in
index 095f9f09c41c..e195bfec35fa 100644
--- a/x11/xscreensaver/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver/files/patch-driver_Makefile.in
@@ -11,34 +11,3 @@
  
  UTILS_SRC	= $(srcdir)/../utils
  UTILS_BIN	= ../utils
-@@ -239,7 +239,6 @@
- EXTRAS		= README Makefile.in \
- 		  XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \
- 		  xscreensaver-demo.glade2 xscreensaver-demo.glade2p \
--		  screensaver-properties.desktop.in \
- 		  .gdbinit
- VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
- 		  vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \
-@@ -490,22 +489,6 @@
- 	  fi ;								\
- 	fi
- 
--# screensaver-properties.desktop
--# into /usr/share/applications/
--install-gnome:: screensaver-properties.desktop
--	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
--	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
--	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
--		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
--	   fi								     ;\
--	   name2=xscreensaver-properties.desktop			     ;\
--	   echo $(INSTALL_DATA) screensaver-properties.desktop		      \
--		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
--		$(INSTALL_DATA) screensaver-properties.desktop		      \
--		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
--	 fi
--
--
- # xscreensaver.xpm
- # into /usr/share/pixmaps/
- install-gnome:: $(LOGO)
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 3d9e5de133e9..776fc6bffc6f 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -36,6 +36,7 @@ bin/xscreensaver-hacks/ccurve
 bin/xscreensaver-hacks/celtic
 bin/xscreensaver-hacks/circuit
 bin/xscreensaver-hacks/cloudlife
+bin/xscreensaver-hacks/companioncube
 bin/xscreensaver-hacks/compass
 bin/xscreensaver-hacks/coral
 bin/xscreensaver-hacks/crackberg
@@ -93,6 +94,7 @@ bin/xscreensaver-hacks/greynetic
 bin/xscreensaver-hacks/halftone
 bin/xscreensaver-hacks/halo
 bin/xscreensaver-hacks/helix
+bin/xscreensaver-hacks/hilbert
 bin/xscreensaver-hacks/hopalong
 bin/xscreensaver-hacks/hypertorus
 bin/xscreensaver-hacks/hypnowheel
@@ -185,6 +187,7 @@ bin/xscreensaver-hacks/thornbird
 bin/xscreensaver-hacks/timetunnel
 bin/xscreensaver-hacks/topblock
 bin/xscreensaver-hacks/triangle
+bin/xscreensaver-hacks/tronbit
 bin/xscreensaver-hacks/truchet
 bin/xscreensaver-hacks/twang
 bin/xscreensaver-hacks/vermiculate
@@ -205,6 +208,7 @@ bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
 %%PAM%%etc/pam.d/xscreensaver
 lib/X11/app-defaults/XScreenSaver
+share/applications/xscreensaver-properties.desktop
 share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/README
 %%DATADIR%%/config/abstractile.xml
@@ -239,6 +243,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/circuit.xml
 %%DATADIR%%/config/cloudlife.xml
 %%DATADIR%%/config/compass.xml
+%%DATADIR%%/config/companioncube.xml
 %%DATADIR%%/config/coral.xml
 %%DATADIR%%/config/crackberg.xml
 %%DATADIR%%/config/crystal.xml
@@ -295,6 +300,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/halftone.xml
 %%DATADIR%%/config/halo.xml
 %%DATADIR%%/config/helix.xml
+%%DATADIR%%/config/hilbert.xml
 %%DATADIR%%/config/hopalong.xml
 %%DATADIR%%/config/hypertorus.xml
 %%DATADIR%%/config/hypnowheel.xml
@@ -386,6 +392,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/timetunnel.xml
 %%DATADIR%%/config/topblock.xml
 %%DATADIR%%/config/triangle.xml
+%%DATADIR%%/config/tronbit.xml
 %%DATADIR%%/config/truchet.xml
 %%DATADIR%%/config/twang.xml
 %%DATADIR%%/config/vermiculate.xml