4 files changed, 90 insertions, 20 deletions

diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 4358607f1577..d206b95ee64d 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -49,44 +49,74 @@ OPTIONS=	BDB_3		"Use BerkeleyDB v3"	on \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
-		BDB_44		"Use BerkeleyDB v4.4"	off
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
 .elif ${USE_BDB_VER} == 4
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	on \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
-		BDB_44		"Use BerkeleyDB v4.4"	off
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
 .elif ${USE_BDB_VER} == 41
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	on \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
-		BDB_44		"Use BerkeleyDB v4.4"	off
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
 .elif ${USE_BDB_VER} == 42
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	on \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
-		BDB_44		"Use BerkeleyDB v4.4"	off
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
 .elif ${USE_BDB_VER} == 43
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	on \
-		BDB_44		"Use BerkeleyDB v4.4"	off
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
 .elif ${USE_BDB_VER} == 44
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
-		BDB_44		"Use BerkeleyDB v4.4"	on
+		BDB_44		"Use BerkeleyDB v4.4"	on \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
+.elif ${USE_BDB_VER} == 45
+OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
+		BDB_4		"Use BerkeleyDB v4"	off \
+		BDB_41		"Use BerkeleyDB v4.1"	off \
+		BDB_42		"Use BerkeleyDB v4.2"	off \
+		BDB_43		"Use BerkeleyDB v4.3"	off \
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	on \
+		BDB_46		"Use BerkeleyDB v4.6"	off
+.elif ${USE_BDB_VER} == 46
+OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
+		BDB_4		"Use BerkeleyDB v4"	off \
+		BDB_41		"Use BerkeleyDB v4.1"	off \
+		BDB_42		"Use BerkeleyDB v4.2"	off \
+		BDB_43		"Use BerkeleyDB v4.3"	off \
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	on
 .else
-IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
+IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43, 44, 45 or 46"
 .endif
 
 OPTIONS+=	DRAC		"Enable DRAC support"			off
@@ -100,7 +130,7 @@ OPTIONS+=	REPLICATION	"Enable replication"			off
 OPTIONS+=	SNMP_4		"Enable SNMP support using net-snmp v4"	off \
 		SNMP_5		"Enable SNMP support using net-snmp v5"	off
 
-BDB_VERS=	3 4 41 42 43 44
+BDB_VERS=	3 4 41 42 43 44 45 46
 
 .include <bsd.port.pre.mk>
 
@@ -134,6 +164,10 @@ USE_BDB=	42
 USE_BDB=	43
 .elif defined(WITH_BDB_44)
 USE_BDB=	44
+.elif defined(WITH_BDB_45)
+USE_BDB=	45
+.elif defined(WITH_BDB_46)
+USE_BDB=	46
 .endif
 CONFIGURE_ARGS+=--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-bdb=${BDB_LIB_NAME}
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 4358607f1577..d206b95ee64d 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -49,44 +49,74 @@ OPTIONS=	BDB_3		"Use BerkeleyDB v3"	on \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
-		BDB_44		"Use BerkeleyDB v4.4"	off
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
 .elif ${USE_BDB_VER} == 4
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	on \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
-		BDB_44		"Use BerkeleyDB v4.4"	off
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
 .elif ${USE_BDB_VER} == 41
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	on \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
-		BDB_44		"Use BerkeleyDB v4.4"	off
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
 .elif ${USE_BDB_VER} == 42
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	on \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
-		BDB_44		"Use BerkeleyDB v4.4"	off
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
 .elif ${USE_BDB_VER} == 43
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	on \
-		BDB_44		"Use BerkeleyDB v4.4"	off
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
 .elif ${USE_BDB_VER} == 44
 OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
 		BDB_4		"Use BerkeleyDB v4"	off \
 		BDB_41		"Use BerkeleyDB v4.1"	off \
 		BDB_42		"Use BerkeleyDB v4.2"	off \
 		BDB_43		"Use BerkeleyDB v4.3"	off \
-		BDB_44		"Use BerkeleyDB v4.4"	on
+		BDB_44		"Use BerkeleyDB v4.4"	on \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	off
+.elif ${USE_BDB_VER} == 45
+OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
+		BDB_4		"Use BerkeleyDB v4"	off \
+		BDB_41		"Use BerkeleyDB v4.1"	off \
+		BDB_42		"Use BerkeleyDB v4.2"	off \
+		BDB_43		"Use BerkeleyDB v4.3"	off \
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	on \
+		BDB_46		"Use BerkeleyDB v4.6"	off
+.elif ${USE_BDB_VER} == 46
+OPTIONS=	BDB_3		"Use BerkeleyDB v3"	off \
+		BDB_4		"Use BerkeleyDB v4"	off \
+		BDB_41		"Use BerkeleyDB v4.1"	off \
+		BDB_42		"Use BerkeleyDB v4.2"	off \
+		BDB_43		"Use BerkeleyDB v4.3"	off \
+		BDB_44		"Use BerkeleyDB v4.4"	off \
+		BDB_45		"Use BerkeleyDB v4.5"	off \
+		BDB_46		"Use BerkeleyDB v4.6"	on
 .else
-IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
+IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43, 44, 45 or 46"
 .endif
 
 OPTIONS+=	DRAC		"Enable DRAC support"			off
@@ -100,7 +130,7 @@ OPTIONS+=	REPLICATION	"Enable replication"			off
 OPTIONS+=	SNMP_4		"Enable SNMP support using net-snmp v4"	off \
 		SNMP_5		"Enable SNMP support using net-snmp v5"	off
 
-BDB_VERS=	3 4 41 42 43 44
+BDB_VERS=	3 4 41 42 43 44 45 46
 
 .include <bsd.port.pre.mk>
 
@@ -134,6 +164,10 @@ USE_BDB=	42
 USE_BDB=	43
 .elif defined(WITH_BDB_44)
 USE_BDB=	44
+.elif defined(WITH_BDB_45)
+USE_BDB=	45
+.elif defined(WITH_BDB_46)
+USE_BDB=	46
 .endif
 CONFIGURE_ARGS+=--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 		--with-bdb=${BDB_LIB_NAME}
diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index 3e3c25a7177e..8f6dd8445e41 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -46,8 +46,9 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 .if ${WITH_BDB_VER} == 4
 USE_BDB=	40
 .elif ${WITH_BDB_VER} != 3 && ${WITH_BDB_VER} != 41 && \
-      ${WITH_BDB_VER} != 42 && ${WITH_BDB_VER} != 43 && ${WITH_BDB_VER} != 44
-IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
+      ${WITH_BDB_VER} != 42 && ${WITH_BDB_VER} != 43 && \
+      ${WITH_BDB_VER} != 44 && ${WITH_BDB_VER} != 45 && ${WITH_BDB_VER} != 46
+IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43, 44, 45 or 46"
 .endif
 USE_BDB?=	${WITH_BDB_VER}
 BDB_SUFFIX?=	${WITH_BDB_VER}
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 3e7126c70ca5..7c109cb2ad3c 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -58,8 +58,9 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 .if ${WITH_BDB_VER} == 4
 USE_BDB=	40
 .elif ${WITH_BDB_VER} != 3 && ${WITH_BDB_VER} != 41 && \
-      ${WITH_BDB_VER} != 42 && ${WITH_BDB_VER} != 43 && ${WITH_BDB_VER} != 44
-IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43 or 44"
+      ${WITH_BDB_VER} != 42 && ${WITH_BDB_VER} != 43 && \
+      ${WITH_BDB_VER} != 44 && ${WITH_BDB_VER} != 45 && ${WITH_BDB_VER} != 46
+IGNORE=		"cannot install: WITH_BDB_VER must be 3, 4, 41, 42, 43, 44, 45 or 46"
 .endif
 USE_BDB?=	${WITH_BDB_VER}
 CONFIGURE_ARGS+=--with-dblib=berkeley --with-bdb-libdir=${LOCALBASE}/lib \