- Update to 5.33

- Resolves the obnoxious startup message issue [1]
- Add options NLS and XFT
- Convert to USES=autoreconf
- Don't install pam file when PAM option is disabled
- Regenerate patches

PR:		201254
Submitted by:	Will B. <will_brokenbourgh at yahoo.com>
Approved by:	Maintainer timeout
MFH:		2015Q4 [1]

10 files changed, 104 insertions, 78 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 4356026658bb..781d97c3845a 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xscreensaver
-PORTVERSION=	5.29
-PORTREVISION=	4
+PORTVERSION=	5.33
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
@@ -14,12 +13,9 @@ RUN_DEPENDS=	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
 		giftopnm:${PORTSDIR}/graphics/netpbm
 LIB_DEPENDS=	libgle.so:${PORTSDIR}/graphics/gle
 
-DESTDIRNAME=	install_prefix
-
 CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
 
-USES=		gettext gmake jpeg perl5 pkgconfig
-USE_AUTOTOOLS=	autoconf
+USES=		autoreconf gettext gmake jpeg perl5 pkgconfig
 USE_GL=		yes
 USE_GNOME=	gdkpixbuf2 gtk20 intltool libglade2 libxml2
 USE_PERL5=	run
@@ -35,11 +31,12 @@ CONFIGURE_ARGS=	--with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
 		--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \
 		--with-xf86gamma-ext --with-randr-ext --without-kerberos \
 		--without-setuid-hacks --enable-locking
+MAKE_ARGS+=	install_prefix=${STAGEDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	PAM SETUID_HACKS FIREF XAOS1 XDALI XEARTH \
-		XMOUN XPLANET XSNOW
+OPTIONS_DEFINE=	PAM SETUID_HACKS FIREF NLS XAOS1 XDALI XEARTH \
+		XFT XMOUN XPLANET XSNOW
 OPTIONS_SUB=	yes
 
 PAM_CONFIGURE_WITH=		pam
@@ -49,12 +46,18 @@ SETUID_HACKS_DESC=		Install sonar hack suid so it can ping
 FIREF_DESC=			Add extra port x11/fireflies
 FIREF_RUN_DEPENDS=		${LOCALBASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
 
+NLS_USES=			gettext-runtime
+NLS_CONFIGURE_ENABLE=		nls
+
 XAOS1_DESC=			Add extra port graphics/xaos
 XAOS1_RUN_DEPENDS=		xaos:${PORTSDIR}/graphics/xaos
 
 XDALI_DESC=			Add extra port x11-clocks/xdaliclock
 XDALI_RUN_DEPENDS=		xdaliclock:${PORTSDIR}/x11-clocks/xdaliclock
 
+XFT_CONFIGURE_WITH=		xft
+XFT_USE=			XORG=xft
+
 XEARTH_DESC=			Add extra port astro/xearth
 XEARTH_RUN_DEPENDS=		xearth:${PORTSDIR}/astro/xearth
 
@@ -83,5 +86,6 @@ post-patch:
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/
 	${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/
+	${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver.pam
 
 .include <bsd.port.mk>
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index c530db549b26..a7c729fda77a 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xscreensaver-5.29.tar.gz) = c418f5750696b578df6d4fd62c8260c018667653ece97f2bb90612046bf0f294
-SIZE (xscreensaver-5.29.tar.gz) = 8774562
+SHA256 (xscreensaver-5.33.tar.gz) = d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d
+SIZE (xscreensaver-5.33.tar.gz) = 10725482
diff --git a/x11/xscreensaver/files/patch-config.h.in b/x11/xscreensaver/files/patch-config.h.in
index 1d1561653ce8..8c9186540b1e 100644
--- a/x11/xscreensaver/files/patch-config.h.in
+++ b/x11/xscreensaver/files/patch-config.h.in
@@ -1,6 +1,6 @@
---- config.h.in.orig	2013-09-02 12:44:35.341733572 +0200
-+++ config.h.in	2013-09-02 12:45:05.396737361 +0200
-@@ -340,6 +340,9 @@
+--- config.h.in.orig	2014-10-08 18:09:49 UTC
++++ config.h.in
+@@ -304,6 +304,9 @@
  /* Define to 1 if you have the <util.h> header file. */
  #undef HAVE_UTIL_H
  
diff --git a/x11/xscreensaver/files/patch-configure.in b/x11/xscreensaver/files/patch-configure.in
index e56bcded9551..a6226c4d890e 100644
--- a/x11/xscreensaver/files/patch-configure.in
+++ b/x11/xscreensaver/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2013-09-02 12:45:33.940731237 +0200
-+++ configure.in	2013-09-02 12:46:13.253728009 +0200
-@@ -3359,7 +3359,7 @@
+--- configure.in.orig	2014-10-08 18:09:41 UTC
++++ configure.in
+@@ -3510,7 +3510,7 @@ fi
  ###############################################################################
  
  PTY_LIBS=
diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in
index 54c8757b0059..a36a18616e5c 100644
--- a/x11/xscreensaver/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver/files/patch-driver_Makefile.in
@@ -1,6 +1,15 @@
---- driver/Makefile.in.orig	2013-07-16 11:23:32.000000000 +0200
-+++ driver/Makefile.in	2013-09-02 11:56:16.862939343 +0200
-@@ -81,8 +81,8 @@
+--- driver/Makefile.in.orig	2015-06-25 18:58:54 UTC
++++ driver/Makefile.in
+@@ -51,7 +51,7 @@ DEPEND_DEFINES	= @DEPEND_DEFINES@
+ 
+ SHELL		= /bin/sh
+ INSTALL		= @INSTALL@
+-SUID_FLAGS      = -o root -m 4755
++SUID_FLAGS      = -m 755
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT  = @INSTALL_SCRIPT@
+ INSTALL_SETUID  = @INSTALL_SETUID@
+@@ -81,8 +81,8 @@ XPM_LIBS	= @XPM_LIBS@
  
  
  AD_DIR		= @APPDEFAULTS@
@@ -11,7 +20,7 @@
  
  UTILS_SRC	= $(srcdir)/../utils
  UTILS_BIN	= ../utils
-@@ -207,7 +207,7 @@
+@@ -205,7 +205,7 @@ PDF2JPEG_LIBS	= -framework Cocoa
  SAVER_LIBS	= $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
  		  $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
  		  -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
diff --git a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
index a932659e5ddb..4770884540cf 100644
--- a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
+++ b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
@@ -1,15 +1,15 @@
---- 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
+--- driver/XScreenSaver.ad.in.orig	2014-11-18 22:54:02 UTC
++++ driver/XScreenSaver.ad.in
 @@ -56,7 +56,7 @@
  *splashDuration:	0:00:05
  *visualID:		default
  *captureStderr: 	True
 -*ignoreUninstalledPrograms: False
 +*ignoreUninstalledPrograms: True
+ *authWarningSlack:	20
  
  *textMode:		file
- *textLiteral:		XScreenSaver
-@@ -122,7 +122,7 @@
+@@ -123,7 +123,7 @@ GetViewPortIsFullOfLies: False
  
  ! The format used for printing the date and time in the password dialog box
  ! (see the strftime(3) manual page for details.)
@@ -18,7 +18,7 @@
  ! To show the time only:
  ! *dateFormat:		%I:%M %p
  ! For 24 hour time:
-@@ -156,6 +156,18 @@
+@@ -157,6 +157,18 @@ GetViewPortIsFullOfLies: False
  ! screen savers interactively.
  !
  *programs:								      \
@@ -37,15 +37,7 @@
  				maze -root				    \n\
  @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
  				attraction -root			    \n\
-@@ -251,7 +263,6 @@
- 				xspirograph -root			    \n\
- @GL_KLUDGE@ GL: 				circuit -root				    \n\
- @GL_KLUDGE@ GL: 				dangerball -root			    \n\
--- GL: 				dnalogo -root				    \n\
- @GL_KLUDGE@ GL: 				engine -root				    \n\
- @GL_KLUDGE@ GL: 				flipscreen3d -root			    \n\
- @GL_KLUDGE@ GL: 				gltext -root				    \n\
-@@ -449,7 +460,6 @@
+@@ -457,7 +469,6 @@ XScreenSaver.bourneShell:		/bin/sh
  *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 9a81c0bc85f2..c9c86f9f3d8a 100644
--- a/x11/xscreensaver/files/patch-hacks__config__sonar.xml
+++ b/x11/xscreensaver/files/patch-hacks__config__sonar.xml
@@ -1,6 +1,6 @@
---- 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 @@
+--- hacks/config/sonar.xml.orig	2015-06-13 23:08:53 UTC
++++ hacks/config/sonar.xml
+@@ -31,7 +31,7 @@
  
       <option id="ssh" _label="Ping known SSH hosts"      arg-set="-ping /etc/hosts,$HOME/.ssh/known_hosts,$HOME/.ssh/known_hosts2"/>
  
@@ -9,12 +9,12 @@
  
       <option id="sim" _label="Simulation (don't ping)"   arg-set="-ping simulation"/>
      </select>
-@@ -76,6 +76,8 @@
+@@ -78,6 +78,8 @@ respectively.
  
  Alternately, it can run a simulation that doesn't involve hosts.
  
 +To ping, use the port build option to install this suid.
 +
- http://en.wikipedia.org/wiki/Ping#History
+ https://en.wikipedia.org/wiki/Ping#History
  
  Written by Jamie Zawinski and Stephen Martin; 1998.
diff --git a/x11/xscreensaver/files/patch-hacks_memscroller.c b/x11/xscreensaver/files/patch-hacks_memscroller.c
index 5832b26a9104..a1174977fb3b 100644
--- a/x11/xscreensaver/files/patch-hacks_memscroller.c
+++ b/x11/xscreensaver/files/patch-hacks_memscroller.c
@@ -1,12 +1,16 @@
---- hacks/memscroller.c.orig	2014-06-12 20:55:52.000000000 +0200
-+++ hacks/memscroller.c	2014-06-12 20:56:03.000000000 +0200
-@@ -349,9 +349,6 @@
-          from earlier days before the advent of virtual memory management."
-             -- sbrk(2) man page on MacOS
-        */
--#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
--#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
--#  endif
-       himem = ((unsigned char *) sbrk(0)) - (2 * sizeof(void *));
- # endif
+--- hacks/memscroller.c.orig	2014-09-13 20:34:45 UTC
++++ hacks/memscroller.c
+@@ -306,13 +306,6 @@ open_file (state *st)
+    from earlier days before the advent of virtual memory management."
+       -- sbrk(2) man page on BSD systems, as of 1995 or so.
+  */
+-#ifdef HAVE_SBRK
+-# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
+-   /* Don't print "warning: 'sbrk' is deprecated". */
+-#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+-# endif
+-#endif
+-
  
+ static unsigned int
+ more_bits (state *st, scroller *sc)
diff --git a/x11/xscreensaver/files/patch-utils_textclient.c b/x11/xscreensaver/files/patch-utils_textclient.c
index b46d2ffc9ae3..2e5b90c9ce4d 100644
--- a/x11/xscreensaver/files/patch-utils_textclient.c
+++ b/x11/xscreensaver/files/patch-utils_textclient.c
@@ -1,5 +1,5 @@
---- utils/textclient.c.orig	2013-09-02 12:43:01.271738814 +0200
-+++ utils/textclient.c	2013-09-02 12:43:25.014748042 +0200
+--- utils/textclient.c.orig	2014-11-05 00:08:06 UTC
++++ utils/textclient.c
 @@ -50,6 +50,9 @@
  # ifdef HAVE_UTIL_H
  #  include <util.h>
@@ -9,4 +9,4 @@
 +# endif
  #endif /* HAVE_FORKPTY */
  
- /*#define DEBUG*/
+ #undef DEBUG
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index b1c775726678..bd09cece0b92 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -1,4 +1,4 @@
-bin/xscreensaver
+@(,,4755) bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
 bin/xscreensaver-getimage
@@ -17,6 +17,7 @@ bin/xscreensaver-hacks/atlantis
 bin/xscreensaver-hacks/attraction
 bin/xscreensaver-hacks/atunnel
 bin/xscreensaver-hacks/barcode
+bin/xscreensaver-hacks/binaryring
 bin/xscreensaver-hacks/blaster
 bin/xscreensaver-hacks/blinkbox
 bin/xscreensaver-hacks/blitspin
@@ -35,6 +36,7 @@ bin/xscreensaver-hacks/carousel
 bin/xscreensaver-hacks/ccurve
 bin/xscreensaver-hacks/celtic
 bin/xscreensaver-hacks/circuit
+bin/xscreensaver-hacks/cityflow
 bin/xscreensaver-hacks/cloudlife
 bin/xscreensaver-hacks/companioncube
 bin/xscreensaver-hacks/compass
@@ -77,6 +79,7 @@ bin/xscreensaver-hacks/fuzzyflakes
 bin/xscreensaver-hacks/galaxy
 bin/xscreensaver-hacks/gears
 bin/xscreensaver-hacks/geodesic
+bin/xscreensaver-hacks/geodesicgears
 bin/xscreensaver-hacks/gflux
 bin/xscreensaver-hacks/glblur
 bin/xscreensaver-hacks/glcells
@@ -161,6 +164,7 @@ bin/xscreensaver-hacks/queens
 bin/xscreensaver-hacks/rd-bomb
 bin/xscreensaver-hacks/ripples
 bin/xscreensaver-hacks/rocks
+bin/xscreensaver-hacks/romanboy
 bin/xscreensaver-hacks/rorschach
 bin/xscreensaver-hacks/rotzoomer
 bin/xscreensaver-hacks/rubik
@@ -177,6 +181,7 @@ bin/xscreensaver-hacks/sonar
 %%SETUID_HACKS%%@mode
 bin/xscreensaver-hacks/speedmine
 bin/xscreensaver-hacks/spheremonics
+bin/xscreensaver-hacks/splitflap
 bin/xscreensaver-hacks/spotlight
 bin/xscreensaver-hacks/sproingies
 bin/xscreensaver-hacks/squiral
@@ -206,6 +211,7 @@ bin/xscreensaver-hacks/wander
 bin/xscreensaver-hacks/webcollage
 bin/xscreensaver-hacks/webcollage-helper
 bin/xscreensaver-hacks/whirlwindwarp
+bin/xscreensaver-hacks/winduprobot
 bin/xscreensaver-hacks/wormhole
 bin/xscreensaver-hacks/xanalogtv
 bin/xscreensaver-hacks/xflame
@@ -216,7 +222,6 @@ bin/xscreensaver-hacks/xrayswarm
 bin/xscreensaver-hacks/xspirograph
 bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
-%%NO_PAM%%etc/pam.d/xscreensaver.pam
 %%PAM%%etc/pam.d/xscreensaver
 lib/X11/app-defaults/XScreenSaver
 man/man1/xscreensaver-command.1.gz
@@ -238,6 +243,7 @@ man/man6/atlantis.6.gz
 man/man6/attraction.6.gz
 man/man6/atunnel.6.gz
 man/man6/barcode.6.gz
+man/man6/binaryring.6.gz
 man/man6/blaster.6.gz
 man/man6/blinkbox.6.gz
 man/man6/blitspin.6.gz
@@ -256,6 +262,7 @@ man/man6/carousel.6.gz
 man/man6/ccurve.6.gz
 man/man6/celtic.6.gz
 man/man6/circuit.6.gz
+man/man6/cityflow.6.gz
 man/man6/cloudlife.6.gz
 man/man6/companioncube.6.gz
 man/man6/compass.6.gz
@@ -298,6 +305,7 @@ man/man6/fuzzyflakes.6.gz
 man/man6/galaxy.6.gz
 man/man6/gears.6.gz
 man/man6/geodesic.6.gz
+man/man6/geodesicgears.6.gz
 man/man6/gflux.6.gz
 man/man6/glblur.6.gz
 man/man6/glcells.6.gz
@@ -377,6 +385,7 @@ man/man6/pyro.6.gz
 man/man6/qix.6.gz
 man/man6/quasicrystal.6.gz
 man/man6/queens.6.gz
+man/man6/romanboy.6.gz
 man/man6/rd-bomb.6.gz
 man/man6/ripples.6.gz
 man/man6/rocks.6.gz
@@ -394,6 +403,7 @@ man/man6/slip.6.gz
 man/man6/sonar.6.gz
 man/man6/speedmine.6.gz
 man/man6/spheremonics.6.gz
+man/man6/splitflap.6.gz
 man/man6/spotlight.6.gz
 man/man6/sproingies.6.gz
 man/man6/squiral.6.gz
@@ -422,6 +432,7 @@ man/man6/voronoi.6.gz
 man/man6/wander.6.gz
 man/man6/webcollage.6.gz
 man/man6/whirlwindwarp.6.gz
+man/man6/winduprobot.6.gz
 man/man6/wormhole.6.gz
 man/man6/xanalogtv.6.gz
 man/man6/xflame.6.gz
@@ -437,29 +448,29 @@ share/applications/xscreensaver-lock.desktop
 share/applications/xscreensaver-properties.desktop
 share/applications/xscreensaver-start.desktop
 share/applications/xscreensaver-stop.desktop
-share/locale/ca/LC_MESSAGES/xscreensaver.mo
-share/locale/da/LC_MESSAGES/xscreensaver.mo
-share/locale/de/LC_MESSAGES/xscreensaver.mo
-share/locale/es/LC_MESSAGES/xscreensaver.mo
-share/locale/et/LC_MESSAGES/xscreensaver.mo
-share/locale/fi/LC_MESSAGES/xscreensaver.mo
-share/locale/fr/LC_MESSAGES/xscreensaver.mo
-share/locale/hu/LC_MESSAGES/xscreensaver.mo
-share/locale/it/LC_MESSAGES/xscreensaver.mo
-share/locale/ja/LC_MESSAGES/xscreensaver.mo
-share/locale/ko/LC_MESSAGES/xscreensaver.mo
-share/locale/nb/LC_MESSAGES/xscreensaver.mo
-share/locale/nl/LC_MESSAGES/xscreensaver.mo
-share/locale/pl/LC_MESSAGES/xscreensaver.mo
-share/locale/pt/LC_MESSAGES/xscreensaver.mo
-share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
-share/locale/ru/LC_MESSAGES/xscreensaver.mo
-share/locale/sk/LC_MESSAGES/xscreensaver.mo
-share/locale/sv/LC_MESSAGES/xscreensaver.mo
-share/locale/vi/LC_MESSAGES/xscreensaver.mo
-share/locale/wa/LC_MESSAGES/xscreensaver.mo
-share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
-share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/wa/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
 share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/README
 %%DATADIR%%/config/abstractile.xml
@@ -474,6 +485,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/attraction.xml
 %%DATADIR%%/config/atunnel.xml
 %%DATADIR%%/config/barcode.xml
+%%DATADIR%%/config/binaryring.xml
 %%DATADIR%%/config/blaster.xml
 %%DATADIR%%/config/blinkbox.xml
 %%DATADIR%%/config/blitspin.xml
@@ -492,6 +504,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/ccurve.xml
 %%DATADIR%%/config/celtic.xml
 %%DATADIR%%/config/circuit.xml
+%%DATADIR%%/config/cityflow.xml
 %%DATADIR%%/config/cloudlife.xml
 %%DATADIR%%/config/companioncube.xml
 %%DATADIR%%/config/compass.xml
@@ -534,6 +547,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/galaxy.xml
 %%DATADIR%%/config/gears.xml
 %%DATADIR%%/config/geodesic.xml
+%%DATADIR%%/config/geodesicgears.xml
 %%DATADIR%%/config/gflux.xml
 %%DATADIR%%/config/glblur.xml
 %%DATADIR%%/config/glcells.xml
@@ -617,6 +631,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/rd-bomb.xml
 %%DATADIR%%/config/ripples.xml
 %%DATADIR%%/config/rocks.xml
+%%DATADIR%%/config/romanboy.xml
 %%DATADIR%%/config/rorschach.xml
 %%DATADIR%%/config/rotzoomer.xml
 %%DATADIR%%/config/rubik.xml
@@ -631,6 +646,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/sonar.xml
 %%DATADIR%%/config/speedmine.xml
 %%DATADIR%%/config/spheremonics.xml
+%%DATADIR%%/config/splitflap.xml
 %%DATADIR%%/config/spotlight.xml
 %%DATADIR%%/config/sproingies.xml
 %%DATADIR%%/config/squiral.xml
@@ -659,6 +675,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/wander.xml
 %%DATADIR%%/config/webcollage.xml
 %%DATADIR%%/config/whirlwindwarp.xml
+%%DATADIR%%/config/winduprobot.xml
 %%DATADIR%%/config/wormhole.xml
 %%DATADIR%%/config/xanalogtv.xml
 %%DATADIR%%/config/xaos.xml