-update to 5.38

 changes: minor fixes and feature additions (most notably: Added -mayan
  option to dclock to count down to end of world (2012 December 21))
 pkgsrc changes: removed dependency on esound, added one on ImageMagick
-added patch from Stefan Schaeckeler to fix dynamic linker search
 path on Linux (PR pkg/45993)

4 files changed, 25 insertions, 15 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index aae456174ee..ec3f98eb7b9 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2012/02/06 12:42:31 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2012/02/13 11:46:13 drochner Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	3
 COMMENT=	Like the XLock session-locker/screensaver, but with more
 
 CONFIGURE_ARGS+=	--with-opengl
@@ -23,7 +22,6 @@ PLIST_SUBST+=    LITE=""
 
 USE_TOOLS+=	pkg-config
 
-.include "../../audio/esound/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 393c749a122..0f92d50550a 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.59 2011/09/17 12:45:32 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.60 2012/02/13 11:46:13 drochner 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.34
+DISTNAME=	xlockmore-5.38
 CATEGORIES=	x11
 MASTER_SITES=	http://www.tux.org/~bagleyd/xlock/${DISTNAME}/ \
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/
@@ -90,8 +90,11 @@ SPECIAL_PERMS+=	bin/xlock ${SETUID_ROOT_PERMS}
 SPECIAL_PERMS+=	bin/xlock ${REAL_ROOT_USER} shadow 2511
 .endif
 
-BUILDLINK_DEPMETHOD.libXt?=	build
+# XXX framework bug: while we don't need it, this would kill
+# the inherited full dependency
+#BUILDLINK_DEPMETHOD.libXt?=	build
 
+.include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index ab221d317d5..205a123f621 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.47 2011/09/17 12:45:32 ryoon Exp $
+$NetBSD: distinfo,v 1.48 2012/02/13 11:46:13 drochner Exp $
 
-SHA1 (xlockmore-5.34.tar.bz2) = 66ec50754e30b81ef6c1db62b3a8034f66d3c582
-RMD160 (xlockmore-5.34.tar.bz2) = 11b23b9b82f0687f5bf04e672cb1518ce3696f1b
-Size (xlockmore-5.34.tar.bz2) = 1955203 bytes
+SHA1 (xlockmore-5.38.tar.bz2) = 5a0fd27209dfc0966a1ec691f9ea4416587082bf
+RMD160 (xlockmore-5.38.tar.bz2) = 227a2c13c8cf1ddb027138dc520874accf5c0f72
+Size (xlockmore-5.38.tar.bz2) = 1970750 bytes
 SHA1 (patch-aa) = 548646fe62b2d201328ca25a067e19998d58eb18
-SHA1 (patch-ab) = 5bd37106a67b3bb3ef437092555cec223999b550
+SHA1 (patch-ab) = 48bd5ea9389f646df5ffe290f3230b028916f0d1
 SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f
 SHA1 (patch-ad) = a76c7d9f17dec5cf2a3de6d0c3343c80cf53d314
 SHA1 (patch-ae) = b78d7d148c9a62dbdf72e05aeec8d22d10ab9cce
diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab
index d77af08959c..798ac8ed519 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.23 2010/12/08 12:54:32 obache Exp $
+$NetBSD: patch-ab,v 1.24 2012/02/13 11:46:13 drochner Exp $
 
---- configure.orig	2008-08-29 01:55:43.000000000 +0200
+--- configure.orig	2011-11-10 16:08:45.000000000 +0000
 +++ configure
-@@ -10532,10 +10399,10 @@ _ACEOF
+@@ -9434,10 +9434,10 @@ case "${canonical}" in
          dirname=`which gcc`
          dirname=`dirname $dirname`
          dirname=`dirname $dirname`/lib
@@ -17,7 +17,16 @@ $NetBSD: patch-ab,v 1.23 2010/12/08 12:54:32 obache Exp $
      fi
      XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}"
      XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}"
-@@ -10833,10 +10700,10 @@ _ACEOF
+@@ -9486,6 +9486,8 @@ _ACEOF
+     ac_fn_c_check_header_mongrel "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default"
+ 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}"
+ 
+ fi
+ 
+@@ -9581,10 +9583,10 @@ $as_echo "no" >&6; }
          dirname=`which gcc`
          dirname=`dirname $dirname`
          dirname=`dirname $dirname`/lib