git: b86d9ca3650c - main - security/cyrus-sasl2{,-saslauthd}: add LMDB0 option on by default for backward compatibility

The branch main has been updated by ume:

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

commit b86d9ca3650cc874f0210b74d60b1a454f7ba048
Author:     Hajimu UMEMOTO <ume@FreeBSD.org>
AuthorDate: 2026-10-07 14:28:10 +0000
Commit:     Hajimu UMEMOTO <ume@FreeBSD.org>
CommitDate: 2026-10-07 14:28:49 +0000

    security/cyrus-sasl2{,-saslauthd}: add LMDB0 option on by default for backward compatibility
---
 security/cyrus-sasl2-saslauthd/Makefile | 6 +++---
 security/cyrus-sasl2/Makefile           | 7 ++++---
 security/cyrus-sasl2/Makefile.common    | 8 ++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index 4099ec8b4077..70f0ed1bdf55 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -13,10 +13,10 @@ USE_RC_SUBR=	saslauthd
 CYRUS_CONFIGURE_ARGS=	--with-saslauthd=${SASLAUTHD_RUNPATH}
 CONFIGURE_ENV+=		andrew_cv_runpath_switch=none
 
-OPTIONS_DEFINE=		DOCS HTTPFORM OPENLDAP SASLDB_IN_VAR
+OPTIONS_DEFINE=		DOCS HTTPFORM LMDB0 OPENLDAP SASLDB_IN_VAR
 OPTIONS_RADIO=		GSSAPI SASLDB
 OPTIONS_RADIO_SASLDB=	BDB1 BDB GDBM LMDB
-OPTIONS_DEFAULT=	BDB1
+OPTIONS_DEFAULT=	BDB1 LMDB0
 
 HTTPFORM_DESC=		Enable HTTP form authentication
 HTTPFORM_CONFIGURE_ENABLE=httpform
@@ -38,12 +38,12 @@ GDBM_CONFIGURE_ON=	--enable-auth-sasldb \
 			--with-dblib=gdbm \
 			--with-gdbm=${LOCALBASE}
 LMDB_DESC=		OpenLDAP Lightning Memory-Mapped Database support
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 LMDB_CONFIGURE_ON=	--enable-auth-sasldb \
 			--with-dblib=lmdb
 LMDB_CFLAGS=		-I${LOCALBASE}/include
 LMDB_LDFLAGS=		-L${LOCALBASE}/lib
 # LMDB_IMPLIES=		SASLDB_IN_VAR
+LMDB0_DESC=		Use LMDB 0.9 library
 SASLDB_IN_VAR_DESC=	sasldb in /var/db/sasl2
 
 .if exists(/usr/lib/libkrb5.a)
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index e904836080b8..14a6fbdea203 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -9,7 +9,7 @@ USE_PERL5=	patch
 CYRUS_CONFIGURE_ARGS=	--with-saslauthd=${SASLAUTHD_RUNPATH}
 
 NO_OPTIONS_SORT=	yes
-OPTIONS_DEFINE=		ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \
+OPTIONS_DEFINE=		ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN LMDB0 \
 			OBSOLETE_CRAM_ATTR OBSOLETE_DIGEST_ATTR \
 			OPIE SASLDB_IN_VAR
 OPTIONS_RADIO=		SASLDB
@@ -17,7 +17,8 @@ OPTIONS_RADIO_SASLDB=	BDB1 BDB GDBM LMDB
 OPTIONS_GROUP=		PLUGIN
 OPTIONS_GROUP_PLUGIN=	ANONYMOUS CRAM DIGEST LOGIN NTLM OTP PLAIN SCRAM
 OPTIONS_DEFAULT=	ANONYMOUS AUTHDAEMOND BDB1 OBSOLETE_CRAM_ATTR CRAM \
-			OBSOLETE_DIGEST_ATTR DIGEST LOGIN NTLM OTP PLAIN SCRAM
+			OBSOLETE_DIGEST_ATTR DIGEST LMDB0 LOGIN NTLM OTP \
+			PLAIN SCRAM
 OPTIONS_SUB=		yes
 ALWAYSTRUE_DESC=	Alwaystrue password verifier (discouraged)
 ALWAYSTRUE_CONFIGURE_ENABLE=alwaystrue
@@ -42,11 +43,11 @@ GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ON=	--with-dblib=gdbm \
 			--with-gdbm=${LOCALBASE}
 LMDB_DESC=		OpenLDAP Lightning Memory-Mapped Database support
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb0
 LMDB_CONFIGURE_ON=	--with-dblib=lmdb
 LMDB_CFLAGS=		-I${LOCALBASE}/include
 LMDB_LDFLAGS=		-L${LOCALBASE}/lib
 # LMDB_IMPLIES=		SASLDB_IN_VAR
+LMDB0_DESC=		Use LMDB 0.9 library
 SASLDB_IN_VAR_DESC=	sasldb in /var/db/sasl2
 ANONYMOUS_DESC=			ANONYMOUS authentication
 ANONYMOUS_CONFIGURE_ENABLE=	anon
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index 37f37cc2dbc8..07af0e1f44b9 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -83,6 +83,14 @@ CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 CPPFLAGS+=	-fPIC
 .endif
 
+.if ${PORT_OPTIONS:MLMDB}
+.if ${PORT_OPTIONS:MLMDB0}
+LIB_DEPENDS+=	liblmdb.so.0:databases/lmdb0
+.else
+LIB_DEPENDS+=	liblmdb.so.1:databases/lmdb
+.endif
+.endif
+
 .if ${PORT_OPTIONS:MSASLDB_IN_VAR}
 SASLDB_DIR=	/var/db/sasl2
 .else