diff options
| author | dsainty <dsainty@pkgsrc.org> | 2009-10-15 21:24:26 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2009-10-15 21:24:26 +0000 |
| commit | da9c17c003d2bd067b3b37e426a6d3ecf018bc08 (patch) | |
| tree | c45d7ef920b2a5b3e3a05f779da94848fa18dc26 /x11/xlockmore | |
| parent | 7436f37809c7dec9fe3549f5cbdc9ed62b6a7db7 (diff) | |
| download | pkgsrc-da9c17c003d2bd067b3b37e426a6d3ecf018bc08.tar.gz | |
Fix execution of 'configure' under shells that dislike if-fi with no
intermediate block (Linux here, but probably Solaris too).
Whilst here, remove a cosmetic patch hunk.
Diffstat (limited to 'x11/xlockmore')
| -rw-r--r-- | x11/xlockmore/distinfo | 4 | ||||
| -rw-r--r-- | x11/xlockmore/patches/patch-ab | 39 |
2 files changed, 21 insertions, 22 deletions
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo index 51bd5c05ec5..65eb411507f 100644 --- a/x11/xlockmore/distinfo +++ b/x11/xlockmore/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.43 2009/09/30 14:59:06 tnn Exp $ +$NetBSD: distinfo,v 1.44 2009/10/15 21:24:26 dsainty 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) = fb7ef9e3ba1eef9ec7326854dc80c95703812e8f +SHA1 (patch-ab) = ad28c034c773027343e2867fe1f5d4ec26232404 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 34c6a55a47e..b0c17a84ff8 100644 --- a/x11/xlockmore/patches/patch-ab +++ b/x11/xlockmore/patches/patch-ab @@ -1,16 +1,7 @@ -$NetBSD: patch-ab,v 1.21 2009/09/30 14:59:06 tnn Exp $ +$NetBSD: patch-ab,v 1.22 2009/10/15 21:24:26 dsainty Exp $ --- configure.orig 2008-08-29 01:55:43.000000000 +0200 +++ configure -@@ -6754,7 +6754,7 @@ else - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat > Imakefile <<'EOF' - acfindx: -- @echo 'ac_x_app_defaults="${XAPPLOADDIR}"' -+ @echo 'ac_x_app_defaults="${XAPPLOADDIR}"' - EOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which'd confuse us. @@ -6763,139 +6763,6 @@ EOF cd .. rm -fr conftestdir @@ -160,25 +151,33 @@ $NetBSD: patch-ab,v 1.21 2009/09/30 14:59:06 tnn 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 +@@ -10532,10 +10399,10 @@ _ACEOF + dirname=`which gcc` dirname=`dirname $dirname` dirname=`dirname $dirname`/lib - if test "$dirname" != "/lib"; then +- 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 ++# if test "$dirname" != "/lib"; then ++# XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname" ++# XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname" ++# fi fi XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}" -@@ -10834,8 +10701,8 @@ _ACEOF + XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}" +@@ -10833,10 +10700,10 @@ _ACEOF + dirname=`which gcc` dirname=`dirname $dirname` dirname=`dirname $dirname`/lib - if test "$dirname" != "/lib"; then +- 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 ++# if test "$dirname" != "/lib"; then ++# XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname" ++# XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname" ++# fi fi XLOCKLDFLAGS="-R${XLOCK_LDFLAGS}" + XMLOCKLDFLAGS="-R${XMLOCK_LDFLAGS}" |