git: 58a89f8418da - main - net/samba422: Sort some more variables
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Dec 2025 22:31:16 UTC
The branch main has been updated by 0mp:
URL: https://cgit.FreeBSD.org/ports/commit/?id=58a89f8418daedd8884287750ba5b7d4c7d9e15d
commit 58a89f8418daedd8884287750ba5b7d4c7d9e15d
Author: Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2025-12-10 22:26:58 +0000
Commit: Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2025-12-10 22:30:01 +0000
net/samba422: Sort some more variables
No functional changes intended.
---
net/samba422/Makefile | 162 +++++++++++++++++++++++---------------------------
1 file changed, 76 insertions(+), 86 deletions(-)
diff --git a/net/samba422/Makefile b/net/samba422/Makefile
index 64366265665f..77c1b8d0bf81 100644
--- a/net/samba422/Makefile
+++ b/net/samba422/Makefile
@@ -12,41 +12,11 @@ WWW= https://gitlab.com/samba-freebsd/
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS_INSTALL?= samba4*
-
-EXTRA_PATCHES= \
- ${PATCHDIR}/0001-Compact-and-simplify-modules-build-and-config-genera.patch:-p1 \
- ${PATCHDIR}/0002-Adjust-abi_gen.sh-script-to-run-under-FreeBSD-with-i.patch:-p1 \
- ${PATCHDIR}/0003-Mask-CLang-prototype-warnings-in-kadm5-admin.h.patch:-p1 \
- ${PATCHDIR}/0004-On-FreeBSD-date-1-has-different-semantics-than-on-Li.patch:-p1 \
- ${PATCHDIR}/0005-Include-jemalloc-jemalloc.h-if-ENABLE_JEMALLOC-is-se.patch:-p1 \
- ${PATCHDIR}/0006-Install-nss_-modules-into-PAMMODULESDIR-path.patch:-p1 \
- ${PATCHDIR}/0007-Use-macro-value-as-a-default-backlog-size-for-the-li.patch:-p1 \
- ${PATCHDIR}/0008-Brute-force-work-around-usage-of-Linux-specific-m-fl.patch:-p1 \
- ${PATCHDIR}/0009-Make-sure-that-config-checks-fail-if-the-warning-is-.patch:-p1 \
- ${PATCHDIR}/0010-Add-option-with-pkgconfigdir-to-specify-alternative-.patch:-p1 \
- ${PATCHDIR}/0011-Use-provided-by-port-location-of-the-XML-catalog.patch:-p1 \
- ${PATCHDIR}/0012-Create-shared-libraries-according-to-the-FreeBSD-spe.patch:-p1 \
- ${PATCHDIR}/0014-Add-option-to-disable-CTDB-tests-failing-on-FreeBSD-.patch:-p1 \
- ${PATCHDIR}/0015-Add-extra-debug-class-to-trck-down-DB-locking-code.patch:-p1 \
- ${PATCHDIR}/0016-Make-ldb_schema_attribute_compare-a-stable-comparisi.patch:-p1 \
- ${PATCHDIR}/0017-Use-arc4random-when-available-to-generate-random-tal.patch:-p1 \
- ${PATCHDIR}/0018-Add-configuration-option-that-allows-to-choose-alter.patch:-p1 \
- ${PATCHDIR}/0019-From-923bc7a1afeb0b920e60e14846987ae1d2d7dca4-Mon-Se.patch:-p1 \
- ${PATCHDIR}/0020-FreeBSD-12-between-r336017-and-r342928-wrongfuly-ret.patch:-p1 \
- ${PATCHDIR}/0021-Fix-casting-warnings-in-the-nfs_quota-debug-message.patch:-p1 \
- ${PATCHDIR}/0022-Clean-up-UTMP-handling-code-and-add-FreeBSD-support..patch:-p1 \
- ${PATCHDIR}/0023-Add-cmd_get_quota-test-function-into-vfstest-to-test.patch:-p1 \
- ${PATCHDIR}/0025-From-d9b748869a8f4018ebee302aae8246bf29f60309-Mon-Se.patch:-p1 \
- ${PATCHDIR}/0028-s3-lib-system-add-FreeBSD-proc_fd_pattern.patch \
-
SAMBA4_BASENAME= samba
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
SAMBA4_VERSION= 4.22.6
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
-CPE_VENDOR= samba
-CPE_PRODUCT= samba
# Directories
VARDIR= ${DESTDIR}/var
SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME}
@@ -63,6 +33,20 @@ SAMBA4_CONFIG= smb4.conf
SAMBA4_MODULES_CLASS= auth bind9 gensec gpext idmap ldb nss_info \
pdb perfcount process_model service vfs
+USES= cpe compiler:c++11-lang iconv localbase:ldflags \
+ perl5 pkgconfig shebangfix waf gettext-runtime \
+ samba:self
+CPE_VENDOR= samba
+CPE_PRODUCT= samba
+USE_LDCONFIG= ${SAMBA4_LIBDIR}
+USE_PERL5= build
+USE_RC_SUBR= samba_server
+WAF_CMD= buildtools/bin/waf
+# Make sure that the right version of Python is used by the tools
+# https://bugzilla.samba.org/show_bug.cgi?id=7305
+SHEBANG_FILES= source3/script* source4/scripting/bin/* selftest/*
+
+CONFIGURE_LOG= bin/config.log
CONFIGURE_ARGS= --mandir="${PREFIX}/share/man" \
--sysconfdir="${SAMBA4_CONFDIR}" \
--includedir="${SAMBA4_INCLUDEDIR}" \
@@ -83,31 +67,80 @@ CONFIGURE_ARGS= --mandir="${PREFIX}/share/man" \
--with-bind-dns-dir=${SAMBA4_BINDDNSDIR} \
--with-privatedir="${SAMBA4_PRIVATEDIR}" \
--with-logfilebase="${SAMBA4_LOGDIR}"
-# XXX: Flags
+CONFIGURE_ARGS+= \
+ --with-pam \
+ --with-iconv \
+ --with-libiconv="${ICONV_PREFIX}" \
+ --with-winbind \
+ --with-regedit \
+ --disable-rpath \
+ --without-lttng \
+ --without-gettext \
+ --enable-pthreadpool \
+ --without-fake-kaserver \
+ --without-systemd \
+ --with-libarchive \
+ --with-acl-support \
+ --with-sendfile-support \
+ --disable-ctdb-tests \
+ --disable-spotlight
CONFIGURE_ENV= PTHREAD_LDFLAGS="-lpthread" \
PYTHONHASHSEED=1
-MAKE_ENV= PYTHONHASHSEED=1
+MAKE_ENV= PYTHONHASHSEED=1 \
+ RPCGEN_CPP="${CPP}"
-USES= cpe compiler:c++11-lang iconv localbase:ldflags \
- perl5 pkgconfig shebangfix waf gettext-runtime \
- samba:self
-USE_PERL5= build
-USE_LDCONFIG= ${SAMBA4_LIBDIR}
-WAF_CMD= buildtools/bin/waf
-CONFIGURE_LOG= bin/config.log
+# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
+CFLAGS_amd64+= -fno-omit-frame-pointer
+# No fancy color error messages
+CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}}
+CFLAGS_clang= -fno-color-diagnostics
+CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
+MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
+# Some symbols in samba's linker version scripts are not defined, but since the
+# scripts are generated dynamically, suppress errors with lld >= 17 due to these
+# undefined symbols.
+LDFLAGS+= -Wl,--undefined-version
-# Make sure that the right version of Python is used by the tools
-# https://bugzilla.samba.org/show_bug.cgi?id=7305
-SHEBANG_FILES= source3/script* source4/scripting/bin/* selftest/*
+CONFLICTS_INSTALL?= samba4*
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,}
-PLIST_SUB= PKGCONFIGDIR=${PKGCONFIGDIR_REL}
+
+EXTRA_PATCHES= \
+ ${PATCHDIR}/0001-Compact-and-simplify-modules-build-and-config-genera.patch:-p1 \
+ ${PATCHDIR}/0002-Adjust-abi_gen.sh-script-to-run-under-FreeBSD-with-i.patch:-p1 \
+ ${PATCHDIR}/0003-Mask-CLang-prototype-warnings-in-kadm5-admin.h.patch:-p1 \
+ ${PATCHDIR}/0004-On-FreeBSD-date-1-has-different-semantics-than-on-Li.patch:-p1 \
+ ${PATCHDIR}/0005-Include-jemalloc-jemalloc.h-if-ENABLE_JEMALLOC-is-se.patch:-p1 \
+ ${PATCHDIR}/0006-Install-nss_-modules-into-PAMMODULESDIR-path.patch:-p1 \
+ ${PATCHDIR}/0007-Use-macro-value-as-a-default-backlog-size-for-the-li.patch:-p1 \
+ ${PATCHDIR}/0008-Brute-force-work-around-usage-of-Linux-specific-m-fl.patch:-p1 \
+ ${PATCHDIR}/0009-Make-sure-that-config-checks-fail-if-the-warning-is-.patch:-p1 \
+ ${PATCHDIR}/0010-Add-option-with-pkgconfigdir-to-specify-alternative-.patch:-p1 \
+ ${PATCHDIR}/0011-Use-provided-by-port-location-of-the-XML-catalog.patch:-p1 \
+ ${PATCHDIR}/0012-Create-shared-libraries-according-to-the-FreeBSD-spe.patch:-p1 \
+ ${PATCHDIR}/0014-Add-option-to-disable-CTDB-tests-failing-on-FreeBSD-.patch:-p1 \
+ ${PATCHDIR}/0015-Add-extra-debug-class-to-trck-down-DB-locking-code.patch:-p1 \
+ ${PATCHDIR}/0016-Make-ldb_schema_attribute_compare-a-stable-comparisi.patch:-p1 \
+ ${PATCHDIR}/0017-Use-arc4random-when-available-to-generate-random-tal.patch:-p1 \
+ ${PATCHDIR}/0018-Add-configuration-option-that-allows-to-choose-alter.patch:-p1 \
+ ${PATCHDIR}/0019-From-923bc7a1afeb0b920e60e14846987ae1d2d7dca4-Mon-Se.patch:-p1 \
+ ${PATCHDIR}/0020-FreeBSD-12-between-r336017-and-r342928-wrongfuly-ret.patch:-p1 \
+ ${PATCHDIR}/0021-Fix-casting-warnings-in-the-nfs_quota-debug-message.patch:-p1 \
+ ${PATCHDIR}/0022-Clean-up-UTMP-handling-code-and-add-FreeBSD-support..patch:-p1 \
+ ${PATCHDIR}/0023-Add-cmd_get_quota-test-function-into-vfstest-to-test.patch:-p1 \
+ ${PATCHDIR}/0025-From-d9b748869a8f4018ebee302aae8246bf29f60309-Mon-Se.patch:-p1 \
+ ${PATCHDIR}/0028-s3-lib-system-add-FreeBSD-proc_fd_pattern.patch \
+
+SUB_FILES= pkg-message README.FreeBSD
SUB_LIST= PKGCONFIGDIR=${PKGCONFIGDIR_REL}
# PLIST must be defined here explicitly as we append to PLIST later on to
# handle extra pkg-plist files like pkg-plist.python.
PLIST?= ${PKGDIR}/pkg-plist
+PLIST_SUB= PKGCONFIGDIR=${PKGCONFIGDIR_REL}
+PORTDOCS= README.FreeBSD
+
##############################################################################
OPTIONS_DEFINE= AD_DC ADS CLUSTER CUPS DOCS FAM LDAP GPGME \
MANPAGES PROFILE PYTHON3 QUOTAS \
@@ -263,27 +296,6 @@ TEST_DEPENDS= bash:shells/bash \
# External Python modules
TEST_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
TEST_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
-##############################################################################
-CONFIGURE_ARGS+= \
- --with-pam \
- --with-iconv \
- --with-libiconv="${ICONV_PREFIX}" \
- --with-winbind \
- --with-regedit \
- --disable-rpath \
- --without-lttng \
- --without-gettext \
- --enable-pthreadpool \
- --without-fake-kaserver \
- --without-systemd \
- --with-libarchive \
- --with-acl-support \
- --with-sendfile-support \
- --disable-ctdb-tests \
- --disable-spotlight
-# ${ICONV_CONFIGURE_BASE}
-##############################################################################
-
##############################################################################
MEMORY_DEBUG_IMPLIES= DEBUG
MEMORY_DEBUG_CONFIGURE_ENV= ADDITIONAL_CFLAGS="-DENABLE_JEMALLOC `pkg-config --cflags jemalloc`" ADDITIONAL_LDFLAGS="`pkg-config --libs jemalloc`"
@@ -477,23 +489,6 @@ PLIST_FILES+= ${SAMBA4_LIBDIR}/private/libldb-mdb-int-private-samba.so \
. endif
.endif
-# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
-CFLAGS_amd64+= -fno-omit-frame-pointer
-# No fancy color error messages
-CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}}
-CFLAGS_clang= -fno-color-diagnostics
-CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
-MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
-# Allow rpcgen to find proper CPP
-MAKE_ENV+= RPCGEN_CPP="${CPP}"
-#.if ${readline_ARGS} == port
-#CFLAGS+= -D_FUNCTION_DEF
-#.endif
-# Some symbols in samba's linker version scripts are not defined, but since the
-# scripts are generated dynamically, suppress errors with lld >= 17 due to these
-# undefined symbols.
-LDFLAGS+= -Wl,--undefined-version
-
SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \
SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \
@@ -509,11 +504,6 @@ SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
PLIST_SUB+= ${SAMBA4_SUB}
SUB_LIST+= ${SAMBA4_SUB}
-USE_RC_SUBR= samba_server
-SUB_FILES= pkg-message README.FreeBSD
-
-PORTDOCS= README.FreeBSD
-
post-extract:
@${RM} -r ${WRKSRC}/pidl/lib/Parse/Yapp