[pkgsrc/trunk]: pkgsrc/devel/apr0 Search /usr/lib64 for builtin expat too, fi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/348713ae691b
branches:  trunk
changeset: 631465:348713ae691b
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Mar 06 11:52:19 2014 +0000

description:
Search /usr/lib64 for builtin expat too, fixes 64-bit RHEL and clones.

diffstat:

 devel/apr0/distinfo                         |   3 ++-
 devel/apr0/patches/patch-apr-util_configure |  18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r cb419f5b53a0 -r 348713ae691b devel/apr0/distinfo
--- a/devel/apr0/distinfo       Thu Mar 06 11:52:04 2014 +0000
+++ b/devel/apr0/distinfo       Thu Mar 06 11:52:19 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2013/08/04 02:44:36 obache Exp $
+$NetBSD: distinfo,v 1.7 2014/03/06 11:52:19 jperkin Exp $
 
 SHA1 (httpd-2.0.65.tar.bz2) = 0183866df73c7877ba9275a075a2ece7a67f6c95
 RMD160 (httpd-2.0.65.tar.bz2) = 1f0142a843486a53ba184ceb9214dc78f071e17e
@@ -7,6 +7,7 @@
 SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596
 SHA1 (patch-ao) = 1dc1dac5370159639b3dcc3ea97e51eeb47622a0
 SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756
+SHA1 (patch-apr-util_configure) = f0942b2b3465d7b55aee83688e0617401019bb7e
 SHA1 (patch-aq) = 6cc1fb879fb5d9280f543ebe068a441e2e6560f3
 SHA1 (patch-ar) = defa2be14ec057e1c41151b8cd1edc0ffb219694
 SHA1 (patch-as) = 37e70ff8b1a3344e47bcd2fe2b145a6e3e6a4562
diff -r cb419f5b53a0 -r 348713ae691b devel/apr0/patches/patch-apr-util_configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/apr0/patches/patch-apr-util_configure       Thu Mar 06 11:52:19 2014 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-apr-util_configure,v 1.1 2014/03/06 11:52:19 jperkin Exp $
+
+Search for builtin expat in /usr/lib64 too.
+
+--- apr-util/configure.orig    2013-06-28 17:48:52.000000000 +0000
++++ apr-util/configure
+@@ -23132,6 +23132,11 @@ $as_echo_n "checking for Expat in $withv
+             expat_include_dir="$abs_expatdir/include"
+     expat_ldflags="-L$abs_expatdir/lib"
+     expat_libs="-lexpat"
++  elif test -r "$abs_expatdir/include/expat.h" -a \
++    -r "$abs_expatdir/lib64/libexpat.a"; then
++            expat_include_dir="$abs_expatdir/include"
++    expat_ldflags="-L$abs_expatdir/lib64"
++    expat_libs="-lexpat"
+   elif test -r "$abs_expatdir/xmlparse.h"; then
+         expat_include_dir="$abs_expatdir"
+     expat_ldflags="-L$abs_expatdir"