Index: devel/apr1/Makefile
===================================================================
--- devel/apr1/Makefile
+++ devel/apr1/Makefile
@@ -12,10 +12,9 @@
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS+=	automake>=1.16.1:devel/automake
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
-USES=		iconv pathfix libtool cpe
+USES=		autoreconf iconv pathfix libtool cpe
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
@@ -31,12 +30,13 @@
 OPTIONS_DEFINE=		IPV6
 OPTIONS_GROUP_APU=	GDBM LDAP MYSQL NDBM ODBC PGSQL SQLITE
 OPTIONS_RADIO=		BERKELEYDB CRYPTO
-OPTIONS_RADIO_BERKELEYDB=	BDB BDB5
+OPTIONS_RADIO_BERKELEYDB=	BDB BDB1 BDB5
 OPTIONS_RADIO_CRYPTO=	SSL NSS
 OPTIONS_DEFAULT=	BDB GDBM SSL
 
 APU_DESC=		Database support
 BDB_DESC=		Berkeley DB support (AGPLv3)
+BDB1_DESC=		Berkeley DB 1.85 support (BSD 3-clause)
 BDB5_DESC=		Berkeley DB v5 support (deprecated)
 BERKELEYDB_DESC=	Berkeley DB provider
 CRYPTO_DESC=		Cryptography provider
@@ -87,6 +87,8 @@
 
 BDB_VARS=	${BDB5_VARS} \
 		LICENSE_COMB=dual LICENSE+=AGPLv3
+BDB1_VARS=	APU_CONF_ARGS+="--with-berkeley-db=/usr/include:/usr/lib \
+			--with-dbm=db1"
 BDB5_VARS=	APU_CONF_ARGS+=--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
 GDBM_VARS=	APU_CONF_ARGS+=--with-gdbm=${LOCALBASE}
 LDAP_VARS=	APU_CONF_ARGS+="--with-ldap-include=${LOCALBASE}/include \
@@ -119,7 +121,7 @@
 
 .include <bsd.port.options.mk>
 
-.if !${PORT_OPTIONS:MBDB} && !${PORT_OPTIONS:MBDB5}
+.if !${PORT_OPTIONS:MBDB} && !${PORT_OPTIONS:MBDB1} && !${PORT_OPTIONS:MBDB5}
 APU_CONF_ARGS+=	--without-berkeley-db
 .endif
 
Index: devel/apr1/files/patch-apr-1.7.3_configure
===================================================================
--- devel/apr1/files/patch-apr-1.7.3_configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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/'`
Index: devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4
===================================================================
--- devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4
+++ devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4
@@ -1,6 +1,4 @@
-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.3/build/dbm.m4
+--- apr-util-1.6.3/build/dbm.m4.orig	2013-11-23 18:00:53 UTC
 +++ apr-util-1.6.3/build/dbm.m4
 @@ -112,7 +112,7 @@ AC_DEFUN([APU_CHECK_BERKELEY_DB], [
          changequote([,])
@@ -11,6 +9,15 @@
              # 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
+@@ -293,7 +293,7 @@ AC_DEFUN([APU_CHECK_DB1], [
+   APU_CHECK_BERKELEY_DB(1, 0, 0,
+     "$places",
+     "db1/db.h db.h",
+-    "db1"
++    "c db1"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=1
 @@ -432,7 +432,15 @@ AC_DEFUN([APU_CHECK_DB], [
        AC_MSG_ERROR(Berkeley db$db_major not found)
      fi