Update to 4.14. While here, change xscreensaver to not install the

xscreensaver-demo program (which requires GTK).  This is done to allow
xscreensaver coexist with xscreensaver-gnome, and to avoid a dependancy
on GTK when installing kdeartwork3.

Changes since 4.13:
* New hacks, `fontglide', `apple2', `xanalogtv', `pong',
  `gleidescope', `mirrorblob', and `blinkbox'.
* New version of `glsnake' (with many more models.)
* Another Windows crash in `bsod'; also HVX/GCOS6/TPS6.
* New version of `endgame'.
* Screen grabbing works on MacOS X.
* Various minor fixes.

Ok'ed by wiz@.

7 files changed, 53 insertions, 58 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index ce99b9e4397..35cd199d402 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,20 +1,16 @@
-# $NetBSD: Makefile,v 1.61 2003/12/13 00:45:27 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2003/12/13 19:22:12 jmmv Exp $
 #
 
 COMMENT=	Screen saver and locker for the X window system
 
-CONFLICTS+=	xscreensaver-gnome-[0-9]*
-PKGREVISION=	2
+CONFLICTS+=	xscreensaver-gnome<1.14
 
 .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+=	--without-gtk
+CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-configdir=${PREFIX}/libexec/xscreensaver/config
 
-.include "../../devel/libglade2/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 07615eb776c..49e7d9cb15a 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.57 2003/11/14 14:58:15 fredb Exp $
+# $NetBSD: Makefile.common,v 1.58 2003/12/13 19:22:12 jmmv Exp $
 #
 
-DISTNAME=		xscreensaver-4.13
+DISTNAME=		xscreensaver-4.14
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE} \
 			ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/
@@ -28,10 +28,9 @@ CONFIGURE_ENV+=		ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
 CONFIGURE_ENV+=		PERL="${PERL5}" ac_cv_perl_version="${PERL_VERSION}"
 MAKE_ENV+=		KDEDIR=${PREFIX}
 
-DISTINFO_FILE=		${.CURDIR}/../xscreensaver/distinfo
-FILESDIR=		${.CURDIR}/../xscreensaver/files
-PATCHDIR=		${.CURDIR}/../xscreensaver/patches
-PKGDIR=			${.CURDIR}/../xscreensaver
+DISTINFO_FILE=		${.CURDIR}/../../x11/xscreensaver/distinfo
+FILESDIR=		${.CURDIR}/../../x11/xscreensaver/files
+PATCHDIR=		${.CURDIR}/../../x11/xscreensaver/patches
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index 3de02999360..380a61132cd 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.15 2003/09/08 12:11:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2003/12/13 19:22:12 jmmv Exp $
 bin/xscreensaver
 bin/xscreensaver-command
-bin/xscreensaver-demo
 bin/xscreensaver-getimage
 bin/xscreensaver-getimage-file
 bin/xscreensaver-getimage-video
@@ -12,11 +11,13 @@ libexec/xscreensaver/anemone
 libexec/xscreensaver/ant
 libexec/xscreensaver/antspotlight
 libexec/xscreensaver/apollonian
+libexec/xscreensaver/apple2
 libexec/xscreensaver/atlantis
 libexec/xscreensaver/attraction
 libexec/xscreensaver/atunnel
 libexec/xscreensaver/barcode
 libexec/xscreensaver/blaster
+libexec/xscreensaver/blinkbox
 libexec/xscreensaver/blitspin
 libexec/xscreensaver/blocktube
 libexec/xscreensaver/bouboule
@@ -37,11 +38,13 @@ libexec/xscreensaver/config/anemone.xml
 libexec/xscreensaver/config/ant.xml
 libexec/xscreensaver/config/antspotlight.xml
 libexec/xscreensaver/config/apollonian.xml
+libexec/xscreensaver/config/apple2.xml
 libexec/xscreensaver/config/atlantis.xml
 libexec/xscreensaver/config/attraction.xml
 libexec/xscreensaver/config/atunnel.xml
 libexec/xscreensaver/config/barcode.xml
 libexec/xscreensaver/config/blaster.xml
+libexec/xscreensaver/config/blinkbox.xml
 libexec/xscreensaver/config/blitspin.xml
 libexec/xscreensaver/config/blocktube.xml
 libexec/xscreensaver/config/bouboule.xml
@@ -89,11 +92,13 @@ libexec/xscreensaver/config/flow.xml
 libexec/xscreensaver/config/fluidballs.xml
 libexec/xscreensaver/config/flurry.xml
 libexec/xscreensaver/config/flyingtoasters.xml
+libexec/xscreensaver/config/fontglide.xml
 libexec/xscreensaver/config/forest.xml
 libexec/xscreensaver/config/galaxy.xml
 libexec/xscreensaver/config/gears.xml
 libexec/xscreensaver/config/gflux.xml
 libexec/xscreensaver/config/glblur.xml
+libexec/xscreensaver/config/gleidescope.xml
 libexec/xscreensaver/config/glforestfire.xml
 libexec/xscreensaver/config/glknots.xml
 libexec/xscreensaver/config/glmatrix.xml
@@ -133,6 +138,7 @@ libexec/xscreensaver/config/loop.xml
 libexec/xscreensaver/config/maze.xml
 libexec/xscreensaver/config/menger.xml
 libexec/xscreensaver/config/metaballs.xml
+libexec/xscreensaver/config/mirrorblob.xml
 libexec/xscreensaver/config/moebius.xml
 libexec/xscreensaver/config/moire.xml
 libexec/xscreensaver/config/moire2.xml
@@ -151,6 +157,7 @@ libexec/xscreensaver/config/piecewise.xml
 libexec/xscreensaver/config/pipes.xml
 libexec/xscreensaver/config/polyominoes.xml
 libexec/xscreensaver/config/polytopes.xml
+libexec/xscreensaver/config/pong.xml
 libexec/xscreensaver/config/popsquares.xml
 libexec/xscreensaver/config/pulsar.xml
 libexec/xscreensaver/config/pyro.xml
@@ -199,6 +206,7 @@ libexec/xscreensaver/config/webcollage.xml
 libexec/xscreensaver/config/whirlwindwarp.xml
 libexec/xscreensaver/config/whirlygig.xml
 libexec/xscreensaver/config/worm.xml
+libexec/xscreensaver/config/xanalogtv.xml
 libexec/xscreensaver/config/xaos.xml
 libexec/xscreensaver/config/xdaliclock.xml
 libexec/xscreensaver/config/xearth.xml
@@ -242,11 +250,13 @@ libexec/xscreensaver/flow
 libexec/xscreensaver/fluidballs
 libexec/xscreensaver/flurry
 libexec/xscreensaver/flyingtoasters
+libexec/xscreensaver/fontglide
 libexec/xscreensaver/forest
 libexec/xscreensaver/galaxy
 libexec/xscreensaver/gears
 libexec/xscreensaver/gflux
 libexec/xscreensaver/glblur
+libexec/xscreensaver/gleidescope
 libexec/xscreensaver/glforestfire
 libexec/xscreensaver/glknots
 libexec/xscreensaver/glmatrix
@@ -286,6 +296,7 @@ libexec/xscreensaver/loop
 libexec/xscreensaver/maze
 libexec/xscreensaver/menger
 libexec/xscreensaver/metaballs
+libexec/xscreensaver/mirrorblob
 libexec/xscreensaver/moebius
 libexec/xscreensaver/moire
 libexec/xscreensaver/moire2
@@ -304,6 +315,7 @@ libexec/xscreensaver/piecewise
 libexec/xscreensaver/pipes
 libexec/xscreensaver/polyominoes
 libexec/xscreensaver/polytopes
+libexec/xscreensaver/pong
 libexec/xscreensaver/popsquares
 libexec/xscreensaver/pulsar
 libexec/xscreensaver/pyro
@@ -347,10 +359,10 @@ libexec/xscreensaver/vidwhacker
 libexec/xscreensaver/vines
 libexec/xscreensaver/wander
 libexec/xscreensaver/webcollage
-libexec/xscreensaver/webcollage-helper
 libexec/xscreensaver/whirlwindwarp
 libexec/xscreensaver/whirlygig
 libexec/xscreensaver/worm
+libexec/xscreensaver/xanalogtv
 libexec/xscreensaver/xflame
 libexec/xscreensaver/xjack
 libexec/xscreensaver/xlyap
@@ -364,11 +376,13 @@ man/man1/anemone.1
 man/man1/ant.1
 man/man1/antspotlight.1
 man/man1/apollonian.1
+man/man1/apple2.1
 man/man1/atlantis.1
 man/man1/attraction.1
 man/man1/atunnel.1
 man/man1/barcode.1
 man/man1/blaster.1
+man/man1/blinkbox.1
 man/man1/blitspin.1
 man/man1/blocktube.1
 man/man1/bouboule.1
@@ -413,11 +427,13 @@ man/man1/flow.1
 man/man1/fluidballs.1
 man/man1/flurry.1
 man/man1/flyingtoasters.1
+man/man1/fontglide.1
 man/man1/forest.1
 man/man1/galaxy.1
 man/man1/gears.1
 man/man1/gflux.1
 man/man1/glblur.1
+man/man1/gleidescope.1
 man/man1/glforestfire.1
 man/man1/glknots.1
 man/man1/glmatrix.1
@@ -457,6 +473,7 @@ man/man1/loop.1
 man/man1/maze.1
 man/man1/menger.1
 man/man1/metaballs.1
+man/man1/mirrorblob.1
 man/man1/moebius.1
 man/man1/moire.1
 man/man1/moire2.1
@@ -475,6 +492,7 @@ man/man1/piecewise.1
 man/man1/pipes.1
 man/man1/polyominoes.1
 man/man1/polytopes.1
+man/man1/pong.1
 man/man1/pulsar.1
 man/man1/pyro.1
 man/man1/qix.1
@@ -520,6 +538,7 @@ man/man1/webcollage.1
 man/man1/whirlwindwarp.1
 man/man1/whirlygig.1
 man/man1/worm.1
+man/man1/xanalogtv.1
 man/man1/xflame.1
 man/man1/xjack.1
 man/man1/xlyap.1
@@ -555,14 +574,5 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
-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
-@dirrm share/xscreensaver
 @dirrm libexec/xscreensaver/config
 @dirrm libexec/xscreensaver
diff --git a/x11/xscreensaver/buildlink2.mk b/x11/xscreensaver/buildlink2.mk
index 60e87c210cb..92a54271b76 100644
--- a/x11/xscreensaver/buildlink2.mk
+++ b/x11/xscreensaver/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/13 00:45:27 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 19:22:13 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use xscreensaver.
 #
@@ -9,16 +9,14 @@
 XSCREENSAVER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xscreensaver
-BUILDLINK_DEPENDS.xscreensaver?=		xscreensaver{,-gnome}>=4.13nb2
+BUILDLINK_DEPENDS.xscreensaver?=		xscreensaver>=4.14
 BUILDLINK_PKGSRCDIR.xscreensaver?=		../../x11/xscreensaver
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xscreensaver=xscreensaver
 BUILDLINK_PREFIX.xscreensaver_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.xscreensaver+=	lib/X11/app-defaults/XScreenSaver
 
-.include "../../devel/libglade2/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
 .include "../../graphics/gle/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index a7b3e9e1406..8ca6062c3ba 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.31 2003/11/14 15:25:16 fredb Exp $
+$NetBSD: distinfo,v 1.32 2003/12/13 19:22:13 jmmv Exp $
 
-SHA1 (xscreensaver-4.13.tar.gz) = 3d78b783fd1bc1e7f33fa7846fea6502217df802
-Size (xscreensaver-4.13.tar.gz) = 3902864 bytes
+SHA1 (xscreensaver-4.14.tar.gz) = 4996718deaceeb578953f400e518b745c1dd32c4
+Size (xscreensaver-4.14.tar.gz) = 3988251 bytes
 SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326
 SHA1 (patch-ab) = 3dc02761edb19658e17935bd245208fa7387316d
 SHA1 (patch-ac) = 9b82326439791ecc8e05e85a4d691109b4e50e68
-SHA1 (patch-ad) = 6ec58b1ce447002dc62e2073f49c3e14bb7efcc0
+SHA1 (patch-ad) = 244908c3e4c278c878bf89e07bd68efb62b3fc4d
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
-SHA1 (patch-af) = f1f7659e7173349868434d6dd35363e305817fd7
 SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114
diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad
index c0e47830928..7e805c2cf7e 100644
--- a/x11/xscreensaver/patches/patch-ad
+++ b/x11/xscreensaver/patches/patch-ad
@@ -1,8 +1,17 @@
-$NetBSD: patch-ad,v 1.10 2003/11/14 15:25:16 fredb Exp $
+$NetBSD: patch-ad,v 1.11 2003/12/13 19:22:13 jmmv Exp $
 
---- driver/Makefile.in.orig	2003-09-07 19:00:00.000000000 -0500
+--- driver/Makefile.in.orig	2003-10-25 09:47:19.000000000 +0200
 +++ driver/Makefile.in
-@@ -456,7 +456,7 @@ install-pam:
+@@ -287,7 +287,7 @@ install-program: $(EXES)
+ 	fi ;								      \
+ 	echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ;    \
+ 	$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
+-	@for exe in xscreensaver-command xscreensaver-demo	           \
++	@for exe in xscreensaver-command			           \
+ 		    xscreensaver-getimage @EXES_OSX@ ; do	           \
+ 	  echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
+ 	       $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
+@@ -462,7 +462,7 @@ install-pam:
  	  fi ;								\
  	fi
  
@@ -11,7 +20,7 @@ $NetBSD: patch-ad,v 1.10 2003/11/14 15:25:16 fredb Exp $
  	@lost=""							     ;\
           if [ "$(GNOME_DATADIR)" != "" ]; then                                \
  	                                                                      \
-@@ -464,10 +464,6 @@ install-gnome:: screensaver-properties.d
+@@ -470,10 +470,6 @@ install-gnome:: screensaver-properties.d
               echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
                    $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
             fi                                                                ;\
@@ -22,7 +31,7 @@ $NetBSD: patch-ad,v 1.10 2003/11/14 15:25:16 fredb Exp $
             if [ ! -d "$(install_prefix)$(GNOME_CCDIR_3)" ]; then              \
               echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)"        ;\
                    $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)"        ;\
-@@ -488,16 +484,6 @@ install-gnome:: screensaver-properties.d
+@@ -494,16 +490,6 @@ install-gnome:: screensaver-properties.d
             fi                                                                ;\
  	                                                                      \
             echo $(INSTALL_DATA) screensaver-properties.desktop		      \
@@ -39,7 +48,7 @@ $NetBSD: patch-ad,v 1.10 2003/11/14 15:25:16 fredb Exp $
               $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\
  	                                                                      \
             if   $(INSTALL_DATA) screensaver-properties.desktop		      \
-@@ -531,7 +517,7 @@ install-gnome:: screensaver-properties.d
+@@ -537,7 +523,7 @@ install-gnome:: screensaver-properties.d
             fi                                                                ;\
           fi
  
@@ -48,7 +57,7 @@ $NetBSD: patch-ad,v 1.10 2003/11/14 15:25:16 fredb Exp $
  	@if [ "$(GNOME_DATADIR)" != "" ]; then                                \
             if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then               \
               echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)"         ;\
-@@ -630,8 +616,6 @@ uninstall-gnome::
+@@ -636,8 +622,6 @@ uninstall-gnome::
            f=screensaver-properties.desktop                                   ;\
            echo rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f                   ;\
                 rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f                   ;\
diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af
deleted file mode 100644
index 81b7694dc19..00000000000
--- a/x11/xscreensaver/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.11 2003/09/08 12:11:16 wiz Exp $
-
---- driver/demo-Gtk.c.orig	Thu Sep  4 04:02:03 2003
-+++ driver/demo-Gtk.c
-@@ -4540,9 +4540,11 @@ main (int argc, char **argv)
-   free (window_title);
-   window_title = 0;
- 
-+#ifdef HAVE_GTK2
-   /* After picking the default size, allow -geometry to override it. */
-   if (geom)
-     gtk_window_parse_geometry (GTK_WINDOW (s->toplevel_widget), geom);
-+#endif
- 
-   gtk_widget_show (s->toplevel_widget);
-   init_icon (GTK_WIDGET (s->toplevel_widget)->window);  /* after `show' */