Upgrade to the latest, version 4.21, with associated tweaks to the

patches and pkg-plist. This version has numerous bugs fixed, and
several new screensavers.

Add gdk_pixbuf as a dependency. It's a small library, and adds
additional features to the image-grabbing screensavers.

Add glade2 as required by the latest versions. The delay in upgrading
was due to the large number of dependencies that were formerly associated
with the glade2 port. The gnome team should be commended for reducing this
to a reasonable level.

5 files changed, 59 insertions, 166 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index a2f0ff5df647..0658ab91e021 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -12,7 +12,7 @@
 #************************************************************************
 
 PORTNAME=	xscreensaver
-PORTVERSION=	4.18
+PORTVERSION=	4.21
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
@@ -20,13 +20,15 @@ MAINTAINER?=	DougB@FreeBSD.org
 COMMENT=	Save your screen while you entertain your cat
 
 LIB_DEPENDS=	gle.3:${PORTSDIR}/graphics/gle \
-		xml2.5:${PORTSDIR}/textproc/libxml2
+		gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		glade-2.0.0:${PORTSDIR}/devel/libglade2
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
-USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-pam --with-gl --with-gle --with-xpm --with-xml \
 		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
@@ -76,7 +78,9 @@ MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	apple2.1 blinkbox.1 fontglide.1 gleidescope.1 mirrorblob.1 pong.1 \
 	xanalogtv.1 mismunch.1 noof.1 pacman.1 wormhole.1 anemotaxis.1 \
 	antinspect.1 fuzzyflakes.1 polyhedra.1 providence.1 memscroller.1 \
-	xscreensaver-command.1 xscreensaver-demo.1 \
+	boing.1 boxfit.1 carousel.1 fiberlamp.1 fireworkx.1 fliptext.1 intermomentary.1 \
+	pinion.1 substrate.1 \
+	xscreensaver-command.1 xscreensaver-demo.1 xscreensaver-text.1 \
 	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
 	xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1
 
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index ac82b10c5450..7a345aaf5d64 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,2 +1,2 @@
-MD5 (xscreensaver-4.18.tar.gz) = 24847c37e2eb54e590997878232530ce
-SIZE (xscreensaver-4.18.tar.gz) = 4252004
+MD5 (xscreensaver-4.21.tar.gz) = 3ea7d0bc9b7159523855296e175d7ac7
+SIZE (xscreensaver-4.21.tar.gz) = 4519828
diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab
index b2dc3fc43705..046d796521ad 100644
--- a/x11/xscreensaver/files/patch-ab
+++ b/x11/xscreensaver/files/patch-ab
@@ -9,33 +9,3 @@
      OBJCC="$OBJCC -Wall"
      # supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
      # and then perhaps we can do without -pedantic?
-@@ -13491,7 +13491,7 @@
-       ok="yes"
-       pkg_check_version gtk+       1.2     ; ac_gtk_version_string="$vers"
-       pkg_check_version glib       1.0
--      pkg_check_version gdk_pixbuf 0.1
-+      # pkg_check_version gdk_pixbuf 0.1 - pick this up later
-       have_gtk="$ok"
- 
-       # Now check for Gnome...
-@@ -19014,13 +19014,13 @@
- # Now that we know whether we have Gnome, we can decide where the XML
- # config files get installed.
- #
--if test -z "$HACK_CONF_DIR" ; then
--  if test -n "$GNOME_DATADIR" ; then
--    HACK_CONF_DIR='${GNOME_DATADIR}/control-center/screensavers'
--  else
--    HACK_CONF_DIR='${prefix}/lib/xscreensaver/config'
--  fi
--fi
-+#if test -z "$HACK_CONF_DIR" ; then
-+#  if test -n "$GNOME_DATADIR" ; then
-+#    HACK_CONF_DIR='${GNOME_DATADIR}/control-center/screensavers'
-+#  else
-+#    HACK_CONF_DIR='${prefix}/lib/xscreensaver/config'
-+#  fi
-+#fi
- 
- 
- 
diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in
index c99156da81ae..87b817815f1e 100644
--- a/x11/xscreensaver/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver/files/patch-driver_Makefile.in
@@ -1,7 +1,7 @@
---- driver/Makefile.in.orig	Thu Feb 26 17:37:56 2004
-+++ driver/Makefile.in	Sat Mar  6 23:51:07 2004
-@@ -125,7 +125,7 @@
- 		  test-apm   test-fade   test-xinerama   xdpyinfo
+--- driver/Makefile.in.orig	Sun Mar 20 23:18:18 2005
++++ driver/Makefile.in	Sun Apr 10 17:56:12 2005
+@@ -121,7 +121,7 @@
+ 		  test-randr    xdpyinfo
  
  MOTIF_LIBS	= @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
 -GTK_LIBS	= @GTK_LIBS@ $(XMU_LIBS)
@@ -9,120 +9,33 @@
  XML_LIBS	= @XML_LIBS@
  
  XDPMS_LIBS	= @XDPMS_LIBS@
-@@ -234,8 +234,6 @@
- EXTRAS		= README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
- 		  xscreensaver-demo.glade xscreensaver-demo.glade2 \
- 		  xscreensaver-demo.glade2p \
+@@ -234,7 +234,6 @@
+ EXTRAS		= README Makefile.in \
+ 		  XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \
+ 		  xscreensaver-demo.glade2 xscreensaver-demo.glade2p \
 -		  screensaver-properties.desktop.in \
--		  screensaver-properties-capplet \
- 		  xscreensaver.kss.in \
  		  .gdbinit
  VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
-@@ -464,107 +462,6 @@
+ 		  vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \
+@@ -461,21 +460,6 @@
   $$e ""									     ;\
  	  fi ;								\
  	fi
 -
+-# screensaver-properties.desktop
+-# into /usr/share/applications/
 -install-gnome:: screensaver-properties.desktop
--	@lost=""							     ;\
--         if [ "$(GNOME_DATADIR)" != "" ]; then                                \
--	                                                                      \
--           if [ ! -d "$(install_prefix)$(GNOME_CCDIR_1)" ]; then              \
--             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
--                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
--           fi                                                                ;\
--           if [ ! -d "$(install_prefix)$(GNOME_CCDIR_2)" ]; then              \
--             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)"        ;\
--                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)"        ;\
--           fi                                                                ;\
--           if [ ! -d "$(install_prefix)$(GNOME_CCDIR_3)" ]; then              \
--             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)"        ;\
--                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)"        ;\
--           fi                                                                ;\
--           if [ ! -d "$(install_prefix)$(GNOME_PANELDIR)" ]; then             \
--             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)"       ;\
--                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)"       ;\
--           fi                                                                ;\
--	                                                                      \
--           echo $(INSTALL_DATA) screensaver-properties.desktop		      \
--             $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
--	                                                                      \
--           if   $(INSTALL_DATA) screensaver-properties.desktop		      \
--             $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
--             then true                                                       ;\
--           else                                                               \
--             lost="$$lost $(install_prefix)$(GNOME_CCDIR_1)"                 ;\
--           fi                                                                ;\
--	                                                                      \
--           echo $(INSTALL_DATA) screensaver-properties.desktop		      \
--             $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\
--	                                                                      \
--           if   $(INSTALL_DATA) screensaver-properties.desktop		      \
--             $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\
--             then true                                                       ;\
--           else                                                               \
--             lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)"                 ;\
--           fi                                                                ;\
--	                                                                      \
--           echo $(INSTALL_DATA) screensaver-properties.desktop		      \
--             $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\
--	                                                                      \
--           if   $(INSTALL_DATA) screensaver-properties.desktop		      \
--             $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\
--             then true                                                       ;\
--           else                                                               \
--             lost="$$lost $(install_prefix)$(GNOME_CCDIR_3)"                 ;\
--           fi                                                                ;\
--	                                                                      \
--           echo $(INSTALL_DATA) screensaver-properties.desktop		      \
--            $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop;\
--           if   $(INSTALL_DATA) screensaver-properties.desktop		      \
--            $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop;\
--             then true                                                       ;\
--           else                                                               \
--             lost="$$lost $(install_prefix)$(GNOME_PANELDIR)"                ;\
--           fi                                                                ;\
--	                                                                      \
--           if [ "$$lost" != "" ]; then                                        \
--             e=echo ;                                                         \
-- $$e ""                                                                      ;\
-- $$e "  ####################################################################";\
-- $$e "  Warning: unable to install screensaver-properties.desktop into:"     ;\
--	set - $$lost							     ;\
--	for f in $$@ ; do echo "             $$f/" ; done                    ;\
-- $$e '           This means the "Screen Saver" section of the Gnome'         ;\
-- $$e "           Control Center (gnomecc) may not work properly."	     ;\
-- $$e "  ####################################################################";\
-- $$e ""                                                                      ;\
--             exit 1 ;                                                         \
--           fi                                                                ;\
--         fi
--
--install-gnome:: screensaver-properties-capplet
--	@if [ "$(GNOME_DATADIR)" != "" ]; then                                \
--           if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then               \
--             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)"         ;\
--                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)"         ;\
--           fi                                                                ;\
--	   program=screensaver-properties-capplet			     ;\
--	   echo $(INSTALL_SCRIPT) $(srcdir)/$$program			      \
--	          $(install_prefix)$(GNOME_BINDIR)/$$program		     ;\
--	   if   $(INSTALL_SCRIPT) $(srcdir)/$$program			      \
--	          $(install_prefix)$(GNOME_BINDIR)/$$program		     ;\
--             then true                                                       ;\
--           else                                                               \
--             e=echo ;                                                         \
-- $$e ""                                                                      ;\
-- $$e "  ####################################################################";\
-- $$e "  Warning: unable to install $$program into"			     ;\
-- $$e "           $(install_prefix)$(GNOME_BINDIR)/."                         ;\
-- $$e "           Without this file, the Gnome session manager will not"      ;\
-- $$e "           launch xscreensaver properly at login time."                ;\
-- $$e "  ####################################################################";\
-- $$e ""                                                                      ;\
--             exit 1 ;                                                         \
--	   fi ;                                                               \
+-	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
+-	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
+-	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+-		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+-	   fi								     ;\
+-	   name2=gnome-screensaver-properties.desktop			     ;\
+-	   echo $(INSTALL_DATA) screensaver-properties.desktop		      \
+-		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+-		$(INSTALL_DATA) screensaver-properties.desktop		      \
+-		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
 -	 fi
  
+ 
  # xscreensaver.xpm
- # into /usr/share/pixmaps/
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 253e7aca5a52..206c97bfa667 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -20,15 +20,18 @@ bin/xscreensaver-hacks/blaster
 bin/xscreensaver-hacks/blinkbox
 bin/xscreensaver-hacks/blitspin
 bin/xscreensaver-hacks/blocktube
+bin/xscreensaver-hacks/boing
 bin/xscreensaver-hacks/bouboule
 bin/xscreensaver-hacks/bouncingcow
 bin/xscreensaver-hacks/boxed
+bin/xscreensaver-hacks/boxfit
 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/carousel
 bin/xscreensaver-hacks/ccurve
 bin/xscreensaver-hacks/circuit
 bin/xscreensaver-hacks/cloudlife
@@ -54,10 +57,13 @@ bin/xscreensaver-hacks/eruption
 bin/xscreensaver-hacks/euler2d
 bin/xscreensaver-hacks/extrusion
 bin/xscreensaver-hacks/fadeplot
+bin/xscreensaver-hacks/fiberlamp
+bin/xscreensaver-hacks/fireworkx
 bin/xscreensaver-hacks/flag
 bin/xscreensaver-hacks/flame
 bin/xscreensaver-hacks/flipflop
 bin/xscreensaver-hacks/flipscreen3d
+bin/xscreensaver-hacks/fliptext
 bin/xscreensaver-hacks/flow
 bin/xscreensaver-hacks/fluidballs
 bin/xscreensaver-hacks/flurry
@@ -90,6 +96,7 @@ bin/xscreensaver-hacks/hypertorus
 bin/xscreensaver-hacks/ifs
 bin/xscreensaver-hacks/imsmap
 bin/xscreensaver-hacks/interference
+bin/xscreensaver-hacks/intermomentary
 bin/xscreensaver-hacks/jigglypuff
 bin/xscreensaver-hacks/jigsaw
 bin/xscreensaver-hacks/juggle
@@ -129,6 +136,7 @@ bin/xscreensaver-hacks/penrose
 bin/xscreensaver-hacks/petri
 bin/xscreensaver-hacks/phosphor
 bin/xscreensaver-hacks/piecewise
+bin/xscreensaver-hacks/pinion
 bin/xscreensaver-hacks/pipes
 bin/xscreensaver-hacks/polyhedra
 bin/xscreensaver-hacks/polyominoes
@@ -166,6 +174,7 @@ bin/xscreensaver-hacks/starfish
 bin/xscreensaver-hacks/starwars
 bin/xscreensaver-hacks/stonerview
 bin/xscreensaver-hacks/strange
+bin/xscreensaver-hacks/substrate
 bin/xscreensaver-hacks/superquadrics
 bin/xscreensaver-hacks/swirl
 bin/xscreensaver-hacks/t3d
@@ -194,13 +203,6 @@ bin/xscreensaver-hacks/xteevee
 bin/xscreensaver-hacks/zoom
 lib/X11/app-defaults/XScreenSaver
 share/pixmaps/xscreensaver.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/config/README
 share/xscreensaver/config/anemone.xml
 share/xscreensaver/config/anemotaxis.xml
@@ -217,21 +219,23 @@ share/xscreensaver/config/blaster.xml
 share/xscreensaver/config/blinkbox.xml
 share/xscreensaver/config/blitspin.xml
 share/xscreensaver/config/blocktube.xml
+share/xscreensaver/config/boing.xml
 share/xscreensaver/config/bouboule.xml
 share/xscreensaver/config/bouncingcow.xml
 share/xscreensaver/config/boxed.xml
+share/xscreensaver/config/boxfit.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/carousel.xml
 share/xscreensaver/config/ccurve.xml
 share/xscreensaver/config/circuit.xml
 share/xscreensaver/config/cloudlife.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/cubenetic.xml
@@ -245,7 +249,6 @@ 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/endgame.xml
 share/xscreensaver/config/engine.xml
 share/xscreensaver/config/epicycle.xml
@@ -253,11 +256,13 @@ share/xscreensaver/config/eruption.xml
 share/xscreensaver/config/euler2d.xml
 share/xscreensaver/config/extrusion.xml
 share/xscreensaver/config/fadeplot.xml
-share/xscreensaver/config/fireflies.xml
+share/xscreensaver/config/fiberlamp.xml
+share/xscreensaver/config/fireworkx.xml
 share/xscreensaver/config/flag.xml
 share/xscreensaver/config/flame.xml
 share/xscreensaver/config/flipflop.xml
 share/xscreensaver/config/flipscreen3d.xml
+share/xscreensaver/config/fliptext.xml
 share/xscreensaver/config/flow.xml
 share/xscreensaver/config/fluidballs.xml
 share/xscreensaver/config/flurry.xml
@@ -277,7 +282,6 @@ share/xscreensaver/config/glplanet.xml
 share/xscreensaver/config/glslideshow.xml
 share/xscreensaver/config/glsnake.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
@@ -291,6 +295,7 @@ share/xscreensaver/config/hypertorus.xml
 share/xscreensaver/config/ifs.xml
 share/xscreensaver/config/imsmap.xml
 share/xscreensaver/config/interference.xml
+share/xscreensaver/config/intermomentary.xml
 share/xscreensaver/config/jigglypuff.xml
 share/xscreensaver/config/jigsaw.xml
 share/xscreensaver/config/juggle.xml
@@ -329,6 +334,7 @@ share/xscreensaver/config/penrose.xml
 share/xscreensaver/config/petri.xml
 share/xscreensaver/config/phosphor.xml
 share/xscreensaver/config/piecewise.xml
+share/xscreensaver/config/pinion.xml
 share/xscreensaver/config/pipes.xml
 share/xscreensaver/config/polyhedra.xml
 share/xscreensaver/config/polyominoes.xml
@@ -356,18 +362,17 @@ 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/spheremonics.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/substrate.xml
 share/xscreensaver/config/superquadrics.xml
 share/xscreensaver/config/swirl.xml
 share/xscreensaver/config/t3d.xml
@@ -385,21 +390,22 @@ share/xscreensaver/config/whirlygig.xml
 share/xscreensaver/config/worm.xml
 share/xscreensaver/config/wormhole.xml
 share/xscreensaver/config/xanalogtv.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/xplanet.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
+share/xscreensaver/glade/screensaver-cmndln.png
+share/xscreensaver/glade/screensaver-colorselector.png
+share/xscreensaver/glade/screensaver-diagnostic.png
+share/xscreensaver/glade/screensaver-locking.png
+share/xscreensaver/glade/screensaver-power.png
+share/xscreensaver/glade/screensaver-snap.png
+share/xscreensaver/glade/xscreensaver-demo.glade2
 @dirrm share/xscreensaver/config
+@dirrm share/xscreensaver/glade
 @dirrm share/xscreensaver
 @dirrm bin/xscreensaver-hacks