Update to xscreensaver 4.08.

Changes since 4.07:   * New hacks, `atunnels' and `piecewise'.
                      * Physics improvement in `fluidballs'.
                      * Various fixes for XDarwin systems (X11 on MacOS X.)
                      * Added -clock option to `barcode'.
                      * Minor fixes to `endgame', `flurry', `flipscreen3d',
                        and `gflux'.

6 files changed, 33 insertions, 42 deletions

diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 0a4eef523c7..d8d6c5b6356 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.44 2003/02/15 10:48:26 wiz Exp $
+# $NetBSD: Makefile.common,v 1.45 2003/02/21 22:05:01 mycroft Exp $
 #
 
-DISTNAME=		xscreensaver-4.07
+DISTNAME=		xscreensaver-4.08
 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 f1d34b71fdf..ad228378363 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/02/15 10:48:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/02/21 22:05:01 mycroft Exp $
 @comment bin/screensaver-properties-capplet
 bin/xscreensaver
 bin/xscreensaver-command
@@ -14,6 +14,7 @@ libexec/xscreensaver/ant
 libexec/xscreensaver/apollonian
 libexec/xscreensaver/atlantis
 libexec/xscreensaver/attraction
+libexec/xscreensaver/atunnel
 libexec/xscreensaver/barcode
 libexec/xscreensaver/blaster
 libexec/xscreensaver/blitspin
@@ -269,6 +270,7 @@ libexec/xscreensaver/penetrate
 libexec/xscreensaver/penrose
 libexec/xscreensaver/petri
 libexec/xscreensaver/phosphor
+libexec/xscreensaver/piecewise
 libexec/xscreensaver/pipes
 libexec/xscreensaver/polyominoes
 libexec/xscreensaver/popsquares
@@ -332,6 +334,7 @@ man/man1/ant.1
 man/man1/apollonian.1
 man/man1/atlantis.1
 man/man1/attraction.1
+man/man1/atunnel.1
 man/man1/barcode.1
 man/man1/blaster.1
 man/man1/blitspin.1
@@ -423,6 +426,7 @@ man/man1/penetrate.1
 man/man1/penrose.1
 man/man1/petri.1
 man/man1/phosphor.1
+man/man1/piecewise.1
 man/man1/pipes.1
 man/man1/polyominoes.1
 man/man1/pulsar.1
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index f0fcaeb1b14..e3d43d77460 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.23 2003/02/15 10:48:26 wiz Exp $
+$NetBSD: distinfo,v 1.24 2003/02/21 22:05:01 mycroft Exp $
 
-SHA1 (xscreensaver-4.07.tar.gz) = 4c81d11681194b93d1be6e6e0e459574624d6680
-Size (xscreensaver-4.07.tar.gz) = 3242535 bytes
+SHA1 (xscreensaver-4.08.tar.gz) = 97d2f00df8f87a1c1732e4d5402ea989451ab456
+Size (xscreensaver-4.08.tar.gz) = 3283803 bytes
 SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326
-SHA1 (patch-ab) = 5d6f368c6f007ac66a3346ba80fe38a8781e03f2
-SHA1 (patch-ac) = 574251635e4046c43a9e368aee84e8fc72a5480b
+SHA1 (patch-ab) = 3dc02761edb19658e17935bd245208fa7387316d
+SHA1 (patch-ac) = 430b3318a1d1623c5ac2ba51dd531c3bff8c9a70
 SHA1 (patch-ad) = 64cd7a683da1afea599d1e8b8dffd951243c9d9b
-SHA1 (patch-ae) = e68e964b218418af4ba0886ddbf0e1aeabea3e15
diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab
index 9737c4589b8..439e8daaa4e 100644
--- a/x11/xscreensaver/patches/patch-ab
+++ b/x11/xscreensaver/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.10 2002/10/28 22:37:11 wiz Exp $
+$NetBSD: patch-ab,v 1.11 2003/02/21 22:05:02 mycroft Exp $
 
---- configure.in.orig	Wed Oct 23 14:24:25 2002
-+++ configure.in
-@@ -1535,7 +1535,7 @@ if test "$enable_locking" = yes -a "$wit
-   if test "$have_kerberos5" = yes ; then
+--- configure.in.orig	2003-02-12 23:27:30.000000000 +0000
++++ configure.in	2003-02-21 21:42:53.000000000 +0000
+@@ -1579,7 +1579,7 @@
      # from Matt Knopp <mhat@infocalypse.netlag.com>
      # (who got it from amu@mit.edu)
--    PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err"
-+    PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err -lcrypt"
-   elif test "$have_kerberos" = yes ; then
-     # from Tim Showalter <tjs@psaux.com> for FreeBSD 4.2
-     PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err"
+ 
+-    PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
++    PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err"
+ 
+     # jwz: MacOS X uses -lkrb5, but not -lcrypt
+     AC_CHECK_X_LIB(crypt, crypt, [PASSWD_LIBS="$PASSWD_LIBS -lcrypt"])
diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
index d9d849ad556..7b31189928b 100644
--- a/x11/xscreensaver/patches/patch-ac
+++ b/x11/xscreensaver/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.8 2002/12/14 02:34:04 salo Exp $
+$NetBSD: patch-ac,v 1.9 2003/02/21 22:05:02 mycroft Exp $
 
---- configure.orig	Thu Oct 24 05:26:17 2002
-+++ configure	Sat Dec 14 02:37:53 2002
-@@ -11012,7 +11012,7 @@
-   if test "$have_kerberos5" = yes ; then
+--- configure.orig	2003-02-19 06:47:45.000000000 +0000
++++ configure	2003-02-21 21:44:23.000000000 +0000
+@@ -11061,7 +11061,7 @@
      # from Matt Knopp <mhat@infocalypse.netlag.com>
      # (who got it from amu@mit.edu)
--    PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err"
-+    PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err -lcrypt"
-   elif test "$have_kerberos" = yes ; then
-     # from Tim Showalter <tjs@psaux.com> for FreeBSD 4.2
-     PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err"
-@@ -12917,19 +12917,7 @@
+ 
+-    PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
++    PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err"
+ 
+     # jwz: MacOS X uses -lkrb5, but not -lcrypt
+ 
+@@ -13050,19 +13050,7 @@
    fi
  
  
diff --git a/x11/xscreensaver/patches/patch-ae b/x11/xscreensaver/patches/patch-ae
deleted file mode 100644
index 7afa1ad39b4..00000000000
--- a/x11/xscreensaver/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2003/02/15 10:48:27 wiz Exp $
-
---- hacks/glx/flurry.c.orig	Mon Feb  3 11:48:30 2003
-+++ hacks/glx/flurry.c
-@@ -103,7 +103,6 @@ ModStruct   flurry_description = {
- #endif
- 
- #include <sys/time.h>
--#include <sys/sysctl.h>
- 
- #include "flurry.h"
-