summaryrefslogtreecommitdiff
path: root/devel/apr-util/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'devel/apr-util/patches/patch-aa')
-rw-r--r--devel/apr-util/patches/patch-aa31
1 files changed, 20 insertions, 11 deletions
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)