git: aa62780e1425 - main - net/samba423: add LMDB selection options (LMDB0 / LMDB1)

The branch main has been updated by kiwi:

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

commit aa62780e1425ec932215cdf99638a0d3a58d315f
Author:     Jordan Ostreff <jordan@ostreff.info>
AuthorDate: 2026-10-07 03:06:45 +0000
Commit:     Xavier Beaudouin <kiwi@FreeBSD.org>
CommitDate: 2026-10-07 03:08:57 +0000

    net/samba423: add LMDB selection options (LMDB0 / LMDB1)
    
    This patch introduces a new radio option group (LMDBG1) allowing
    users to select between LMDB 0.9 (databases/lmdb0) and LMDB 1.0
    (databases/lmdb), following the pattern used in mail/postfix.
    
    Summary of changes:
    - Introduced LMDBG1 radio option group with LMDB0 and LMDB1 choices.
    - Added LMDB0 to OPTIONS_DEFAULT to preserve existing default behavior.
    - Updated _LMDB_DEPDENDS for AD_DC / DEVELOPER builds to depend on
      databases/lmdb when LMDB1 is selected, defaulting to databases/lmdb0.
    - Guarded FORTIFY_UNSAFE with .ifnmake portclippy to prevent portclippy
      warnings.
    
    Inspired by mail/postfix workaround of the problem with LMDB.
    
    PR:     299147
    Approved by:    samba (kiwi)
---
 net/samba423/Makefile | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/net/samba423/Makefile b/net/samba423/Makefile
index 81b1c705bc1f..c5e8a7c76824 100644
--- a/net/samba423/Makefile
+++ b/net/samba423/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=			samba423
 DISTVERSION=			4.23.13
-PORTREVISION=			0
+PORTREVISION=			1
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			samba-${DISTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
@@ -124,7 +124,9 @@ CFLAGS+=			${_CFLAGS_${CHOSEN_COMPILER_TYPE}}
 _CFLAGS_clang=			-fno-color-diagnostics
 .endif
 CONFIGURE_ENV+=			NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
+.ifnmake portclippy
 FORTIFY_UNSAFE=			yes
+.endif
 MAKE_ENV+=			NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
 # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
 CFLAGS_amd64+=			-fno-omit-frame-pointer
@@ -179,13 +181,15 @@ PORTDOCS=			README.FreeBSD
 OPTIONS_DEFINE=			AD_DC ADS CLUSTER CUPS DOCS FAM LDAP GPGME \
 				MANPAGES PROFILE PYTHON3 QUOTAS \
 				SYSLOG UTMP
-OPTIONS_DEFAULT=		AD_DC ADS DOCS FAM LDAP MANPAGES \
-				PROFILE PYTHON3 QUOTAS SYSLOG UTMP \
-				FRUIT GSSAPI_BUILTIN AVAHI
+OPTIONS_DEFAULT=		AD_DC ADS AVAHI DOCS FAM FRUIT GSSAPI_BUILTIN \
+				LDAP LMDB0 MANPAGES PROFILE PYTHON3 QUOTAS \
+				SYSLOG UTMP
 OPTIONS_GROUP=			BUNDLED_DEPS DEVELOPMENT VFS
 OPTIONS_GROUP_BUNDLED_DEPS=	BUNDLED_CMOCKA BUNDLED_TALLOC BUNDLED_TDB BUNDLED_TEVENT
 OPTIONS_GROUP_DEVELOPMENT=	DEVELOPER MEMORY_DEBUG TEST
 OPTIONS_GROUP_VFS=		FRUIT GLUSTERFS
+OPTIONS_RADIO=			LMDBG1
+OPTIONS_RADIO_LMDBG1=		LMDB0 LMDB1
 OPTIONS_SINGLE=			GSSAPI ZEROCONF
 OPTIONS_SINGLE_GSSAPI=		GSSAPI_BUILTIN GSSAPI_MIT
 OPTIONS_SINGLE_ZEROCONF=	ZEROCONF_NONE AVAHI MDNSRESPONDER
@@ -207,6 +211,9 @@ GLUSTERFS_DESC=			GlusterFS support
 GPGME_DESC=			GpgME support
 GSSAPI_BUILTIN_DESC=		GSSAPI support via bundled Heimdal
 LDAP_DESC=			LDAP client
+LMDB0_DESC=			Use LMDB 0.9 library
+LMDB1_DESC=			Use LMDB 1.0 library
+LMDBG1_DESC=			LMDB version to use
 MEMORY_DEBUG_DESC=		Debug memory allocator
 PROFILE_DESC=			Profiling data
 QUOTAS_DESC=			Disk quota support
@@ -430,7 +437,11 @@ _BUNDLED_LIBS+=			${"${PORT_OPTIONS:MBUNDLED_TDB}" == "BUNDLED_TDB":?:!}pytdb
 .if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != powerpc && ${ARCH} != powerpcspe
 .	if (${PORT_OPTIONS:MAD_DC} || ${PORT_OPTIONS:MDEVELOPER})
 # LMDB
+.		if ${PORT_OPTIONS:MLMDB1}
+_LMDB_DEPDENDS=			lmdb>=1.0:databases/lmdb
+.		else
 _LMDB_DEPDENDS=			lmdb0>=0.9.16:databases/lmdb0
+.		endif
 PLIST_FILES+=			${SAMBA_LIBDIR}/private/libldb-mdb-int-private-samba.so \
 				${SAMBA_LDB_MODULESDIR}/mdb.so
 .	endif