Update xlockmore to 5.21. Changes:

* Removed random colors from petri mode.  Found that it could cause a fatal
*   error on PseudoColor.  (Will try to fix better on next release.)
+ PAM update from Yuri Bushmelev <jay-dev AT simcom.ru> fixes an
+   initialization problem PAM_conv function and made cleaner and friendly.
+   BAD_PAM fixed.
  fzort mode by Mauro Persano <mauro_persano AT yahoo.com>... its not a
    OpenGL mode but it looks like it is.  Try using with -mono also.
    Tom Schmidt found an as of yet unresolved Uninitialized Memory read,
    see Purify logs.
  dclock -binary option added thanks to Petey Leinonen (he saw the
    original on thinkgeek).
  Non-compatible routines for shared memory workaround for VMS when using
    libs MMOV(Multimedia for sounds) and DECWINDOWS thanks to Jouk Jansen.
  mandelbrot options added thanks to Tim Auckland
    update from Jouk Jansen to avoid log of 0
    -alpha adds detail to the interior of the set by displaying level sets
    of "closest return", ie how close does the orbit of z come back to its
    starting point z=0.  These show minima around the center of each bud.
    -index is similar, but displays at which iteration the closest return
    occurs.  These show a fibonacci branching structure from the base of
    each bud, ie each adjacent pair of domains surrounds a domain whose
    index is the sum of the indices of its neigbours.
    -lyap option for colours in the interior of the set according to an
    estimate of the Lyapunov exponent.  (Not to be confused with real plane
    Lyapunov fractals).  Also now allow -binary and -dem.
  New random mode for win32, compile with -DRANDOMMODE .
    It seems to bomb out if you run it for a while, so I did not make it
    the default.
  win32 changes from Tim Auckland:
    new configure dialog
    random mode done to enable
  win32 changes from Petey Leinonen:
    fixes for nose and life1d
    matrix mode works with the 2 following changes
    fixed XCopyArea() for destinations that are not windows (ie a bitmap)
    fixed XCreatePixmapFromBitmapData() so it always creates a pixmap
      regardless of depth ( creates the Windows bitmap with 1 bit depth),
      and apply the foreground and background colors.
    XCopyArea, XSetTSOrigin, XSetFillRule fixes and got these modes to work:
    bat, bounce, dilemma, eyes, image, nose, pacman,
    shape, slip, star, starfish, wator, world
  unlock delay from lgx <lgxror AT gmail.com>  [it was explained to me
    but still not sure why you would use it]

 + new update since BETA
 * new since BETA

4 files changed, 8 insertions, 12 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 764f072ac20..51c702d4e71 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2006/01/07 12:04:48 tron Exp $
+# $NetBSD: Makefile,v 1.69 2006/01/09 21:18:31 hubertf Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	1
 COMMENT=	Like the XLock session-locker/screensaver, but with more
 
 CONFIGURE_ARGS+=	--with-mesagl
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 71d86aa2339..f6b34c6c322 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2006/01/07 12:04:48 tron Exp $
+# $NetBSD: Makefile.common,v 1.40 2006/01/09 21:18:31 hubertf Exp $
 #
 # This Makefile.common is included by:
 #
@@ -8,7 +8,7 @@
 # If these packages are updated, please remember to reset any PKGREVISIONs
 # in those Makefiles.
 
-DISTNAME=       xlockmore-5.20.1  # Remove DIST_SUBDIR below on upgrade! - HF
+DISTNAME=       xlockmore-5.21
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
@@ -20,7 +20,6 @@ HOMEPAGE=	http://www.tux.org/~bagleyd/xlockmore.html
 
 CONFLICTS+=	xlockmore-[0-9]* xlockmore-lite-[0-9]*
 
-DIST_SUBDIR=		${DISTNAME}v2
 DISTINFO_FILE?=		${.CURDIR}/../xlockmore/distinfo
 PATCHDIR?=		${.CURDIR}/../xlockmore/patches
 PLIST_SRC?=		${.CURDIR}/../xlockmore/PLIST
diff --git a/x11/xlockmore/PLIST b/x11/xlockmore/PLIST
index 04289364636..f8bdd99046e 100644
--- a/x11/xlockmore/PLIST
+++ b/x11/xlockmore/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/11/27 00:15:22 hubertf Exp $
-${LITE}bin/xglock
+@comment $NetBSD: PLIST,v 1.4 2006/01/09 21:18:31 hubertf Exp $
 bin/xlock
 lib/X11/app-defaults/XLock
 lib/X11/xlock/sounds/complete.au
@@ -7,7 +6,6 @@ lib/X11/xlock/sounds/identify-please.au
 lib/X11/xlock/sounds/not-programmed.au
 lib/X11/xlock/sounds/thank-you.au
 man/man1/xlock.1
-${LITE}share/xlock/xglockrc
 ${LITE}@dirrm share/xlock
 @dirrm lib/X11/xlock/sounds
 @dirrm lib/X11/xlock
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index a08a5a41898..0b85e870160 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.33 2005/11/08 17:53:18 wiz Exp $
+$NetBSD: distinfo,v 1.34 2006/01/09 21:18:31 hubertf Exp $
 
-SHA1 (xlockmore-5.20.1v2/xlockmore-5.20.1.tar.bz2) = 99a8dceaf505662cc6f0143d31303b943f069b2c
-RMD160 (xlockmore-5.20.1v2/xlockmore-5.20.1.tar.bz2) = 095d5fbbc5b7177d2e6ab499d1bb9e93bea45306
-Size (xlockmore-5.20.1v2/xlockmore-5.20.1.tar.bz2) = 1768913 bytes
+SHA1 (xlockmore-5.21.tar.bz2) = 9f22729377fb39dfdd8f1dd8f8a8f897d30ad86f
+RMD160 (xlockmore-5.21.tar.bz2) = 6d7ba16538ed7f411bf00339a038cd2380977847
+Size (xlockmore-5.21.tar.bz2) = 1794442 bytes
 SHA1 (patch-aa) = 98243d9a615d3f44b6e3aab71388acb72b96d383
 SHA1 (patch-ab) = 89f12f16e0756dd0eb1afc9df9bb175fd294e2f9
 SHA1 (patch-ac) = 1bcbf56cdb6709cf8f21855b141a4892a36751c1