4 files changed, 4 insertions, 278 deletions

diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 56b43acf23e9..ff00457c8b14 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
@@ -31,7 +30,7 @@ OPTIONS=	THREADS "Enable Threads in apr"				on  \
 		DEVRANDOM "Use /dev/random or compatible in apr"	on
 
 APR_VERSION=	1.4.2
-APU_VERSION=	1.3.9
+APU_VERSION=	1.3.10
 
 USE_ICONV=		yes
 USE_AUTOTOOLS=	automake:111 autoconf:267 libtool:22:env
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
index 3dbdf15760e7..d3ea3cc14e31 100644
--- a/devel/apr1/distinfo
+++ b/devel/apr1/distinfo
@@ -1,6 +1,6 @@
 MD5 (apr-1.4.2.tar.gz) = fc80cb54f158c2674f9eeb47a1f672cd
 SHA256 (apr-1.4.2.tar.gz) = 6a0291d6f6a59d5eab5ae5441c37b78b17f7a1a2fa1478741b7178f5fbc33ebe
 SIZE (apr-1.4.2.tar.gz) = 949945
-MD5 (apr-util-1.3.9.tar.gz) = cc2ec0ba4f01d88375f1170f762518fa
-SHA256 (apr-util-1.3.9.tar.gz) = 20897069274a026057df26b90a6424da9d70318d930c99885c451d8753b8e4d9
-SIZE (apr-util-1.3.9.tar.gz) = 790952
+MD5 (apr-util-1.3.10.tar.gz) = 82acd25cf3df8c72eba44eaee8b80c19
+SHA256 (apr-util-1.3.10.tar.gz) = 7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23
+SIZE (apr-util-1.3.10.tar.gz) = 768634
diff --git a/devel/apr1/files/patch-apr-util-1.3.9__build__dbm.m4 b/devel/apr1/files/patch-apr-util-1.3.9__build__dbm.m4
deleted file mode 100644
index 0f0fe1e9cbb3..000000000000
--- a/devel/apr1/files/patch-apr-util-1.3.9__build__dbm.m4
+++ /dev/null
@@ -1,129 +0,0 @@
---- ./apr-util-1.3.9/build/dbm.m4.orig	2008-11-21 01:32:58.000000000 -0500
-+++ ./apr-util-1.3.9/build/dbm.m4	2010-05-06 20:21:58.910611623 -0400
-@@ -522,6 +522,25 @@
-     apu_db_version=4
-   fi
- ])
-+dnl
-+dnl APU_CHECK_DB48: is DB4.8 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB48], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.4.8 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("4", "8", "-1",
-+    "$places",
-+    "db48/db.h db4/db.h db.h",
-+    "db-4.8 db4-4.8 db48 db4 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=4
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -606,6 +625,12 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db48)
-+    APU_CHECK_DB48("$check_places")
-+    if test "$apu_db_version" != "4"; then
-+      AC_MSG_ERROR(Berkeley db4 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -613,34 +638,37 @@
- ])
- 
- dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.7 to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.8 to 1.
- dnl
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-  
--  APU_CHECK_DB47("$all_places")
-+  APU_CHECK_DB48("$all_places")
-   if test "$apu_db_version" != "4"; then
--    APU_CHECK_DB46("$all_places")
-+    APU_CHECK_DB47("$all_places")
-     if test "$apu_db_version" != "4"; then
--      APU_CHECK_DB45("$all_places")
-+      APU_CHECK_DB46("$all_places")
-       if test "$apu_db_version" != "4"; then
--        APU_CHECK_DB44("$all_places")
-+        APU_CHECK_DB45("$all_places")
-         if test "$apu_db_version" != "4"; then
--          APU_CHECK_DB43("$all_places")
-+          APU_CHECK_DB44("$all_places")
-           if test "$apu_db_version" != "4"; then
--            APU_CHECK_DB42("$all_places")
-+            APU_CHECK_DB43("$all_places")
-             if test "$apu_db_version" != "4"; then
--              APU_CHECK_DB41("$all_places")
-+              APU_CHECK_DB42("$all_places")
-               if test "$apu_db_version" != "4"; then
--                APU_CHECK_DB4("$all_places")
-+                APU_CHECK_DB41("$all_places")
-                 if test "$apu_db_version" != "4"; then
--                  APU_CHECK_DB3("$all_places")
--                  if test "$apu_db_version" != "3"; then
--                    APU_CHECK_DB2("$all_places")
--                    if test "$apu_db_version" != "2"; then
--                      APU_CHECK_DB1("$all_places")
--                      if test "$apu_db_version" != "1"; then
--                        APU_CHECK_DB185("$all_places")
-+                  APU_CHECK_DB4("$all_places")
-+                  if test "$apu_db_version" != "4"; then
-+                    APU_CHECK_DB3("$all_places")
-+                    if test "$apu_db_version" != "3"; then
-+                      APU_CHECK_DB2("$all_places")
-+                      if test "$apu_db_version" != "2"; then
-+                        APU_CHECK_DB1("$all_places")
-+                        if test "$apu_db_version" != "1"; then
-+                          APU_CHECK_DB185("$all_places")
-+                        fi
-                       fi
-                     fi
-                   fi
-@@ -679,11 +707,11 @@
-   apu_db_version=0
- 
-   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48}])],
-   [
-     if test "$withval" = "yes"; then
-       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
--        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
-     fi
-     requested="$withval"
-   ], [
-@@ -882,6 +910,10 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db48)
-+      apu_use_db=1
-+      apu_default_dbm=db4
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -889,7 +921,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
-       ;;
-   esac
- 
diff --git a/devel/apr1/files/patch-bdb5 b/devel/apr1/files/patch-bdb5
deleted file mode 100644
index 46b24e564345..000000000000
--- a/devel/apr1/files/patch-bdb5
+++ /dev/null
@@ -1,144 +0,0 @@
-Index: apr-util-1.3.9/build/dbm.m4
-===================================================================
---- build/dbm.m4	(revision 948003)
-+++ build/dbm.m4	(working copy)
-@@ -112,7 +112,7 @@
-         changequote([,])
-         unset $cache_id
-         AC_CHECK_HEADER([$bdb_header], [
--          if test "$1" = "3" -o "$1" = "4"; then
-+          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then
-             # We generate a separate cache variable for each prefix and libname
-             # we search under.  That way, we avoid caching information that
-             # changes if the user runs `configure' with a different set of
-@@ -541,6 +541,25 @@
-     apu_db_version=4
-   fi
- ])
-+dnl
-+dnl APU_CHECK_DB50: is DB5.0 present?
-+dnl
-+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
-+dnl
-+AC_DEFUN([APU_CHECK_DB50], [
-+  places=$1
-+  if test -z "$places"; then
-+    places="std /usr/local/BerkeleyDB.5.0 /boot/home/config"
-+  fi
-+  APU_CHECK_BERKELEY_DB("5", "0", "-1",
-+    "$places",
-+    "db50/db.h db5/db.h db.h",
-+    "db-5.0 db5-5.0 db50 db5 db"
-+  )
-+  if test "$apu_have_db" = "1"; then
-+    apu_db_version=5
-+  fi
-+])
- 
- AC_DEFUN([APU_CHECK_DB], [
-   requested=$1
-@@ -631,6 +650,12 @@
-       AC_MSG_ERROR(Berkeley db4 not found)
-     fi
-     ;;
-+  db50)
-+    APU_CHECK_DB50("$check_places")
-+    if test "$apu_db_version" != "5"; then
-+      AC_MSG_ERROR(Berkeley db5 not found)
-+    fi
-+    ;;
-   default)
-     APU_CHECK_DB_ALL("$check_places")
-     ;;
-@@ -638,36 +663,39 @@
- ])
- 
- dnl
--dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.8 to 1.
-+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.0 to 1.
- dnl
- AC_DEFUN([APU_CHECK_DB_ALL], [
-   all_places=$1
-  
--  APU_CHECK_DB48("$all_places")
--  if test "$apu_db_version" != "4"; then
--    APU_CHECK_DB47("$all_places")
-+  APU_CHECK_DB50("$all_places")
-+  if test "$apu_db_version" != "5"; then
-+    APU_CHECK_DB48("$all_places")
-     if test "$apu_db_version" != "4"; then
--      APU_CHECK_DB46("$all_places")
-+      APU_CHECK_DB47("$all_places")
-       if test "$apu_db_version" != "4"; then
--        APU_CHECK_DB45("$all_places")
-+        APU_CHECK_DB46("$all_places")
-         if test "$apu_db_version" != "4"; then
--          APU_CHECK_DB44("$all_places")
-+          APU_CHECK_DB45("$all_places")
-           if test "$apu_db_version" != "4"; then
--            APU_CHECK_DB43("$all_places")
-+            APU_CHECK_DB44("$all_places")
-             if test "$apu_db_version" != "4"; then
--              APU_CHECK_DB42("$all_places")
-+              APU_CHECK_DB43("$all_places")
-               if test "$apu_db_version" != "4"; then
--                APU_CHECK_DB41("$all_places")
-+                APU_CHECK_DB42("$all_places")
-                 if test "$apu_db_version" != "4"; then
--                  APU_CHECK_DB4("$all_places")
-+                  APU_CHECK_DB41("$all_places")
-                   if test "$apu_db_version" != "4"; then
--                    APU_CHECK_DB3("$all_places")
--                    if test "$apu_db_version" != "3"; then
--                      APU_CHECK_DB2("$all_places")
--                      if test "$apu_db_version" != "2"; then
--                        APU_CHECK_DB1("$all_places")
--                        if test "$apu_db_version" != "1"; then
--                          APU_CHECK_DB185("$all_places")
-+                    APU_CHECK_DB4("$all_places")
-+                    if test "$apu_db_version" != "4"; then
-+                      APU_CHECK_DB3("$all_places")
-+                      if test "$apu_db_version" != "3"; then
-+                        APU_CHECK_DB2("$all_places")
-+                        if test "$apu_db_version" != "2"; then
-+                          APU_CHECK_DB1("$all_places")
-+                          if test "$apu_db_version" != "1"; then
-+                            APU_CHECK_DB185("$all_places")
-+                          fi
-                         fi
-                       fi
-                     fi
-@@ -707,11 +735,11 @@
-   apu_db_version=0
- 
-   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
--      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48}])],
-+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])],
-   [
-     if test "$withval" = "yes"; then
-       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
--        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
-+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
-     fi
-     requested="$withval"
-   ], [
-@@ -914,6 +942,10 @@
-       apu_use_db=1
-       apu_default_dbm=db4
-       ;;
-+    db50)
-+      apu_use_db=1
-+      apu_default_dbm=db5
-+      ;;
-     default)
-       dnl ### use more sophisticated DBMs for the default?
-       apu_default_dbm="sdbm (default)"
-@@ -921,7 +953,7 @@
-       ;;
-     *)
-       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
--        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
-+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])
-       ;;
-   esac
-