Update xscreensaver to 4.18:

 4.18                              14-Aug-2004
   * Oops, pay no attention to the man behind the curtain.
 4.17                              14-Aug-2004
   * New hacks, anemotaxis and memscroller.
   * Fixed a bad bug that caused vidwhacker to never die.
   * Fixed normals and lighting in polyhedra.
   * Don't reuse the window when changing hacks (to work around bugs in some GL
     implementations.)
   * Made xscreensaver-getimage-file skip thumbnail-sized images.
   * Fixed endian problem in barcode on non-x86.
   * Updates to webcollage, apple2, fuzzyflakes, atunnel, and pacman.
   * Timing tweaks to bubble3d, bouncingcow, engine, gltext, lavalite,
     molecule, spotlight, sballs, boxed, blinkbox, and circuit.
   * Configure updates for Fedora core 2 / xorg 6.7.0.
   * Compile without warnings under gcc 3.3.3.
   * I give up: don't blank or lock the screen if we can't get a keyboard grab.
     In that case, both choices are bad.

6 files changed, 33 insertions, 27 deletions

diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 7c1b08fc67b..f6e296eac37 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,7 +1,7 @@
 # $nETbsd: Makefile.common,v 1.75 2004/05/15 13:13:19 wiz Exp $
 #
 
-DISTNAME=		xscreensaver-4.16
+DISTNAME=		xscreensaver-4.18
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/ \
 			${HOMEPAGE}
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index b9caa46bc7e..5acc8ad79cb 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2004/05/15 13:13:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2004/09/27 14:19:44 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -8,6 +8,7 @@ bin/xscreensaver-gl-helper
 bin/xscreensaver.kss
 lib/X11/app-defaults/XScreenSaver
 libexec/xscreensaver/anemone
+libexec/xscreensaver/anemotaxis
 libexec/xscreensaver/ant
 libexec/xscreensaver/antinspect
 libexec/xscreensaver/antspotlight
@@ -36,6 +37,7 @@ libexec/xscreensaver/cloudlife
 libexec/xscreensaver/compass
 libexec/xscreensaver/config/README
 libexec/xscreensaver/config/anemone.xml
+libexec/xscreensaver/config/anemotaxis.xml
 libexec/xscreensaver/config/ant.xml
 libexec/xscreensaver/config/antinspect.xml
 libexec/xscreensaver/config/antspotlight.xml
@@ -139,6 +141,7 @@ libexec/xscreensaver/config/lissie.xml
 libexec/xscreensaver/config/lmorph.xml
 libexec/xscreensaver/config/loop.xml
 libexec/xscreensaver/config/maze.xml
+libexec/xscreensaver/config/memscroller.xml
 libexec/xscreensaver/config/menger.xml
 libexec/xscreensaver/config/metaballs.xml
 libexec/xscreensaver/config/mirrorblob.xml
@@ -305,6 +308,7 @@ libexec/xscreensaver/ljlatest
 libexec/xscreensaver/lmorph
 libexec/xscreensaver/loop
 libexec/xscreensaver/maze
+libexec/xscreensaver/memscroller
 libexec/xscreensaver/menger
 libexec/xscreensaver/metaballs
 libexec/xscreensaver/mirrorblob
@@ -390,6 +394,7 @@ libexec/xscreensaver/xsublim
 libexec/xscreensaver/xteevee
 libexec/xscreensaver/zoom
 man/man1/anemone.1
+man/man1/anemotaxis.1
 man/man1/ant.1
 man/man1/antinspect.1
 man/man1/antspotlight.1
@@ -490,6 +495,7 @@ man/man1/ljlatest.1
 man/man1/lmorph.1
 man/man1/loop.1
 man/man1/maze.1
+man/man1/memscroller.1
 man/man1/menger.1
 man/man1/metaballs.1
 man/man1/mirrorblob.1
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 1e24cda37e9..0c86d8c86df 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.37 2004/05/15 13:13:20 wiz Exp $
+$NetBSD: distinfo,v 1.38 2004/09/27 14:19:44 wiz Exp $
 
-SHA1 (xscreensaver-4.16.tar.gz) = de26823e5c8f9a111d2e8b9b0173c81a5813a5e1
-Size (xscreensaver-4.16.tar.gz) = 4211337 bytes
+SHA1 (xscreensaver-4.18.tar.gz) = 8f7fdf53dbcc3cc96c5d9d4165c66289859d80c5
+Size (xscreensaver-4.18.tar.gz) = 4252004 bytes
 SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326
-SHA1 (patch-ab) = 9afb731b9f946517f061bc0c3bc147867f2db06b
-SHA1 (patch-ac) = 504d0773269d2a5fee5ed995a003d8339b8526e7
-SHA1 (patch-ad) = 990853ab6c83c173df9139aad43caa29193d349c
+SHA1 (patch-ab) = 29fad502419dc3e5e1acd28a7b86e1a0fe140113
+SHA1 (patch-ac) = 6b749c5f987107af00c6817243368ff46762b25a
+SHA1 (patch-ad) = da46433afc0df48d20c6810600fb8bcb1f54ffb6
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = 2340efe0cf677a20c336570b24374d675f5cd6eb
 SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114
diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab
index bd4535ec4ef..60401c15dff 100644
--- a/x11/xscreensaver/patches/patch-ab
+++ b/x11/xscreensaver/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2004/05/11 13:34:20 wiz Exp $
+$NetBSD: patch-ab,v 1.13 2004/09/27 14:19:44 wiz Exp $
 
---- configure.in.orig	2004-02-20 23:58:44.000000000 +0100
+--- configure.in.orig	2004-08-09 10:26:19.000000000 +0200
 +++ configure.in
-@@ -1661,7 +1661,7 @@ if test "$enable_locking" = yes -a "$wit
+@@ -1722,7 +1722,7 @@ if test "$enable_locking" = yes -a "$wit
      # from Matt Knopp <mhat@infocalypse.netlag.com>
      # (who got it from amu@mit.edu)
  
diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
index 69bd9ce8c3f..a2ef6438a8d 100644
--- a/x11/xscreensaver/patches/patch-ac
+++ b/x11/xscreensaver/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.12 2004/05/11 13:34:20 wiz Exp $
+$NetBSD: patch-ac,v 1.13 2004/09/27 14:19:44 wiz Exp $
 
---- configure.orig	2004-02-27 02:37:55.000000000 +0100
+--- configure.orig	2004-08-15 00:22:36.000000000 +0200
 +++ configure
-@@ -2594,6 +2594,9 @@ echo "${ECHO_T}Turning on SGI compiler w
+@@ -2689,6 +2689,9 @@ echo "${ECHO_T}Turning on SGI compiler w
      esac
    fi
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.12 2004/05/11 13:34:20 wiz Exp $
  if test -n "$GCC"; then
     if test -n "$GCC"; then
     echo "$as_me:$LINENO: checking whether gcc accepts -std" >&5
-@@ -2640,6 +2643,7 @@ echo "${ECHO_T}Disabling C++ comments in
+@@ -2735,6 +2738,7 @@ echo "${ECHO_T}Disabling C++ comments in
       CC="$CC -Wp,-lang-c89"
     fi
    fi
@@ -20,16 +20,16 @@ $NetBSD: patch-ac,v 1.12 2004/05/11 13:34:20 wiz Exp $
  
  if test -n "$GCC"; then
     if test -n "$GCC"; then
-@@ -11780,7 +11784,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
+@@ -13226,7 +13230,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lkrb4  $LIBS"
 +LIBS="-lkrb -lcrypto -lroken -lcom_err  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -11860,7 +11864,7 @@ echo "$as_me: WARNING: Cannot find compa
+ _ACEOF
+@@ -13316,7 +13320,7 @@ echo "$as_me: WARNING: Cannot find compa
      # from Matt Knopp <mhat@infocalypse.netlag.com>
      # (who got it from amu@mit.edu)
  
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.12 2004/05/11 13:34:20 wiz Exp $
  
      # jwz: MacOS X uses -lkrb5, but not -lcrypt
  
-@@ -13907,19 +13911,7 @@ fi
+@@ -15535,19 +15539,7 @@ fi
    fi
  
  
diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad
index 4bb52669564..cb8672cb414 100644
--- a/x11/xscreensaver/patches/patch-ad
+++ b/x11/xscreensaver/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.12 2004/05/11 13:34:20 wiz Exp $
+$NetBSD: patch-ad,v 1.13 2004/09/27 14:19:44 wiz Exp $
 
---- driver/Makefile.in.orig	2004-02-27 02:37:56.000000000 +0100
+--- driver/Makefile.in.orig	2004-08-15 00:22:38.000000000 +0200
 +++ driver/Makefile.in
-@@ -290,7 +290,7 @@ install-program: $(EXES)
+@@ -292,7 +292,7 @@ install-program: $(EXES)
  	fi ;								      \
  	echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ;    \
  	$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/11 13:34:20 wiz Exp $
  		    xscreensaver-getimage @EXES_OSX@ ; do	           \
  	  echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
  	       $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
-@@ -465,7 +465,7 @@ install-pam:
+@@ -467,7 +467,7 @@ install-pam:
  	  fi ;								\
  	fi
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/11 13:34:20 wiz Exp $
  	@lost=""							     ;\
           if [ "$(GNOME_DATADIR)" != "" ]; then                                \
  	                                                                      \
-@@ -473,10 +473,6 @@ install-gnome:: screensaver-properties.d
+@@ -475,10 +475,6 @@ install-gnome:: screensaver-properties.d
               echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
                    $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
             fi                                                                ;\
@@ -31,7 +31,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/11 13:34:20 wiz Exp $
             if [ ! -d "$(install_prefix)$(GNOME_CCDIR_3)" ]; then              \
               echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)"        ;\
                    $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)"        ;\
-@@ -497,16 +493,6 @@ install-gnome:: screensaver-properties.d
+@@ -499,16 +495,6 @@ install-gnome:: screensaver-properties.d
             fi                                                                ;\
  	                                                                      \
             echo $(INSTALL_DATA) screensaver-properties.desktop		      \
@@ -48,7 +48,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/11 13:34:20 wiz Exp $
               $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\
  	                                                                      \
             if   $(INSTALL_DATA) screensaver-properties.desktop		      \
-@@ -540,7 +526,7 @@ install-gnome:: screensaver-properties.d
+@@ -542,7 +528,7 @@ install-gnome:: screensaver-properties.d
             fi                                                                ;\
           fi
  
@@ -57,7 +57,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/11 13:34:20 wiz Exp $
  	@if [ "$(GNOME_DATADIR)" != "" ]; then                                \
             if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then               \
               echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)"         ;\
-@@ -639,8 +625,6 @@ uninstall-gnome::
+@@ -641,8 +627,6 @@ uninstall-gnome::
            f=screensaver-properties.desktop                                   ;\
            echo rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f                   ;\
                 rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f                   ;\