Update to 4.21 with a much cleaner installation, and one new hack. Release

notes available at http://www.jwz.org/xscreensaver/changelog.html.

5 files changed, 19 insertions, 97 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 0ffa53a41f5e..5e9e402b41ea 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xscreensaver-gnome
-PORTVERSION=	4.20
-PORTREVISION=	1
+PORTVERSION=	4.21
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -68,7 +67,7 @@ MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	mismunch.1 noof.1 pacman.1 wormhole.1 antinspect.1 fuzzyflakes.1\
 	polyhedra.1 anemotaxis.1 providence.1 memscroller.1 fireworkx.1 \
 	intermomentary.1 pinion.1 substrate.1 boing.1 boxfit.1 carousel.1 \
-	fiberlamp.1 \
+	fiberlamp.1 fliptext.1 xscreensaver-text.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 2bb07d04590b..7a345aaf5d64 100644
--- a/x11/xscreensaver-gnome/distinfo
+++ b/x11/xscreensaver-gnome/distinfo
@@ -1,2 +1,2 @@
-MD5 (xscreensaver-4.20.tar.gz) = 7df61d5d8e3190711988534f7ca84eda
-SIZE (xscreensaver-4.20.tar.gz) = 4437919
+MD5 (xscreensaver-4.21.tar.gz) = 3ea7d0bc9b7159523855296e175d7ac7
+SIZE (xscreensaver-4.21.tar.gz) = 4519828
diff --git a/x11/xscreensaver-gnome/files/patch-ab b/x11/xscreensaver-gnome/files/patch-ab
index 54df708a7b1b..5e896db2d49b 100644
--- a/x11/xscreensaver-gnome/files/patch-ab
+++ b/x11/xscreensaver-gnome/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Thu Mar 25 22:53:53 2004
-+++ configure	Thu Mar 25 22:57:09 2004
-@@ -2574,7 +2574,7 @@
+--- configure.orig	Wed Mar 23 02:35:18 2005
++++ configure	Wed Mar 23 02:36:54 2005
+@@ -2666,7 +2666,7 @@
    if test -n "$GCC"; then
      echo "$as_me:$LINENO: result: Turning on gcc compiler warnings." >&5
  echo "${ECHO_T}Turning on gcc compiler warnings." >&6
@@ -9,24 +9,12 @@
      OBJCC="$OBJCC -Wall"
      # supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
      # and then perhaps we can do without -pedantic?
-@@ -19014,13 +19011,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
- 
- 
+@@ -14516,7 +14516,7 @@
+   GTK_DATADIR=""
+   if test "$have_gtk" = yes; then
+     GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
+-    GTK_DATADIR="$GTK_DATADIR/share"
++    GTK_DATADIR="$GTK_DATADIR/share/gnome"
+   fi
  
+   if test "$have_gtk" = yes; then
diff --git a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
deleted file mode 100644
index 440569f6b9ee..000000000000
--- a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- driver/Makefile.in.orig	Thu Feb 24 02:30:59 2005
-+++ driver/Makefile.in	Thu Feb 24 02:31:32 2005
-@@ -24,14 +24,14 @@
- INTLTOOL_MERGE	= @INTLTOOL_MERGE@
- 
- GNOME_DATADIR	= @GNOME_DATADIR@
--GNOME_CCDIR_1	= $(GNOME_DATADIR)/control-center/Desktop
--GNOME_CCDIR_2	= $(GNOME_DATADIR)/control-center/capplets
--GNOME_CCDIR_3	= $(GNOME_DATADIR)/control-center-2.0/capplets
-+GNOME_CCDIR_1	= $(GNOME_DATADIR)/gnome/control-center/Desktop
-+GNOME_CCDIR_2	= $(GNOME_DATADIR)/gnome/control-center/capplets
-+GNOME_CCDIR_3	= $(GNOME_DATADIR)/gnome/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_PANELDIR	= @GNOME_PANELDIR@
- GLADE_DATADIR	= @GLADE_DATADIR@
--GNOME_ICONDIR	= $(GNOME_DATADIR)/pixmaps
-+GNOME_ICONDIR	= $(GNOME_DATADIR)/gnome/pixmaps
- GNOME_BINDIR	= $(bindir)
- HACK_CONF_DIR	= @HACK_CONF_DIR@
- 
-@@ -256,7 +256,7 @@
- tests: $(TEST_EXES)
- 
- install:   install-program   install-ad    install-scripts \
--	   install-gnome     install-man   @INSTALL_PAM@
-+	   install-gnome     install-man
- uninstall: uninstall-program uninstall-ad  \
- 	   uninstall-gnome   uninstall-man
- 
-@@ -489,8 +489,11 @@
- 	                                                                      \
-            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_1)/screensaver-properties.desktop;\
-              then true                                                       ;\
-            else                                                               \
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 958b8e796ebb..f70ef1b464b7 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -1,4 +1,3 @@
-bin/screensaver-properties-capplet
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -64,6 +63,7 @@ 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
@@ -202,11 +202,9 @@ bin/xscreensaver-hacks/xspirograph
 bin/xscreensaver-hacks/xsublim
 bin/xscreensaver-hacks/xteevee
 bin/xscreensaver-hacks/zoom
+bin/xscreensaver-text
 lib/X11/app-defaults/XScreenSaver
-share/gnome/control-center/capplets/screensaver-properties.desktop
-share/gnome/control-center/Desktop/screensaver-properties.desktop
-share/gnome/applications/screensaver-properties.desktop
-share/gnome/control-center-2.0/capplets/screensaver-properties.desktop
+share/gnome/applications/gnome-screensaver-properties.desktop
 share/gnome/pixmaps/xscreensaver.xpm
 share/locale/ca/LC_MESSAGES/xscreensaver.mo
 share/locale/da/LC_MESSAGES/xscreensaver.mo
@@ -264,7 +262,6 @@ 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
@@ -278,7 +275,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
@@ -287,12 +283,12 @@ share/xscreensaver/config/euler2d.xml
 share/xscreensaver/config/extrusion.xml
 share/xscreensaver/config/fadeplot.xml
 share/xscreensaver/config/fiberlamp.xml
-share/xscreensaver/config/fireflies.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
@@ -312,7 +308,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
@@ -394,12 +389,10 @@ share/xscreensaver/config/sonar.xml
 share/xscreensaver/config/speedmine.xml
 share/xscreensaver/config/sphere.xml
 share/xscreensaver/config/spheremonics.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
@@ -423,28 +416,14 @@ 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/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
 @dirrm share/xscreensaver/config
 @dirrm share/xscreensaver
 @dirrm bin/xscreensaver-hacks