2 files changed, 6 insertions, 20 deletions
diff --git a/devel/apr-util/patches/patch-aa b/devel/apr-util/patches/patch-aa
index f2213ec635d..6a48c4046d8 100644
--- a/devel/apr-util/patches/patch-aa
+++ b/devel/apr-util/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2008/11/02 15:05:11 cube 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
+$NetBSD: patch-aa,v 1.2.14.1 2010/10/15 07:06:49 spz 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
  
- dnl
- dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
+ case "$host_alias" in
+ *bsdi* | BSD/OS)
diff --git a/devel/apr-util/patches/patch-ab b/devel/apr-util/patches/patch-ab
deleted file mode 100644
index 09cf93ff846..00000000000
--- a/devel/apr-util/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/11/02 15:05:11 cube 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:' -e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
- 
- case "$host_alias" in
- *bsdi* | BSD/OS)