Update xlockmore to 5.18. Changes:

  toneclock coredump fix for 5.17 version thanks to Jouk Jansen.
  Invalid mode added.  :)  lock the screen if an invalid mode is specified
    "xlock -mode tom" like "xlock -modelist bug,tom"
  errno fix in passwd.c for DragonFly thanks to Joerg Sonnenberger
    <joerg AT britannica.bec.de>.
  PAM fixes for when 1. TTY is not set to DISPLAY xlock can fail, 2. Tidy
    fixes for PAM_BAIL.  Thanks to George D M Ross <gdmr AT inf.ed.ac.uk>.
  Notes from Marcelo Vianna <mfvianna AT centroin.com.br> on morph3d added
    as comments to morph3d.c.

4 files changed, 10 insertions, 26 deletions

diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 6a3bf649dce..d026a7c2e97 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2005/06/01 18:03:32 jlam Exp $
+# $NetBSD: Makefile.common,v 1.29 2005/06/07 23:35:16 hubertf Exp $
 #
 # This Makefile.common is included by:
 #
@@ -8,13 +8,12 @@
 # If these packages are updated, please remember to reset any PKGREVISIONs
 # in those Makefiles.
 
-DISTNAME=       xlockmore-5.17
+DISTNAME=       xlockmore-5.18
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
 		${MASTER_SITE_XCONTRIB:=applications/}
 EXTRACT_SUFX=	.tar.bz2
-PKGREVISION=	1
 
 MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.tux.org/~bagleyd/xlockmore.html
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index 7eae1fd3c48..97242c1e50d 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.27 2005/05/30 23:34:49 hubertf Exp $
+$NetBSD: distinfo,v 1.28 2005/06/07 23:35:16 hubertf Exp $
 
-SHA1 (xlockmore-5.17.tar.bz2) = ff38c9903d786e86fc000009b0854954241a4518
-RMD160 (xlockmore-5.17.tar.bz2) = 63f0a58259676df9dacd9ebe829a2a240fc7ab09
-Size (xlockmore-5.17.tar.bz2) = 1734958 bytes
+SHA1 (xlockmore-5.18.tar.bz2) = 2278245d54159ab973746cb0481fcdf2f67e1969
+RMD160 (xlockmore-5.18.tar.bz2) = 4ad859bee85cff465ce85803be5e7fd39f8dde60
+Size (xlockmore-5.18.tar.bz2) = 1738513 bytes
 SHA1 (patch-aa) = 98243d9a615d3f44b6e3aab71388acb72b96d383
-SHA1 (patch-ab) = 93273c90ed447e5dec4c03c0f4ade960da2783b3
+SHA1 (patch-ab) = 31eda5e02bd96e6abbff274a62b2136197ad67fc
 SHA1 (patch-ac) = 1bcbf56cdb6709cf8f21855b141a4892a36751c1
-SHA1 (patch-ad) = af411be0c0c8a7d5775bf4ee7a9e5a910d7cf6c8
diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab
index 94d4986aac6..96d230f1b8f 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.17 2004/11/27 00:15:22 hubertf Exp $
+$NetBSD: patch-ab,v 1.18 2005/06/07 23:35:16 hubertf Exp $
 
---- configure.orig	2004-11-05 03:44:37.000000000 +0100
+--- configure.orig	2005-02-16 21:19:14.000000000 +0100
 +++ configure
-@@ -8364,7 +8364,7 @@ else
+@@ -7856,7 +7856,7 @@ else
  #define USE_GL 1
  _ACEOF
  
diff --git a/x11/xlockmore/patches/patch-ad b/x11/xlockmore/patches/patch-ad
deleted file mode 100644
index bae06cb4368..00000000000
--- a/x11/xlockmore/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2005/05/30 23:34:49 hubertf Exp $
-
---- xlock/passwd.c.orig	2005-05-30 23:28:55.000000000 +0200
-+++ xlock/passwd.c
-@@ -88,7 +88,9 @@ static login_cap_t *rlc = NULL;
- #endif
- 
- #include <errno.h>
-+#ifndef errno
- extern int  errno;
-+#endif
- 
- #if ( HAVE_FCNTL_H && (defined( USE_MULTIPLE_ROOT ) || defined( USE_MULTIPLE_USER )))
- #include <fcntl.h>