6 files changed, 13 insertions, 114 deletions

diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 7c9517cf27c1..fb1f61389014 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -15,7 +15,7 @@
 # APR_UTIL_WITH_LDAP:		force dependency on OpenLDAP
 
 PORTNAME=	apr
-PORTVERSION=	1.2.7
+PORTVERSION=	1.2.8
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
diff --git a/devel/apr0/distinfo b/devel/apr0/distinfo
index 847dbdc2dd2b..d9f4d4e90274 100644
--- a/devel/apr0/distinfo
+++ b/devel/apr0/distinfo
@@ -1,6 +1,6 @@
-MD5 (apr-1.2.7.tar.gz) = aea926cbe588f844ad9e317157d60175
-SHA256 (apr-1.2.7.tar.gz) = 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa
-SIZE (apr-1.2.7.tar.gz) = 1102370
-MD5 (apr-util-1.2.7.tar.gz) = c3702668a640be1695956115857ec22e
-SHA256 (apr-util-1.2.7.tar.gz) = 8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3
-SIZE (apr-util-1.2.7.tar.gz) = 641600
+MD5 (apr-1.2.8.tar.gz) = 814f19528d9cfc79aef188dd752e04d8
+SHA256 (apr-1.2.8.tar.gz) = 96e31f0ea2e028f372d5fdbbd4f88f31d59e14eda85cd12153183759f8e221c7
+SIZE (apr-1.2.8.tar.gz) = 1107189
+MD5 (apr-util-1.2.8.tar.gz) = a2e2e54d65e9eae961f7171335cf2550
+SHA256 (apr-util-1.2.8.tar.gz) = 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6
+SIZE (apr-util-1.2.8.tar.gz) = 646379
diff --git a/devel/apr0/files/patch-apr-util_build_dbm.m4 b/devel/apr0/files/patch-apr-util_build_dbm.m4
index 68dd6cb2f837..7de0e3c4d3aa 100644
--- a/devel/apr0/files/patch-apr-util_build_dbm.m4
+++ b/devel/apr0/files/patch-apr-util_build_dbm.m4
@@ -1,5 +1,5 @@
---- apr-util-1.2.7/build/dbm.m4-orig	Wed Dec  7 09:02:23 2005
-+++ apr-util-1.2.7/build/dbm.m4	Wed Dec 23 09:07:34 2005
+--- apr-util-1.2.8/build/dbm.m4-orig	Wed Dec  7 09:02:23 2005
++++ apr-util-1.2.8/build/dbm.m4	Wed Dec 23 09:07:34 2005
 @@ -588,6 +588,8 @@
      elif test "$withval" = "no"; then
        apu_have_gdbm=0
diff --git a/devel/apr0/files/patch-apr-util_configure b/devel/apr0/files/patch-apr-util_configure
index 9bfd536bc5aa..b6eea660e68c 100644
--- a/devel/apr0/files/patch-apr-util_configure
+++ b/devel/apr0/files/patch-apr-util_configure
@@ -1,5 +1,5 @@
---- apr-util-1.2.7/configure.orig	Mon Sep 26 18:28:49 2005
-+++ apr-util-1.2.7/configure	Fri Dec 23 15:06:09 2005
+--- apr-util-1.2.8/configure.orig	Mon Sep 26 18:28:49 2005
++++ apr-util-1.2.8/configure	Fri Dec 23 15:06:09 2005
 @@ -13806,6 +13806,8 @@
      elif test "$withval" = "no"; then
        apu_have_gdbm=0
diff --git a/devel/apr0/files/patch-apr_dbd_sqlite3.c b/devel/apr0/files/patch-apr_dbd_sqlite3.c
deleted file mode 100644
index bedbfb6c1474..000000000000
--- a/devel/apr0/files/patch-apr_dbd_sqlite3.c
+++ /dev/null
@@ -1,101 +0,0 @@
---- apr-util-1.2.7/dbd/apr_dbd_sqlite3.c.orig	Wed Mar 15 01:04:54 2006
-+++ apr-util-1.2.7/dbd/apr_dbd_sqlite3.c	Mon May 29 09:08:08 2006
-@@ -24,6 +24,7 @@
- #include <sqlite3.h>
- 
- #include "apr_strings.h"
-+#include "apr_thread_mutex.h"
- #include "apr_time.h"
- 
- #include "apr_dbd_internal.h"
-@@ -39,7 +40,9 @@
- struct apr_dbd_t {
-     sqlite3 *conn;
-     apr_dbd_transaction_t *trans;
-+#if APR_HAS_THREADS
-     apr_thread_mutex_t *mutex;
-+#endif
-     apr_pool_t *pool;
- };
- 
-@@ -93,11 +96,15 @@
-         return sql->trans->errnum;
-     }
- 
-+#if APR_HAS_THREADS
-     apr_thread_mutex_lock(sql->mutex);
-+#endif
- 
-     ret = sqlite3_prepare(sql->conn, query, strlen(query), &stmt, &tail);
-     if (!dbd_sqlite3_is_success(ret)) {
-+#if APR_HAS_THREADS
-         apr_thread_mutex_unlock(sql->mutex);
-+#endif
-         return ret;
-     } else {
-         int column_count;
-@@ -118,7 +125,9 @@
-                 if (retry_count++ > MAX_RETRY_COUNT) {
-                     ret = SQLITE_ERROR;
-                 } else {
-+#if APR_HAS_THREADS
-                     apr_thread_mutex_unlock(sql->mutex);
-+#endif
-                     apr_sleep(MAX_RETRY_SLEEP);
-                     apr_thread_mutex_lock(sql->mutex);
-                 }
-@@ -179,7 +188,9 @@
-         } while (ret == SQLITE_ROW || ret == SQLITE_BUSY);
-     }
-     ret = sqlite3_finalize(stmt);
-+#if APR_HAS_THREADS
-     apr_thread_mutex_unlock(sql->mutex);
-+#endif
- 
-     if (sql->trans) {
-         sql->trans->errnum = ret;
-@@ -242,7 +253,9 @@
-     }
- 
-     length = strlen(query);
-+#if APR_HAS_THREADS
-     apr_thread_mutex_lock(sql->mutex);
-+#endif
- 
-     do {
-         ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
-@@ -260,7 +273,9 @@
-     if (dbd_sqlite3_is_success(ret)) {
-         ret =  0;
-     }
-+#if APR_HAS_THREADS
-     apr_thread_mutex_unlock(sql->mutex);
-+#endif
-     if (sql->trans) {
-         sql->trans->errnum = ret;
-     }
-@@ -366,12 +381,14 @@
-     sql->conn = conn;
-     sql->pool = pool;
-     sql->trans = NULL;
-+#if APR_HAS_THREADS
-     /* Create a mutex */
-     res = apr_thread_mutex_create(&sql->mutex, APR_THREAD_MUTEX_DEFAULT,
-                                   pool);
-     if (res != APR_SUCCESS) {
-         return NULL;
-     }
-+#endif
- 
-     return sql;
- }
-@@ -379,7 +396,9 @@
- static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle)
- {
-     sqlite3_close(handle->conn);
-+#if APR_HAS_THREADS
-     apr_thread_mutex_destroy(handle->mutex);
-+#endif
-     return APR_SUCCESS;
- }
- 
diff --git a/devel/apr0/files/patch-apr_hints.m4 b/devel/apr0/files/patch-apr_hints.m4
index 3891ecae5176..77e831a5347b 100644
--- a/devel/apr0/files/patch-apr_hints.m4
+++ b/devel/apr0/files/patch-apr_hints.m4
@@ -1,5 +1,5 @@
---- apr-1.2.7/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ apr-1.2.7/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+--- apr-1.2.8/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
++++ apr-1.2.8/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
 @@ -137,11 +137,7 @@
  	;;
      *-freebsd*)