Update to 4.13:

4.13
* On Xinerama systems, xscreensaver now runs one hack on each
  monitor (just like in ``real'' multi-head mode) instead of running
  one hack stretching across all the screens. Note that for this to
  work with any 3rd party screensavers, they must update their
  ``vroot.h'' file.
* webcollage and vidwhacker display images using xscreensaver-getimage now.
* Added ljlatest script for use with starwars and phosphor.
4.12
* New GL hacks, flipflop, antspotlight, and polytopes.
* Added VMS to bsod.
* Compile without warnings in ``gcc -pedantic''.
* Updates to webcollage and queens.
* Fixed a bug that could cause PAM to hang.

7 files changed, 50 insertions, 18 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index daf78f31204..427bfe09cbd 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/07/13 13:54:33 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/08 12:11:17 wiz Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	1
 COMMENT=	Screen saver and locker for the X window system (with GNOME support)
 
 CONFLICTS+=	xscreensaver-[0-9]*
diff --git a/x11/xscreensaver-gnome/PLIST b/x11/xscreensaver-gnome/PLIST
index 7d31c98d23b..4706139adfa 100644
--- a/x11/xscreensaver-gnome/PLIST
+++ b/x11/xscreensaver-gnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2003/06/24 10:22:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2003/09/08 12:11:17 wiz Exp $
 bin/screensaver-properties-capplet
 bin/xscreensaver
 bin/xscreensaver-command
@@ -11,6 +11,7 @@ bin/xscreensaver.kss
 lib/X11/app-defaults/XScreenSaver
 libexec/xscreensaver/anemone
 libexec/xscreensaver/ant
+libexec/xscreensaver/antspotlight
 libexec/xscreensaver/apollonian
 libexec/xscreensaver/atlantis
 libexec/xscreensaver/attraction
@@ -55,6 +56,7 @@ libexec/xscreensaver/extrusion
 libexec/xscreensaver/fadeplot
 libexec/xscreensaver/flag
 libexec/xscreensaver/flame
+libexec/xscreensaver/flipflop
 libexec/xscreensaver/flipscreen3d
 libexec/xscreensaver/flow
 libexec/xscreensaver/fluidballs
@@ -98,6 +100,7 @@ libexec/xscreensaver/lavalite
 libexec/xscreensaver/lightning
 libexec/xscreensaver/lisa
 libexec/xscreensaver/lissie
+libexec/xscreensaver/ljlatest
 libexec/xscreensaver/lmorph
 libexec/xscreensaver/loop
 libexec/xscreensaver/maze
@@ -120,6 +123,7 @@ libexec/xscreensaver/phosphor
 libexec/xscreensaver/piecewise
 libexec/xscreensaver/pipes
 libexec/xscreensaver/polyominoes
+libexec/xscreensaver/polytopes
 libexec/xscreensaver/popsquares
 libexec/xscreensaver/pulsar
 libexec/xscreensaver/pyro
@@ -178,6 +182,7 @@ libexec/xscreensaver/xteevee
 libexec/xscreensaver/zoom
 man/man1/anemone.1
 man/man1/ant.1
+man/man1/antspotlight.1
 man/man1/apollonian.1
 man/man1/atlantis.1
 man/man1/attraction.1
@@ -222,6 +227,7 @@ man/man1/extrusion.1
 man/man1/fadeplot.1
 man/man1/flag.1
 man/man1/flame.1
+man/man1/flipflop.1
 man/man1/flipscreen3d.1
 man/man1/flow.1
 man/man1/fluidballs.1
@@ -265,6 +271,7 @@ man/man1/lavalite.1
 man/man1/lightning.1
 man/man1/lisa.1
 man/man1/lissie.1
+man/man1/ljlatest.1
 man/man1/lmorph.1
 man/man1/loop.1
 man/man1/maze.1
@@ -287,6 +294,7 @@ man/man1/phosphor.1
 man/man1/piecewise.1
 man/man1/pipes.1
 man/man1/polyominoes.1
+man/man1/polytopes.1
 man/man1/pulsar.1
 man/man1/pyro.1
 man/man1/qix.1
@@ -354,6 +362,7 @@ share/control-center/capplets/screensaver-properties.desktop
 share/control-center/screensavers/README
 share/control-center/screensavers/anemone.xml
 share/control-center/screensavers/ant.xml
+share/control-center/screensavers/antspotlight.xml
 share/control-center/screensavers/apollonian.xml
 share/control-center/screensavers/atlantis.xml
 share/control-center/screensavers/attraction.xml
@@ -398,8 +407,10 @@ share/control-center/screensavers/eruption.xml
 share/control-center/screensavers/euler2d.xml
 share/control-center/screensavers/extrusion.xml
 share/control-center/screensavers/fadeplot.xml
+share/control-center/screensavers/fireflies.xml
 share/control-center/screensavers/flag.xml
 share/control-center/screensavers/flame.xml
+share/control-center/screensavers/flipflop.xml
 share/control-center/screensavers/flipscreen3d.xml
 share/control-center/screensavers/flow.xml
 share/control-center/screensavers/fluidballs.xml
@@ -466,6 +477,7 @@ share/control-center/screensavers/phosphor.xml
 share/control-center/screensavers/piecewise.xml
 share/control-center/screensavers/pipes.xml
 share/control-center/screensavers/polyominoes.xml
+share/control-center/screensavers/polytopes.xml
 share/control-center/screensavers/popsquares.xml
 share/control-center/screensavers/pulsar.xml
 share/control-center/screensavers/pyro.xml
@@ -529,15 +541,12 @@ share/control-center/screensavers/xspirograph.xml
 share/control-center/screensavers/xteevee.xml
 share/control-center/screensavers/zoom.xml
 share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xscreensaver.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xscreensaver.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xscreensaver.mo
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 5fc18a039d7..b14dd78bec3 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2003/07/13 13:54:33 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2003/09/08 12:11:14 wiz Exp $
 #
 
-PKGREVISION=	1
-
 COMMENT=	Screen saver and locker for the X window system
 
 CONFLICTS+=	xscreensaver-gnome-[0-9]*
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index b57a4daa53f..bb9e12bf34c 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.52 2003/07/17 22:57:02 grant Exp $
+# $NetBSD: Makefile.common,v 1.53 2003/09/08 12:11:14 wiz Exp $
 #
 
-DISTNAME=		xscreensaver-4.11
+DISTNAME=		xscreensaver-4.13
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE} \
 			ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index f103f057c5b..3de02999360 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2003/06/24 10:22:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2003/09/08 12:11:15 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -10,6 +10,7 @@ bin/xscreensaver.kss
 lib/X11/app-defaults/XScreenSaver
 libexec/xscreensaver/anemone
 libexec/xscreensaver/ant
+libexec/xscreensaver/antspotlight
 libexec/xscreensaver/apollonian
 libexec/xscreensaver/atlantis
 libexec/xscreensaver/attraction
@@ -34,6 +35,7 @@ libexec/xscreensaver/compass
 libexec/xscreensaver/config/README
 libexec/xscreensaver/config/anemone.xml
 libexec/xscreensaver/config/ant.xml
+libexec/xscreensaver/config/antspotlight.xml
 libexec/xscreensaver/config/apollonian.xml
 libexec/xscreensaver/config/atlantis.xml
 libexec/xscreensaver/config/attraction.xml
@@ -78,8 +80,10 @@ libexec/xscreensaver/config/eruption.xml
 libexec/xscreensaver/config/euler2d.xml
 libexec/xscreensaver/config/extrusion.xml
 libexec/xscreensaver/config/fadeplot.xml
+libexec/xscreensaver/config/fireflies.xml
 libexec/xscreensaver/config/flag.xml
 libexec/xscreensaver/config/flame.xml
+libexec/xscreensaver/config/flipflop.xml
 libexec/xscreensaver/config/flipscreen3d.xml
 libexec/xscreensaver/config/flow.xml
 libexec/xscreensaver/config/fluidballs.xml
@@ -146,6 +150,7 @@ libexec/xscreensaver/config/phosphor.xml
 libexec/xscreensaver/config/piecewise.xml
 libexec/xscreensaver/config/pipes.xml
 libexec/xscreensaver/config/polyominoes.xml
+libexec/xscreensaver/config/polytopes.xml
 libexec/xscreensaver/config/popsquares.xml
 libexec/xscreensaver/config/pulsar.xml
 libexec/xscreensaver/config/pyro.xml
@@ -231,6 +236,7 @@ libexec/xscreensaver/extrusion
 libexec/xscreensaver/fadeplot
 libexec/xscreensaver/flag
 libexec/xscreensaver/flame
+libexec/xscreensaver/flipflop
 libexec/xscreensaver/flipscreen3d
 libexec/xscreensaver/flow
 libexec/xscreensaver/fluidballs
@@ -274,6 +280,7 @@ libexec/xscreensaver/lavalite
 libexec/xscreensaver/lightning
 libexec/xscreensaver/lisa
 libexec/xscreensaver/lissie
+libexec/xscreensaver/ljlatest
 libexec/xscreensaver/lmorph
 libexec/xscreensaver/loop
 libexec/xscreensaver/maze
@@ -296,6 +303,7 @@ libexec/xscreensaver/phosphor
 libexec/xscreensaver/piecewise
 libexec/xscreensaver/pipes
 libexec/xscreensaver/polyominoes
+libexec/xscreensaver/polytopes
 libexec/xscreensaver/popsquares
 libexec/xscreensaver/pulsar
 libexec/xscreensaver/pyro
@@ -354,6 +362,7 @@ libexec/xscreensaver/xteevee
 libexec/xscreensaver/zoom
 man/man1/anemone.1
 man/man1/ant.1
+man/man1/antspotlight.1
 man/man1/apollonian.1
 man/man1/atlantis.1
 man/man1/attraction.1
@@ -398,6 +407,7 @@ man/man1/extrusion.1
 man/man1/fadeplot.1
 man/man1/flag.1
 man/man1/flame.1
+man/man1/flipflop.1
 man/man1/flipscreen3d.1
 man/man1/flow.1
 man/man1/fluidballs.1
@@ -441,6 +451,7 @@ man/man1/lavalite.1
 man/man1/lightning.1
 man/man1/lisa.1
 man/man1/lissie.1
+man/man1/ljlatest.1
 man/man1/lmorph.1
 man/man1/loop.1
 man/man1/maze.1
@@ -463,6 +474,7 @@ man/man1/phosphor.1
 man/man1/piecewise.1
 man/man1/pipes.1
 man/man1/polyominoes.1
+man/man1/polytopes.1
 man/man1/pulsar.1
 man/man1/pyro.1
 man/man1/qix.1
@@ -524,15 +536,12 @@ man/man1/xspirograph.1
 man/man1/xsublim.1
 man/man1/xteevee.1
 man/man1/zoom.1
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xscreensaver.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xscreensaver.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xscreensaver.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xscreensaver.mo
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 7064a907fea..c65c23499aa 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.27 2003/06/24 10:22:47 wiz Exp $
+$NetBSD: distinfo,v 1.28 2003/09/08 12:11:15 wiz Exp $
 
-SHA1 (xscreensaver-4.11.tar.gz) = 35ed2910975fe5fd565f48519b90ba6c47726145
-Size (xscreensaver-4.11.tar.gz) = 3744413 bytes
+SHA1 (xscreensaver-4.13.tar.gz) = 3d78b783fd1bc1e7f33fa7846fea6502217df802
+Size (xscreensaver-4.13.tar.gz) = 3902864 bytes
 SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326
 SHA1 (patch-ab) = 3dc02761edb19658e17935bd245208fa7387316d
 SHA1 (patch-ac) = 430b3318a1d1623c5ac2ba51dd531c3bff8c9a70
 SHA1 (patch-ad) = 64cd7a683da1afea599d1e8b8dffd951243c9d9b
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
+SHA1 (patch-af) = f1f7659e7173349868434d6dd35363e305817fd7
diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af
new file mode 100644
index 00000000000..81b7694dc19
--- /dev/null
+++ b/x11/xscreensaver/patches/patch-af
@@ -0,0 +1,16 @@
+$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' */