git: dbd3f8a1541e - main - mail/cyrus-imapd25: disable BDB option by default and back to not force db18

The branch main has been updated by ume:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dbd3f8a1541ea056c29567e1d896de4725a2a99e

commit dbd3f8a1541ea056c29567e1d896de4725a2a99e
Author:     Hajimu UMEMOTO <ume@FreeBSD.org>
AuthorDate: 2024-06-15 14:38:55 +0000
Commit:     Hajimu UMEMOTO <ume@FreeBSD.org>
CommitDate: 2024-06-15 14:44:32 +0000

    mail/cyrus-imapd25: disable BDB option by default and back to not force db18
    
    PR:             279145
    Requested by:   des
---
 UPDATING                    | 12 ++++++++++++
 mail/cyrus-imapd25/Makefile |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/UPDATING b/UPDATING
index 7dc496c8d4e7..e5c1d67e5baf 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20240615:
+  AFFECTS: mail/cyrus-imapd25
+  AUTHOR: ume@FreeBSD.org
+
+  The BDB option is disabled by default.
+
+  If you are using the berkeley cyrusdb backend, we strongly recommend
+  that you switch to something other than the berkeley cyrusdb
+  backend.  If you want to continue using the berkeley cyrusdb
+  backend, build the cyrus-imapd25 port yourself with the BDB option
+  enabled.
+
 20240613:
   AFFECTS: multimedia/audacios and multimedia/audacious-plugins
   AUTHOR: madpilot@FreeBSD.org
diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index 97af828beee0..1811ed1c7500 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.5.17
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	25
@@ -44,11 +44,11 @@ CPE_PRODUCT=	cyrus_imap_server
 OPTIONS_DEFINE=		AUTOCREATE BDB CLAMAV HTTP IDLED LDAP MURDER MYSQL \
 			NETSCAPEHACK NNTP PGSQL REPLICATION SNMP SQLITE DOCS \
 			EXAMPLES
-OPTIONS_DEFAULT=	BDB IDLED
+OPTIONS_DEFAULT=	IDLED
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
 AUTOCREATE_CONFIGURE_ENABLE=	autocreate
-BDB_USES=		bdb:18
+BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${LOCALBASE}/lib
 CLAMAV_DESC=		Use ClamAV