Upgrade to version 4.04.2, and clean up the port while I'm at it.

Changes to the software:
* Several new little screensavers (hacks)
* Updates to many others
* Better GTK/Gnome 2 support
* New man pages for things that didn't have them

Changes to the port:
* Removed ill-advised, unapproved, and inappropriate changes
from previous commits. Things like webcollage-helper are created
dynamically by configure, and will be accounted for at some point
in the future. Meanwhile, having one extra item for a few people
is better than one two few for others.
* One more port goes over to the GMAKE darkside
* Since there are so many new man pages, re-sort them all
* Updated pkg-plist for the new stuff
* One of my patches was included in the distribution, so
shorten patch-ab
* Take advantage of the fact that I have to regenerate the
other patch anyway, and fix the name of the patch file

6 files changed, 60 insertions, 52 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 3ebc07d1aed2..324d7bf958fc 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -5,20 +5,28 @@
 # $FreeBSD$
 #
 
+#************************************************************************
+#									*
+#	DO NOT COMMIT TO THIS PORT WITHOUT MY PERMISSION. THANKS.	*
+#									*
+#************************************************************************
+
 PORTNAME=	xscreensaver
-PORTVERSION=	4.02
+PORTVERSION=	4.04.2
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
 MAINTAINER?=	DougB@FreeBSD.org
 
 LIB_DEPENDS=	gle.3:${PORTSDIR}/graphics/gle \
-		xml.5:${PORTSDIR}/textproc/libxml \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+		xml.5:${PORTSDIR}/textproc/libxml
+
+WRKSRC=		${WRKDIR}/xscreensaver-4.04
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_MESA=	yes
+USE_GMAKE=	yes
 USE_GTK=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
@@ -34,29 +42,35 @@ USE_GNOME=	yes
 CONFIGURE_ARGS+=	--with-gnome
 .else
 CONFIGURE_ARGS+=	--without-gnome
-PLIST_SUB+=	GNOME:="@comment "
 .endif
 
 CONFIGURE_ENV=	X_CFLAGS=-I${LOCALBASE}/include/gnome-xml
 
-MAN1=		attraction.1 blitspin.1 bouboule.1 braid.1 \
-		bsod.1 bubbles.1 critical.1 decayscreen.1 \
-		deco.1 distort.1 drift.1 epicycle.1 flag.1 flame.1 \
-		forest.1 galaxy.1 gflux.1 gltext.1 goop.1 grav.1 greynetic.1 \
-		halo.1 helix.1 hopalong.1 hyperball.1 hypercube.1 ifs.1 \
-		imsmap.1 jigsaw.1 julia.1 kaleidescope.1 lament.1 laser.1 \
-		lightning.1 lisa.1 lmorph.1 maze.1 moire.1 munch.1 nerverot.1 \
-		noseguy.1 pedal.1 penrose.1 petri.1 phosphor.1 pyro.1 qix.1 \
-		rd-bomb.1 rocks.1 rorschach.1 sierpinski.1 slidescreen.1 \
-		slip.1 sonar.1 sphere.1 spiral.1 spotlight.1 squiral.1 \
-		starfish.1 starwars.1 strange.1 swirl.1 t3d.1 vidwhacker.1 \
-		vines.1 webcollage.1 whirlwindwarp.1 xflame.1 xjack.1 xlyap.1 \
-		xmatrix.1 xscreensaver-command.1 xscreensaver-demo.1 \
-		xscreensaver-gl-helper.1 xscreensaver.1 xsublim.1 xteevee.1 \
-		zoom.1 molecule.1 rotzoomer.1 bumps.1 xscreensaver-getimage.1 \
-		xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
-		speedmine.1 whirlygig.1 penetrate.1 glforestfire.1 \
-		glsnake.1 sballs.1 twang.1 xspirograph.1
+MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
+	blitspin.1 bouboule.1 boxed.1 braid.1 bsod.1 bubble3d.1 bubbles.1 \
+	bumps.1 cage.1 ccurve.1 circuit.1 compass.1 coral.1 critical.1 \
+	crystal.1 cubenetic.1 cynosure.1 dangerball.1 decayscreen.1 deco.1 \
+	deluxe.1 demon.1 discrete.1 distort.1 drift.1 engine.1 epicycle.1 \
+	euler2d.1 extrusion.1 fadeplot.1 flag.1 flame.1 flipscreen3d.1 flow.1 \
+	fluidballs.1 forest.1 galaxy.1 gears.1 gflux.1 glforestfire.1 \
+	glplanet.1 glsnake.1 gltext.1 goop.1 grav.1 greynetic.1 halo.1 helix.1 \
+	hopalong.1 hyperball.1 hypercube.1 ifs.1 imsmap.1 interference.1 \
+	jigsaw.1 juggle.1 julia.1 kaleidescope.1 kumppa.1 lament.1 laser.1 \
+	lavalite.1 lightning.1 lisa.1 lissie.1 lmorph.1 loop.1 maze.1 menger.1 \
+	moebius.1 moire.1 moire2.1 molecule.1 morph3d.1 mountain.1 munch.1 \
+	nerverot.1 noseguy.1 pedal.1 penetrate.1 penrose.1 petri.1 phosphor.1 \
+	pipes.1 polyominoes.1 pulsar.1 pyro.1 qix.1 queens.1 rd-bomb.1 \
+	ripples.1 rocks.1 rorschach.1 rotor.1 rotzoomer.1 rubik.1 sballs.1 \
+	shadebobs.1 sierpinski.1 sierpinski3d.1 slidescreen.1 slip.1 sonar.1 \
+	speedmine.1 sphere.1 spheremonics.1 spiral.1 spotlight.1 sproingies.1 \
+	squiral.1 stairs.1 starfish.1 starwars.1 stonerview.1 strange.1 \
+	superquadrics.1 swirl.1 t3d.1 thornbird.1 triangle.1 truchet.1 twang.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 \
+	xscreensaver-command.1 xscreensaver-demo.1 \
+	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
+	xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1
 
 post-patch:
 	@ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 0828f1d6f7b4..bbb6c458d0ae 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1 +1 @@
-MD5 (xscreensaver-4.02.tar.gz) = ea0deb9c38cae11b89ea3dd5c0a04540
+MD5 (xscreensaver-4.04.2.tar.gz) = 79f99780be37eec5d7ffb8671afe7406
diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab
index 6ce706317db5..d75477c6e95c 100644
--- a/x11/xscreensaver/files/patch-ab
+++ b/x11/xscreensaver/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Mon Mar 18 15:42:35 2002
-+++ configure	Sat Mar 23 23:58:01 2002
-@@ -10728,13 +10728,13 @@
+--- configure.orig	Fri May 31 20:43:47 2002
++++ configure	Wed Jun  5 00:58:27 2002
+@@ -17452,13 +17452,13 @@
  # Now that we know whether we have Gnome, we can decide where the XML
  # config files get installed.
  #
@@ -20,18 +20,4 @@
 +#fi
  
  
-
-@@ -11658,8 +11658,12 @@
  
- # M4 sucks!!
- 
--rpmv=`(rpm -qv xscreensaver) 2>&- | \
-+case `uname` in
-+[Ll]inux)
-+  rpmv=`(rpm -qv xscreensaver) 2>&- | \
-       sed -n 's/^xscreensaver-\([0-9][0-9]*[.][0-9][0-9]*\)-.*$/\1/p'`
-+  ;;
-+esac
- 
- 
- if test \! -z "$rpmv" ; then
diff --git a/x11/xscreensaver/files/patch-driver::Makefile.in b/x11/xscreensaver/files/patch-driver::Makefile.in
deleted file mode 100644
index 3acb14502f32..000000000000
--- a/x11/xscreensaver/files/patch-driver::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- driver/Makefile.in.orig	Mon Mar 18 15:42:36 2002
-+++ driver/Makefile.in	Sun Mar 24 00:05:52 2002
-@@ -19,7 +19,7 @@
- GNOME_DATADIR	= @GNOME_DATADIR@
- GNOME_CCDIR_1	= $(GNOME_DATADIR)/control-center/Desktop
- GNOME_CCDIR_2	= $(GNOME_DATADIR)/control-center/capplets
--GNOME_PANELDIR	= $(GNOME_DATADIR)/gnome/apps/Settings/Desktop
-+GNOME_PANELDIR	= $(GNOME_DATADIR)/apps/Settings/Desktop
- GNOME_BINDIR	= $(bindir)
- HACK_CONF_DIR	= @HACK_CONF_DIR@
- GTK_ICONDIR	= @GTK_ICONDIR@
diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in
new file mode 100644
index 000000000000..c7e40e2c7bdd
--- /dev/null
+++ b/x11/xscreensaver/files/patch-driver_Makefile.in
@@ -0,0 +1,11 @@
+--- driver/Makefile.in.orig	Fri May 31 20:43:49 2002
++++ driver/Makefile.in	Wed Jun  5 00:37:42 2002
+@@ -24,7 +24,7 @@
+ 
+ GNOME_DATADIR	= @GNOME_DATADIR@
+ GNOME_CCDIR	= $(GNOME_DATADIR)/control-center/Desktop
+-GNOME_PANELDIR1 = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop
++GNOME_PANELDIR1 = $(GNOME_DATADIR)/apps/Settings/Desktop
+ GNOME_PANELDIR2	= $(GNOME_DATADIR)/applications
+ GNOME_PANELDIR	= @GNOME_PANELDIR@
+ GLADE_DATADIR	= @GLADE_DATADIR@
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 10e3b9760610..ef7e4d2aa87e 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -6,6 +6,7 @@ bin/xscreensaver-getimage
 bin/xscreensaver-getimage-file
 bin/xscreensaver-getimage-video
 bin/xscreensaver-gl-helper
+bin/xscreensaver-hacks/anemone
 bin/xscreensaver-hacks/ant
 bin/xscreensaver-hacks/apollonian
 bin/xscreensaver-hacks/atlantis
@@ -72,6 +73,7 @@ bin/xscreensaver-hacks/kaleidescope
 bin/xscreensaver-hacks/kumppa
 bin/xscreensaver-hacks/lament
 bin/xscreensaver-hacks/laser
+bin/xscreensaver-hacks/lavalite
 bin/xscreensaver-hacks/lightning
 bin/xscreensaver-hacks/lisa
 bin/xscreensaver-hacks/lissie
@@ -98,6 +100,7 @@ bin/xscreensaver-hacks/polyominoes
 bin/xscreensaver-hacks/pulsar
 bin/xscreensaver-hacks/pyro
 bin/xscreensaver-hacks/qix
+bin/xscreensaver-hacks/queens
 bin/xscreensaver-hacks/rd-bomb
 bin/xscreensaver-hacks/ripples
 bin/xscreensaver-hacks/rocks
@@ -114,6 +117,7 @@ bin/xscreensaver-hacks/slip
 bin/xscreensaver-hacks/sonar
 bin/xscreensaver-hacks/speedmine
 bin/xscreensaver-hacks/sphere
+bin/xscreensaver-hacks/spheremonics
 bin/xscreensaver-hacks/spiral
 bin/xscreensaver-hacks/spotlight
 bin/xscreensaver-hacks/sproingies
@@ -135,7 +139,6 @@ bin/xscreensaver-hacks/vidwhacker
 bin/xscreensaver-hacks/vines
 bin/xscreensaver-hacks/wander
 bin/xscreensaver-hacks/webcollage
-bin/xscreensaver-hacks/webcollage-helper
 bin/xscreensaver-hacks/whirlwindwarp
 bin/xscreensaver-hacks/whirlygig
 bin/xscreensaver-hacks/worm
@@ -160,6 +163,7 @@ lib/X11/app-defaults/XScreenSaver
 %%GNOME:%%share/gnome/pixmaps/screensaver-snap.xpm
 %%GNOME:%%share/gnome/pixmaps/xscreensaver.xpm
 share/xscreensaver/config/README
+share/xscreensaver/config/anemone.xml
 share/xscreensaver/config/ant.xml
 share/xscreensaver/config/apollonian.xml
 share/xscreensaver/config/atlantis.xml
@@ -201,6 +205,7 @@ share/xscreensaver/config/flag.xml
 share/xscreensaver/config/flame.xml
 share/xscreensaver/config/flipscreen3d.xml
 share/xscreensaver/config/flow.xml
+share/xscreensaver/config/fluidballs.xml
 share/xscreensaver/config/forest.xml
 share/xscreensaver/config/galaxy.xml
 share/xscreensaver/config/gears.xml
@@ -228,6 +233,7 @@ share/xscreensaver/config/kaleidescope.xml
 share/xscreensaver/config/kumppa.xml
 share/xscreensaver/config/lament.xml
 share/xscreensaver/config/laser.xml
+share/xscreensaver/config/lavalite.xml
 share/xscreensaver/config/lightning.xml
 share/xscreensaver/config/lisa.xml
 share/xscreensaver/config/lissie.xml
@@ -254,6 +260,7 @@ share/xscreensaver/config/polyominoes.xml
 share/xscreensaver/config/pulsar.xml
 share/xscreensaver/config/pyro.xml
 share/xscreensaver/config/qix.xml
+share/xscreensaver/config/queens.xml
 share/xscreensaver/config/rd-bomb.xml
 share/xscreensaver/config/ripples.xml
 share/xscreensaver/config/rocks.xml
@@ -271,6 +278,7 @@ share/xscreensaver/config/sonar.xml
 share/xscreensaver/config/speedmine.xml
 share/xscreensaver/config/sphere.xml
 share/xscreensaver/config/sphereEversion.xml
+share/xscreensaver/config/spheremonics.xml
 share/xscreensaver/config/spiral.xml
 share/xscreensaver/config/spotlight.xml
 share/xscreensaver/config/sproingies.xml