3 files changed, 30 insertions, 19 deletions
diff --git a/devel/apr-util/Makefile b/devel/apr-util/Makefile
index c6573bca9f0..279c8b0431e 100644
--- a/devel/apr-util/Makefile
+++ b/devel/apr-util/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2013/05/09 07:39:34 adam Exp $
+# $NetBSD: Makefile,v 1.32 2013/07/04 15:21:51 wiz Exp $
 
-DISTNAME=	apr-util-1.4.1
-PKGREVISION=	6
+DISTNAME=	apr-util-1.5.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE:=apr/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,6 +22,9 @@ CONFIGURE_ARGS+=	--without-odbc
 CONFIGURE_ARGS+=	--without-sqlite2
 PKGCONFIG_OVERRIDE+=	apr-util.pc.in
 
+# just a list of exported symbols for a library that also starts with shebang
+CHECK_INTERPRETER_SKIP=	lib/aprutil.exp
+
 MAKE_ENV+=	WRAPPER_DIR=${WRAPPER_DIR}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/devel/apr-util/distinfo b/devel/apr-util/distinfo
index 85effcae74d..4cdd8ebf082 100644
--- a/devel/apr-util/distinfo
+++ b/devel/apr-util/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2012/03/11 12:18:37 ryoon Exp $
+$NetBSD: distinfo,v 1.15 2013/07/04 15:21:51 wiz Exp $
 
-SHA1 (apr-util-1.4.1.tar.bz2) = 229a1df48822e3048ae90e2467a5c078474e99a6
-RMD160 (apr-util-1.4.1.tar.bz2) = a16ca2c192e82ff811570e84b88f9b6b60141ca6
-Size (apr-util-1.4.1.tar.bz2) = 635000 bytes
-SHA1 (patch-aa) = c778c6c5b9ea1d51aa6899fd885f00e4a5e9242b
+SHA1 (apr-util-1.5.2.tar.bz2) = 67139f51ee6c484f3f1b7b3edc0b00dae3640b0a
+RMD160 (apr-util-1.5.2.tar.bz2) = 412821dccd3f4ba726720c9620d737b24ca24444
+Size (apr-util-1.5.2.tar.bz2) = 693258 bytes
+SHA1 (patch-aa) = 413d29e36d475b9f66392c7b1a90741817fd06ce
diff --git a/devel/apr-util/patches/patch-aa b/devel/apr-util/patches/patch-aa
index 88f08e681d0..772b9fbad60 100644
--- a/devel/apr-util/patches/patch-aa
+++ b/devel/apr-util/patches/patch-aa
@@ -1,12 +1,21 @@
-$NetBSD: patch-aa,v 1.3 2010/10/13 19:21:16 tron Exp $
---- configure.orig	2010-10-01 14:56:47.000000000 +0300
-+++ configure	2010-10-10 10:00:59.000000000 +0300
-@@ -33407,7 +33407,7 @@
- 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:' -e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
+$NetBSD: patch-aa,v 1.4 2013/07/04 15:21:51 wiz Exp $
+--- configure.orig	2013-03-30 20:30:11.000000000 +0000
++++ configure
+@@ -11219,7 +11219,7 @@ fi
+       fi
+ 
+       test ${apu_has_ldap} != "1" && as_fn_error $? "could not find an LDAP library" "$LINENO" 5
+-      test ${apu_has_ldap} == "1" &&
++      test ${apu_has_ldap} = "1" &&
+   if test "x$LDADD_ldap" = "x"; then
+     test "x$silent" != "xyes" && echo "  setting LDADD_ldap to \"$LDADD_ldap_found\""
+     LDADD_ldap="$LDADD_ldap_found"
+@@ -24304,7 +24304,7 @@ case $host in
+             < $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
+         ;;
+     *)
+-        cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk
++        sed -e 's:^LIBTOOL=.*:LIBTOOL=$(WRAPPER_DIR)/bin/libtool:' -e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
+         ;;
+ esac
  
- case "$host_alias" in
- *bsdi* | BSD/OS)