Update to 4.11.

5 files changed, 39 insertions, 22 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index b300b169837d..49b968843ece 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xscreensaver-gnome
-PORTVERSION=	4.10
+PORTVERSION=	4.11
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -61,7 +61,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 \
+	glslideshow.1 jigglypuff.1 klein.1 blocktube.1 cloudlife.1 \
+	cubestorm.1 glknots.1 glmatrix.1 hypertorus.1 \
 	xscreensaver-command.1 xscreensaver-demo.1 \
 	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
 	xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1
@@ -72,8 +73,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|
||' \
 		${WRKSRC}/hacks/glx/klein.c
 
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/utils/images/logo-50.xpm \
-		${PREFIX}/share/gnome/pixmaps/xscreensaver.xpm
-
 .include <bsd.port.mk>
diff --git a/x11/xscreensaver-gnome/distinfo b/x11/xscreensaver-gnome/distinfo
index f5788c1dc02a..347165e34afe 100644
--- a/x11/xscreensaver-gnome/distinfo
+++ b/x11/xscreensaver-gnome/distinfo
@@ -1 +1 @@
-MD5 (xscreensaver-4.10.tar.gz) = e12fd9a598feaa46b05ee7121e423330
+MD5 (xscreensaver-4.11.tar.gz) = fda86c57130f03f887725fad33807d63
diff --git a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
index e038e5e8a7ce..faf6df445619 100644
--- a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
@@ -1,6 +1,6 @@
---- driver/Makefile.in.orig	Tue Jun 17 10:54:08 2003
-+++ driver/Makefile.in	Tue Jun 17 10:56:37 2003
-@@ -24,11 +24,11 @@
+--- driver/Makefile.in.orig	Tue Jul 22 00:19:10 2003
++++ driver/Makefile.in	Tue Jul 22 00:26:47 2003
+@@ -24,14 +24,14 @@
  INTLTOOL_MERGE	= @INTLTOOL_MERGE@
  
  GNOME_DATADIR	= @GNOME_DATADIR@
@@ -15,8 +15,12 @@
 +GNOME_PANELDIR2 = $(GNOME_DATADIR)/gnome/applications
  GNOME_PANELDIR	= @GNOME_PANELDIR@
  GLADE_DATADIR	= @GLADE_DATADIR@
+-GNOME_ICONDIR	= $(GNOME_DATADIR)/pixmaps
++GNOME_ICONDIR	= $(GNOME_DATADIR)/gnome/pixmaps
  GNOME_BINDIR	= $(bindir)
-@@ -238,7 +238,7 @@
+ HACK_CONF_DIR	= @HACK_CONF_DIR@
+ 
+@@ -239,7 +239,7 @@
  tests: $(TEST_EXES)
  
  install:   install-program   install-ad    install-scripts \
@@ -25,7 +29,7 @@
  uninstall: uninstall-program uninstall-ad  \
  	   uninstall-gnome   uninstall-kde uninstall-man
  
-@@ -477,8 +477,11 @@
+@@ -478,8 +478,11 @@
  	                                                                      \
             echo $(INSTALL_DATA) screensaver-properties.desktop		      \
               $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
diff --git a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver.h b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver.h
new file mode 100644
index 000000000000..23eb032dedb2
--- /dev/null
+++ b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver.h
@@ -0,0 +1,10 @@
+--- 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/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 8195482e3ae9..51b210484e24 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -15,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
@@ -32,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
@@ -61,6 +63,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
@@ -74,6 +78,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
@@ -176,14 +181,11 @@ share/gnome/control-center-2.0/capplets/screensaver-properties.desktop
 share/gnome/pixmaps/xscreensaver.xpm
 share/locale/ca/LC_MESSAGES/xscreensaver.mo
 share/locale/da/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/nl/LC_MESSAGES/xscreensaver.mo
 share/locale/no/LC_MESSAGES/xscreensaver.mo
 share/locale/pl/LC_MESSAGES/xscreensaver.mo
@@ -203,6 +205,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
@@ -221,6 +224,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
@@ -251,6 +255,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
@@ -265,6 +271,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
@@ -365,14 +372,13 @@ share/xscreensaver/config/xsnow.xml
 share/xscreensaver/config/xspirograph.xml
 share/xscreensaver/config/xteevee.xml
 share/xscreensaver/config/zoom.xml
-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/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/xscreensaver.xpm
 @dirrm share/xscreensaver/config
 @dirrm share/xscreensaver
 @dirrm bin/xscreensaver-hacks