Update to xlockmore-5.00. Changes:

Note that the main reason for version 5.0 were various security flaws in
some of the blanker modules.

5.00
+ Just about all modes are now updated.  Numerous bug fixes added.
+   Modes modified for safer allocating.  Part of fix to security flaw.
+   xlock was broken by using up all the virtual memory.
+   xlockdir may need more work.  Multiscreen fixes added.
+   text3d, an unstable C++ mode, needs more work, for the calls to "new".
+   Tom Schmidt & Jouk Jansen caught numerous goofs.
  Assorted fixes when doing above like "discrete -mono", and lyapunov &
    mandelbrot now sometimes draw from the right side.  tube, lyapunov, and
    mandelbrot now go through colormap changes forward and backward.
* XFreeColors bug fix in colors.c thanks to Ian Collier
*   <Ian.Collier@comlab.ox.ac.uk>.
* Enhanced xlock/util.c for SunOS 4.1.X and others that needed the
*   matherr() function defined.  Now handles acos() and asin() DOMAIN
*   error messages. Thanks to Tom Schmidt <tschmidt@micron.com>.
* SunOS 4.1.3_U1 did not have CLOCKS_PER_SEC defined.  Thanks to Tom Schmidt
*   <tschmidt@micron.com>.
  pentomino mode added by Stephen Montgomery-Smith
    <stephen@math.missouri.edu>... it includes a scalable 3d look.
    tetris mode now uses and older version of this scalable 3d look as well.
  fire, sballs, lament and atlantis updates by Eric Lassauge.
  SIA passwording for Tru64 help thanks to Octave Orgeron <octave@sun.com>.
  ImageMagick stuff added by Jouk Jansen <joukj@hrem.stm.tudelft.nl>
    Setup to go only for VMS.
  SunC++ (Forte 6 U1) compatiblity changes.
  sball mode... new GL mode, converted by Eric Lassauge  (one improvement
    I would like to see is to see balls at the corners of the 4 other
    platonic solids instead of just the cube).
  euler2d new mode option, eulerpower Added optimizations, rotation
    of region to maximize screen fill, and new algorithm for solving
    diff equation makes it twice as fast thanks to Stephen
    Montgomery-Smith <stephen@math.missouri.edu>.
  bubble3d, invert release fix
  fire mode... new GL mode converted by Eric Lassauge
    <lassauge@mail.dotcom.fr>.  Also had a few other mods including a
    solitare and new l-* icons in pixmaps.  Tom Schmidt
    <tschmidt@micron.com> added a -size option similar to sproingies.
    tree stuff added
  lint cleanups
  cartoon and raster image removed, bat and bounce modes modified to do
    some of what it used to but not all...
  e-sound can now be turned off thanks to Mark Davies
  life patterns more random
  VMS edits thanks to Jouk Jansen <joukj@hrem.stm.tudelft.nl>.
  Dpms lib changes for configure for Solaris 8 and XFree86 4.0 (latter not
    tested).  Also added a new Solaris xpm.
  kaleid: new spiral and spots options thanks Robert Adam, II
    <raii@comm.net> (spiral looks best like:
    xlock -mode kaleid -spiral -alternate -size 20 -count 5  ).
  Configure update for Mesa thanks to Tom Schmidt <tschmidt@micron.com>.
  closedown patch thanks to Bernd 'Bing' Leibing
    <bernd.leibing@rz.uni-ulm.de>.
  vtlock patches Eric Lassauge <lassauge@mail.dotcom.fr>.
  VMS edits thanks to Jouk Jansen <joukj@hrem.stm.tudelft.nl>.
  Configure update for X11R6.4 and X11R6.5.1.
  Display error should be printed if SYSLOG defined thanks to Alexander
    Elgert <elgert@rbg.informatik.tu-darmstadt.de>.
  xlock -resources crash fixed on Solaris thanks to Alexander Elgert
    <elgert@rbg.informatik.tu-darmstadt.de>.
  coredump fix for GL modes cage, moebius, rubik, skewb, and stairs
    and Mesa3.1 thanks to Tom Schmidt <tschmidt@micron.com>.
  solitare.cc update for disable-interactive.
  xlock -resources crash fixed on Solaris thanks to Alexander Elgert
    <elgert@rbg.informatik.tu-darmstadt.de>.
  Security Focus found a security bug with display name passing "%d" as the
    display name.  Thanks to Jeremy Buhler <jbuhler@cs.washington.edu> for
    the xlockmore patch.
  Environment configuration (--disable-interactive) logic was corrected
    (default was ok but you had to --enable-interactive to disable) thanks
    to Tom Schmidt <tschmidt@micron.com>.
  Man page changes.

  * New since last beta
  + Updated since last beta

5 files changed, 15 insertions, 25 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 28bde83cc45..aef94cc80ce 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2000/11/30 01:16:16 jwise Exp $
+# $NetBSD: Makefile,v 1.39 2000/12/15 22:32:17 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
 #
 
-DISTNAME=       xlockmore-4.17.2
+DISTNAME=       xlockmore-5.00
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
 		${MASTER_SITE_XCONTRIB:=applications/}
diff --git a/x11/xlockmore/files/md5 b/x11/xlockmore/files/md5
index d8892aab0f1..56b695302ad 100644
--- a/x11/xlockmore/files/md5
+++ b/x11/xlockmore/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.18 2000/08/29 01:37:17 hubertf Exp $
+$NetBSD: md5,v 1.19 2000/12/15 22:32:17 hubertf Exp $
 
-MD5 (xlockmore-4.17.2.tar.gz) = 309723a0e4905545c4d40ca9567640fe
+MD5 (xlockmore-5.00.tar.gz) = 31ec9e3a5178ac97aa93ecda1d532454
diff --git a/x11/xlockmore/files/patch-sum b/x11/xlockmore/files/patch-sum
index b10d29a4a1e..3f767064a6f 100644
--- a/x11/xlockmore/files/patch-sum
+++ b/x11/xlockmore/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.8 2000/11/09 04:46:21 hubertf Exp $
+$NetBSD: patch-sum,v 1.9 2000/12/15 22:32:17 hubertf Exp $
 
 MD5 (patch-aa) = ef89b7291b0d3c6351330887741cd7ae
-MD5 (patch-ab) = 4e4e61c9a827f268dc6a80bdcf555d98
-MD5 (patch-ac) = 982191521403c38e1804c7b078e4f45d
+MD5 (patch-ab) = 23f7960c2c9be9045ef147c9d43487d6
+MD5 (patch-ac) = 9c5f655d8bd35411d8d46b6d9b89eb56
 MD5 (patch-ad) = c8f16f930ebc3a759cc6dbb85da43ffd
 MD5 (patch-ae) = 9dab989b9c932f21d88f08f080221a38
diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab
index 67a617a5a28..af763622ce5 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.10 2000/11/09 04:46:22 hubertf Exp $
+$NetBSD: patch-ab,v 1.11 2000/12/15 22:32:17 hubertf Exp $
 
---- xlock/xlock.c.orig	Mon Aug 21 16:14:05 2000
+--- xlock/xlock.c.orig	Tue Nov 28 18:44:01 2000
 +++ xlock/xlock.c
-@@ -597,7 +597,9 @@
- #include <X11/extensions/dpms.h>
+@@ -609,7 +609,9 @@
+ #endif
  #else /* XFree86 < 4.x */
  #include <X11/extensions/dpms.h>
 +#ifndef __NetBSD__
@@ -12,13 +12,3 @@ $NetBSD: patch-ab,v 1.10 2000/11/09 04:46:22 hubertf Exp $
  extern int  DPMSGetTimeouts(Display *, unsigned short *, unsigned short *, unsigned short *);
  extern int  DPMSSetTimeouts(Display *, unsigned short, unsigned short, unsigned short);
  #endif
-@@ -3084,7 +3086,8 @@
- #endif
- 
- #if defined( USE_SOUND ) && defined( USE_ESOUND )
--        sound =( init_sound() != -1 );
-+	/* only enable sound if not disabled - see NetBSD PR pkg/11185 */
-+        sound = sound && ( init_sound() != -1 );
- #endif
- 
- #ifdef USE_DTSAVER
diff --git a/x11/xlockmore/patches/patch-ac b/x11/xlockmore/patches/patch-ac
index 283c9f541a7..ba4e40d33ae 100644
--- a/x11/xlockmore/patches/patch-ac
+++ b/x11/xlockmore/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2000/08/15 03:54:17 hubertf Exp $
+$NetBSD: patch-ac,v 1.6 2000/12/15 22:32:17 hubertf Exp $
 
---- configure.orig	Sat Jul 29 00:48:47 2000
-+++ configure	Tue Aug 15 05:38:38 2000
-@@ -4542,7 +4542,7 @@
+--- configure.orig	Fri Nov 17 18:59:04 2000
++++ configure
+@@ -4671,7 +4671,7 @@
  #define USE_GL 1
  EOF