Update to 5.34

* This change also bumps the version of x11/xlockmore-lite.
* Change primary MASTER_SITES to http, ftp is not fetchabel for me.

Changes:
sssss
 changed from 30 sec to 5 sec.  Define -DMIN_DPMS=3 at compile-time
    if you would like to change it to be sooner.
  life mode fix for hexagons, life forms would not map certain screen sizes
  life mode: Added new neighbor 9 ship, added asym ships for neighbor 12
    S356/B46, and added some new oscillators including a neighbor 6 p16.
    Now (mostly) use generated file from java app and life2d.xml.
  life3d mode: Added new some new oscillators including a neighbor 12 p10
    S456/B3.  Also new puffers and gliders found.  Now use generated file
    from java app and life3d.xml.
  loop mode: made new small loops less frequent

5.33
  Took out mode description on screen for WIN32 as it seems to
    mess up the screen frequently.
  life updates:
    added 2 more triangle rules from Carter Bays' applet.
    added a few more life forms to life (hexagonal)
    added a non-totalistic rule to life (square)  known as Rule 3/2ab3
      but for consistency it is known here as S2a2b2c2d3/B3.
  life3d added new life forms to truncated octahedral.
  ant/demon/life updates for -neighbors 5 or 7.  Now with better
    pentagons.  ant with -neighbors 5 should now work properly (7 removed).
  loop update added Byl and Chou-Reggia (1&2) loops, changed colors to be
    more traditional

5.32
  life3d update for -neighbors 14, new truncated octahedral life form.
  ant & demon updates for -neighbors 5 or 7

5.31
  -xinerama option added off by default. [Untested as I do not have true
    multiscreen.  I tried with Xnest but I do not think this ever worked
    with Xinerama.]
  cppcheck fixed minor issues in xlock subdirectory and with pyro2 and
    invert.

5.30
  atlantis, atunnel, biof, bubble3d, cage, fire, gears, invert, lament,
    moebius, morph3d, noof, pipes, rubik, sballs, sierpinski3d, skewb,
    sproingies, stairs, and superquadrics added to Windows version (atunnel,
    fire, lament, and sballs lack textures).
  skewb mode now scrambles, taken out of unstable category.
  Undo a cleanup in vroot.h, as xlock exits on startup with a BadWindow
    on pievwm and tvtwm.

3 files changed, 8 insertions, 9 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index c244d6614dd..c5789949c5f 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2011/04/22 13:45:16 obache Exp $
+# $NetBSD: Makefile,v 1.88 2011/09/17 12:45:32 ryoon Exp $
 
 .include "Makefile.common"
-PKGREVISION=	6
 
 COMMENT=	Like the XLock session-locker/screensaver, but with more
 
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 0f14fa16c35..393c749a122 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.58 2010/12/08 12:54:30 obache Exp $
+# $NetBSD: Makefile.common,v 1.59 2011/09/17 12:45:32 ryoon Exp $
 #
 # This Makefile.common is included by:
 #
@@ -8,9 +8,9 @@
 # If these packages are updated, please remember to reset any PKGREVISIONs
 # in those Makefiles.
 
-DISTNAME=	xlockmore-5.29.1
+DISTNAME=	xlockmore-5.34
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/${DISTNAME}/ \
+MASTER_SITES=	http://www.tux.org/~bagleyd/xlock/${DISTNAME}/ \
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index 300f5dc667f..ab221d317d5 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.46 2010/12/08 12:54:30 obache Exp $
+$NetBSD: distinfo,v 1.47 2011/09/17 12:45:32 ryoon Exp $
 
-SHA1 (xlockmore-5.29.1.tar.bz2) = c6d0380a54e403dce4dfe6570d7c9d11363d2eea
-RMD160 (xlockmore-5.29.1.tar.bz2) = 8ade29e088de990c4dffcaa721fe4cc359c201c2
-Size (xlockmore-5.29.1.tar.bz2) = 1938941 bytes
+SHA1 (xlockmore-5.34.tar.bz2) = 66ec50754e30b81ef6c1db62b3a8034f66d3c582
+RMD160 (xlockmore-5.34.tar.bz2) = 11b23b9b82f0687f5bf04e672cb1518ce3696f1b
+Size (xlockmore-5.34.tar.bz2) = 1955203 bytes
 SHA1 (patch-aa) = 548646fe62b2d201328ca25a067e19998d58eb18
 SHA1 (patch-ab) = 5bd37106a67b3bb3ef437092555cec223999b550
 SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f