6 files changed, 43 insertions, 19 deletions
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index ff2da09f915c..cf2ddbef85b6 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xscreensaver-gnome
-PORTVERSION=	4.15
-PORTREVISION=	2
+PORTVERSION=	4.16
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -65,7 +64,8 @@ MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.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 \
+	mismunch.1 noof.1 pacman.1 wormhole.1 antinspect.1 fuzzyflakes.1\
+	polyhedra.1 providence.1 \
 	xscreensaver-command.1 xscreensaver-demo.1 \
 	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
 	xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1
diff --git a/x11/xscreensaver-gnome/distinfo b/x11/xscreensaver-gnome/distinfo
index 110426fabbca..8f34549b055d 100644
--- a/x11/xscreensaver-gnome/distinfo
+++ b/x11/xscreensaver-gnome/distinfo
@@ -1,3 +1,2 @@
-MD5 (xscreensaver-4.15.tar.gz) = 2cfd498b21c0fea828be5f39fc8af53c
-SIZE (xscreensaver-4.14.tar.gz) = 3988251
-SIZE (xscreensaver-4.15.tar.gz) = 4045811
+MD5 (xscreensaver-4.16.tar.gz) = e715ca402fc1218a078d65b7e7922082
+SIZE (xscreensaver-4.16.tar.gz) = 4211337
diff --git a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
index db5f51c2d293..8e29544a2ff8 100644
--- a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
+++ b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
@@ -1,15 +1,6 @@
---- driver/xscreensaver-getimage-file.orig	Sat Jun 28 19:01:43 2003
-+++ driver/xscreensaver-getimage-file	Fri Aug 15 02:46:20 2003
-@@ -43,7 +43,7 @@
- # So we do it like this instead:
- #
- BEGIN {
--  if (! defined(&S_ISLNK)) {  # perhaps defined by "POSIX"?
-+  if ((! defined(&S_ISLNK)) and ($] > 5.6)) {  # perhaps defined by "POSIX"?
-     require Fcntl;
-     import  Fcntl ':mode';    # if not, look for it in "Fcntl".
-   }
-@@ -149,7 +149,7 @@
+--- 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);
diff --git a/x11/xscreensaver-gnome/files/patch-hacks_apple2-main.c b/x11/xscreensaver-gnome/files/patch-hacks_apple2-main.c
new file mode 100644
index 000000000000..8af7fa07239f
--- /dev/null
+++ b/x11/xscreensaver-gnome/files/patch-hacks_apple2-main.c
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 000000000000..e01033342531
--- /dev/null
+++ b/x11/xscreensaver-gnome/files/patch-hacks_phosphor.c
@@ -0,0 +1,13 @@
+--- 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/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index f23cd32b4f0e..42789dc86dce 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -8,6 +8,7 @@ bin/xscreensaver-getimage-video
 bin/xscreensaver-gl-helper
 bin/xscreensaver-hacks/anemone
 bin/xscreensaver-hacks/ant
+bin/xscreensaver-hacks/antinspect
 bin/xscreensaver-hacks/antspotlight
 bin/xscreensaver-hacks/apollonian
 bin/xscreensaver-hacks/apple2
@@ -63,6 +64,7 @@ bin/xscreensaver-hacks/flurry
 bin/xscreensaver-hacks/flyingtoasters
 bin/xscreensaver-hacks/fontglide
 bin/xscreensaver-hacks/forest
+bin/xscreensaver-hacks/fuzzyflakes
 bin/xscreensaver-hacks/galaxy
 bin/xscreensaver-hacks/gears
 bin/xscreensaver-hacks/gflux
@@ -127,10 +129,12 @@ bin/xscreensaver-hacks/petri
 bin/xscreensaver-hacks/phosphor
 bin/xscreensaver-hacks/piecewise
 bin/xscreensaver-hacks/pipes
+bin/xscreensaver-hacks/polyhedra
 bin/xscreensaver-hacks/polyominoes
 bin/xscreensaver-hacks/polytopes
 bin/xscreensaver-hacks/pong
 bin/xscreensaver-hacks/popsquares
+bin/xscreensaver-hacks/providence
 bin/xscreensaver-hacks/pulsar
 bin/xscreensaver-hacks/pyro
 bin/xscreensaver-hacks/qix
@@ -220,6 +224,7 @@ share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
 share/xscreensaver/config/README
 share/xscreensaver/config/anemone.xml
 share/xscreensaver/config/ant.xml
+share/xscreensaver/config/antinspect.xml
 share/xscreensaver/config/antspotlight.xml
 share/xscreensaver/config/apollonian.xml
 share/xscreensaver/config/apple2.xml
@@ -278,6 +283,7 @@ share/xscreensaver/config/flurry.xml
 share/xscreensaver/config/flyingtoasters.xml
 share/xscreensaver/config/fontglide.xml
 share/xscreensaver/config/forest.xml
+share/xscreensaver/config/fuzzyflakes.xml
 share/xscreensaver/config/galaxy.xml
 share/xscreensaver/config/gears.xml
 share/xscreensaver/config/gflux.xml
@@ -342,10 +348,12 @@ share/xscreensaver/config/petri.xml
 share/xscreensaver/config/phosphor.xml
 share/xscreensaver/config/piecewise.xml
 share/xscreensaver/config/pipes.xml
+share/xscreensaver/config/polyhedra.xml
 share/xscreensaver/config/polyominoes.xml
 share/xscreensaver/config/polytopes.xml
 share/xscreensaver/config/pong.xml
 share/xscreensaver/config/popsquares.xml
+share/xscreensaver/config/providence.xml
 share/xscreensaver/config/pulsar.xml
 share/xscreensaver/config/pyro.xml
 share/xscreensaver/config/qix.xml
@@ -366,8 +374,8 @@ 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/sphereeversion.xml
 share/xscreensaver/config/spiral.xml
 share/xscreensaver/config/spotlight.xml
 share/xscreensaver/config/sproingies.xml