Update to 4.12.

5 files changed, 31 insertions, 17 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 49b968843ece..0e7b65c14597 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xscreensaver-gnome
-PORTVERSION=	4.11
+PORTVERSION=	4.12
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -62,7 +62,8 @@ MAN1=   anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.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 \
+	cubestorm.1 glknots.1 glmatrix.1 hypertorus.1 antspotlight.1 \
+	flipflop.1 polytopes.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 347165e34afe..260ab3622585 100644
--- a/x11/xscreensaver-gnome/distinfo
+++ b/x11/xscreensaver-gnome/distinfo
@@ -1 +1 @@
-MD5 (xscreensaver-4.11.tar.gz) = fda86c57130f03f887725fad33807d63
+MD5 (xscreensaver-4.12.tar.gz) = 5c82e689c9307d89001ba6485fb6386a
diff --git a/x11/xscreensaver-gnome/files/patch-ab b/x11/xscreensaver-gnome/files/patch-ab
index 1eab7a77fdeb..9344223796a0 100644
--- a/x11/xscreensaver-gnome/files/patch-ab
+++ b/x11/xscreensaver-gnome/files/patch-ab
@@ -1,9 +1,15 @@
-
-$FreeBSD$
-
---- configure.orig	Tue Jun 11 12:09:04 2002
-+++ configure	Thu Jul 18 15:09:54 2002
-@@ -17491,13 +17491,13 @@
+--- configure.orig	Fri Aug 15 02:46:48 2003
++++ configure	Fri Aug 15 02:50:17 2003
+@@ -2380,7 +2380,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"
+     # supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
+     # and then perhaps we can do without -pedantic?
+   else
+@@ -17886,13 +17886,13 @@
  # Now that we know whether we have Gnome, we can decide where the XML
  # config files get installed.
  #
diff --git a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
index 5a9ed975f5ff..db5f51c2d293 100644
--- a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
+++ b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
@@ -1,6 +1,6 @@
---- driver/xscreensaver-getimage-file.orig	Sun Jan 19 21:27:38 2003
-+++ driver/xscreensaver-getimage-file	Fri Apr 18 23:02:37 2003
-@@ -42,7 +42,7 @@
+--- 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 {
@@ -9,12 +9,12 @@
      require Fcntl;
      import  Fcntl ':mode';    # if not, look for it in "Fcntl".
    }
-@@ -139,7 +139,7 @@
-     if (S_ISDIR($mode)) {
+@@ -149,7 +149,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")) {
-       push @all_files, $file;
-       print STDERR "$progname:   found file $file\n" if ($verbose > 2);
-     } elsif ($verbose > 2) {
+ 
+       if ($file =~ m/[~%\#]$/ ||               # backup file, or
+           ! ($file =~ m/$good_file_re/io)) {   # no image extension
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 51b210484e24..0b83a7bde240 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/antspotlight
 bin/xscreensaver-hacks/apollonian
 bin/xscreensaver-hacks/atlantis
 bin/xscreensaver-hacks/attraction
@@ -52,6 +53,7 @@ bin/xscreensaver-hacks/extrusion
 bin/xscreensaver-hacks/fadeplot
 bin/xscreensaver-hacks/flag
 bin/xscreensaver-hacks/flame
+bin/xscreensaver-hacks/flipflop
 bin/xscreensaver-hacks/flipscreen3d
 bin/xscreensaver-hacks/flow
 bin/xscreensaver-hacks/fluidballs
@@ -117,6 +119,7 @@ bin/xscreensaver-hacks/phosphor
 bin/xscreensaver-hacks/piecewise
 bin/xscreensaver-hacks/pipes
 bin/xscreensaver-hacks/polyominoes
+bin/xscreensaver-hacks/polytopes
 bin/xscreensaver-hacks/popsquares
 bin/xscreensaver-hacks/pulsar
 bin/xscreensaver-hacks/pyro
@@ -198,6 +201,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/antspotlight.xml
 share/xscreensaver/config/apollonian.xml
 share/xscreensaver/config/atlantis.xml
 share/xscreensaver/config/attraction.xml
@@ -242,8 +246,10 @@ share/xscreensaver/config/eruption.xml
 share/xscreensaver/config/euler2d.xml
 share/xscreensaver/config/extrusion.xml
 share/xscreensaver/config/fadeplot.xml
+share/xscreensaver/config/fireflies.xml
 share/xscreensaver/config/flag.xml
 share/xscreensaver/config/flame.xml
+share/xscreensaver/config/flipflop.xml
 share/xscreensaver/config/flipscreen3d.xml
 share/xscreensaver/config/flow.xml
 share/xscreensaver/config/fluidballs.xml
@@ -310,6 +316,7 @@ share/xscreensaver/config/phosphor.xml
 share/xscreensaver/config/piecewise.xml
 share/xscreensaver/config/pipes.xml
 share/xscreensaver/config/polyominoes.xml
+share/xscreensaver/config/polytopes.xml
 share/xscreensaver/config/popsquares.xml
 share/xscreensaver/config/pulsar.xml
 share/xscreensaver/config/pyro.xml