Update xscreensaver and xscreensaver-gnome to 4.02.

* Plugged a few minor leaks in `xscreensaver' and `xscreensaver-demo'.
* New hacks, `cubenetic' and `fluidballs'.
* Sped up `pipes'.
* Fixed sphere projection error in `glplanet'; installed a better image
  of earth.
* Added Win2K and MacOS 1 crashes to `bsod'.
* Put back previous (better) version of `forest' that was accidentially
  downgraded in the last release.
* New version of `bumps'.
* Made FPS computation in GL hacks more efficient: it will influence the
  results less, thus resulting in higher (but more accurate) reported frame
  rates.

8 files changed, 29 insertions, 154 deletions

diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index f9ed4b86bfc..71ec500aa4e 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.common,v 1.26 2002/03/13 17:38:05 fredb Exp $
+# $NetBSD: Makefile.common,v 1.27 2002/03/19 15:34:31 wiz Exp $
 #
 
-DISTNAME=		xscreensaver-4.01
-PKGREVISION=		1
+DISTNAME=		xscreensaver-4.02
 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 b627e0fd62b..48cf473327f 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/03/01 06:46:49 fredb Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/03/19 15:34:32 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -46,6 +46,7 @@ libexec/xscreensaver/config/compass.xml
 libexec/xscreensaver/config/coral.xml
 libexec/xscreensaver/config/cosmos.xml
 libexec/xscreensaver/config/critical.xml
+libexec/xscreensaver/config/cubenetic.xml
 libexec/xscreensaver/config/crystal.xml
 libexec/xscreensaver/config/cynosure.xml
 libexec/xscreensaver/config/dangerball.xml
@@ -178,6 +179,7 @@ libexec/xscreensaver/config/zoom.xml
 libexec/xscreensaver/coral
 libexec/xscreensaver/critical
 libexec/xscreensaver/crystal
+libexec/xscreensaver/cubenetic
 libexec/xscreensaver/cynosure
 libexec/xscreensaver/dangerball
 libexec/xscreensaver/decayscreen
@@ -196,6 +198,7 @@ libexec/xscreensaver/flag
 libexec/xscreensaver/flame
 libexec/xscreensaver/flipscreen3d
 libexec/xscreensaver/flow
+libexec/xscreensaver/fluidballs
 libexec/xscreensaver/forest
 libexec/xscreensaver/galaxy
 libexec/xscreensaver/gears
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 24ae758827b..e89b74b288f 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.13 2002/03/14 01:02:29 wiz Exp $
+$NetBSD: distinfo,v 1.14 2002/03/19 15:34:32 wiz Exp $
 
-SHA1 (xscreensaver-4.01.tar.gz) = 09f087d653c9c8d6b3777aa3f348c5e2f7217686
-Size (xscreensaver-4.01.tar.gz) = 2156101 bytes
-SHA1 (patch-aa) = f2c8ac0ffeb0f8aab546362caf3084bcfc31309a
+SHA1 (xscreensaver-4.02.tar.gz) = b32cf3ed37680669a4a7ea2b945fadb5841fc6b3
+Size (xscreensaver-4.02.tar.gz) = 2201442 bytes
+SHA1 (patch-aa) = 42e87cbd976e0aee890a4707b39c90fce8edc12f
 SHA1 (patch-ab) = 3f60a99f7d45f38b6c4afe2fcc6eafc9456acb30
-SHA1 (patch-ac) = 280c0bb061926fe5dad5b23e1a0c938dedc2cb35
-SHA1 (patch-ad) = 5ebb07de69a0ed5a8db2a1cfa3bedca024cd97bb
-SHA1 (patch-ae) = c3e7ddffb2caab5c545b0834c93238455852dea6
-SHA1 (patch-af) = 70bd25c608d1b98e208dbcab2444e0d9e2edffbf
+SHA1 (patch-ac) = 4f201f01b65935c57efa7bfec8291f29a7ff1280
+SHA1 (patch-ae) = 9209256c4dcc7bde3dd812bb8fcbad1f8b4f0f08
diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa
index 40ef4598b11..eca2ba8417e 100644
--- a/x11/xscreensaver/patches/patch-aa
+++ b/x11/xscreensaver/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2002/03/01 06:46:50 fredb Exp $
+$NetBSD: patch-aa,v 1.17 2002/03/19 15:34:32 wiz Exp $
 
---- configure.orig	Sun Feb 24 03:56:28 2002
+--- configure.orig	Tue Mar 19 00:42:35 2002
 +++ configure
-@@ -1544,7 +1544,7 @@
+@@ -1638,7 +1638,7 @@
  # implement the "install-strip" target properly (strip executables,
  # but do not try to strip scripts.)
  #
@@ -11,10 +11,10 @@ $NetBSD: patch-aa,v 1.16 2002/03/01 06:46:50 fredb Exp $
  
  # random libc stuff
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-@@ -7479,7 +7479,7 @@
+@@ -7584,7 +7584,7 @@
      /*)
       echo $ac_n "checking for XML headers""... $ac_c" 1>&6
- echo "configure:7493: checking for XML headers" >&5
+ echo "configure:7598: checking for XML headers" >&5
 -     d=$with_xml/include
 +     d=$with_xml/include/gnome-xml
       if test -d $d; then
diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
index 3592069879e..8dad6f5b5ed 100644
--- a/x11/xscreensaver/patches/patch-ac
+++ b/x11/xscreensaver/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2002/03/01 07:36:07 fredb Exp $
+$NetBSD: patch-ac,v 1.6 2002/03/19 15:34:32 wiz Exp $
 
---- driver/Makefile.in.orig	Sun Feb 24 03:56:29 2002
+--- driver/Makefile.in.orig	Tue Mar 19 00:42:36 2002
 +++ driver/Makefile.in
 @@ -433,10 +433,6 @@
               echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
@@ -13,10 +13,12 @@ $NetBSD: patch-ac,v 1.5 2002/03/01 07:36:07 fredb Exp $
  	                                                                      \
             echo    $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
               $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
-@@ -448,16 +444,6 @@
+@@ -446,16 +442,6 @@
+              then true                                                       ;\
+            else                                                               \
               lost="$$lost $(install_prefix)$(GNOME_CCDIR_1)"                 ;\
-            fi                                                                ;\
- 	                                                                      \
+-           fi                                                                ;\
+-	                                                                      \
 -           echo    $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
 -             $(install_prefix)$(GNOME_CCDIR_2)/screensaver.desktop           ;\
 -	                                                                      \
@@ -25,17 +27,6 @@ $NetBSD: patch-ac,v 1.5 2002/03/01 07:36:07 fredb Exp $
 -             then true                                                       ;\
 -           else                                                               \
 -             lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)"                 ;\
--           fi                                                                ;\
--	                                                                      \
+            fi                                                                ;\
+ 	                                                                      \
             if [ ! -d "$(install_prefix)$(GNOME_PANELDIR)" ]; then             \
-              echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)"       ;\
-                   $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)"       ;\
-@@ -762,7 +748,7 @@
- 
- 
- xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@
--	$(INSTALL_PROGRAM) @PREFERRED_DEMO_PROGRAM@ $@
-+	cp -p @PREFERRED_DEMO_PROGRAM@ $@
- 
- xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS)
- 	$(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \
diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad
deleted file mode 100644
index c2cc25df35a..00000000000
--- a/x11/xscreensaver/patches/patch-ad
+++ /dev/null
@@ -1,98 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2002/03/14 01:02:29 wiz Exp $
-
---- hacks/glx/glsnake.c.orig	Thu Feb 14 13:06:38 2002
-+++ hacks/glx/glsnake.c
-@@ -65,7 +65,7 @@
- #ifdef USE_GL /* whole file */
- 
- #include <GL/glu.h>
--#include <sys/timeb.h>
-+#include <sys/time.h>
- #include <string.h>
- #include <unistd.h>
- #include <stdio.h>
-@@ -98,8 +98,8 @@
- 	int is_legal;
- 	int last_turn;
- 	int selected;
--	struct timeb last_iteration;
--	struct timeb last_morph;
-+	struct timeval last_iteration;
-+	struct timeval last_morph;
- 	int morphing;
- 	nodeang_t node[24];
- 	GLfloat roty;
-@@ -693,8 +693,17 @@
- 	bp->dragging = 0;
- 	bp->interactive = 0;
- 
--	ftime(&(bp->last_iteration));
--	memcpy(&(bp->last_morph), &(bp->last_iteration), sizeof(struct timeb));
-+        {
-+# ifdef GETTIMEOFDAY_TWO_ARGS
-+          struct timezone tzp;
-+          gettimeofday(&bp->last_iteration, &tzp);
-+# else
-+          gettimeofday(&bp->last_iteration);
-+# endif
-+        }
-+
-+	memcpy(&bp->last_morph, &(bp->last_iteration),
-+               sizeof(bp->last_morph));
- 	/* srand((unsigned int) bp->last_iteration.time); */
- 
- 	/* load the model files */
-@@ -871,7 +880,7 @@
- 	long morf_msec;
- 	float iter_angle_max;
- 	int i;
--	struct timeb current_time;
-+	struct timeval current_time;
- 	int still_morphing;
- 
- 	/* Do nothing to the model if we are paused */
-@@ -880,8 +889,15 @@
- 		usleep(1);
- 		return;
- 	}
--	/* ftime is winDOS compatible */
--	ftime(&current_time);
-+
-+        {
-+# ifdef GETTIMEOFDAY_TWO_ARGS
-+          struct timezone tzp;
-+          gettimeofday(&current_time, &tzp);
-+# else
-+          gettimeofday(&current_time);
-+# endif
-+        }
- 
- 	/* <spiv> Well, ftime gives time with millisecond resolution.
- 	 * <Jaq> if current time is exactly equal to last iteration, 
-@@ -892,18 +908,20 @@
- 	 *             it would be the same
- 	 * <spiv>   b) The code will divide by zero
- 	 */
--	iter_msec = (long) current_time.millitm - bp->last_iteration.millitm + 
--		    ((long) current_time.time - bp->last_iteration.time) * 1000L;
-+	iter_msec = ((long) current_time.tv_usec - bp->last_iteration.tv_usec)/1000L + 
-+		    ((long) current_time.tv_sec - bp->last_iteration.tv_sec) * 1000L;
- 	if (iter_msec) {
- 		/* save the current time */
--		memcpy(&(bp->last_iteration), &current_time, sizeof(struct timeb));
-+		memcpy(&bp->last_iteration, &current_time,
-+                       sizeof(bp->last_iteration));
- 		
- 		/* work out if we have to switch models */
--		morf_msec = bp->last_iteration.millitm - bp->last_morph.millitm +
--			((long) (bp->last_iteration.time - bp->last_morph.time) * 1000L);
-+		morf_msec = (bp->last_iteration.tv_usec - bp->last_morph.tv_usec)/1000L +
-+			((long) (bp->last_iteration.tv_sec - bp->last_morph.tv_sec) * 1000L);
- 
- 		if ((morf_msec > statictime) && !bp->interactive) {
--			memcpy(&(bp->last_morph), &(bp->last_iteration), sizeof(struct timeb));
-+			memcpy(&bp->last_morph, &(bp->last_iteration),
-+                               sizeof(bp->last_morph));
- 			start_morph(RAND(bp->m_count), 0, bp);
- 		}
- 
diff --git a/x11/xscreensaver/patches/patch-ae b/x11/xscreensaver/patches/patch-ae
index 695b03dcd93..6bc92c40440 100644
--- a/x11/xscreensaver/patches/patch-ae
+++ b/x11/xscreensaver/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.3 2001/02/08 05:57:53 fredb Exp $
+$NetBSD: patch-ae,v 1.4 2002/03/19 15:34:32 wiz Exp $
 
---- driver/xscreensaver.kss.orig	Wed Jan 31 19:06:02 2001
-+++ driver/xscreensaver.kss	Wed Feb  7 23:31:02 2001
+--- driver/xscreensaver.kss.orig	Thu Feb  1 02:06:02 2001
++++ driver/xscreensaver.kss
 @@ -1,4 +1,4 @@
 -#!/bin/bash -
 +#!/bin/sh -
diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af
deleted file mode 100644
index 96fedfb8229..00000000000
--- a/x11/xscreensaver/patches/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.4 2002/03/14 01:02:29 wiz Exp $
-
---- hacks/screenhack.h.orig	Sat Jan 20 05:28:31 2001
-+++ hacks/screenhack.h
-@@ -1,4 +1,4 @@
--/* xscreensaver, Copyright (c) 1992-2001 Jamie Zawinski <jwz@jwz.org>
-+/* xscreensaver, Copyright (c) 1992-2002 Jamie Zawinski <jwz@jwz.org>
-  *
-  * Permission to use, copy, modify, distribute, and sell this software and its
-  * documentation for any purpose is hereby granted without fee, provided that
-@@ -102,5 +102,7 @@
- #define bzero  __ERROR_use_memset_not_bzero_in_xscreensaver__
- #undef  bcopy
- #define bcopy  __ERROR_use_memcpy_not_bcopy_in_xscreensaver__
-+#undef  ftime
-+#define ftime  __ERROR_use_gettimeofday_not_ftime_in_xscreensaver__
- 
- #endif /* __SCREENHACK_H__ */