Upgrade to version 4.12, which contains several new hacks, and updates

to several of the existing ones.

Add a knob to install the ping program setuid so it can ping your network.

Remove some now-redundant patching.

Regenerate a couple of patches.

6 files changed, 77 insertions, 34 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 17c03190136e..cab39b41bb80 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -12,7 +12,7 @@
 #************************************************************************
 
 PORTNAME=	xscreensaver
-PORTVERSION=	4.10
+PORTVERSION=	4.12
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
@@ -31,13 +31,17 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-pam --with-gl --with-gle --with-xpm --with-xml \
 		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
 		--with-configdir=${PREFIX}/share/xscreensaver/config/ \
-		--with-jpeg=${LOCALBASE} --without-gnome --without-kerberos
+		--with-jpeg=${LOCALBASE} --without-gnome --without-kerberos \
+		--without-motif
 
 .include <bsd.port.pre.mk>
 
 .if defined(XS_WITH_ALL_FORTUNES)
 CONFIGURE_ARGS+=	--with-fortune="/usr/games/fortune -sa"
 .endif
+.if defined(XS_WITH_SETUID_HACKS)
+CONFIGURE_ARGS+=	--with-setuid-hacks
+.endif
 
 .undef HAVE_GNOME
 
@@ -67,7 +71,8 @@ MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.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 \
+	jigglypuff.1 klein.1 cloudlife.1 hypertorus.1 glmatrix.1 cubestorm.1 \
+	glknots.1 blocktube.1 flipflop.1 antspotlight.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
@@ -85,14 +90,8 @@ pre-fetch:
 post-patch:
 	@ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
 	@ ${SED} -e 's#-lpthread#${PTHREAD_LIBS}#g' \
+		-e 's#malloc.h#stdlib.h#g' \
 		${WRKSRC}/configure.Patched > ${WRKSRC}/configure
-.for file in extrusion.c
-	@ ${CP} ${WRKSRC}/hacks/glx/${file} ${WRKSRC}/hacks/glx/${file}.Dist
-	@ ${SED} -e 's/malloc.h/stdlib.h/g' ${WRKSRC}/hacks/glx/${file}.Dist > \
-		${WRKSRC}/hacks/glx/${file}
-.endfor
-	@ ${CP} ${WRKSRC}/hacks/glx/klein.c ${WRKSRC}/hacks/glx/klein.c.presed
-	@ ${SED} -e 's#
##' ${WRKSRC}/hacks/glx/klein.c.presed > ${WRKSRC}/hacks/glx/klein.c
 
 post-install:
 	@(if test -x ${X11BASE}/bin/xscreensaver-hacks/webcollage-helper; then \
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index f5788c1dc02a..260ab3622585 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1 +1 @@
-MD5 (xscreensaver-4.10.tar.gz) = e12fd9a598feaa46b05ee7121e423330
+MD5 (xscreensaver-4.12.tar.gz) = 5c82e689c9307d89001ba6485fb6386a
diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab
index d75477c6e95c..7614a2a1ddea 100644
--- a/x11/xscreensaver/files/patch-ab
+++ b/x11/xscreensaver/files/patch-ab
@@ -1,6 +1,24 @@
---- configure.orig	Fri May 31 20:43:47 2002
-+++ configure	Wed Jun  5 00:58:27 2002
-@@ -17452,13 +17452,13 @@
+--- configure.orig	Thu Aug 14 02:52:10 2003
++++ configure	Sun Sep  7 15:52:28 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
+@@ -12859,7 +12859,7 @@
+       ok="yes"
+       pkg_check_version gtk+       1.2     ; ac_gtk_version_string="$vers"
+       pkg_check_version glib       1.0
+-      pkg_check_version gdk_pixbuf 0.1
++      # pkg_check_version gdk_pixbuf 0.1 - pick this up later
+       have_gtk="$ok"
+ 
+       # Now check for Gnome...
+@@ -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/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in
index f5e2704ba1ff..b3bb8c2f32e6 100644
--- a/x11/xscreensaver/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver/files/patch-driver_Makefile.in
@@ -1,6 +1,15 @@
---- driver/Makefile.in.Dist	Wed Oct 23 20:26:18 2002
-+++ driver/Makefile.in	Thu Oct 24 23:20:33 2002
-@@ -216,8 +216,6 @@
+--- driver/Makefile.in.orig	Thu Aug 14 02:52:11 2003
++++ driver/Makefile.in	Sun Sep  7 16:02:47 2003
+@@ -121,7 +121,7 @@
+ 		  test-apm   test-fade   xdpyinfo
+ 
+ MOTIF_LIBS	= @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
+-GTK_LIBS	= @GTK_LIBS@ $(XMU_LIBS)
++GTK_LIBS	= @GTK_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
+ XML_LIBS	= @XML_LIBS@
+ 
+ XDPMS_LIBS	= @XDPMS_LIBS@
+@@ -219,8 +219,6 @@
  EXTRAS		= README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
  		  xscreensaver-demo.glade xscreensaver-demo.glade2 \
  		  xscreensaver-demo.glade2p \
@@ -9,7 +18,7 @@
  		  xscreensaver.kss.in \
  		  .gdbinit
  VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
-@@ -451,107 +449,6 @@
+@@ -454,107 +452,6 @@
   $$e ""									     ;\
  	  fi ;								\
  	fi
@@ -116,4 +125,4 @@
 -	 fi
  
  # xscreensaver.xpm
- install-gnome:: $(LOGO)
+ # into /usr/share/pixmaps/
diff --git a/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file b/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file
index 5a9ed975f5ff..db5f51c2d293 100644
--- a/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file
+++ b/x11/xscreensaver/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/pkg-plist b/x11/xscreensaver/pkg-plist
index e0bee01fd20d..705a96645647 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -7,6 +7,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
@@ -14,6 +15,7 @@ bin/xscreensaver-hacks/atunnel
 bin/xscreensaver-hacks/barcode
 bin/xscreensaver-hacks/blaster
 bin/xscreensaver-hacks/blitspin
+bin/xscreensaver-hacks/blocktube
 bin/xscreensaver-hacks/bouboule
 bin/xscreensaver-hacks/bouncingcow
 bin/xscreensaver-hacks/boxed
@@ -31,6 +33,7 @@ bin/xscreensaver-hacks/coral
 bin/xscreensaver-hacks/critical
 bin/xscreensaver-hacks/crystal
 bin/xscreensaver-hacks/cubenetic
+bin/xscreensaver-hacks/cubestorm
 bin/xscreensaver-hacks/cynosure
 bin/xscreensaver-hacks/dangerball
 bin/xscreensaver-hacks/decayscreen
@@ -49,6 +52,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
@@ -60,6 +64,8 @@ bin/xscreensaver-hacks/gears
 bin/xscreensaver-hacks/gflux
 bin/xscreensaver-hacks/glblur
 bin/xscreensaver-hacks/glforestfire
+bin/xscreensaver-hacks/glknots
+bin/xscreensaver-hacks/glmatrix
 bin/xscreensaver-hacks/glplanet
 bin/xscreensaver-hacks/glslideshow
 bin/xscreensaver-hacks/glsnake
@@ -73,6 +79,7 @@ bin/xscreensaver-hacks/helix
 bin/xscreensaver-hacks/hopalong
 bin/xscreensaver-hacks/hyperball
 bin/xscreensaver-hacks/hypercube
+bin/xscreensaver-hacks/hypertorus
 bin/xscreensaver-hacks/ifs
 bin/xscreensaver-hacks/imsmap
 bin/xscreensaver-hacks/interference
@@ -111,6 +118,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
@@ -167,17 +175,18 @@ bin/xscreensaver-hacks/xsublim
 bin/xscreensaver-hacks/xteevee
 bin/xscreensaver-hacks/zoom
 lib/X11/app-defaults/XScreenSaver
-share/xscreensaver/xscreensaver.xpm
-share/xscreensaver/screensaver-cmndln.xpm
-share/xscreensaver/screensaver-colorselector.xpm
-share/xscreensaver/screensaver-diagnostic.xpm
-share/xscreensaver/screensaver-locking.xpm
-share/xscreensaver/screensaver-power.xpm
-share/xscreensaver/screensaver-snap.xpm
+share/pixmaps/xscreensaver.xpm
+share/xscreensaver/screensaver-cmndln.png
+share/xscreensaver/screensaver-colorselector.png
+share/xscreensaver/screensaver-diagnostic.png
+share/xscreensaver/screensaver-locking.png
+share/xscreensaver/screensaver-power.png
+share/xscreensaver/screensaver-snap.png
 share/xscreensaver/xscreensaver-demo.glade2
 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
@@ -185,6 +194,7 @@ share/xscreensaver/config/atunnel.xml
 share/xscreensaver/config/barcode.xml
 share/xscreensaver/config/blaster.xml
 share/xscreensaver/config/blitspin.xml
+share/xscreensaver/config/blocktube.xml
 share/xscreensaver/config/bouboule.xml
 share/xscreensaver/config/bouncingcow.xml
 share/xscreensaver/config/boxed.xml
@@ -203,6 +213,7 @@ share/xscreensaver/config/cosmos.xml
 share/xscreensaver/config/critical.xml
 share/xscreensaver/config/crystal.xml
 share/xscreensaver/config/cubenetic.xml
+share/xscreensaver/config/cubestorm.xml
 share/xscreensaver/config/cynosure.xml
 share/xscreensaver/config/dangerball.xml
 share/xscreensaver/config/decayscreen.xml
@@ -220,8 +231,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
@@ -233,6 +246,8 @@ share/xscreensaver/config/gears.xml
 share/xscreensaver/config/gflux.xml
 share/xscreensaver/config/glblur.xml
 share/xscreensaver/config/glforestfire.xml
+share/xscreensaver/config/glknots.xml
+share/xscreensaver/config/glmatrix.xml
 share/xscreensaver/config/glplanet.xml
 share/xscreensaver/config/glslideshow.xml
 share/xscreensaver/config/glsnake.xml
@@ -247,6 +262,7 @@ share/xscreensaver/config/helix.xml
 share/xscreensaver/config/hopalong.xml
 share/xscreensaver/config/hyperball.xml
 share/xscreensaver/config/hypercube.xml
+share/xscreensaver/config/hypertorus.xml
 share/xscreensaver/config/ifs.xml
 share/xscreensaver/config/imsmap.xml
 share/xscreensaver/config/interference.xml
@@ -285,6 +301,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