diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index d3ba4db4a51e..0665d9648f41 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -1,172 +1,175 @@
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/apr
 DISTFILES=	apr-${APR_VERSION}.tar.gz \
 		apr-util-${APU_VERSION}.tar.gz
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache Portability Library
 WWW=		https://apr.apache.org/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS+=	automake>=1.16.1:devel/automake
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		iconv pathfix libtool cpe
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-APR_VERSION=	1.7.0
-APU_VERSION=	1.6.1
+APR_VERSION=	1.7.3
+APU_VERSION=	1.6.3
 
 CPE_VENDOR=	apache
 CPE_PRODUCT=	apr-util
 CPE_VERSION=	${APU_VERSION}
 
 OPTIONS_SUB=		yes
 OPTIONS_GROUP=		APU
 OPTIONS_DEFINE=		IPV6
-OPTIONS_GROUP_APU=	BDB GDBM LDAP MYSQL NDBM ODBC PGSQL SQLITE
-OPTIONS_RADIO=		CRYPTO
+OPTIONS_GROUP_APU=	GDBM LDAP MYSQL NDBM ODBC PGSQL SQLITE
+OPTIONS_RADIO=		BERKLEYDB CRYPTO
+OPTIONS_RADIO_BERKLEYDB=BDB BDB5
 OPTIONS_RADIO_CRYPTO=	SSL NSS
 OPTIONS_DEFAULT=	BDB GDBM SSL
 
 APU_DESC=		Database support
+BDB5_DESC=		Berkeley DB v5 support (deprecated)
+BERKLEYDB_DESC=		Berkley DB provider
 CRYPTO_DESC=		Cryptography provider
 NDBM_DESC=		NDBM support
 NSS_DESC=		NSS crypto driver
 SSL_DESC=		OpenSSL crypto driver
 
 # APR-Util Options
-BDB_USES=		bdb:5+
+BDB_USES=		bdb:18
+BDB5_USES=		bdb:5
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 LDAP_USES=		ldap
 MYSQL_USES=		mysql
 NSS_LIB_DEPENDS=	libnss3.so:security/nss
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 PGSQL_USES=		pgsql
 SQLITE_USES=		sqlite
 SSL_USES=		ssl
 
 APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
 APU_WRKDIR=	${WRKDIR}/apr-util-${APU_VERSION}
 WRKSRC=		${APR_WRKDIR}
 PATCH_WRKSRC=	${WRKDIR}
 PATHFIX_WRKSRC=	${WRKDIR}
 
 SHLIB_APR_MAJOR=${APR_VERSION:C/^1/0/}
 SHLIB_APU_MAJOR=${APU_VERSION:C/^1/0/}
 
 PLIST_SUB+=	SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" \
 		SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"
 
 APR_CONF_ARGS=	--with-installbuilddir=${DATADIR}/build-1 \
 		--enable-threads \
 		--enable-posix-shm \
 		--with-devrandom
 
 APU_CONF_ARGS=	--with-apr=${APR_WRKDIR} \
 		--with-expat=${LOCALBASE}
 
 ########## APR Options
 IPV6_VARS=		APR_CONF_ARGS+=--enable-ipv6
 IPV6_VARS_OFF=		APR_CONF_ARGS+=--disable-ipv6
 
 ######### APR-Util Options
 # make sure 1st include is "${APR_WRKDIR}/include"
 # to avoid failures if previous apr_version.h is present
 APU_CPPFLAGS=	-I${APR_WRKDIR}/include
 
 BDB_VARS=	APU_CONF_ARGS+=--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
 BDB_VARS_OFF=	APU_CONF_ARGS+=--without-berkeley-db
 GDBM_VARS=	APU_CONF_ARGS+=--with-gdbm=${LOCALBASE}
 LDAP_VARS=	APU_CONF_ARGS+="--with-ldap-include=${LOCALBASE}/include \
 			--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap"
 MYSQL_VARS=	APU_CONF_ARGS+=--with-mysql=${LOCALBASE} \
 		APU_CPPFLAGS+="-I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H" \
 		LIBS+=-L${LOCALBASE}/lib/mysql
 NDBM_VARS=	APU_CONF_ARGS+=--with-ndbm=/usr
 NSS_VARS=	APU_CONF_ARGS+=--with-nss=${LOCALBASE} \
 		APU_CPPFLAGS+=-I${LOCALBASE}/include/nss \
 		LDFLAGS+=-L${LOCALBASE}/lib/nss
 ODBC_VARS=	APU_CONF_ARGS+=--with-odbc=${LOCALBASE}
 SSL_VARS=	APU_CONF_ARGS+=--with-openssl=${OPENSSLBASE} \
 		APU_CPPFLAGS+=-I${OPENSSLINC} \
 		LDFLAGS+=-L${OPENSSLLIB}
 SSL_VARS_OFF=	APU_CONF_ARGS+=--without-openssl
 PGSQL_VARS=	APU_CONF_ARGS+=--with-pgsql=${LOCALBASE} \
 		APU_CONF_ENV+=ac_cv_path_PGSQL_CONFIG=""
 SQLITE_VARS=		APU_CONF_ARGS+=--with-sqlite3=${LOCALBASE}
 SQLITE_VARS_OFF=	APU_CONF_ARGS+=--without-sqlite3
 
 .for db in GDBM NDBM LDAP ODBC MYSQL NSS PGSQL
 ${db}_VARS_OFF=	APU_CONF_ARGS+=--without-${db:tl}
 .endfor
 
 APR_CONF_ENV+=	${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
 # include apu specific CPPFLAGS 1st!
 APU_CONF_ENV+=	${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${APU_CPPFLAGS} ${CPPFLAGS}"
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL} || ${PORT_OPTIONS:MNSS}
 APU_CONF_ARGS+=	--with-crypto
 .else
 APU_CONF_ARGS+=	--without-crypto
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 # cleanup files not used on this platform
 	@${FIND} ${WRKDIR} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' \) -delete
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' \
 		${APR_WRKDIR}/configure
 
 do-configure:
 	@${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}"
 	(cd ${APR_WRKDIR} && \
 		${SETENV} ${APR_CONF_ENV} ./configure ${APR_CONF_ARGS} ${CONFIGURE_ARGS})
 	@${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}"
 	(cd ${APU_WRKDIR} && \
 		autoreconf -f -i && \
 		${SETENV} ${APU_CONF_ENV} ./configure ${APU_CONF_ARGS} ${CONFIGURE_ARGS})
 
 do-build:
 	@${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}"
 	(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS})
 	@${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}"
 	(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS})
 
 pre-install:
 # always create the modules directory
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/apr-util-1
 	${ECHO} "keep me" > ${STAGEDIR}${PREFIX}/lib/apr-util-1/.keep.me
 
 do-install:
 	@${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}"
 	(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} ${MAKE_ARGS})
 	@${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}"
 	(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} ${MAKE_ARGS})
 
 	-${FIND} ${STAGEDIR}${PREFIX}/lib/ -name \*.so | ${XARGS} ${STRIP_CMD}
 
 do-test:
 	@${ECHO_MSG} "# ===> ${.TARGET} apr-${APR_VERSION}"
 	-(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test)
 	@${ECHO_MSG} "# ===> ${.TARGET} apr-util-${APU_VERSION}"
 	-(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test)
 
 #regression-test: test
 
 rpfl: configure
 # maintainer only: strip PID from logs (better compare)
 	${SED} -i '' -E 's|^configure:[0-9]+:|configure:_pid_:|g' ${APR_WRKDIR}/config.log
 	${SED} -i '' -E 's|^configure:[0-9]+:|configure:_pid_:|g' ${APU_WRKDIR}/config.log
 
 .include <bsd.port.post.mk>
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
index 0f7ca55d459d..24e66396aade 100644
--- a/devel/apr1/distinfo
+++ b/devel/apr1/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1564990523
-SHA256 (apr-1.7.0.tar.gz) = 48e9dbf45ae3fdc7b491259ffb6ccf7d63049ffacbc1c0977cced095e4c2d5a2
-SIZE (apr-1.7.0.tar.gz) = 1093896
-SHA256 (apr-util-1.6.1.tar.gz) = b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459
-SIZE (apr-util-1.6.1.tar.gz) = 554301
+TIMESTAMP = 1680344440
+SHA256 (apr-1.7.3.tar.gz) = af9bfd5b8a04425d6b419673f3e0a7656fade226aae78180d93f8a6f2d3d1c09
+SIZE (apr-1.7.3.tar.gz) = 1097690
+SHA256 (apr-util-1.6.3.tar.gz) = 2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983
+SIZE (apr-util-1.6.3.tar.gz) = 556623
diff --git a/devel/apr1/files/patch-PR59332 b/devel/apr1/files/patch-PR59332
new file mode 100644
index 000000000000..781d41e852dd
--- /dev/null
+++ b/devel/apr1/files/patch-PR59332
@@ -0,0 +1,18 @@
+See https://bz.apache.org/bugzilla/show_bug.cgi?id=59332
+
+Also reported in PR230538 devel/apr1 fails with mysql80-client
+
+--- apr-util-1.6.3/dbd/apr_dbd_mysql.c.orig	2023-01-27 13:32:52 UTC
++++ apr-util-1.6.3/dbd/apr_dbd_mysql.c
+@@ -44,6 +44,11 @@
+ #include <errmsg.h>
+ #endif
+ 
++#if !defined(HAVE_TYPE_MY_BOOL) && !defined(LIBMARIADB)
++#include <stdbool.h>
++typedef bool my_bool;
++#endif
++
+ #include "apr_strings.h"
+ #include "apr_lib.h"
+ #include "apr_buckets.h"
diff --git a/devel/apr1/files/patch-PR61517 b/devel/apr1/files/patch-PR61517
deleted file mode 100644
index 1e729094a298..000000000000
--- a/devel/apr1/files/patch-PR61517
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -ur a/build/dbd.m4 b/build/dbd.m4
---- apr-util-1.6.1/build/dbd.m4.orig	2017-05-03 19:18:52.000000000 -0400
-+++ apr-util-1.6.1/build/dbd.m4	2017-09-13 16:58:07.369546391 -0400
-@@ -163,10 +163,15 @@
-   old_cppflags="$CPPFLAGS"
-   old_ldflags="$LDFLAGS"
- 
-+  my_library="mysqlclient"
-+
-   AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]),
-   [
-     if test "$withval" = "yes"; then
-       AC_PATH_PROG([MYSQL_CONFIG],[mysql_config])
-+      if test "x$MYSQL_CONFIG" = "x"; then
-+        AC_PATH_PROG([MYSQL_CONFIG],[mariadb_config])
-+      fi
-       if test "x$MYSQL_CONFIG" != 'x'; then
-         mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
-         mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
-@@ -174,32 +179,40 @@
- 
-         APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
-         APR_ADDTO(LIBS, [$mysql_LIBS])
-+
-+	if $MYSQL_CONFIG --libs_r | grep -q mariadb; then
-+	  my_library="mariadb"
-+	fi
-       fi
- 
--      AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
--                       AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
--                       [apu_have_mysql=0; break],
--                       [#include <my_global.h>])
--      if test "$apu_have_mysql" = "0"; then
--        AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
--                         AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
--                         [apu_have_mysql=0; break],
--                         [#include <mysql/my_global.h>])
-+      AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
-+      if test "$apr_have_mysql" = "0"; then
-+	AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
-       fi
--      if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then
--        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
-+      if test "$apr_have_mysql" = "1"; then
-+	AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
-+	AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
-+      fi
-+      if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then
-+	APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
-       fi
-     elif test "$withval" = "no"; then
-       :
-     else
-       AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin])
-+      if test "x$MYSQL_CONFIG" = "x"; then
-+	AC_PATH_PROG([MYSQL_CONFIG],[mariadb_config],,[$withval/bin])
-+      fi
-       if test "x$MYSQL_CONFIG" != 'x'; then
--        mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
--        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
--        mysql_LIBS="`$MYSQL_CONFIG --libs_r`"
-+	mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
-+	mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
-+	mysql_LIBS="`$MYSQL_CONFIG --libs_r`"
-+	if $MYSQL_CONFIG --libs_r | grep -q mariadb; then
-+	  my_library="mariadb"
-+	fi
-       else
--        mysql_CPPFLAGS="-I$withval/include"
--        mysql_LDFLAGS="-L$withval/lib "
-+	mysql_CPPFLAGS="-I$withval/include"
-+	mysql_LDFLAGS="-L$withval/lib "
-       fi
- 
-       APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
-@@ -207,18 +220,15 @@
-       APR_ADDTO(LIBS, [$mysql_LIBS])
- 
-       AC_MSG_NOTICE(checking for mysql in $withval)
--      AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
--                       AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
--                       [apu_have_mysql=0; break],
--                       [#include <my_global.h>])
--
--      if test "$apu_have_mysql" != "1"; then
--        AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
--                         AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
--                         [apu_have_mysql=0; break],
--                         [#include <mysql/my_global.h>])
-+      AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
-+      if test "$apr_have_mysql" = "0"; then
-+	AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break])
-+      fi
-+      if test "$apr_have_mysql" = "1"; then
-+	AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h])
-+	AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0])
-       fi
--      if test "$apu_have_mysql" != "0"; then
-+      if test "$apu_have_mysql" = "1"; then
-         APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
-       fi
-     fi
-@@ -229,7 +239,7 @@
-   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
-   dnl we know the library is there.
-   if test "$apu_have_mysql" = "1"; then
--    APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS])
-+    APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -l$my_library $mysql_LIBS])
-   fi
-   AC_SUBST(LDADD_dbd_mysql)
- 
-diff -ur a/dbd/apr_dbd_mysql.c b/dbd/apr_dbd_mysql.c
---- apr-util-1.6.1/dbd/apr_dbd_mysql.c.orig	2017-05-03 19:18:52.000000000 -0400
-+++ apr-util-1.6.1/dbd/apr_dbd_mysql.c	2017-09-13 19:15:20.894368809 -0400
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
-
diff --git a/devel/apr1/files/patch-apr-1.7.0_configure b/devel/apr1/files/patch-apr-1.7.3_configure
similarity index 91%
rename from devel/apr1/files/patch-apr-1.7.0_configure
rename to devel/apr1/files/patch-apr-1.7.3_configure
index c31f12dd0ab0..927e44d9c5db 100644
--- a/devel/apr1/files/patch-apr-1.7.0_configure
+++ b/devel/apr1/files/patch-apr-1.7.3_configure
@@ -1,28 +1,28 @@
---- apr-1.7.0/configure.orig	2015-04-25 12:04:18 UTC
-+++ apr-1.7.0/configure
+--- apr-1.7.3/configure.orig	2015-04-25 12:04:18 UTC
++++ apr-1.7.3/configure
 @@ -6624,11 +6624,7 @@ if test "x$apr_preload_done" != "xyes" ;
      apr_lock_method="USE_FLOCK_SERIALIZE"
    fi
  
 -        if test -x /sbin/sysctl; then
 -            os_version=`/sbin/sysctl -n kern.osreldate`
 -        else
 -            os_version=000000
 -        fi
 +            os_version="OSVERSION"
          # 502102 is when libc_r switched to libpthread (aka libkse).
          if test $os_version -ge "502102"; then
            apr_cv_pthreads_cflags="none"
 @@ -18841,11 +18837,7 @@ fi
  # comparisons.
  case $host in
      *freebsd*)
 -        if test -x /sbin/sysctl; then
 -            os_version=`/sbin/sysctl -n kern.osreldate`
 -        else
 -            os_version=000000
 -        fi
 +            os_version="OSVERSION"
          ;;
      *linux*)
          os_major=`uname -r | sed -e 's/\([1-9][0-9]*\)\..*/\1/'`
diff --git a/devel/apr1/files/patch-apr-1.7.0_poll_unix_kqueue.c b/devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c
similarity index 88%
rename from devel/apr1/files/patch-apr-1.7.0_poll_unix_kqueue.c
rename to devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c
index e93abccf3fb1..1a31398d40c5 100644
--- a/devel/apr1/files/patch-apr-1.7.0_poll_unix_kqueue.c
+++ b/devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c
@@ -1,77 +1,77 @@
 # upstram PR: https://bz.apache.org/bugzilla/show_bug.cgi?id=59914
 # FreeBSD PR: 211430
 ========================================================================
---- apr-1.7.0/poll/unix/kqueue.c.orig	2015-03-20 01:34:07 UTC
-+++ apr-1.7.0/poll/unix/kqueue.c
+--- apr-1.7.3/poll/unix/kqueue.c.orig	2022-01-19 23:17:18 UTC
++++ apr-1.7.3/poll/unix/kqueue.c
 @@ -25,21 +25,40 @@
  
  #ifdef HAVE_KQUEUE
  
 -static apr_int16_t get_kqueue_revent(apr_int16_t event, apr_int16_t flags)
 +static apr_int16_t get_kqueue_revent(apr_int16_t event, apr_int16_t flags,
 +                                     int fflags, intptr_t data)
  {
      apr_int16_t rv = 0;
  
 -    if (event == EVFILT_READ)
 -        rv |= APR_POLLIN;
 -    else if (event == EVFILT_WRITE)
 -        rv |= APR_POLLOUT;
 -    if (flags & EV_EOF)
 -        rv |= APR_POLLHUP;
 -    /* APR_POLLPRI, APR_POLLERR, and APR_POLLNVAL are not handled by this
 -     * implementation.
 +    /* APR_POLLPRI and APR_POLLNVAL are not handled by this implementation.
       * TODO: See if EV_ERROR + certain system errors in the returned data field
       * should map to APR_POLLNVAL.
       */
 +    if (event == EVFILT_READ) {
 +	if (data > 0 || fflags == 0)
 +	    rv |= APR_POLLIN;
 +	else
 +	    rv |= APR_POLLERR;
 +        /*
 +	 * Don't return POLLHUP if connect fails.  Apparently Linux
 +         * does not, and this is expected by serf in order for IPv6 to
 +	 * IPv4 or multihomed host fallback to work.
 +         *
 +	 * ETIMEDOUT is ambiguous here since we don't know if a
 +	 * connection was established.  We don't want to return
 +	 * POLLHUP here if the connection attempt timed out, but
 +	 * we do if the connection was successful but later dropped.
 +	 * For now, favor the latter.
 +	 */
 +	if ((flags & EV_EOF) != 0 && fflags != ECONNREFUSED &&
 +	    fflags != ENETUNREACH && fflags != EHOSTUNREACH)
 +	    rv |= APR_POLLHUP;
 +    } else if (event == EVFILT_WRITE) {
 +	if (data > 0 || fflags == 0)
 +	    rv |= APR_POLLOUT;
 +	else
 +	    rv |= APR_POLLERR;
 +    }
      return rv;
  }
  
-@@ -290,7 +309,9 @@ static apr_status_t impl_pollset_poll(ap
-                 pollset->p->result_set[j] = fd;
+@@ -293,7 +312,9 @@ static apr_status_t impl_pollset_poll(apr_pollset_t *p
+                 pollset->p->result_set[j] = *fd;
                  pollset->p->result_set[j].rtnevents =
                          get_kqueue_revent(pollset->p->ke_set[i].filter,
 -                                          pollset->p->ke_set[i].flags);
 +                                          pollset->p->ke_set[i].flags,
 +                                          pollset->p->ke_set[i].fflags,
 +                                          pollset->p->ke_set[i].data);
                  j++;
              }
          }
-@@ -471,7 +492,9 @@ static apr_status_t impl_pollcb_poll(apr
-             apr_pollfd_t *pollfd = (apr_pollfd_t *)(pollcb->pollset.ke[i].udata);
-             
+@@ -478,7 +499,9 @@ static apr_status_t impl_pollcb_poll(apr_pollcb_t *pol
+             }
+ 
              pollfd->rtnevents = get_kqueue_revent(pollcb->pollset.ke[i].filter,
 -                                                  pollcb->pollset.ke[i].flags);
 +                                                  pollcb->pollset.ke[i].flags,
 +                                                  pollcb->pollset.ke[i].fflags,
 +                                                  pollcb->pollset.ke[i].data);
              
              rv = func(baton, pollfd);
              
diff --git a/devel/apr1/files/patch-bdb18 b/devel/apr1/files/patch-bdb18
index 302dfca4d6ac..6bb9ed5e8343 100644
--- a/devel/apr1/files/patch-bdb18
+++ b/devel/apr1/files/patch-bdb18
@@ -1,107 +1,107 @@
 diff --git apr-util-1.6.1/build/dbm.m4 apr-util-1.6.1/build/dbm.m4
 index 57bd131f..5cbee4b3 100644
---- apr-util-1.6.1/build/dbm.m4
-+++ apr-util-1.6.1/build/dbm.m4
+--- apr-util-1.6.3/build/dbm.m4
++++ apr-util-1.6.3/build/dbm.m4
 @@ -112,7 +112,7 @@ AC_DEFUN([APU_CHECK_BERKELEY_DB], [
          changequote([,])
          unset $cache_id
          AC_CHECK_HEADER([$bdb_header], [
 -          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6"; then
 +          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6" -o "$1" = "18"; 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
 @@ -432,7 +432,15 @@ AC_DEFUN([APU_CHECK_DB], [
        AC_MSG_ERROR(Berkeley db$db_major not found)
      fi
      ;;
 -  db[[456]])
 +  db18[[0-9]])
 +    db_major=`echo "$requested" | sed -e 's/db//' -e 's/.$//'`
 +    db_minor=`echo "$requested" | sed -e 's/db//' -e 's/..//'`
 +    APU_CHECK_DBXY("$check_places", "$db_major", "$db_minor")
 +    if test "$apu_db_version" != "$db_major"; then
 +      AC_MSG_ERROR(Berkeley db$db_major not found)
 +    fi
 +    ;;
 +  db[[456]] | db18)
      db_major=`echo "$requested" | sed -e 's/db//'`
      # Start version search at version x.9
      db_minor=9
 @@ -455,17 +463,21 @@ AC_DEFUN([APU_CHECK_DB], [
  ])
  
  dnl
 -dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 6.X to 1.
 +dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 18.X to 1.
  dnl
  AC_DEFUN([APU_CHECK_DB_ALL], [
    all_places=$1
  
 -  # Start version search at version 6.9
 -  db_version=69
 +  # Start version search at version 18.9
 +  db_version=189
    while [[ $db_version -ge 40 ]]
    do
      db_major=`echo $db_version | sed -e 's/.$//'`
 -    db_minor=`echo $db_version | sed -e 's/.//'`
 +    if test "$db_version" -ge "100" ; then
 +      db_minor=`echo $db_version | sed -e 's/..//'`
 +    else
 +      db_minor=`echo $db_version | sed -e 's/.//'`
 +    fi
      APU_CHECK_DBXY("$all_places", "$db_major", "$db_minor")
      if test "$apu_have_db" = "1"; then
        break
 @@ -511,7 +523,7 @@ AC_DEFUN([APU_CHECK_DBM], [
    apu_db_version=0
  
    # Maximum supported version announced in help string.
 -  # Although we search for all versions up to 6.9,
 +  # Although we search for all versions up to 18.9,
    # we should only include existing versions in our
    # help string.
    dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4"
 @@ -531,7 +543,7 @@ AC_DEFUN([APU_CHECK_DBM], [
      dbm_list="$dbm_list, db$db_version"
      db_version=`expr $db_version + 1`
    done
 -  db_max_version=60
 +  db_max_version=62
    db_min_version=60
    db_version="$db_min_version"
    while [[ $db_version -le $db_max_version ]]
 @@ -539,9 +551,17 @@ AC_DEFUN([APU_CHECK_DBM], [
      dbm_list="$dbm_list, db$db_version"
      db_version=`expr $db_version + 1`
    done
 +  db_max_version=181
 +  db_min_version=180
 +  db_version="$db_min_version"
 +  while [[ $db_version -le $db_max_version ]]
 +  do
 +    dbm_list="$dbm_list, db$db_version"
 +    db_version=`expr $db_version + 1`
 +  done
  
    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,db4X,db5X,db6X} for some X=0,...,9])],
 +      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X,db18x} for some X=0,...,9])],
    [
      if test "$withval" = "yes"; then
        AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
 @@ -684,11 +704,11 @@ AC_DEFUN([APU_CHECK_DBM], [
        eval "apu_use_$requested=1"
        apu_default_dbm=$requested
        ;;
 -    db185 | db[[123456]])
 +    db185 | db[[123456]] | db18)
        apu_use_db=1
        apu_default_dbm=$requested
        ;;
 -    db[[456]][[0-9]])
 +    db[[456]][[0-9]] | db18[[0-9]])
        apu_use_db=1
        apu_default_dbm=`echo $requested | sed -e 's/.$//'`
        ;;