git: 5c84f1f2623c - main - net/samba422: Clean up handling of Python bindings

From: Mateusz Piotrowski <0mp_at_FreeBSD.org>
Date: Wed, 10 Dec 2025 22:31:14 UTC
The branch main has been updated by 0mp:

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

commit 5c84f1f2623cbb6ca04547e7f8f750cc17860641
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2025-12-10 22:26:57 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2025-12-10 22:30:00 +0000

    net/samba422: Clean up handling of Python bindings
    
    No functional changes intended.
---
 net/samba422/Makefile | 45 ++++++++++++++-------------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/net/samba422/Makefile b/net/samba422/Makefile
index 12529c5ce642..67669cbcd9b0 100644
--- a/net/samba422/Makefile
+++ b/net/samba422/Makefile
@@ -371,6 +371,20 @@ MDNSRESPONDER_VARS=		SAMBA4_SERVICES+=mdnsd
 
 PROFILE_CONFIGURE_WITH=		profiling-data
 
+PYTHON3_USES=			python
+PYTHON3_USES_OFF=		python:build,test
+# Don't cache Python modules
+PYTHON3_CONFIGURE_ON=		--nopycache
+# Use PYTHON3_CONFIGURE_OFF instead of PYTHON3_CONFIGURE_ENABLE=python because
+# Samba's configure script does not recognize --enable-python.
+PYTHON3_CONFIGURE_OFF=		--disable-python
+PYTHON3_MAKE_ENV=		PYTHONDONTWRITEBYTECODE=1
+PYTHON3_VARS=			PLIST+=${PKGDIR}/pkg-plist.python \
+				SAMBA4_BUNDLED_LIBS+=${"${SAMBA4_BUNDLED_TALLOC:Myes}" == "yes":?:!}pytalloc-util \
+				SAMBA4_BUNDLED_LIBS+=${"${SAMBA4_BUNDLED_TEVENT:Myes}" == "yes":?:!}pytevent \
+				SAMBA4_BUNDLED_LIBS+=${"${SAMBA4_BUNDLED_TDB:Myes}" == "yes":?:!}pytdb \
+				SAMBA4_BUNDLED_LIBS+="pyldb pyldb-util"
+
 QUOTAS_CONFIGURE_WITH=		quotas
 
 SYSLOG_CONFIGURE_WITH=		syslog
@@ -415,37 +429,6 @@ SAMBA4_MODULES+=		auth_skel pdb_test gpext_security gpext_registry \
 				vfs_shadow_copy_test vfs_fake_acls \
 				vfs_nfs4acl_xattr vfs_error_inject vfs_delay_inject
 .endif
-# Python bindings
-.if ! ${PORT_OPTIONS:MPYTHON3}
-USES+=				python:build,test
-CONFIGURE_ARGS+=		--disable-python
-.else
-USES+=				python
-PLIST+=				${PKGDIR}/pkg-plist.python
-# Don't cache Python modules
-CONFIGURE_ARGS+=		--nopycache
-MAKE_ENV+=			PYTHONDONTWRITEBYTECODE=1
-
-.	if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
-SAMBA4_BUNDLED_LIBS+=		pytalloc-util
-.	else
-SAMBA4_BUNDLED_LIBS+=		!pytalloc-util
-.	endif
-
-.	if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
-SAMBA4_BUNDLED_LIBS+=		pytevent
-.	else
-SAMBA4_BUNDLED_LIBS+=		!pytevent
-.	endif
-
-.	if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
-SAMBA4_BUNDLED_LIBS+=		pytdb
-.	else
-SAMBA4_BUNDLED_LIBS+=		!pytdb
-.	endif
-
-SAMBA4_BUNDLED_LIBS+=		pyldb pyldb-util
-.endif
 
 .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
 SAMBA4_MODULES+=		${WANT_EXP_MODULES}