Index: apr1/Makefile
===================================================================
--- apr1/Makefile	(revision 302261)
+++ apr1/Makefile	(working copy)
@@ -8,7 +8,8 @@
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITES=	http://apr.apache.org/dev/dist/ \
+		${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
 DISTFILES=	apr-${APR_VERSION}.tar.gz apr-util-${APU_VERSION}.tar.gz
 
@@ -24,15 +25,16 @@
 OPTIONS_DEFINE=	THREADS IPV6 DEVRANDOM
 # apr-util
 OPTIONS_DEFINE+=BDB GDBM LDAP MYSQL NDBM PGSQL SQLITE
-OPTIONS_DEFAULT=THREADS IPV6 DEVRANDOM BDB GDBM
+#OPTIONS_DEFAULT=THREADS IPV6 DEVRANDOM BDB GDBM
+OPTIONS_DEFAULT=${OPTIONS_DEFINE}
 
 DEVRANDOM_DESC= Use /dev/random or compatible
 NDBM_DESC=	NDBM support
 
 .include <bsd.port.options.mk>
 
-APR_VERSION=	1.4.5
-APU_VERSION=	1.3.12
+APR_VERSION=	1.4.6
+APU_VERSION=	1.5.0
 
 USE_ICONV=		yes
 USE_AUTOTOOLS=	automake autoconf libtool:env
@@ -49,7 +51,7 @@
 
 PLIST_SUB=	SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"
 SHLIB_APR_MAJOR=	4
-SHLIB_APU_MAJOR=	3
+SHLIB_APU_MAJOR=	5
 
 APR_CONF_ARGS=	--with-installbuilddir=${DATADIR}/build-1
 APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
@@ -243,13 +245,15 @@
 	cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE}
 	cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE}
 
+post-build: test
+
 do-install:
 	cd ${APR_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
 	cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
 
-test: build
-	@(cd ${APR_WRKDIR}; ${MAKE} test)
-	@(cd ${APU_WRKDIR}; ${MAKE} test)
+test:
+	-@(cd ${APR_WRKDIR}; ${MAKE} test)
+	-@(cd ${APU_WRKDIR}; ${MAKE} test)
 
 #regression-test: test
 
Index: apr1/distinfo
===================================================================
--- apr1/distinfo	(revision 302261)
+++ apr1/distinfo	(working copy)
@@ -1,4 +1,4 @@
-SHA256 (apr-1.4.5.tar.gz) = 7323d5f72d6bddf7d1ecb63e4326df82a66210018bb2f1e8f6d97357e68302df
-SIZE (apr-1.4.5.tar.gz) = 994320
-SHA256 (apr-util-1.3.12.tar.gz) = 815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8
-SIZE (apr-util-1.3.12.tar.gz) = 769076
+SHA256 (apr-1.4.6.tar.gz) = 538d593d805c36985fc6d200d31bf6c1b5f90df2a50b917902743a13bbc10e05
+SIZE (apr-1.4.6.tar.gz) = 982243
+SHA256 (apr-util-1.5.0.tar.gz) = 3db16491c0dbcb5dc68a5f7a56d5c453d7fab6ef06ecd0b332b62172ddc845a3
+SIZE (apr-util-1.5.0.tar.gz) = 832614
Index: apr1/pkg-plist
===================================================================
--- apr1/pkg-plist	(revision 302261)
+++ apr1/pkg-plist	(working copy)
@@ -6,6 +6,7 @@
 include/apr-1/apr_atomic.h
 include/apr-1/apr_base64.h
 include/apr-1/apr_buckets.h
+include/apr-1/apr_crypto.h
 include/apr-1/apr_date.h
 include/apr-1/apr_dbd.h
 include/apr-1/apr_dbm.h
@@ -65,6 +66,7 @@
 include/apr-1/apr_xlate.h
 include/apr-1/apr_xml.h
 include/apr-1/apu.h
+include/apr-1/apu_errno.h
 include/apr-1/apu_version.h
 include/apr-1/apu_want.h
 %%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so
Index: apr1/files/patch-apr_hints.m4
===================================================================
--- apr1/files/patch-apr_hints.m4	(revision 302261)
+++ apr1/files/patch-apr_hints.m4	(working copy)
@@ -1,5 +1,5 @@
---- apr-1.4.5/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ apr-1.4.5/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+--- ./apr-1.4.6/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
++++ ./apr-1.4.6/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
 @@ -159,11 +159,7 @@
  	;;
      *-freebsd*)
Index: apr1/files/patch-apr_ldap_rebind.c
===================================================================
--- apr1/files/patch-apr_ldap_rebind.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- apr-util-1.3.12/ldap/apr_ldap_rebind.c.orig	2011-06-18 14:42:15.000000000 +0000
-+++ apr-util-1.3.12/ldap/apr_ldap_rebind.c	2011-06-18 14:42:28.000000000 +0000
-@@ -81,11 +81,11 @@
-     get_apd
- #endif
- 
-+#if APR_HAS_THREADS
-     /* run after apr_thread_mutex_create cleanup */
-     apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null,
-                               apr_pool_cleanup_null);
- 
--#if APR_HAS_THREADS
-     if (apr_ldap_xref_lock == NULL) {
-         retcode = apr_thread_mutex_create(&apr_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool);
-     }