[pkgsrc/trunk]: pkgsrc/devel/apr-util Use libtool in the wrapper directory in...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c5ba2da6bf0
branches:  trunk
changeset: 528291:7c5ba2da6bf0
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Apr 28 06:23:04 2007 +0000

description:
Use libtool in the wrapper directory instead of the one installed by
apr.  Otherwise, dependency_libs in libaprutil-1.la is set incorrectly.

Bump PKGREVISION.

diffstat:

 devel/apr-util/Makefile         |   6 ++++--
 devel/apr-util/distinfo         |   4 +++-
 devel/apr-util/patches/patch-aa |  13 +++++++++++++
 devel/apr-util/patches/patch-ab |  13 +++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diffs (69 lines):

diff -r 8d48e2d15a0c -r 7c5ba2da6bf0 devel/apr-util/Makefile
--- a/devel/apr-util/Makefile   Sat Apr 28 03:42:30 2007 +0000
+++ b/devel/apr-util/Makefile   Sat Apr 28 06:23:04 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/24 19:37:20 epg Exp $
+# $NetBSD: Makefile,v 1.2 2007/04/28 06:23:04 minskim Exp $
 #
 
 DISTNAME=      apr-util-1.2.8
+PKGREVISION=    1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_APACHE:=apr/}
 
@@ -22,7 +23,8 @@
 CONFIGURE_ARGS+= \
                --with-apr=${BUILDLINK_PREFIX.apr}/bin/apr-1-config \
                --with-expat=${BUILDLINK_PREFIX.expat} \
-               --without-gdbm
+               --without-gdbm --without-sqlite3
+MAKE_ENV+=      WRAPPER_DIR=${WRAPPER_DIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
diff -r 8d48e2d15a0c -r 7c5ba2da6bf0 devel/apr-util/distinfo
--- a/devel/apr-util/distinfo   Sat Apr 28 03:42:30 2007 +0000
+++ b/devel/apr-util/distinfo   Sat Apr 28 06:23:04 2007 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/24 19:37:20 epg Exp $
+$NetBSD: distinfo,v 1.2 2007/04/28 06:23:04 minskim Exp $
 
 SHA1 (apr-util-1.2.8.tar.gz) = 49260d98b863756974bd83cd28bc39338d4f3a82
 RMD160 (apr-util-1.2.8.tar.gz) = 00b10ef0aab26f3ea5d374e2400c1dba566a9020
 Size (apr-util-1.2.8.tar.gz) = 646379 bytes
+SHA1 (patch-aa) = afcf1a45c408370a9094d350192c8649d0073c44
+SHA1 (patch-ab) = 823c936d2ea924a73dc31761012fae0c09f0cbe1
diff -r 8d48e2d15a0c -r 7c5ba2da6bf0 devel/apr-util/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/apr-util/patches/patch-aa   Sat Apr 28 06:23:04 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/04/28 06:23:04 minskim Exp $
+
+--- configure.in.orig  2005-05-05 12:24:29.000000000 -0700
++++ configure.in
+@@ -164,7 +164,7 @@ dnl copy apr's rules.mk into our build d
+ if test ! -d ./build; then
+    $mkdir_p build
+ fi
+-cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk
++sed -e 's:^LIBTOOL=.*:LIBTOOL=$(WRAPPER_DIR)/bin/libtool:' $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
+ 
+ dnl
+ dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
diff -r 8d48e2d15a0c -r 7c5ba2da6bf0 devel/apr-util/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/apr-util/patches/patch-ab   Sat Apr 28 06:23:04 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/04/28 06:23:05 minskim Exp $
+
+--- configure.orig     2006-11-29 03:48:46.000000000 -0800
++++ configure
+@@ -39658,7 +39658,7 @@ APRUTIL_LIBNAME="aprutil${libsuffix}"
+ if test ! -d ./build; then
+    $mkdir_p build
+ fi
+-cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk
++sed -e 's:^LIBTOOL=.*:LIBTOOL=$(WRAPPER_DIR)/bin/libtool:' $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
+ 
+ case "$host_alias" in
+ *bsdi* | BSD/OS)