Update to 4.21:

Changes since 4.20:   * New hack: `fliptext'.
                      * Changed default configure installation directories:
                        /usr/bin/ for xscreensaver, etc.;
                        /usr/libexec/xscreensaver/ for hacks;
                        /usr/share/xscreensaver/config/ for xml files.
                      * All the text-manipulating screen savers can have their
                        text source configured via `xscreensaver-demo' now.
                      * xscreensaver.spec now builds three RPMs:
                        base (no hacks); extras (2d hacks); and gl-extras.
                      * Added `-program' and `-front' option to `gltext'.
                      * Added `-shells' to `molecule'.
                      * Fixed text-alpha glitch in `carousel'.
                      * New `pacman': the ghosts can be killed now.
                      * Fixed a bug in screen-grabbing GL hacks where images
                        would be tiled instead of scaled on machines that
                        can't do large textures.
                      * `webcollage' can hit Flickr now.
                      * New (rewritten) implementation of `ifs'.
                      * The unlock dialog can be made to have a "New Login"
                        button that will run `gdmflexiserver'.  Experimental!
                      * Fixed non-ASCII display bug in `starwars'.
                      * Configure finds a default for imageDirectory.
                      * "xscreensaver-command -lock" now works even if
                        in "screensaver disabled" mode.
                      * If a bad password is typed while CapsLock is on, the
                        unlock dialog says "CapsLock?" instead of "Sorry".
                      * Mouse motion only counts as activity if the mouse moved
                        more than 10 pixels (so the screen won't unblank every
                        time you bump your desk.)
                      * New mode option "random-same": if you have multiple
                        monitors, this will run the *same* randomly chosen
                        hack on each screen, instead of different ones on each.
Changes since 4.19:   * New hacks, `fiberlamp', `boing', `boxfit', and
                        `carousel'.
                      * Rewrote `glslideshow' again: should be faster now.
                      * Sped up loading of images in GL programs.
                      * `starwars' uses texture-mapped fonts now.
                      * New `bsod' modes: tru64, hppa, and nvidia.
                      * Updates to `webcollage', `juggle', `pinion',
                        `fireworkx', `sonar', `extrusion', `substrate', and
                        `pong'.
Changes since 4.18:   * New hacks, `substrate', `intermomentary', `fireworkx',
                        and `pinion'.
                      * New version of `flow'.
                      * Made /proc/interrupts work again on Linux 2.6.
                      * Made `analogtv' not hog the CPU.
                      * Made analogtv-based hacks work properly on PPC/ARM.
                      * Fixed a bad memory leak in `piecewise'.
                      * Minor updates to `sonar', `molecule', `glmatrix',
                        `galaxy', and `webcollage'.
                      * Removed support for GTK 1.x (everyone uses 2.x now.)

2 files changed, 10 insertions, 11 deletions

diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 9df1af438b4..6299008f5be 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:18:40 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/03/24 13:55:42 wiz Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-demo-/}
-PKGREVISION=	1
 COMMENT=	Demo viewer and configuration tool for xscreensaver
 
 CONFLICTS+=	xscreensaver<4.14 xscreensaver-gnome-[0-9]*
@@ -12,7 +11,6 @@ USE_DIRS+=	xdg-1.1
 
 .include "../../x11/xscreensaver/Makefile.common"
 
-CONFIGURE_ARGS+=	--without-gnome
 CONFIGURE_ARGS+=        --with-gtk=${BUILDLINK_PREFIX.gtk2}
 CONFIGURE_ARGS+=        --with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-configdir=${PREFIX}/libexec/xscreensaver/config
diff --git a/x11/xscreensaver-demo/PLIST b/x11/xscreensaver-demo/PLIST
index fc3fe07ee77..ac9fcaaf0ac 100644
--- a/x11/xscreensaver-demo/PLIST
+++ b/x11/xscreensaver-demo/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/13 19:23:43 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/03/24 13:55:42 wiz Exp $
 bin/xscreensaver-demo
 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/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/glade
 @dirrm share/xscreensaver