summaryrefslogtreecommitdiff
path: root/x11/xlockmore
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2009-09-30 14:59:06 +0000
committertnn <tnn@pkgsrc.org>2009-09-30 14:59:06 +0000
commitea92a441aa53e1dfc733096b7864f2cdbd7ec53e (patch)
treeaf2afa769987b8cc297960a3aa5ba33a3c0a28bb /x11/xlockmore
parent7b225c644d407fdbbfe1bb2319c292733f5517fa (diff)
downloadpkgsrc-ea92a441aa53e1dfc733096b7864f2cdbd7ec53e.tar.gz
don't leak WRKDIR into run path.
Bump revision.
Diffstat (limited to 'x11/xlockmore')
-rw-r--r--x11/xlockmore/Makefile4
-rw-r--r--x11/xlockmore/distinfo4
-rw-r--r--x11/xlockmore/patches/patch-ab24
3 files changed, 27 insertions, 5 deletions
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index b686771ea90..ebc95f23995 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -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 --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index 4b7b178ffff..51bd5c05ec5 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -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 --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab
index a68ebbb4405..34c6a55a47e 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-ab
@@ -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 @@ $NetBSD: patch-ab,v 1.20 2008/10/06 22:40:12 hubertf Exp $
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}"