git: 6c234366823b - main - mail/meta1: remove option BDB

The branch main has been updated by dinoex:

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

commit 6c234366823b250c67164057c6a41c1d1fc22a90
Author:     Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2022-02-28 09:21:51 +0000
Commit:     Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2022-02-28 09:21:51 +0000

    mail/meta1: remove option BDB
    
    PR: 262210
---
 mail/meta1/Makefile  | 16 +---------------
 mail/meta1/pkg-plist | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index d542a6ea2f51..c473eeef32bc 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -41,19 +41,17 @@ USERS=		meta1s meta1q meta1c meta1m meta1
 META1CONFDIR?=	${PREFIX}/etc/meta1
 NOLOGIN_CMD?=	/usr/sbin/nologin
 
-OPTIONS_DEFINE=	IPV6 BDB PMILTER DKIM MSP SASL2 SASL2AUTHD TLS DOCS
+OPTIONS_DEFINE=	IPV6 PMILTER DKIM MSP SASL2 SASL2AUTHD TLS DOCS
 OPTIONS_DEFAULT=	PMILTER DKIM SASL2 TLS
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 
-BDB_DESC=	External Berkeley DB support
 PMILTER_DESC=	Adds policy milter support
 DKIM_DESC=	Enable DKIM signing support
 MSP_DESC=	Enable mail submision program
 SASL2_DESC=	Adds SASL2 support
 SASL2AUTHD_DESC=	Enable plaintext authentication via SASL2
 
-BDB_USES=		bdb
 PMILTER_USES=		ssl
 PMILTER_CONFIGURE_ENABLE=	pmilter
 DKIM_CONFIGURE_ENABLE=	DKIM
@@ -74,18 +72,6 @@ TLS_LDFLAGS=		-L${LOCALBASE}/lib
 MAKE_ENV+=	MTA_NETINET6=1
 .endif
 
-.if ${PORT_OPTIONS:MBDB}
-BROKEN=		port version of Berkeley DB is not compatible
-INVALID_BDB_VER=	48 5 6
-CONFIGURE_ARGS+=	--disable-included-bdb
-CONFIGURE_ARGS+=	--with-bdb-incdir=${BDB_INCLUDE_DIR}
-CONFIGURE_ARGS+=	--with-bdb-libdir=${BDB_LIB_DIR}
-CONFIGURE_ARGS+=	--with-bdb-lib=${BDB_LIB_NAME}
-PLIST_SUB+=	WITH_BDBINT="@comment "
-.else
-PLIST_SUB+=	WITH_BDBINT=""
-.endif
-
 .if ${PORT_OPTIONS:MMSP}
 CONFLICTS+=	courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* sendmail-*
 .endif
diff --git a/mail/meta1/pkg-plist b/mail/meta1/pkg-plist
index 4239c123e399..ab060dfda02c 100644
--- a/mail/meta1/pkg-plist
+++ b/mail/meta1/pkg-plist
@@ -1,16 +1,16 @@
-%%WITH_BDBINT%%bin/db_archive
-%%WITH_BDBINT%%bin/db_checkpoint
-%%WITH_BDBINT%%bin/db_deadlock
-%%WITH_BDBINT%%bin/db_dump
-%%WITH_BDBINT%%bin/db_load
-%%WITH_BDBINT%%bin/db_printlog
-%%WITH_BDBINT%%bin/db_recover
-%%WITH_BDBINT%%bin/db_stat
-%%WITH_BDBINT%%bin/db_upgrade
-%%WITH_BDBINT%%bin/db_verify
-%%WITH_BDBINT%%include/db.h
-%%WITH_BDBINT%%lib/libdb-4.3.a
-%%WITH_BDBINT%%lib/libdb.a
+bin/db_archive
+bin/db_checkpoint
+bin/db_deadlock
+bin/db_dump
+bin/db_load
+bin/db_printlog
+bin/db_recover
+bin/db_stat
+bin/db_upgrade
+bin/db_verify
+include/db.h
+lib/libdb-4.3.a
+lib/libdb.a
 bin/createmap
 bin/log2time
 bin/mailq