14 files changed, 175 insertions, 187 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 13ed1e6d9da6..0a1eef157bc0 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME?=	xscreensaver-gnome
-PORTVERSION=	4.24
-PORTREVISION?=	8
+PORTVERSION=	5.05
+PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -27,54 +27,59 @@ USE_PERL5_RUN=	yes
 USE_GNOME=	gnomehier libglade2 gnomehack
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gl --with-gle --with-xpm --with-xml \
+CONFIGURE_ARGS=	--with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
+		--with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \
 		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks \
 		--with-configdir=${PREFIX}/share/xscreensaver/config \
-		--with-jpeg=${LOCALBASE} --without-motif \
-		--without-kerberos
+		--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \
+		--with-xf86gamma-ext --with-randr-ext --enable-locking
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 OPTIONS?=	PAM "Pluggable Authentication Module support" off \
-		ALL_FORTUNES "Enable support for all fortunes" off
-
-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 blocktube.1 cloudlife.1 \
-	cubestorm.1 glknots.1 glmatrix.1 hypertorus.1 antspotlight.1 \
-	flipflop.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 antinspect.1 fuzzyflakes.1\
-	polyhedra.1 anemotaxis.1 providence.1 memscroller.1 fireworkx.1 \
-	intermomentary.1 pinion.1 substrate.1 boing.1 boxfit.1 carousel.1 \
-	antmaze.1 crackberg.1 interaggregate.1 tangram.1 celtic.1 \
-	cube21.1 glhanoi.1 juggler3d.1 timetunnel.1 \
-	fiberlamp.1 fliptext.1 xscreensaver-text.1 \
-	xscreensaver-command.1 xscreensaver-demo.1 \
+		KERBEROS "Add support for kerberos" off \
+		ALL_FORTUNES "Enable support for all fortunes" off \
+		SETUID_HACKS "Install sonar hack suid so it can ping" off
+
+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 cwaves.6 glcells.6 voronoi.6 \
+	abstractile.6 moebiusgears.6 lockward.6 cubicgrid.6 hypnowheel.6 \
+	xscreensaver-gl-helper.6
 
 .include <bsd.port.pre.mk>
 
@@ -82,23 +87,55 @@ MAN1?=	anemone.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 CONFIGURE_ARGS+=	--with-fortune="/usr/games/fortune -sa"
 .endif
 
-.if !defined(WITH_PAM)
+.if defined(WITH_PAM)
+PLIST_SUB+=		PAM=""
+CONFIGURE_ARGS+=	--without-pam
+.else
 CONFIGURE_ARGS+=	--without-pam
+PLIST_SUB+=		PAM="@comment "
+.endif
+
+.if defined(WITH_KERBEROS)
+CONFIGURE_ARGS+=	--with-kerberos
+.else
+CONFIGURE_ARGS+=	--without-kerberos
+.endif
+
+.if defined(WITH_SETUID_HACKS)
+CONFIGURE_ARGS+=	--with-setuid-hacks
 .endif
 
 .if ${ARCH} == "amd64"
 CFLAGS+=	-O0
 .endif
 
+USE_DOS2UNIX=	hacks/glx/topblock.c
 post-patch:
-	@${REINPLACE_CMD}  -e 's|malloc[.]h|stdlib.h|g' \
-		${WRKSRC}/hacks/glx/extrusion.c
-	@${REINPLACE_CMD} -e 's|
||' \
-		${WRKSRC}/hacks/glx/klein.c
-	@${REINPLACE_CMD} -E -e 's|^[[:space:]]*GL_LIBS="${PTHREAD_LIBS}"|#|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	    	s|malloc.h|stdlib.h|g ; \
 		s|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD}  -e 's|<util.h>|<libutil.h>|' \
-		${WRKSRC}/hacks/phosphor.c ${WRKSRC}/hacks/apple2-main.c
+.if defined(WITH_PAM)
+.for f in driver/passwd-pam.c driver/xscreensaver.man
+	@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
+	    	${WRKSRC}/${f}
+.endfor
+	@${CP} ${FILESDIR}/xscreensaver.pam ${WRKSRC}/driver/xscreensaver.pam
+.else
+	@${REINPLACE_CMD} -e 's|install-xml install-pam|install-xml|' \
+	    	${WRKSRC}/driver/Makefile.in
+.endif
+
+.if !target(post-install-slave)
+post-install-slave:
+	@${NO_NADA}
+.endif
+
+post-install: post-install-slave
+	@(if test -x ${PREFIX}/bin/xscreensaver-hacks/webcollage-helper; then \
+	    	${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \
+			${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \
+			${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi)
+	${RM} ${PREFIX}/man/man6/lcdscrub
 
 .include <bsd.port.post.mk>
diff --git a/x11/xscreensaver-gnome/distinfo b/x11/xscreensaver-gnome/distinfo
index 8b6b616cd6fd..d38b0f7f2816 100644
--- a/x11/xscreensaver-gnome/distinfo
+++ b/x11/xscreensaver-gnome/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.05.tar.gz) = d759262b10d76f87f1a7fc50ae8664d4
+SHA256 (xscreensaver-5.05.tar.gz) = 3c64366f1990ebe173db422660dce5d9d80b1c758f3a9ad6e55fb72657dc821a
+SIZE (xscreensaver-5.05.tar.gz) = 5468293
diff --git a/x11/xscreensaver-gnome/files/extra-patch-nodriver b/x11/xscreensaver-gnome/files/extra-patch-nodriver
index d341fc44545d..b7eb1621aedf 100644
--- a/x11/xscreensaver-gnome/files/extra-patch-nodriver
+++ b/x11/xscreensaver-gnome/files/extra-patch-nodriver
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon Sep 12 20:24:57 2005
-+++ Makefile.in	Mon Sep 12 20:25:15 2005
-@@ -6,7 +6,7 @@
+--- Makefile.in.orig	2008-07-06 16:33:27.000000000 -0400
++++ Makefile.in	2008-07-06 16:35:46.000000000 -0400
+@@ -6,7 +6,7 @@ srcdir		= @srcdir@
  VPATH		= @srcdir@
  
  SHELL		= /bin/sh
 -SUBDIRS		= utils driver hacks hacks/glx po
-+SUBDIRS		= utils hacks hacks/glx
- TARFILES	= README README.VMS README.debugging INSTALL \
++SUBDIRS		= utils hacks hacks/glx po
+ SUBDIRS2	= $(SUBDIRS) OSX
+ TARFILES	= README README.hacking README.VMS INSTALL \
  		  configure configure.in Makefile.in config.h.in \
- 		  config.h-vms install-sh setup.com config.guess aclocal.m4 \
diff --git a/x11/xscreensaver-gnome/files/patch-ab b/x11/xscreensaver-gnome/files/patch-ab
deleted file mode 100644
index dce689cd2cbf..000000000000
--- a/x11/xscreensaver-gnome/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Mar 23 02:35:18 2005
-+++ configure	Wed Mar 23 02:36:54 2005
-@@ -2666,7 +2666,7 @@
-   if test -n "$GCC"; then
-     echo "$as_me:$LINENO: result: Turning on gcc compiler warnings." >&5
- echo "${ECHO_T}Turning on gcc compiler warnings." >&6
--    CC="$CC -pedantic -Wall -Wstrict-prototypes -Wnested-externs"
-+    CC="$CC -Wall -Wstrict-prototypes -Wnested-externs"
-     OBJCC="$OBJCC -Wall"
-     # supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
-     # and then perhaps we can do without -pedantic?
diff --git a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
index ed9995479280..1ab88ba9ffeb 100644
--- a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
@@ -1,11 +1,43 @@
---- driver/Makefile.in.orig	Sun Apr  3 21:14:26 2005
-+++ driver/Makefile.in	Sun Apr  3 21:14:39 2005
-@@ -253,7 +253,7 @@
- tests: $(TEST_EXES)
+--- driver/Makefile.in.orig	2007-11-13 00:39:35.000000000 -0800
++++ driver/Makefile.in	2007-12-08 23:23:01.000000000 -0800
+@@ -81,8 +81,8 @@
  
- install:   install-program   install-ad    install-scripts \
--	   install-gnome     install-man   install-xml install-pam
-+	   install-gnome     install-man   install-xml
- uninstall: uninstall-program uninstall-ad  \
- 	   uninstall-gnome   uninstall-man uninstall-xml  
  
+ AD_DIR		= @APPDEFAULTS@
+-PAM_DIR		= /etc/pam.d
+-PAM_CONF	= /etc/pam.conf
++PAM_DIR		= ${prefix}/etc/pam.d
++PAM_CONF	= ${prefix}/etc/pam.conf
+ 
+ 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,21 +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=gnome-screensaver-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/
diff --git a/x11/xscreensaver-gnome/files/patch-driver_passwd-pam.c b/x11/xscreensaver-gnome/files/patch-driver_passwd-pam.c
deleted file mode 100644
index 0bd646582ff0..000000000000
--- a/x11/xscreensaver-gnome/files/patch-driver_passwd-pam.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- driver/passwd-pam.c.orig	Sat Jul 12 04:44:38 2003
-+++ driver/passwd-pam.c	Thu Feb  5 18:09:45 2004
-@@ -183,6 +183,7 @@
-   char *user = 0;
-   sigset_t set;
-   struct timespec timeout;
-+  struct timeval tv;
- 
-   struct passwd *p = getpwuid (getuid ());
-   if (!p) return False;
-@@ -249,8 +250,9 @@
-   timeout.tv_sec = 0;
-   timeout.tv_nsec = 1;
-   set = block_sigchld();
-+  TIMESPEC_TO_TIMEVAL (&tv, &timeout);
-   status = pam_authenticate (pamh, 0);
--  sigtimedwait (&set, NULL, &timeout);
-+  select (0, NULL, NULL, NULL, &tv);
-   unblock_sigchld();
- 
-   if (verbose_p)
-@@ -289,7 +291,7 @@
- 
-   set = block_sigchld();
-   status = pam_authenticate (pamh, 0);
--  sigtimedwait(&set, NULL, &timeout);
-+  select (0, NULL, NULL, NULL, &tv);
-   unblock_sigchld();
- 
-   if (verbose_p)
diff --git a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
deleted file mode 100644
index 8e29544a2ff8..000000000000
--- a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
+++ /dev/null
@@ -1,11 +0,0 @@
---- driver/xscreensaver-getimage-file.orig	Tue May  4 20:40:38 2004
-+++ driver/xscreensaver-getimage-file	Wed May 19 21:39:59 2004
-@@ -133,7 +133,7 @@
-       push @dirs, $file;
-       $dir_count++;
-       print STDERR "$progname:   found dir  $file\n" if ($verbose > 2);
--    } elsif (S_ISREG($mode) || S_ISLNK($mode)) {
-+    } elsif (S_ISREG($mode) || (-l "$file")) {
- 
-       if ($file =~ m/[~%\#]$/ ||               # backup file, or
-           ! ($file =~ m/$good_file_re/io)) {   # no image extension
diff --git a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver.h b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver.h
deleted file mode 100644
index 23eb032dedb2..000000000000
--- a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- driver/xscreensaver.h.orig	Tue Jul 22 00:14:02 2003
-+++ driver/xscreensaver.h	Tue Jul 22 00:14:10 2003
-@@ -19,6 +19,7 @@
- 
- #include <string.h>
- #include <stdio.h>
-+#include <signal.h>
- 
- #include "prefs.h"
- 
diff --git a/x11/xscreensaver-gnome/files/patch-fix_with_glib-2.16 b/x11/xscreensaver-gnome/files/patch-fix_with_glib-2.16
deleted file mode 100644
index e63d28b1e6cd..000000000000
--- a/x11/xscreensaver-gnome/files/patch-fix_with_glib-2.16
+++ /dev/null
@@ -1,11 +0,0 @@
---- driver/demo-Gtk.c.orig	2008-03-26 16:35:44.000000000 -0500
-+++ driver/demo-Gtk.c	2008-03-26 16:36:14.000000000 -0500
-@@ -1085,7 +1085,7 @@
-   if (!was) gtk_widget_set_sensitive (parent, True);
- #ifdef HAVE_GTK2
-   model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));
--  STFU g_assert (model);
-+  g_assert (model != NULL);
-   if (gtk_tree_model_iter_nth_child (model, &iter, NULL, list_elt))
-     {
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));
diff --git a/x11/xscreensaver-gnome/files/patch-hacks_apple2-main.c b/x11/xscreensaver-gnome/files/patch-hacks_apple2-main.c
deleted file mode 100644
index 8af7fa07239f..000000000000
--- a/x11/xscreensaver-gnome/files/patch-hacks_apple2-main.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- hacks/apple2-main.c.orig	Wed May 19 21:45:49 2004
-+++ hacks/apple2-main.c	Wed May 19 21:46:13 2004
-@@ -30,6 +30,10 @@
- # ifdef HAVE_UTIL_H
- #  include <util.h>
- # endif
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <libutil.h>
- #endif /* HAVE_FORKPTY */
- 
- #undef countof
diff --git a/x11/xscreensaver-gnome/files/patch-hacks_phosphor.c b/x11/xscreensaver-gnome/files/patch-hacks_phosphor.c
deleted file mode 100644
index e01033342531..000000000000
--- a/x11/xscreensaver-gnome/files/patch-hacks_phosphor.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- hacks/phosphor.c.orig	Wed May 19 21:43:52 2004
-+++ hacks/phosphor.c	Wed May 19 21:44:54 2004
-@@ -33,6 +33,10 @@
- # ifdef HAVE_UTIL_H
- #  include <util.h>
- # endif
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <libutil.h>
- #endif /* HAVE_FORKPTY */
- 
- extern XtAppContext app;
diff --git a/x11/xscreensaver-gnome/files/xscreensaver.pam b/x11/xscreensaver-gnome/files/xscreensaver.pam
new file mode 100644
index 000000000000..1cd383e68d50
--- /dev/null
+++ b/x11/xscreensaver-gnome/files/xscreensaver.pam
@@ -0,0 +1,2 @@
+auth		include		system
+account		include		system
diff --git a/x11/xscreensaver-gnome/pkg-messsage b/x11/xscreensaver-gnome/pkg-messsage
deleted file mode 100644
index 22201366a532..000000000000
--- a/x11/xscreensaver-gnome/pkg-messsage
+++ /dev/null
@@ -1,13 +0,0 @@
-================================================================================
-If you compiled WITH_PAM support on 4.X, you need to edit /etc/pam.conf and
-add the following lines:
-
-xscreensaver		auth	required	pam_nologin.so	no_warn
-xscreensaver		auth	required	pam_unix.so	no_warn try_first_pass
-
-If you compiled WITH_PAM support on 5.X or later, you need to create an
-/etc/pam.d/xscreensaver file with the following contents:
-
-auth            include         system
-account         include         system
-================================================================================
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 0e309bef1bbd..65ead7da00da 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -5,6 +5,7 @@ bin/xscreensaver-getimage
 bin/xscreensaver-getimage-file
 bin/xscreensaver-getimage-video
 bin/xscreensaver-gl-helper
+bin/xscreensaver-hacks/abstractile
 bin/xscreensaver-hacks/anemone
 bin/xscreensaver-hacks/anemotaxis
 bin/xscreensaver-hacks/antinspect
@@ -44,6 +45,8 @@ bin/xscreensaver-hacks/crystal
 bin/xscreensaver-hacks/cube21
 bin/xscreensaver-hacks/cubenetic
 bin/xscreensaver-hacks/cubestorm
+bin/xscreensaver-hacks/cubicgrid
+bin/xscreensaver-hacks/cwaves
 bin/xscreensaver-hacks/cynosure
 bin/xscreensaver-hacks/dangerball
 bin/xscreensaver-hacks/decayscreen
@@ -78,12 +81,14 @@ bin/xscreensaver-hacks/galaxy
 bin/xscreensaver-hacks/gears
 bin/xscreensaver-hacks/gflux
 bin/xscreensaver-hacks/glblur
+bin/xscreensaver-hacks/glcells
 bin/xscreensaver-hacks/gleidescope
 bin/xscreensaver-hacks/glforestfire
 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
@@ -97,6 +102,7 @@ bin/xscreensaver-hacks/hopalong
 bin/xscreensaver-hacks/hyperball
 bin/xscreensaver-hacks/hypercube
 bin/xscreensaver-hacks/hypertorus
+bin/xscreensaver-hacks/hypnowheel
 bin/xscreensaver-hacks/ifs
 bin/xscreensaver-hacks/imsmap
 bin/xscreensaver-hacks/interaggregate
@@ -113,12 +119,15 @@ bin/xscreensaver-hacks/kumppa
 bin/xscreensaver-hacks/lament
 bin/xscreensaver-hacks/laser
 bin/xscreensaver-hacks/lavalite
+bin/xscreensaver-hacks/lcdscrub
 bin/xscreensaver-hacks/lightning
 bin/xscreensaver-hacks/lisa
 bin/xscreensaver-hacks/lissie
 bin/xscreensaver-hacks/ljlatest
 bin/xscreensaver-hacks/lmorph
+bin/xscreensaver-hacks/lockward
 bin/xscreensaver-hacks/loop
+bin/xscreensaver-hacks/m6502
 bin/xscreensaver-hacks/maze
 bin/xscreensaver-hacks/memscroller
 bin/xscreensaver-hacks/menger
@@ -126,6 +135,7 @@ bin/xscreensaver-hacks/metaballs
 bin/xscreensaver-hacks/mirrorblob
 bin/xscreensaver-hacks/mismunch
 bin/xscreensaver-hacks/moebius
+bin/xscreensaver-hacks/moebiusgears
 bin/xscreensaver-hacks/moire
 bin/xscreensaver-hacks/moire2
 bin/xscreensaver-hacks/molecule
@@ -187,15 +197,16 @@ 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
 bin/xscreensaver-hacks/vermiculate
 bin/xscreensaver-hacks/vidwhacker
 bin/xscreensaver-hacks/vines
+bin/xscreensaver-hacks/voronoi
 bin/xscreensaver-hacks/wander
 bin/xscreensaver-hacks/webcollage
-bin/xscreensaver-hacks/webcollage-helper
 bin/xscreensaver-hacks/whirlwindwarp
 bin/xscreensaver-hacks/whirlygig
 bin/xscreensaver-hacks/worm
@@ -208,10 +219,9 @@ 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
-share/applications/gnome-screensaver-properties.desktop
+%%PAM%%etc/pam.d/xscreensaver
 share/pixmaps/xscreensaver.xpm
 share/xscreensaver/glade/screensaver-cmndln.png
 share/xscreensaver/glade/screensaver-colorselector.png
@@ -245,6 +255,7 @@ share/locale/wa/LC_MESSAGES/xscreensaver.mo
 share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
 share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
 share/xscreensaver/config/README
+share/xscreensaver/config/abstractile.xml
 share/xscreensaver/config/anemone.xml
 share/xscreensaver/config/anemotaxis.xml
 share/xscreensaver/config/antinspect.xml
@@ -278,12 +289,15 @@ share/xscreensaver/config/circuit.xml
 share/xscreensaver/config/cloudlife.xml
 share/xscreensaver/config/compass.xml
 share/xscreensaver/config/coral.xml
+share/xscreensaver/config/cosmos.xml
 share/xscreensaver/config/crackberg.xml
 share/xscreensaver/config/critical.xml
 share/xscreensaver/config/crystal.xml
 share/xscreensaver/config/cube21.xml
 share/xscreensaver/config/cubenetic.xml
 share/xscreensaver/config/cubestorm.xml
+share/xscreensaver/config/cubicgrid.xml
+share/xscreensaver/config/cwaves.xml
 share/xscreensaver/config/cynosure.xml
 share/xscreensaver/config/dangerball.xml
 share/xscreensaver/config/decayscreen.xml
@@ -293,6 +307,7 @@ share/xscreensaver/config/demon.xml
 share/xscreensaver/config/discrete.xml
 share/xscreensaver/config/distort.xml
 share/xscreensaver/config/drift.xml
+share/xscreensaver/config/electricsheep.xml
 share/xscreensaver/config/endgame.xml
 share/xscreensaver/config/engine.xml
 share/xscreensaver/config/epicycle.xml
@@ -301,6 +316,7 @@ share/xscreensaver/config/euler2d.xml
 share/xscreensaver/config/extrusion.xml
 share/xscreensaver/config/fadeplot.xml
 share/xscreensaver/config/fiberlamp.xml
+share/xscreensaver/config/fireflies.xml
 share/xscreensaver/config/fireworkx.xml
 share/xscreensaver/config/flag.xml
 share/xscreensaver/config/flame.xml
@@ -318,15 +334,18 @@ share/xscreensaver/config/galaxy.xml
 share/xscreensaver/config/gears.xml
 share/xscreensaver/config/gflux.xml
 share/xscreensaver/config/glblur.xml
+share/xscreensaver/config/glcells.xml
 share/xscreensaver/config/gleidescope.xml
 share/xscreensaver/config/glforestfire.xml
 share/xscreensaver/config/glhanoi.xml
 share/xscreensaver/config/glknots.xml
 share/xscreensaver/config/glmatrix.xml
 share/xscreensaver/config/glplanet.xml
+share/xscreensaver/config/glschool.xml
 share/xscreensaver/config/glslideshow.xml
 share/xscreensaver/config/glsnake.xml
 share/xscreensaver/config/gltext.xml
+share/xscreensaver/config/goban.xml
 share/xscreensaver/config/goop.xml
 share/xscreensaver/config/grav.xml
 share/xscreensaver/config/greynetic.xml
@@ -337,6 +356,7 @@ share/xscreensaver/config/hopalong.xml
 share/xscreensaver/config/hyperball.xml
 share/xscreensaver/config/hypercube.xml
 share/xscreensaver/config/hypertorus.xml
+share/xscreensaver/config/hypnowheel.xml
 share/xscreensaver/config/ifs.xml
 share/xscreensaver/config/imsmap.xml
 share/xscreensaver/config/interaggregate.xml
@@ -353,11 +373,14 @@ share/xscreensaver/config/kumppa.xml
 share/xscreensaver/config/lament.xml
 share/xscreensaver/config/laser.xml
 share/xscreensaver/config/lavalite.xml
+share/xscreensaver/config/lcdscrub.xml
 share/xscreensaver/config/lightning.xml
 share/xscreensaver/config/lisa.xml
 share/xscreensaver/config/lissie.xml
 share/xscreensaver/config/lmorph.xml
+share/xscreensaver/config/lockward.xml
 share/xscreensaver/config/loop.xml
+share/xscreensaver/config/m6502.xml
 share/xscreensaver/config/maze.xml
 share/xscreensaver/config/memscroller.xml
 share/xscreensaver/config/menger.xml
@@ -365,6 +388,7 @@ share/xscreensaver/config/metaballs.xml
 share/xscreensaver/config/mirrorblob.xml
 share/xscreensaver/config/mismunch.xml
 share/xscreensaver/config/moebius.xml
+share/xscreensaver/config/moebiusgears.xml
 share/xscreensaver/config/moire.xml
 share/xscreensaver/config/moire2.xml
 share/xscreensaver/config/molecule.xml
@@ -409,6 +433,7 @@ share/xscreensaver/config/slip.xml
 share/xscreensaver/config/sonar.xml
 share/xscreensaver/config/speedmine.xml
 share/xscreensaver/config/sphere.xml
+share/xscreensaver/config/sphereeversion.xml
 share/xscreensaver/config/spheremonics.xml
 share/xscreensaver/config/spiral.xml
 share/xscreensaver/config/spotlight.xml
@@ -426,12 +451,14 @@ share/xscreensaver/config/t3d.xml
 share/xscreensaver/config/tangram.xml
 share/xscreensaver/config/thornbird.xml
 share/xscreensaver/config/timetunnel.xml
+share/xscreensaver/config/topblock.xml
 share/xscreensaver/config/triangle.xml
 share/xscreensaver/config/truchet.xml
 share/xscreensaver/config/twang.xml
 share/xscreensaver/config/vermiculate.xml
 share/xscreensaver/config/vidwhacker.xml
 share/xscreensaver/config/vines.xml
+share/xscreensaver/config/voronoi.xml
 share/xscreensaver/config/wander.xml
 share/xscreensaver/config/webcollage.xml
 share/xscreensaver/config/whirlwindwarp.xml
@@ -439,19 +466,21 @@ share/xscreensaver/config/whirlygig.xml
 share/xscreensaver/config/worm.xml
 share/xscreensaver/config/wormhole.xml
 share/xscreensaver/config/xanalogtv.xml
+share/xscreensaver/config/xaos.xml
+share/xscreensaver/config/xdaliclock.xml
 share/xscreensaver/config/xflame.xml
 share/xscreensaver/config/xjack.xml
 share/xscreensaver/config/xlyap.xml
 share/xscreensaver/config/xmatrix.xml
+share/xscreensaver/config/xmountains.xml
+share/xscreensaver/config/xplanet.xml
 share/xscreensaver/config/xrayswarm.xml
+share/xscreensaver/config/xsnow.xml
 share/xscreensaver/config/xspirograph.xml
-share/xscreensaver/config/xteevee.xml
 share/xscreensaver/config/zoom.xml
 @dirrm share/xscreensaver/config
-@dirrm share/xscreensaver
 @dirrm share/xscreensaver/glade
 @dirrm share/xscreensaver
 @dirrm bin/xscreensaver-hacks
 @cwd %%LOCALBASE%%
 lib/X11/app-defaults/XScreenSaver
-@dirrmtry share/applications