git: 11fe0a329a41 - main - samba.mk: Set SAMBA_LDB_MODULESDIR to ${_SAMBA_BASE}/lib/shared-modules/ldb

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

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

commit 11fe0a329a41ba97934a0d74e4402fb11150f72c
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2025-12-10 22:26:50 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2025-12-10 22:29:53 +0000

    samba.mk: Set SAMBA_LDB_MODULESDIR to ${_SAMBA_BASE}/lib/shared-modules/ldb
    
    This is the path that's actually required in the build of Samba 4.22
    with default options.
    
    Also, make sure to use _SAMBA_BASE instead of LOCALBASE or PREFIX here.
---
 Mk/Uses/samba.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk
index ca41232a6e6f..f9fcddfd04e6 100644
--- a/Mk/Uses/samba.mk
+++ b/Mk/Uses/samba.mk
@@ -32,16 +32,11 @@ _SAMBA_BASE=	${PREFIX}
 .  endif
 
 ### Directories
-SAMBA_LDB_MODULESDIR_416=	${LOCALBASE}/lib/shared-modules/ldb
-SAMBA_LDB_MODULESDIR_419=	${LOCALBASE}/lib/shared-modules/ldb
-SAMBA_LDB_MODULESDIR_420=	${LOCALBASE}/lib/shared-modules/ldb
-SAMBA_LDB_MODULESDIR_422=	${SAMBA_MODULESDIR}/ldb
-
 SAMBA_INCLUDEDIR=	${_SAMBA_BASE}/include/samba4
 SAMBA_LIBDIR=		${_SAMBA_BASE}/lib/samba4
 SAMBA_MODULESDIR=	${SAMBA_LIBDIR}/modules
 SAMBA_IDMAP_MODULESDIR=	${SAMBA_MODULESDIR}/idmap
-SAMBA_LDB_MODULESDIR=	${SAMBA_LDB_MODULESDIR_${SAMBA_SUFFIX}}
+SAMBA_LDB_MODULESDIR=	${_SAMBA_BASE}/lib/shared-modules/ldb
 
 ### Port names
 SAMBA_PORT_416=		net/samba416