Update to 4.06.

5 files changed, 31 insertions, 37 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index e62dff5ebd6d..1d3b09b5072b 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xscreensaver-gnome
-PORTVERSION=	4.05
-PORTREVISION=	2
+PORTVERSION=	4.06
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -59,7 +58,7 @@ MAN1=   anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.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 \
+	endgame.1 glblur.1 halftone.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 161e91f5098e..4657045716b8 100644
--- a/x11/xscreensaver-gnome/distinfo
+++ b/x11/xscreensaver-gnome/distinfo
@@ -1 +1 @@
-MD5 (xscreensaver-4.05.tar.gz) = 39b05d4da14158638e501e3bc31c0943
+MD5 (xscreensaver-4.06.tar.gz) = acf78cc3ce7c8145dea79e9aa610c86d
diff --git a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
index eff4d7bf634e..b66a4a20c0bb 100644
--- a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
@@ -1,33 +1,29 @@
-
-$FreeBSD$
-
---- driver/Makefile.in.orig	Tue Jun 11 12:09:07 2002
-+++ driver/Makefile.in	Mon Aug  5 14:55:05 2002
-@@ -23,9 +23,9 @@
+--- driver/Makefile.in.orig	Wed Oct 23 23:26:18 2002
++++ driver/Makefile.in	Sun Nov 10 01:07:33 2002
+@@ -23,11 +23,11 @@
  INTLTOOL_MERGE	= @INTLTOOL_MERGE@
  
  GNOME_DATADIR	= @GNOME_DATADIR@
--GNOME_CCDIR	= $(GNOME_DATADIR)/control-center/Desktop
-+GNOME_CCDIR	= $(GNOME_DATADIR)/gnome/control-center/Desktop
+-GNOME_CCDIR_1	= $(GNOME_DATADIR)/control-center/Desktop
++GNOME_CCDIR_1	= $(GNOME_DATADIR)/gnome/control-center/Desktop
+ GNOME_CCDIR_2	= $(GNOME_DATADIR)/control-center/capplets
+ GNOME_CCDIR_3	= $(GNOME_DATADIR)/control-center-2.0/capplets
  GNOME_PANELDIR1 = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop
 -GNOME_PANELDIR2	= $(GNOME_DATADIR)/applications
-+GNOME_PANELDIR2	= $(GNOME_DATADIR)/gnome/applications
++GNOME_PANELDIR2 = $(GNOME_DATADIR)/gnome/applications
  GNOME_PANELDIR	= @GNOME_PANELDIR@
  GLADE_DATADIR	= @GLADE_DATADIR@
  GNOME_BINDIR	= $(bindir)
-@@ -444,11 +444,14 @@
-              echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR)"          ;\
-                   $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR)"          ;\
-            fi                                                                ;\
-+	   /usr/bin/sed 's|xscreensaver-demo.*|screensaver-properties-capplet|'\
-+			screensaver-properties.desktop >                      \
-+				screensaver-properties.desktop1              ;\
+@@ -475,8 +475,11 @@
  	                                                                      \
-            echo    $(INSTALL_DATA) screensaver-properties.desktop	      \
-              $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop;  \
+            echo $(INSTALL_DATA) screensaver-properties.desktop		      \
+              $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
++	   /usr/bin/sed 's|xscreensaver-demo.*|screensaver-properties-capplet|'\
++	   	screensaver-properties.desktop >                      	      \
++			screensaver-properties.desktop1              	      ;\
  	                                                                      \
--           if      $(INSTALL_DATA) screensaver-properties.desktop	      \
-+           if      $(INSTALL_DATA) screensaver-properties.desktop1	      \
-              $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop;  \
+-           if   $(INSTALL_DATA) screensaver-properties.desktop		      \
++           if   $(INSTALL_DATA) screensaver-properties.desktop1		      \
+              $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
               then true                                                       ;\
             else                                                               \
diff --git a/x11/xscreensaver-gnome/files/patch-po::Makefile.in.in b/x11/xscreensaver-gnome/files/patch-po::Makefile.in.in
index 4a63ea151a0c..4b901722cf41 100644
--- a/x11/xscreensaver-gnome/files/patch-po::Makefile.in.in
+++ b/x11/xscreensaver-gnome/files/patch-po::Makefile.in.in
@@ -1,12 +1,9 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/06/06 19:53:47	1.1
-+++ po/Makefile.in.in	2002/06/06 19:54:28
+--- po/Makefile.in.in.orig	Wed Oct 23 07:23:05 2002
++++ po/Makefile.in.in	Sun Nov 10 01:09:28 2002
 @@ -101,7 +101,7 @@
  exec_prefix = @exec_prefix@
  #datadir = $(prefix)/@DATADIRNAME@      -- not for xscreensaver
- datadir = @GNOME_DATADIR@
+ datadir = @PO_DATADIR@
 -localedir = $(datadir)/locale
 +localedir = $(prefix)/share/locale
  #gnulocaledir = $(prefix)/share/locale  -- not for xscreensaver
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 50a1962dfe41..05e15aa160e3 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -52,6 +52,7 @@ bin/xscreensaver-hacks/forest
 bin/xscreensaver-hacks/galaxy
 bin/xscreensaver-hacks/gears
 bin/xscreensaver-hacks/gflux
+bin/xscreensaver-hacks/glblur
 bin/xscreensaver-hacks/glforestfire
 bin/xscreensaver-hacks/glplanet
 bin/xscreensaver-hacks/glsnake
@@ -59,6 +60,7 @@ bin/xscreensaver-hacks/gltext
 bin/xscreensaver-hacks/goop
 bin/xscreensaver-hacks/grav
 bin/xscreensaver-hacks/greynetic
+bin/xscreensaver-hacks/halftone
 bin/xscreensaver-hacks/halo
 bin/xscreensaver-hacks/helix
 bin/xscreensaver-hacks/hopalong
@@ -158,23 +160,21 @@ share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
 share/gnome/control-center/Desktop/screensaver-properties.desktop
 share/gnome/pixmaps/xscreensaver.xpm
 share/locale/ca/LC_MESSAGES/xscreensaver.mo
-share/locale/da/LC_MESSAGES/xscreensaver.mo
 share/locale/de/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
 share/locale/pt/LC_MESSAGES/xscreensaver.mo
 share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
 share/locale/ru/LC_MESSAGES/xscreensaver.mo
+share/locale/sk/LC_MESSAGES/xscreensaver.mo
 share/locale/sv/LC_MESSAGES/xscreensaver.mo
-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/anemone.xml
 share/xscreensaver/config/ant.xml
@@ -224,6 +224,7 @@ share/xscreensaver/config/forest.xml
 share/xscreensaver/config/galaxy.xml
 share/xscreensaver/config/gears.xml
 share/xscreensaver/config/gflux.xml
+share/xscreensaver/config/glblur.xml
 share/xscreensaver/config/glforestfire.xml
 share/xscreensaver/config/glplanet.xml
 share/xscreensaver/config/glsnake.xml
@@ -232,6 +233,7 @@ share/xscreensaver/config/goban.xml
 share/xscreensaver/config/goop.xml
 share/xscreensaver/config/grav.xml
 share/xscreensaver/config/greynetic.xml
+share/xscreensaver/config/halftone.xml
 share/xscreensaver/config/halo.xml
 share/xscreensaver/config/helix.xml
 share/xscreensaver/config/hopalong.xml