git: bfeb5c7e28b9 - main - net/samba423: Golf PKGCONFIGDIR into _SAMBA_SUB

From: Mateusz Piotrowski <0mp_at_FreeBSD.org>
Date: Tue, 16 Dec 2025 11:04:46 UTC
The branch main has been updated by 0mp:

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

commit bfeb5c7e28b95c8a6e62da712a8a974855c8bcd2
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2025-12-16 09:45:44 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2025-12-16 11:03:07 +0000

    net/samba423: Golf PKGCONFIGDIR into _SAMBA_SUB
---
 net/samba423/Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/net/samba423/Makefile b/net/samba423/Makefile
index 1abb8c7136a0..ea76af30ae79 100644
--- a/net/samba423/Makefile
+++ b/net/samba423/Makefile
@@ -162,8 +162,7 @@ EXTRA_PATCHES=			\
 				${PATCHDIR}/0028-s3-lib-system-add-FreeBSD-proc_fd_pattern.patch \
 
 SUB_FILES=			pkg-message README.FreeBSD
-SUB_LIST=			PKGCONFIGDIR=${_PKGCONFIGDIR_REL} \
-				${_SAMBA_SUB}
+SUB_LIST=			${_SAMBA_SUB}
 
 # PLIST must be defined here explicitly as we append to PLIST later on to
 # handle extra pkg-plist files like pkg-plist.python.
@@ -172,8 +171,7 @@ PLIST_DIRS=			${SAMBA_MODULESDIR} \
 				${_MODULE_CLASSES:S|^|${SAMBA_MODULESDIR}/|}
 # ":C|_|/|:C|-|_|" is a workaround for turning "nss-info_*" modules into "nss_info/*".
 PLIST_FILES+=			${_SHARED_MODULES:C|_|/|:C|-|_|:S|^|${SAMBA_MODULESDIR}/|:S|$|.so|}
-PLIST_SUB=			PKGCONFIGDIR=${_PKGCONFIGDIR_REL} \
-				${_SAMBA_SUB}
+PLIST_SUB=			${_SAMBA_SUB}
 PORTDOCS=			README.FreeBSD
 
 OPTIONS_DEFINE=			AD_DC ADS CLUSTER CUPS DOCS FAM LDAP GPGME \
@@ -398,7 +396,8 @@ _SHARED_MODULES+=		vfs_acl_tdb vfs_acl_xattr vfs_aio_fork vfs_aio_pthread \
 				vfs_widelinks vfs_worm vfs_xattr_tdb vfs_zfsacl
 
 _SAMBA_MAJVERNAME=		samba4
-_SAMBA_SUB=			SAMBA4_LOGDIR="${_LOGDIR}" \
+_SAMBA_SUB=			PKGCONFIGDIR=${_PKGCONFIGDIR_REL} \
+				SAMBA4_LOGDIR="${_LOGDIR}" \
 				SAMBA4_RUNDIR="${_RUNDIR}" \
 				SAMBA4_LOCKDIR="${_LOCKDIR}" \
 				SAMBA4_LIBDIR="${SAMBA_LIBDIR}" \