[pkgsrc/trunk]: pkgsrc/x11 Update of xlockmore and xlockmore-lite to the late...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e49a032d73cf
branches:  trunk
changeset: 649984:e49a032d73cf
user:      spz <spz%pkgsrc.org@localhost>
date:      Wed Apr 15 07:31:15 2015 +0000

description:
Update of xlockmore and xlockmore-lite to the latest version.

Upstream changelog:

xlockmore-5.46 as of 10 March 2015, the maintained version of xlock

5.46
  xmb fonts messing up password screen since ascent was not being set
    correctly.  Also fixed xjack mode.
  Updated language use in xlock.c, now removed to .h files.  If I made some
    bad assumption about the language... let me know.
  BSD install fixes (DESTDIR, FreeType2, fortune) and switching to xz.
  Cygwin install fixes (cygport, xlockrc).

5.45
  A bad value of fnt for pyro2 could cause to give an X error.  Fixed to
    not free memory we are using and have a better default.

5.44
  Fix for make_one_sided_pentomino was using 18 as basis for 2 sided
    pentominoes in loop.  Found out about it by gcc 4.8.1 warning: iteration
    12u invokes undefined behavior [-Waggressive-loop-optimizations].
  dilemma, voters, wator size fix for neighbors = 6.
  Proper crediting of Nathan Thompson for discovering High Life part of
    life mode.
  A few new gliders and patterns for life and life3d.
  Updated win32 to use updated cygwin.  Currently links are only satisfied
    using cygwin using 32-bit installation.  For me, cross compiling using
    64-bit gave undefined references in visgl.c and xlock.c.
  magick.c update for version 7, thanks to Jouk Jansen.

5.43
  life3d: added new rule B58S58, which has a replicator.
  -e added to shell in Makefile.in, told it should now stop on build errors,
    rather than trying to continue which could be confusing.  Thanks to
    Glyn Kennington <glyn AT potatojunkie.co.uk>.
  If crypt fails (which is possible with glibc2.17) it could cause xlock to
    get a signal 11.  There is now protection around the strcmp() to prevent
    NULL poiter dereferences thanks to Mancha <mancha1 AT hush.com>.

5.42
  USE_MB now defined by default. If this is not defined it can only
    correctly display ASCII.  There could be font issues which may
    lead one to want only ASCII (if so use configure --disable_mb).
    Also looked into Xutf8 but did not see any benefit this had over Xmb.
    Password window and the following modes: bomb,dclock,image,marquee,nose
    are affected.  Fixed a few problems with marquee for width, height, and
    if a character needs more than 2 bytes.
  In Cygwin a seemingly unrelated fix where USE_MB gets defined in xlock.h.
    An #undef was added in xlock.h, if USE_MB gets defined in an internal
    include file.
  -lcrypt added to modes/Makefile.in.  This is needed on my Linux Ubuntu
    and seems ok on Cygwin where it was not needed.  (If this causes a
    problem remove from modes/Makefile).  Also tested on FreeBSD.
  cppcheck fixes
    passwd.c: passcpy could be freed twice
    iostuff.c: could have left file open
    ras.c: leak if mem fails
    resource.c: check if malloc succeeded was in wrong spot
    sound.c: ESound, a redundant check
    memcheck.c: continuing after memory failure
    dclock: problem with parens in ifdefs
    rain: leak fix ( :) )
    t3d: uninitialized time1 (unlikely but fixed anyway)
    molecule: leak if mem fails
    text3d: leak if nothing to draw

diffstat:

 x11/xlockmore-lite/Makefile                |   4 +-
 x11/xlockmore/Makefile                     |   4 +-
 x11/xlockmore/Makefile.common              |   8 ++--
 x11/xlockmore/distinfo                     |  19 +++++----
 x11/xlockmore/patches/patch-aa             |  56 +++++++++++++++++++++++++----
 x11/xlockmore/patches/patch-ab             |  18 ++++----
 x11/xlockmore/patches/patch-ac             |   6 +-
 x11/xlockmore/patches/patch-ad             |   6 +-
 x11/xlockmore/patches/patch-ae             |  20 +++++----
 x11/xlockmore/patches/patch-config.cygport |  19 ++++++++++
 10 files changed, 108 insertions(+), 52 deletions(-)

diffs (270 lines):

diff -r 8e902296695e -r e49a032d73cf x11/xlockmore-lite/Makefile
--- a/x11/xlockmore-lite/Makefile       Tue Apr 14 21:09:48 2015 +0000
+++ b/x11/xlockmore-lite/Makefile       Wed Apr 15 07:31:15 2015 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2012/12/14 15:54:30 is Exp $
+# $NetBSD: Makefile,v 1.21 2015/04/15 07:31:15 spz Exp $
 
 .include "../../x11/xlockmore/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-lite-/}
 COMMENT=       "lite" version of xlockmore
 
-PKGREVISION=   2
-
 CONFIGURE_ARGS+=       --without-xpm
 CONFIGURE_ARGS+=       --without-gltt
 CONFIGURE_ARGS+=       --without-ttf
diff -r 8e902296695e -r e49a032d73cf x11/xlockmore/Makefile
--- a/x11/xlockmore/Makefile    Tue Apr 14 21:09:48 2015 +0000
+++ b/x11/xlockmore/Makefile    Wed Apr 15 07:31:15 2015 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.118 2014/10/07 16:47:38 adam Exp $
+# $NetBSD: Makefile,v 1.119 2015/04/15 07:31:15 spz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   16
-
 COMMENT=       Like the XLock session-locker/screensaver, but with more
 
 CONFIGURE_ARGS+=       --with-opengl
diff -r 8e902296695e -r e49a032d73cf x11/xlockmore/Makefile.common
--- a/x11/xlockmore/Makefile.common     Tue Apr 14 21:09:48 2015 +0000
+++ b/x11/xlockmore/Makefile.common     Wed Apr 15 07:31:15 2015 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.72 2014/10/09 14:07:16 wiz Exp $
+# $NetBSD: Makefile.common,v 1.73 2015/04/15 07:31:15 spz Exp $
 #
 # used by x11/xlockmore/Makefile
 # used by x11/xlockmore-lite/Makefile
 
-DISTNAME=      xlockmore-5.41
+DISTNAME=      xlockmore-5.46
 CATEGORIES=    x11
-MASTER_SITES=  http://www.tux.org/~bagleyd/xlock/${DISTNAME}/ \
+MASTER_SITES=  http://www.tux.org/~bagleyd/xlock/ \
                ftp://ibiblio.org/pub/Linux/X11/screensavers/
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.tux.org/~bagleyd/xlockmore.html
diff -r 8e902296695e -r e49a032d73cf x11/xlockmore/distinfo
--- a/x11/xlockmore/distinfo    Tue Apr 14 21:09:48 2015 +0000
+++ b/x11/xlockmore/distinfo    Wed Apr 15 07:31:15 2015 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.52 2012/12/14 15:54:30 is Exp $
+$NetBSD: distinfo,v 1.53 2015/04/15 07:31:15 spz Exp $
 
-SHA1 (xlockmore-5.41.tar.bz2) = 68115d9f7b92fea3fa55ce07f03a3fe4a42952ec
-RMD160 (xlockmore-5.41.tar.bz2) = 98eda44768f5d757ad12dc1c0eed1692e6ee725f
-Size (xlockmore-5.41.tar.bz2) = 1962608 bytes
-SHA1 (patch-aa) = 548646fe62b2d201328ca25a067e19998d58eb18
-SHA1 (patch-ab) = 48bd5ea9389f646df5ffe290f3230b028916f0d1
-SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f
-SHA1 (patch-ad) = a76c7d9f17dec5cf2a3de6d0c3343c80cf53d314
-SHA1 (patch-ae) = e0cac92c22eb1b83f634f4d1ef2ce0950984ad21
+SHA1 (xlockmore-5.46.tar.xz) = 849ba21a6a82493b0b352d5fbd9212e6d4581752
+RMD160 (xlockmore-5.46.tar.xz) = 978f8119c89c1c954ec5bc5f8cc8d8edea7c8c8e
+Size (xlockmore-5.46.tar.xz) = 1610356 bytes
+SHA1 (patch-aa) = a8af264d041df95d0773cbe27984f9461e865722
+SHA1 (patch-ab) = 918be6904fb2a1b616dfbf7ac3d9759cc39d1608
+SHA1 (patch-ac) = 465a9e5e9f6310b7207a0a71dca8cbdca0f33922
+SHA1 (patch-ad) = 619c3413ae4bfdb420c77867062670dce336f5d8
+SHA1 (patch-ae) = 2dd755a188cf6701fd822472be169d8583ef04be
+SHA1 (patch-config.cygport) = c120f9b9f9ca6a9ba60f8e46e9c2dd23225079d9
diff -r 8e902296695e -r e49a032d73cf x11/xlockmore/patches/patch-aa
--- a/x11/xlockmore/patches/patch-aa    Tue Apr 14 21:09:48 2015 +0000
+++ b/x11/xlockmore/patches/patch-aa    Wed Apr 15 07:31:15 2015 +0000
@@ -1,17 +1,55 @@
-$NetBSD: patch-aa,v 1.6 2008/10/06 22:40:12 hubertf Exp $
+$NetBSD: patch-aa,v 1.7 2015/04/15 07:31:15 spz Exp $
 
---- xlock/XLock.ad.orig        2008-10-05 02:51:17.000000000 +0200
+--- xlock/XLock.ad.orig        2015-03-12 13:34:33.000000000 +0000
 +++ xlock/XLock.ad
-@@ -62,9 +62,9 @@ XLock.left3d: Red
+@@ -46,10 +46,10 @@ XLock.icongeometry: 64x64
+ !XLock.icongeometry: 256x256
+ 
+ ! For sound
+-XLock.locksound: /usr/lib/X11/xlock/sounds/complete.au
+-XLock.infosound: /usr/lib/X11/xlock/sounds/identify-please.au
+-XLock.validsound: /usr/lib/X11/xlock/sounds/thank-you.au
+-XLock.invalidsound: /usr/lib/X11/xlock/sounds/not-programmed.au
++XLock.locksound: /usr/pkg/lib/X11/xlock/sounds/complete.au
++XLock.infosound: /usr/pkg/lib/X11/xlock/sounds/identify-please.au
++XLock.validsound: /usr/pkg/lib/X11/xlock/sounds/thank-you.au
++XLock.invalidsound: /usr/pkg/lib/X11/xlock/sounds/not-programmed.au
+ !XLock.locksound: complete.au
+ !XLock.infosound: identify-please.au
+ !XLock.validsound: thank-you.au
+@@ -63,12 +63,12 @@ XLock.left3d: Red
  XLock.both3d: Magenta
  
  ! For marquee & nose modes
--!XLock.program: fortune -o
 -XLock.program: fortune -s
--!XLock.program: fortune
-+!XLock.program:  /usr/games/fortune -o
-+XLock.program:  /usr/games/fortune -s
-+!XLock.program:  /usr/games/fortune
++!XLock.program: fortune -s
+ !XLock.program: fortune -o
+ !XLock.program: fortune -s
+ !XLock.program: fortune
  !XLock.program: /usr/games/fortune -o
- !XLock.program: /usr/games/fortune -s
+-!XLock.program: /usr/games/fortune -s
++XLock.program: /usr/games/fortune -s
  !XLock.program: /usr/games/fortune
+ !XLock.program: finger
+ !XLock.messagesfile: fortune.dat
+@@ -81,7 +81,7 @@ XLock.messagefont: *8x16*
+ ! For modes with images
+ !XLock.*.bitmap: bitmaps/m-xlock.xbm
+ !XLock.*.bitmap: pixmaps/m-xlock.xpm
+-!XLock.*.bitmap: /usr/lib/X11/xlock/bitmaps
++!XLock.*.bitmap: /usr/pkg/lib/X11/xlock/bitmaps
+ 
+ ! For mailbox check application
+ !XLock.mailCmd: /usr/ucb/mail -e
+@@ -847,9 +847,9 @@ XLock.text3d.delay: 100000
+ !XLock.text3d.cycles: 1
+ !XLock.text3d.size: 1
+ XLock.text3d.saturation: 1.0
+-!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/arial.ttf
++!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/arial.ttf
+ ! Directory of only *.ttf fonts. symbol.ttf and wingding.ttf should be excluded
+-!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/
++!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/
+ XLock.text3d.extrusion: 25.0
+ XLock.text3d.rot_amplitude: 1.0
+ XLock.text3d.rot_frequency: 0.001
diff -r 8e902296695e -r e49a032d73cf x11/xlockmore/patches/patch-ab
--- a/x11/xlockmore/patches/patch-ab    Tue Apr 14 21:09:48 2015 +0000
+++ b/x11/xlockmore/patches/patch-ab    Wed Apr 15 07:31:15 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.24 2012/02/13 11:46:13 drochner Exp $
+$NetBSD: patch-ab,v 1.25 2015/04/15 07:31:15 spz Exp $
 
---- configure.orig     2011-11-10 16:08:45.000000000 +0000
+--- configure.orig     2015-03-03 01:05:29.000000000 +0000
 +++ configure
-@@ -9434,10 +9434,10 @@ case "${canonical}" in
+@@ -9508,10 +9508,10 @@ $as_echo "#define LESS_THAN_AIX3_2 1" >>
          dirname=`which gcc`
          dirname=`dirname $dirname`
          dirname=`dirname $dirname`/lib
@@ -17,16 +17,16 @@
      fi
      XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}"
      XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}"
-@@ -9486,6 +9486,8 @@ _ACEOF
-     ac_fn_c_check_header_mongrel "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default"
+@@ -9566,6 +9566,8 @@ _ACEOF
  if test "x$ac_cv_header_elf_h" = xyes; then :
-   $as_echo "#define HAVE_SHADOW 1" >>confdefs.h
-+  XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}"
-+  XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}"
+ 
+ $as_echo "#define HAVE_SHADOW 1" >>confdefs.h
++XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}"
++XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}"
  
  fi
  
-@@ -9581,10 +9583,10 @@ $as_echo "no" >&6; }
+@@ -9673,10 +9675,10 @@ $as_echo "#define SVR4 1" >>confdefs.h
          dirname=`which gcc`
          dirname=`dirname $dirname`
          dirname=`dirname $dirname`/lib
diff -r 8e902296695e -r e49a032d73cf x11/xlockmore/patches/patch-ac
--- a/x11/xlockmore/patches/patch-ac    Tue Apr 14 21:09:48 2015 +0000
+++ b/x11/xlockmore/patches/patch-ac    Wed Apr 15 07:31:15 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.12 2007/10/28 16:06:04 joerg Exp $
+$NetBSD: patch-ac,v 1.13 2015/04/15 07:31:15 spz Exp $
 
---- xglock/Makefile.in.orig    2006-10-25 03:01:51.000000000 +0200
+--- xglock/Makefile.in.orig    2010-04-19 13:34:35.000000000 +0000
 +++ xglock/Makefile.in
-@@ -116,14 +116,14 @@ install_xglock : install-program install
+@@ -117,14 +117,14 @@ install_xglock : install-program install
        @ $(ECHO) ""
  
  install-program : xglock
diff -r 8e902296695e -r e49a032d73cf x11/xlockmore/patches/patch-ad
--- a/x11/xlockmore/patches/patch-ad    Tue Apr 14 21:09:48 2015 +0000
+++ b/x11/xlockmore/patches/patch-ad    Wed Apr 15 07:31:15 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2007/10/28 16:15:21 joerg Exp $
+$NetBSD: patch-ad,v 1.9 2015/04/15 07:31:15 spz Exp $
 
---- xmlock/Makefile.in.orig    2007-09-16 20:16:51.000000000 +0200
+--- xmlock/Makefile.in.orig    2010-04-19 13:33:29.000000000 +0000
 +++ xmlock/Makefile.in
-@@ -118,14 +118,14 @@ install_xmlock : install-program install
+@@ -119,14 +119,14 @@ install_xmlock : install-program install
        @ $(ECHO) ""
  
  install-program : xmlock
diff -r 8e902296695e -r e49a032d73cf x11/xlockmore/patches/patch-ae
--- a/x11/xlockmore/patches/patch-ae    Tue Apr 14 21:09:48 2015 +0000
+++ b/x11/xlockmore/patches/patch-ae    Wed Apr 15 07:31:15 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2012/12/14 15:54:30 is Exp $
+$NetBSD: patch-ae,v 1.8 2015/04/15 07:31:15 spz Exp $
 
---- modes/Makefile.in.orig     2008-10-05 02:50:23.000000000 +0200
+--- modes/Makefile.in.orig     2015-02-13 04:24:37.000000000 +0000
 +++ modes/Makefile.in
-@@ -588,19 +588,20 @@ install : install-program install-man in
+@@ -600,21 +600,22 @@ install : install-program install-man in
        @ $(ECHO) ""
  
  install-program : xlock
@@ -24,11 +24,13 @@
 +      $(INSTALL_DATA) $(UTILDIR)xlock.man ${DESTDIR}$(mandir)/xlock.1
  
  install-ad :
--      $(top_srcdir)/mkinstalldirs $(xapploaddir)
--      $(INSTALL_DATA) $(UTILDIR)XLock.ad $(xapploaddir)/XLock
-+      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(xapploaddir)
-+      $(top_srcdir)/mkinstalldirs        ${DESTDIR}${datarootdir}/examples/xlock/app-defaults
-+      $(INSTALL_DATA) $(UTILDIR)XLock.ad ${DESTDIR}${datarootdir}/examples/xlock/app-defaults/XLock
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir)
+-      $(INSTALL_DATA) $(UTILDIR)XLock.ad $(DESTDIR)$(xapploaddir)/XLock
++      $(top_srcdir)/mkinstalldirs $(DESTDIR)${datarootdir}/examples/xlock/app-defaults
++      $(INSTALL_DATA) $(UTILDIR)XLock.ad $(DESTDIR)${datarootdir}/examples/xlock/app-defaults/XLock
+       @FORTUNE@sed 's;^XLock.program: fortune;XLock.program: $(FORTUNE);' $(UTILDIR)XLock.ad > $(UTILOBJDIR)XLock.ad.tmp 
+-      @FORTUNE@$(INSTALL_DATA) $(UTILOBJDIR)XLock.ad.tmp $(DESTDIR)$(xapploaddir)/XLock
++      @FORTUNE@$(INSTALL_DATA) $(UTILOBJDIR)XLock.ad.tmp $(DESTDIR)${datarootdir}/examples/xlock/app-defaults/XLock
+       @FORTUNE@rm -f $(UTILOBJDIR)XLock.ad.tmp
  
  uninstall : uninstall-program uninstall-man uninstall-ad
- 
diff -r 8e902296695e -r e49a032d73cf x11/xlockmore/patches/patch-config.cygport
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xlockmore/patches/patch-config.cygport        Wed Apr 15 07:31:15 2015 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-config.cygport,v 1.1 2015/04/15 07:31:15 spz Exp $
+
+--- config.cygport.orig        2015-02-18 04:10:55.000000000 +0000
++++ config.cygport
+@@ -4,12 +4,12 @@ PWD=`pwd`
+ #NAME=${DIR}
+ NAME=xlockmore
+ GROUP=${NAME}
+-if test "$1" == ""; then
++if test "$1" = ""; then
+       VERSION=`sed 's/^.*"\(.*\)"/\1/' ./version.h`
+       RELEASE=1
+ else
+       VERSION=$1
+-      if test "$2" == ""; then
++      if test "$2" = ""; then
+               RELEASE=1
+       else
+               RELEASE=$2