[pkgsrc/trunk]: pkgsrc/x11/xlockmore don't leak WRKDIR into run path.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/710115e94992
branches:  trunk
changeset: 399773:710115e94992
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Sep 30 14:59:06 2009 +0000

description:
don't leak WRKDIR into run path.
Bump revision.

diffstat:

 x11/xlockmore/Makefile         |   4 ++--
 x11/xlockmore/distinfo         |   4 ++--
 x11/xlockmore/patches/patch-ab |  24 +++++++++++++++++++++++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diffs (65 lines):

diff -r c6fe8af67790 -r 710115e94992 x11/xlockmore/Makefile
--- a/x11/xlockmore/Makefile    Wed Sep 30 11:18:07 2009 +0000
+++ b/x11/xlockmore/Makefile    Wed Sep 30 14:59:06 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2009/08/26 19:58:42 sno Exp $
+# $NetBSD: Makefile,v 1.79 2009/09/30 14:59:06 tnn Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       Like the XLock session-locker/screensaver, but with more
 
 CONFIGURE_ARGS+=       --with-mesagl
diff -r c6fe8af67790 -r 710115e94992 x11/xlockmore/distinfo
--- a/x11/xlockmore/distinfo    Wed Sep 30 11:18:07 2009 +0000
+++ b/x11/xlockmore/distinfo    Wed Sep 30 14:59:06 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.42 2009/04/16 12:31:18 tron Exp $
+$NetBSD: distinfo,v 1.43 2009/09/30 14:59:06 tnn Exp $
 
 SHA1 (xlockmore-5.28.tar.bz2) = a6fd4786d678a090c454a9993c8880a03160634f
 RMD160 (xlockmore-5.28.tar.bz2) = f75f2dea6fa747c4299a8c7c5ee9462f238f5e0b
 Size (xlockmore-5.28.tar.bz2) = 1901583 bytes
 SHA1 (patch-aa) = 548646fe62b2d201328ca25a067e19998d58eb18
-SHA1 (patch-ab) = f535c3f9792248416fb1b1c4699c131682cfcf16
+SHA1 (patch-ab) = fb7ef9e3ba1eef9ec7326854dc80c95703812e8f
 SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f
 SHA1 (patch-ad) = a76c7d9f17dec5cf2a3de6d0c3343c80cf53d314
 SHA1 (patch-ae) = b78d7d148c9a62dbdf72e05aeec8d22d10ab9cce
diff -r c6fe8af67790 -r 710115e94992 x11/xlockmore/patches/patch-ab
--- a/x11/xlockmore/patches/patch-ab    Wed Sep 30 11:18:07 2009 +0000
+++ b/x11/xlockmore/patches/patch-ab    Wed Sep 30 14:59:06 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.20 2008/10/06 22:40:12 hubertf Exp $
+$NetBSD: patch-ab,v 1.21 2009/09/30 14:59:06 tnn Exp $
 
 --- configure.orig     2008-08-29 01:55:43.000000000 +0200
 +++ configure
@@ -160,3 +160,25 @@
      test "x$mesa_includes" = xNONE && mesa_includes=$ac_mesa_includes
      test "x$mesa_libraries" = xNONE && mesa_libraries=$ac_mesa_libraries
      case "${canonical}" in
+@@ -10533,8 +10400,8 @@ _ACEOF
+         dirname=`dirname $dirname`
+         dirname=`dirname $dirname`/lib
+       if test "$dirname" != "/lib"; then
+-          XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
+-          XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
++#         XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
++#         XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
+       fi
+     fi
+     XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}"
+@@ -10834,8 +10701,8 @@ _ACEOF
+         dirname=`dirname $dirname`
+         dirname=`dirname $dirname`/lib
+       if test "$dirname" != "/lib"; then
+-          XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
+-          XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
++#         XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
++#         XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
+       fi
+     fi
+     XLOCKLDFLAGS="-R${XLOCK_LDFLAGS}"