From 0c9fdbb16f9e2f8215ddd14f91f51d81a31c522a Mon Sep 17 00:00:00 2001
From: pgollucci <pgollucci@FreeBSD.org>
Date: Wed, 8 Jul 2009 00:01:58 +0000
Subject: - Update to apr 1.3.6, apr-util 1.3.8

---
 .../apr0/files/patch-apr-util-1.3.7__apu-config.in | 39 ----------------------
 devel/apr0/files/patch-apr_hints.m4                |  4 +--
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 devel/apr0/files/patch-apr-util-1.3.7__apu-config.in

(limited to 'devel/apr0/files')

diff --git a/devel/apr0/files/patch-apr-util-1.3.7__apu-config.in b/devel/apr0/files/patch-apr-util-1.3.7__apu-config.in
deleted file mode 100644
index 7e8f2fa0e122..000000000000
--- a/devel/apr0/files/patch-apr-util-1.3.7__apu-config.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./apr-util-1.3.7/apu-config.in.orig	2008-05-23 17:27:59.000000000 -0400
-+++ ./apr-util-1.3.7/apu-config.in	2009-06-10 01:03:50.971447822 -0400
-@@ -31,6 +31,7 @@
- INCLUDES="@APRUTIL_INCLUDES@"
- LDFLAGS="@APRUTIL_LDFLAGS@"
- LDAP_LIBS="@LDADD_ldap@"
-+DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
- 
- APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
- 
-@@ -56,6 +57,8 @@
-   --libs            print library information
-   --avoid-ldap      do not include ldap library information with --libs
-   --ldap-libs       print additional library information to link with ldap
-+  --avoid-dbm       do not include DBM library information with --libs
-+  --dbm-libs        print additional library information to link with DBM
-   --srcdir          print APR-util source directory
-   --link-ld         print link switch(es) for linking to APR-util
-   --link-libtool    print the libtool inputs for linking to APR-util
-@@ -115,12 +118,18 @@
-     --avoid-ldap)
-     LDAP_LIBS=""
-     ;;
-+    --avoid-dbm)
-+    DBM_LIBS=""
-+    ;;
-     --libs)
--    flags="$flags $LDAP_LIBS $LIBS"
-+    flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
-     ;;
-     --ldap-libs)
-     flags="$flags $LDAP_LIBS"
-     ;;
-+    --dbm-libs)
-+    flags="$flags $DBM_LIBS"
-+    ;;
-     --includedir)
-     if test "$location" = "installed"; then
-         flags="$includedir"
diff --git a/devel/apr0/files/patch-apr_hints.m4 b/devel/apr0/files/patch-apr_hints.m4
index a360c89bbf99..c6de4ba24775 100644
--- a/devel/apr0/files/patch-apr_hints.m4
+++ b/devel/apr0/files/patch-apr_hints.m4
@@ -1,5 +1,5 @@
---- apr-1.3.5/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ apr-1.3.5/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+--- apr-1.3.6/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
++++ apr-1.3.6/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
 @@ -137,11 +137,7 @@
  	;;
      *-freebsd*)
-- 
cgit