git: 236e11241172 - main - devel/talloc243: Update to 2.4.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 26 Aug 2025 16:45:39 UTC
The branch main has been updated by 0mp:
URL: https://cgit.FreeBSD.org/ports/commit/?id=236e11241172ea7240913159425049a3d31362f0
commit 236e11241172ea7240913159425049a3d31362f0
Author: Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2025-08-26 14:40:30 +0000
Commit: Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2025-08-26 16:44:03 +0000
devel/talloc243: Update to 2.4.3
- After the repocopy in the previous commit, update the port to version
2.4.3.
- Lint with portfmt and portclippy.
- Update CONFLICTS_INSTALL in other talloc* ports.
- Remove a patch file that on longer applied. It seems harmless to
remove it.
- Remove NO_COLOR-related settings. The port builds fine without those
and the reason for their presence is unclear. Let's drop them.
PR: 287985
Reported by: Andrej Ebert <andrej@ebert.su>
Sponsored by: Klara, Inc.
---
devel/Makefile | 1 +
devel/talloc242/Makefile | 4 +-
devel/talloc243/Makefile | 91 ++++++++++------------
devel/talloc243/distinfo | 6 +-
.../patch-buildtools_wafsamba_samba__autoconf.py | 35 ---------
5 files changed, 49 insertions(+), 88 deletions(-)
diff --git a/devel/Makefile b/devel/Makefile
index dcb808363927..9f1e567993cf 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -8298,6 +8298,7 @@
SUBDIR += tailor
SUBDIR += talloc
SUBDIR += talloc242
+ SUBDIR += talloc243
SUBDIR += task
SUBDIR += taskctl
SUBDIR += taskflow
diff --git a/devel/talloc242/Makefile b/devel/talloc242/Makefile
index 456bd27bd165..17c57e136348 100644
--- a/devel/talloc242/Makefile
+++ b/devel/talloc242/Makefile
@@ -1,6 +1,6 @@
PORTNAME= talloc
DISTVERSION= 2.4.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= SAMBA
PKGNAMESUFFIX= 242
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --disable-rpath \
CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1
-CONFLICTS_INSTALL= talloc
+CONFLICTS_INSTALL= talloc talloc[0-9]*
OPTIONS_DEFINE= DEBUG MANPAGES PYTHON
OPTIONS_DEFAULT= MANPAGES PYTHON
diff --git a/devel/talloc243/Makefile b/devel/talloc243/Makefile
index 456bd27bd165..f9f5109e5509 100644
--- a/devel/talloc243/Makefile
+++ b/devel/talloc243/Makefile
@@ -1,70 +1,65 @@
-PORTNAME= talloc
-DISTVERSION= 2.4.2
-PORTREVISION= 2
-CATEGORIES= devel
-MASTER_SITES= SAMBA
-PKGNAMESUFFIX= 242
+PORTNAME= talloc
+DISTVERSION= 2.4.3
+CATEGORIES= devel
+MASTER_SITES= SAMBA
+PKGNAMESUFFIX= 243
-MAINTAINER= samba@FreeBSD.org
-COMMENT= Hierarchical pool based memory allocator
+MAINTAINER= samba@FreeBSD.org
+COMMENT= Hierarchical pool based memory allocator
WWW= https://talloc.samba.org/
-LICENSE= LGPL3
+LICENSE= LGPL3
-USES= compiler pkgconfig shebangfix waf
-USE_LDCONFIG= yes
-SHEBANG_GLOB= *.py
-WAF_CMD= buildtools/bin/waf
-CONFIGURE_LOG= bin/config.log
+USES= compiler pkgconfig shebangfix waf
+USE_LDCONFIG= yes
+WAF_CMD= buildtools/bin/waf
+SHEBANG_GLOB= *.py
+CONFIGURE_LOG= bin/config.log
-PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
-PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;^${PREFIX}/;;}
+PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
-CONFIGURE_ARGS+= --disable-rpath \
- --disable-rpath-install \
- --bundled-libraries=NONE \
- --builtin-libraries=replace \
- --without-gettext
-CONFIGURE_ENV= PYTHONHASHSEED=1
-MAKE_ENV= PYTHONHASHSEED=1
+CONFIGURE_ARGS+= --builtin-libraries=replace \
+ --bundled-libraries=NONE \
+ --disable-rpath \
+ --disable-rpath-install \
+ --without-gettext
+CONFIGURE_ENV= PYTHONHASHSEED=1
+MAKE_ENV= PYTHONHASHSEED=1
+# Some symbols in talloc'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
-CONFLICTS_INSTALL= talloc
+CONFLICTS_INSTALL= talloc talloc[0-9]*
-OPTIONS_DEFINE= DEBUG MANPAGES PYTHON
-OPTIONS_DEFAULT= MANPAGES PYTHON
-OPTIONS_SUB= yes
+PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;^${PREFIX}/;;}
-DEBUG_CFLAGS= -g -ggdb3 -O0
-DEBUG_CONFIGURE_ON= --verbose --enable-debug
-DEBUG_MAKE_ARGS= --verbose
+OPTIONS_DEFINE= DEBUG MANPAGES PYTHON
+OPTIONS_DEFAULT= MANPAGES PYTHON
+OPTIONS_SUB= yes
-PYTHON_USES= gettext-runtime python
-PYTHON_USES_OFF= python:build,test
-PYTHON_CONFIGURE_OFF= --disable-python
+DEBUG_CONFIGURE_ON= --enable-debug \
+ --verbose
+DEBUG_MAKE_ARGS= --verbose
+DEBUG_CFLAGS= -g -ggdb3 -O0
-MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
xsltproc:textproc/libxslt
MANPAGES_CONFIGURE_ENV_OFF= XSLTPROC="false"
-# No fancy color error messages
-CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}}
-CFLAGS_clang= -fno-color-diagnostics
-CONFIGURE_ENV+= NOCOLOR=yes
-MAKE_ENV+= NOCOLOR=yes
-# Some symbols in talloc'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
+PYTHON_USES= gettext-runtime python
+PYTHON_USES_OFF= python:build,test
+PYTHON_CONFIGURE_OFF= --disable-python
post-patch:
- @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
- ${BUILD_WRKSRC}/wscript
+ @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
+ ${BUILD_WRKSRC}/wscript
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalloc.so.2
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalloc.so.2
post-install-PYTHON-on:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util*.so
- ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc*.so
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util*.so
+ ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc*.so
.include <bsd.port.mk>
diff --git a/devel/talloc243/distinfo b/devel/talloc243/distinfo
index 21db59527faa..a70a5d6f4a7f 100644
--- a/devel/talloc243/distinfo
+++ b/devel/talloc243/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737641773
-SHA256 (talloc-2.4.2.tar.gz) = 85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6
-SIZE (talloc-2.4.2.tar.gz) = 679750
+TIMESTAMP = 1751442256
+SHA256 (talloc-2.4.3.tar.gz) = dc46c40b9f46bb34dd97fe41f548b0e8b247b77a918576733c528e83abd854dd
+SIZE (talloc-2.4.3.tar.gz) = 684092
diff --git a/devel/talloc243/files/patch-buildtools_wafsamba_samba__autoconf.py b/devel/talloc243/files/patch-buildtools_wafsamba_samba__autoconf.py
deleted file mode 100644
index 42607c1b5813..000000000000
--- a/devel/talloc243/files/patch-buildtools_wafsamba_samba__autoconf.py
+++ /dev/null
@@ -1,35 +0,0 @@
---- buildtools/wafsamba/samba_autoconf.py.orig 2019-09-03 13:59:55 UTC
-+++ buildtools/wafsamba/samba_autoconf.py
-@@ -573,7 +573,7 @@ def library_flags(self, libs):
-
-
- @conf
--def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
-+def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
- '''check if a set of libraries exist as system libraries
-
- returns the sublist of libs that do exist as a syslib or []
-@@ -593,11 +593,14 @@ int foo()
- ret.append(lib)
- continue
-
-+ if msg is None:
-+ msg = 'Checking for library %s' % lib
-+
- (ccflags, ldflags, cpppath) = library_flags(conf, lib)
- if shlib:
-- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+ res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg)
- else:
-- res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+ res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg)
-
- if not res:
- if mandatory:
-@@ -944,5 +947,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
- conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
-
- if (conf.env.undefined_ignore_ldflags == [] and
-- conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'])):
-+ conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS)):
- conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']