Upgrade to version 4.00, which includes:

1. Redesigned -demo GUI (nice, except see below).
2. New modes of operation; one saver, blank/don't blank.
3. New hacks (screen saver modules).
4. Improved or fixed several other hacks.
5. Improved xinerama compatibility.

See http://www.jwz.org/xscreensaver/changelog.html for details.

* Sadly, the new GUI relies on xml, so that's now a dependency.
* I moved the various hack files and their xml config files into
their own directories.
* Fixed the poorly done hack in the Makefile to s/malloc.h/stdlib.h/
* Removed a patch hunk that's no longer needed.
* Added a fix for the new configure script's failure to recognize the
option to put the xml files in their own directories. (Already contacted author)

4 files changed, 297 insertions, 145 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 74c1b90977f7..6d47227e0772 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,21 +6,25 @@
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION=	3.34
+PORTVERSION=	4.00
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
 MAINTAINER=	DougB@FreeBSD.org
 
-LIB_DEPENDS=	gle.3:${PORTSDIR}/graphics/gle
+LIB_DEPENDS=	gle.3:${PORTSDIR}/graphics/gle \
+		xml.5:${PORTSDIR}/textproc/libxml
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_MESA=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-pam --with-gl --with-xpm --without-gnome \
-		--with-zippy=/usr/games/fortune --with-gle
+CONFIGURE_ARGS=	--without-pam --without-gnome --with-gl --with-gle --with-xpm \
+		--with-xml --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
+		--with-configdir=${PREFIX}/share/xscreensaver/config/
+
+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 \
@@ -44,8 +48,10 @@ post-patch:
 	@ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
 	@ ${SED} -e 's#-lpthread#${PTHREAD_LIBS}#g' \
 		${WRKSRC}/configure.Patched > ${WRKSRC}/configure
-.for file in pulsar.c extrusion.c extrusion.c
-	@${PERL} -pi -e "s/malloc.h/stdlib.h/g" ${WRKSRC}/hacks/glx/${file}
+.for file in pulsar.c 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
 
 .include <bsd.port.pre.mk>
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index f2dcda62f4e2..fb393947fd09 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1 +1 @@
-MD5 (xscreensaver-3.34.tar.gz) = 8243473e811c7e445e5e3cb60334ef0d
+MD5 (xscreensaver-4.00.tar.gz) = 4745690b32b4d85741dfafedb565feb2
diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab
index a93af8a502a8..a02757728c78 100644
--- a/x11/xscreensaver/files/patch-ab
+++ b/x11/xscreensaver/files/patch-ab
@@ -1,15 +1,6 @@
---- configure.orig	Tue Feb 13 00:09:23 2001
-+++ configure	Mon Feb 26 01:54:03 2001
-@@ -3239,7 +3239,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-+  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE -lXmu -lXt"
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -5401,7 +5401,7 @@
+--- configure.orig	Wed Jan  2 00:15:22 2002
++++ configure	Sun Jan 13 15:52:38 2002
+@@ -5999,7 +5999,7 @@
      PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err"
    elif test "$have_kerberos" = yes ; then
      # from Tim Showalter <tjs+@andrew.cmu.edu>
@@ -18,3 +9,12 @@
    fi
  
    if test "$have_kerberos" = yes ; then
+@@ -9883,6 +9883,8 @@
+ if test -z "$HACK_CONF_DIR" ; then
+   if test -n "$GNOME_DATADIR" ; then
+     HACK_CONF_DIR='${GNOME_DATADIR}/control-center/screensavers'
++  elif test -n "$CONFIGDIR" ; then
++    HACK_CONF_DIR="$CONFIGDIR"
+   else
+     HACK_CONF_DIR='${prefix}/lib/xscreensaver/config'
+   fi
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 7064a034030d..3517350bf4fe 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -1,125 +1,3 @@
-bin/ant
-bin/atlantis
-bin/attraction
-bin/blaster
-bin/blitspin
-bin/bouboule
-bin/braid
-bin/bsod
-bin/bubble3d
-bin/bubbles
-bin/bumps
-bin/cage
-bin/ccurve
-bin/circuit
-bin/compass
-bin/coral
-bin/critical
-bin/crystal
-bin/cynosure
-bin/dangerball
-bin/decayscreen
-bin/deco
-bin/deluxe
-bin/demon
-bin/discrete
-bin/distort
-bin/drift
-bin/epicycle
-bin/extrusion
-bin/fadeplot
-bin/flag
-bin/flame
-bin/flow
-bin/forest
-bin/galaxy
-bin/gears
-bin/gflux
-bin/glplanet
-bin/gltext
-bin/goop
-bin/grav
-bin/greynetic
-bin/halo
-bin/helix
-bin/hopalong
-bin/hyperball
-bin/hypercube
-bin/ifs
-bin/imsmap
-bin/interference
-bin/jigsaw
-bin/julia
-bin/kaleidescope
-bin/kumppa
-bin/lament
-bin/laser
-bin/lightning
-bin/lisa
-bin/lissie
-bin/lmorph
-bin/loop
-bin/maze
-bin/moebius
-bin/moire
-bin/moire2
-bin/molecule
-bin/morph3d
-bin/mountain
-bin/munch
-bin/nerverot
-bin/noseguy
-bin/pedal
-bin/penetrate
-bin/penrose
-bin/petri
-bin/phosphor
-bin/pipes
-bin/pulsar
-bin/pyro
-bin/qix
-bin/rd-bomb
-bin/ripples
-bin/rocks
-bin/rorschach
-bin/rotor
-bin/rotzoomer
-bin/rubik
-bin/shadebobs
-bin/sierpinski
-bin/sierpinski3d
-bin/slidescreen
-bin/slip
-bin/sonar
-bin/speedmine
-bin/sphere
-bin/spiral
-bin/spotlight
-bin/sproingies
-bin/squiral
-bin/stairs
-bin/starfish
-bin/starwars
-bin/stonerview
-bin/strange
-bin/superquadrics
-bin/swirl
-bin/t3d
-bin/triangle
-bin/truchet
-bin/vermiculate
-bin/vidwhacker
-bin/vines
-bin/wander
-bin/webcollage
-bin/whirlwindwarp
-bin/whirlygig
-bin/worm
-bin/xflame
-bin/xjack
-bin/xlyap
-bin/xmatrix
-bin/xrayswarm
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -127,8 +5,276 @@ bin/xscreensaver-getimage
 bin/xscreensaver-getimage-file
 bin/xscreensaver-getimage-video
 bin/xscreensaver-gl-helper
-bin/xspirograph
-bin/xsublim
-bin/xteevee
-bin/zoom
+bin/xscreensaver-hacks/ant
+bin/xscreensaver-hacks/atlantis
+bin/xscreensaver-hacks/attraction
+bin/xscreensaver-hacks/blaster
+bin/xscreensaver-hacks/blitspin
+bin/xscreensaver-hacks/bouboule
+bin/xscreensaver-hacks/braid
+bin/xscreensaver-hacks/bsod
+bin/xscreensaver-hacks/bubble3d
+bin/xscreensaver-hacks/bubbles
+bin/xscreensaver-hacks/bumps
+bin/xscreensaver-hacks/cage
+bin/xscreensaver-hacks/ccurve
+bin/xscreensaver-hacks/circuit
+bin/xscreensaver-hacks/compass
+bin/xscreensaver-hacks/coral
+bin/xscreensaver-hacks/critical
+bin/xscreensaver-hacks/crystal
+bin/xscreensaver-hacks/cynosure
+bin/xscreensaver-hacks/dangerball
+bin/xscreensaver-hacks/decayscreen
+bin/xscreensaver-hacks/deco
+bin/xscreensaver-hacks/deluxe
+bin/xscreensaver-hacks/demon
+bin/xscreensaver-hacks/discrete
+bin/xscreensaver-hacks/distort
+bin/xscreensaver-hacks/drift
+bin/xscreensaver-hacks/engine
+bin/xscreensaver-hacks/epicycle
+bin/xscreensaver-hacks/extrusion
+bin/xscreensaver-hacks/fadeplot
+bin/xscreensaver-hacks/flag
+bin/xscreensaver-hacks/flame
+bin/xscreensaver-hacks/flipscreen3d
+bin/xscreensaver-hacks/flow
+bin/xscreensaver-hacks/forest
+bin/xscreensaver-hacks/galaxy
+bin/xscreensaver-hacks/gears
+bin/xscreensaver-hacks/gflux
+bin/xscreensaver-hacks/glplanet
+bin/xscreensaver-hacks/gltext
+bin/xscreensaver-hacks/goop
+bin/xscreensaver-hacks/grav
+bin/xscreensaver-hacks/greynetic
+bin/xscreensaver-hacks/halo
+bin/xscreensaver-hacks/helix
+bin/xscreensaver-hacks/hopalong
+bin/xscreensaver-hacks/hyperball
+bin/xscreensaver-hacks/hypercube
+bin/xscreensaver-hacks/ifs
+bin/xscreensaver-hacks/imsmap
+bin/xscreensaver-hacks/interference
+bin/xscreensaver-hacks/jigsaw
+bin/xscreensaver-hacks/julia
+bin/xscreensaver-hacks/kaleidescope
+bin/xscreensaver-hacks/kumppa
+bin/xscreensaver-hacks/lament
+bin/xscreensaver-hacks/laser
+bin/xscreensaver-hacks/lightning
+bin/xscreensaver-hacks/lisa
+bin/xscreensaver-hacks/lissie
+bin/xscreensaver-hacks/lmorph
+bin/xscreensaver-hacks/loop
+bin/xscreensaver-hacks/maze
+bin/xscreensaver-hacks/menger
+bin/xscreensaver-hacks/moebius
+bin/xscreensaver-hacks/moire
+bin/xscreensaver-hacks/moire2
+bin/xscreensaver-hacks/molecule
+bin/xscreensaver-hacks/morph3d
+bin/xscreensaver-hacks/mountain
+bin/xscreensaver-hacks/munch
+bin/xscreensaver-hacks/nerverot
+bin/xscreensaver-hacks/noseguy
+bin/xscreensaver-hacks/pedal
+bin/xscreensaver-hacks/penetrate
+bin/xscreensaver-hacks/penrose
+bin/xscreensaver-hacks/petri
+bin/xscreensaver-hacks/phosphor
+bin/xscreensaver-hacks/pipes
+bin/xscreensaver-hacks/pulsar
+bin/xscreensaver-hacks/pyro
+bin/xscreensaver-hacks/qix
+bin/xscreensaver-hacks/rd-bomb
+bin/xscreensaver-hacks/ripples
+bin/xscreensaver-hacks/rocks
+bin/xscreensaver-hacks/rorschach
+bin/xscreensaver-hacks/rotor
+bin/xscreensaver-hacks/rotzoomer
+bin/xscreensaver-hacks/rubik
+bin/xscreensaver-hacks/shadebobs
+bin/xscreensaver-hacks/sierpinski
+bin/xscreensaver-hacks/sierpinski3d
+bin/xscreensaver-hacks/slidescreen
+bin/xscreensaver-hacks/slip
+bin/xscreensaver-hacks/sonar
+bin/xscreensaver-hacks/speedmine
+bin/xscreensaver-hacks/sphere
+bin/xscreensaver-hacks/spiral
+bin/xscreensaver-hacks/spotlight
+bin/xscreensaver-hacks/sproingies
+bin/xscreensaver-hacks/squiral
+bin/xscreensaver-hacks/stairs
+bin/xscreensaver-hacks/starfish
+bin/xscreensaver-hacks/starwars
+bin/xscreensaver-hacks/stonerview
+bin/xscreensaver-hacks/strange
+bin/xscreensaver-hacks/superquadrics
+bin/xscreensaver-hacks/swirl
+bin/xscreensaver-hacks/t3d
+bin/xscreensaver-hacks/triangle
+bin/xscreensaver-hacks/truchet
+bin/xscreensaver-hacks/vermiculate
+bin/xscreensaver-hacks/vidwhacker
+bin/xscreensaver-hacks/vines
+bin/xscreensaver-hacks/wander
+bin/xscreensaver-hacks/webcollage
+bin/xscreensaver-hacks/whirlwindwarp
+bin/xscreensaver-hacks/whirlygig
+bin/xscreensaver-hacks/worm
+bin/xscreensaver-hacks/xflame
+bin/xscreensaver-hacks/xjack
+bin/xscreensaver-hacks/xlyap
+bin/xscreensaver-hacks/xmatrix
+bin/xscreensaver-hacks/xrayswarm
+bin/xscreensaver-hacks/xspirograph
+bin/xscreensaver-hacks/xsublim
+bin/xscreensaver-hacks/xteevee
+bin/xscreensaver-hacks/zoom
+share/xscreensaver/config/README
+share/xscreensaver/config/ant.xml
+share/xscreensaver/config/atlantis.xml
+share/xscreensaver/config/attraction.xml
+share/xscreensaver/config/blaster.xml
+share/xscreensaver/config/blitspin.xml
+share/xscreensaver/config/bouboule.xml
+share/xscreensaver/config/braid.xml
+share/xscreensaver/config/bsod.xml
+share/xscreensaver/config/bubble3d.xml
+share/xscreensaver/config/bubbles.xml
+share/xscreensaver/config/bumps.xml
+share/xscreensaver/config/cage.xml
+share/xscreensaver/config/ccurve.xml
+share/xscreensaver/config/circuit.xml
+share/xscreensaver/config/compass.xml
+share/xscreensaver/config/coral.xml
+share/xscreensaver/config/cosmos.xml
+share/xscreensaver/config/critical.xml
+share/xscreensaver/config/crystal.xml
+share/xscreensaver/config/cynosure.xml
+share/xscreensaver/config/dangerball.xml
+share/xscreensaver/config/decayscreen.xml
+share/xscreensaver/config/deco.xml
+share/xscreensaver/config/deluxe.xml
+share/xscreensaver/config/demon.xml
+share/xscreensaver/config/discrete.xml
+share/xscreensaver/config/distort.xml
+share/xscreensaver/config/drift.xml
+share/xscreensaver/config/electricsheep.xml
+share/xscreensaver/config/engine.xml
+share/xscreensaver/config/epicycle.xml
+share/xscreensaver/config/extrusion.xml
+share/xscreensaver/config/fadeplot.xml
+share/xscreensaver/config/flag.xml
+share/xscreensaver/config/flame.xml
+share/xscreensaver/config/flipscreen3d.xml
+share/xscreensaver/config/flow.xml
+share/xscreensaver/config/forest.xml
+share/xscreensaver/config/galaxy.xml
+share/xscreensaver/config/gears.xml
+share/xscreensaver/config/gflux.xml
+share/xscreensaver/config/glplanet.xml
+share/xscreensaver/config/gltext.xml
+share/xscreensaver/config/goban.xml
+share/xscreensaver/config/goop.xml
+share/xscreensaver/config/grav.xml
+share/xscreensaver/config/greynetic.xml
+share/xscreensaver/config/halo.xml
+share/xscreensaver/config/helix.xml
+share/xscreensaver/config/hopalong.xml
+share/xscreensaver/config/hyperball.xml
+share/xscreensaver/config/hypercube.xml
+share/xscreensaver/config/ifs.xml
+share/xscreensaver/config/imsmap.xml
+share/xscreensaver/config/interference.xml
+share/xscreensaver/config/jigsaw.xml
+share/xscreensaver/config/julia.xml
+share/xscreensaver/config/kaleidescope.xml
+share/xscreensaver/config/kumppa.xml
+share/xscreensaver/config/lament.xml
+share/xscreensaver/config/laser.xml
+share/xscreensaver/config/lightning.xml
+share/xscreensaver/config/lisa.xml
+share/xscreensaver/config/lissie.xml
+share/xscreensaver/config/lmorph.xml
+share/xscreensaver/config/loop.xml
+share/xscreensaver/config/maze.xml
+share/xscreensaver/config/menger.xml
+share/xscreensaver/config/moebius.xml
+share/xscreensaver/config/moire.xml
+share/xscreensaver/config/moire2.xml
+share/xscreensaver/config/molecule.xml
+share/xscreensaver/config/morph3d.xml
+share/xscreensaver/config/mountain.xml
+share/xscreensaver/config/munch.xml
+share/xscreensaver/config/nerverot.xml
+share/xscreensaver/config/noseguy.xml
+share/xscreensaver/config/pedal.xml
+share/xscreensaver/config/penetrate.xml
+share/xscreensaver/config/penrose.xml
+share/xscreensaver/config/petri.xml
+share/xscreensaver/config/phosphor.xml
+share/xscreensaver/config/pipes.xml
+share/xscreensaver/config/pulsar.xml
+share/xscreensaver/config/pyro.xml
+share/xscreensaver/config/qix.xml
+share/xscreensaver/config/rd-bomb.xml
+share/xscreensaver/config/ripples.xml
+share/xscreensaver/config/rocks.xml
+share/xscreensaver/config/rorschach.xml
+share/xscreensaver/config/rotor.xml
+share/xscreensaver/config/rotzoomer.xml
+share/xscreensaver/config/rubik.xml
+share/xscreensaver/config/shadebobs.xml
+share/xscreensaver/config/sierpinski.xml
+share/xscreensaver/config/sierpinski3d.xml
+share/xscreensaver/config/slidescreen.xml
+share/xscreensaver/config/slip.xml
+share/xscreensaver/config/sonar.xml
+share/xscreensaver/config/speedmine.xml
+share/xscreensaver/config/sphere.xml
+share/xscreensaver/config/sphereEversion.xml
+share/xscreensaver/config/spiral.xml
+share/xscreensaver/config/spotlight.xml
+share/xscreensaver/config/sproingies.xml
+share/xscreensaver/config/squiral.xml
+share/xscreensaver/config/ssystem.xml
+share/xscreensaver/config/stairs.xml
+share/xscreensaver/config/starfish.xml
+share/xscreensaver/config/starwars.xml
+share/xscreensaver/config/stonerview.xml
+share/xscreensaver/config/strange.xml
+share/xscreensaver/config/superquadrics.xml
+share/xscreensaver/config/swirl.xml
+share/xscreensaver/config/t3d.xml
+share/xscreensaver/config/triangle.xml
+share/xscreensaver/config/truchet.xml
+share/xscreensaver/config/vermiculate.xml
+share/xscreensaver/config/vidwhacker.xml
+share/xscreensaver/config/vines.xml
+share/xscreensaver/config/wander.xml
+share/xscreensaver/config/webcollage.xml
+share/xscreensaver/config/whirlwindwarp.xml
+share/xscreensaver/config/whirlygig.xml
+share/xscreensaver/config/worm.xml
+share/xscreensaver/config/xaos.xml
+share/xscreensaver/config/xdaliclock.xml
+share/xscreensaver/config/xearth.xml
+share/xscreensaver/config/xfishtank.xml
+share/xscreensaver/config/xflame.xml
+share/xscreensaver/config/xjack.xml
+share/xscreensaver/config/xlyap.xml
+share/xscreensaver/config/xmatrix.xml
+share/xscreensaver/config/xmountains.xml
+share/xscreensaver/config/xrayswarm.xml
+share/xscreensaver/config/xsnow.xml
+share/xscreensaver/config/xspirograph.xml
+share/xscreensaver/config/xteevee.xml
+share/xscreensaver/config/zoom.xml
 lib/X11/app-defaults/XScreenSaver
+@dirrm share/xscreensaver/config
+@dirrm share/xscreensaver
+@dirrm bin/xscreensaver-hacks