Upgrade to 4.06, the latest and greatest.

* Two new hacks (little screen saver programs), and improvements to
many others.
* Remove the libwarning, since hopefully by now everyone has upgraded
their pkgconfig ports by now.
* Undo some more unauthorized changes.

4 files changed, 8 insertions, 18 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 65f3f363a992..2209db34630a 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -12,7 +12,7 @@
 #************************************************************************
 
 PORTNAME=	xscreensaver
-PORTVERSION=	4.05
+PORTVERSION=	4.06
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
@@ -25,8 +25,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gtk12
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-pam --with-gl --with-gle --with-xpm --with-xml \
 		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
@@ -65,15 +64,13 @@ 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
 
 pre-fetch:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-	@(/usr/bin/dialog --textbox ${MASTERDIR}/pkg-libwarning 15 70 || \
-		/usr/bin/true)
 	@${ECHO} ''
 	@${ECHO} '*** This is the non-gnome version of the port.'
 	@${ECHO} '    If you want gnome support, hit Ctrl-C now,'
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 161e91f5098e..4657045716b8 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1 +1 @@
-MD5 (xscreensaver-4.05.tar.gz) = 39b05d4da14158638e501e3bc31c0943
+MD5 (xscreensaver-4.06.tar.gz) = acf78cc3ce7c8145dea79e9aa610c86d
diff --git a/x11/xscreensaver/pkg-libwarning b/x11/xscreensaver/pkg-libwarning
deleted file mode 100644
index 8cb4793662b4..000000000000
--- a/x11/xscreensaver/pkg-libwarning
+++ /dev/null
@@ -1,11 +0,0 @@
-There is currently a conflict between configure for this port,
-and pkgconfig. If your build fails, do the following:
-
-make clean
-pkg_delete -f pkgconfig*
-make install
-
-You may also want to upgrade your complete ports tree and
-then re-install glib12 and gtk12 which will also fix the
-pkg-config files for those two ports, and should offer a
-more permanent solution.
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index b827fe7873cf..7b7e40bdc378 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -51,6 +51,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
@@ -58,6 +59,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
@@ -209,6 +211,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
@@ -217,6 +220,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