Updated xlockmore to 5.01.2. Changes:

5.01.2
  dclock broken in 5.01.1 thanks to for Stephen Montgomery-Smith
    pointing it out.  (5.01 dclock.c put back).

5.01.1
  Missed a patch to config.h.in for Red Hat 7.1... thanks again to
    Tim Aukland <tda10@Procket.com>.
+ New "tetris -well", now uses generated images, also cleaned up some
+   bugs too.  Bug fix thanks to Tom Schmidt.
  New molecule to solve a random SEGV on Sun thanks to Tom Schmidt
    <tschmidt@micron.com> (it still crashes on my Sun with OpenGL but
    I think its an isolated case).  Also cleaned up a few mistakes in the
    menus and resource file.
  OSF1_ENH_SEC passwd updated to handle passwords with more than eight
    characters using dispcrypt, thanks to Steve VanDevender
    <stevev@hexadecimal.uoregon.edu>.
  molecule fix in sscanf thanks to Jouk Jansen.
  scooter updated thanks to Sven Thoennissen <posse@gmx.net>.
+ Got rid of of some -Wall, lint, and C++ warnings (mostly the new 5.01 modes).
+   ecgs g++ warnings removed from solitare and all glx modes, regular modes
+   left for later (casting NULL).
  Fixed generated xlock.hlp.
+ gears added -size but defaults to 0, only -planetary will use up lots of
+   CPU so added a -planetsize 400 which takes over if -size is 0 (full screen
+   if both are 0).

5 files changed, 21 insertions, 21 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 6690fe85d0c..55015dbc2ec 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2001/03/31 11:14:31 zuntum Exp $
+# $NetBSD: Makefile,v 1.43 2001/05/29 00:55:34 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
 #
 
-DISTNAME=       xlockmore-5.00
+DISTNAME=       xlockmore-5.01.2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
 		${MASTER_SITE_XCONTRIB:=applications/}
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index 786bf62d7cc..a17c28240e4 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:56 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/05/29 00:55:34 hubertf Exp $
 
-SHA1 (xlockmore-5.00.tar.gz) = 952e531c6e0881e5637ae1ded0e3b2f981c4d834
-Size (xlockmore-5.00.tar.gz) = 1569040 bytes
+SHA1 (xlockmore-5.01.2.tar.gz) = fa51ee731522d8bfb59a7554e17765f7b616a4b0
+Size (xlockmore-5.01.2.tar.gz) = 1696131 bytes
 SHA1 (patch-aa) = 88ba89782704f03552a02a917ab68be2e7875d2b
-SHA1 (patch-ab) = c61254b40dbdc9c8ff38386ec4a07301d47bd59e
-SHA1 (patch-ac) = a873567a6832fcc9813ce1bfbb3c94f9e3584458
+SHA1 (patch-ab) = 525f7b3466d910ea838e3f81b77d1fba6f4566c4
+SHA1 (patch-ac) = 167adbc68bd7e985fb42dab90e770fcfb7d1f961
 SHA1 (patch-ad) = c2123e8579920922d9e33445316edbb29245b82a
-SHA1 (patch-ae) = 459d5576a4d8e54de6aabff35d5aeeb99aef4bf6
+SHA1 (patch-ae) = f7d93917b2526384f8f455158e5cbeec53f40d74
diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab
index af763622ce5..3f63edbfd72 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2000/12/15 22:32:17 hubertf Exp $
+$NetBSD: patch-ab,v 1.12 2001/05/29 00:55:35 hubertf Exp $
 
---- xlock/xlock.c.orig	Tue Nov 28 18:44:01 2000
+--- xlock/xlock.c.orig	Thu Apr 26 22:02:42 2001
 +++ xlock/xlock.c
-@@ -609,7 +609,9 @@
+@@ -614,7 +614,9 @@
  #endif
  #else /* XFree86 < 4.x */
  #include <X11/extensions/dpms.h>
diff --git a/x11/xlockmore/patches/patch-ac b/x11/xlockmore/patches/patch-ac
index ba4e40d33ae..ca050fb8b5a 100644
--- a/x11/xlockmore/patches/patch-ac
+++ b/x11/xlockmore/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.6 2000/12/15 22:32:17 hubertf Exp $
+$NetBSD: patch-ac,v 1.7 2001/05/29 00:55:35 hubertf Exp $
 
---- configure.orig	Fri Nov 17 18:59:04 2000
+--- configure.orig	Wed Apr 18 16:17:26 2001
 +++ configure
-@@ -4671,7 +4671,7 @@
+@@ -4699,7 +4699,7 @@
  #define USE_GL 1
  EOF
  
 -    XLOCKLIBS="${XLOCKLIBS} -lMesaGL -lMesaGLU"
 +    XLOCKLIBS="${XLOCKLIBS} -lGL -lGLU"
-     test "x$mesagl_includes" = xNONE && mesagl_includes=$ac_mesagl_includes
-     test "x$mesagl_libraries" = xNONE && mesagl_libraries=$ac_mesagl_libraries
+     test "x$mesa_includes" = xNONE && mesa_includes=$ac_mesa_includes
+     test "x$mesa_libraries" = xNONE && mesa_libraries=$ac_mesa_libraries
      case "${canonical}" in
diff --git a/x11/xlockmore/patches/patch-ae b/x11/xlockmore/patches/patch-ae
index 39695767977..a45f5ed184d 100644
--- a/x11/xlockmore/patches/patch-ae
+++ b/x11/xlockmore/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2000/08/15 03:54:17 hubertf Exp $
+$NetBSD: patch-ae,v 1.3 2001/05/29 00:55:35 hubertf Exp $
 
---- xlock/resource.c.orig	Mon Jul 10 17:54:13 2000
-+++ xlock/resource.c	Tue Aug 15 05:43:10 2000
-@@ -86,7 +86,7 @@
+--- xlock/resource.c.orig	Fri Mar  9 17:57:06 2001
++++ xlock/resource.c
+@@ -90,7 +90,7 @@
  
  #ifdef USE_MODULES
  # ifndef DEF_MODULEPATH
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.2 2000/08/15 03:54:17 hubertf Exp $
  # endif
  #endif
  
-@@ -252,7 +252,7 @@
+@@ -256,7 +256,7 @@
  #  endif /* !USE_VMSPLAY */
  #  ifdef USE_ESOUND
  #   ifndef DEFAULT_SOUND_DIR