From nobody Tue Aug 26 16:45:44 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBD7D4J3hz65pZN; Tue, 26 Aug 2025 16:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBD7D2W4Sz3qd1; Tue, 26 Aug 2025 16:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756226744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PwgzP0ik0EVhcXqAsxAKzHFDHUdRQAz1vOYvKdcm5qU=; b=ThH/3X68ertR9wWx6A9sI2I3kX1f21B0O0l8HSwGkVROcEZz0k3TuO6U7ldYQic6+V4FfE FaZ9VxRabKzQ6kqpIYUDuGgSze7/Cr1Cbroc9zuNyB8suIYf17HqhCn2lCE7OUkt3RTRzI oPo6SIx4q/ilC8dOILRtgiQHxgcj10B/IxNLLguPfJiigpdUKitE0VuiGL22HMgrNKZTj+ /geLbnegyJHoEc90ZJoMTU1v7Wp/vN9pBc33xkhb1hLLqcb0vtPMCoWMnaWn7V2thbMszX gm0GZeDMjFxIiWzWEtPOJUyzIOauNHlqA9K0ahoEJzlXLezsw1jQBzeXkZ+jtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756226744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PwgzP0ik0EVhcXqAsxAKzHFDHUdRQAz1vOYvKdcm5qU=; b=UHjBY5uyP1h8ZWZKYVeNFySd+bwUtXgF4uSrNGVdDTXT/F1ZM6tP9Y1vwrsq3+z+KVPMWH 6M+DKZehY7o/K47zstLkPso2NfatVMwvaJwGBiUqBhVONbSf0/2MKOiMRs+a+QAlV7zzd/ A/LbcwefbZDM2SR5ZZk2Rl8Va3cV4YjxWWBy0hg+NmiIMVLgiw6iMdfpmIgazfRE1X7iZo kcuzYT+ouqQVZekOQNmmEhyvyQS4kscc3ps7Z8/sK3f51cnAwySv6CPKHpZbRU2BcAMrqP 4dBbO9cqUm/IjXmN0WQM3cYS0qNdknUGpGWzfXisYDr/RlFtwx3G74BNh6IVAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756226744; a=rsa-sha256; cv=none; b=GbrOxrk7whDpdb83LA8B7QbbHrIi4nVurROBcTTuGzUbwegFZshmHvYLG5Mqs8zlIH9miU Ize8ytFFviYCErI9McnnHq6eJsvq33zEt/eXg5FHTLGZN6k6p5zPr3QZKx7ncczOeJsxep WTBCZRA2rL1CU8V2M+yqwi9TgDYGZyxDkwAKApqq/2YqclQ7VvZmjD0F/09WRVnSDn20hb t0L+dvkQ3em4U2AT4+PesIBjw1IuAbB44E8x0TceoZwklJ/ez0nCrQkZvavk3XoGAFcZDW //C+IWDB6+KRc3G+wqMYfDZhvOyIHuDKRfjqP2MlsKdGerBR8s3bMyh0GTJibw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBD7D24HCzl17; Tue, 26 Aug 2025 16:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57QGji2C022721; Tue, 26 Aug 2025 16:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57QGjiof022718; Tue, 26 Aug 2025 16:45:44 GMT (envelope-from git) Date: Tue, 26 Aug 2025 16:45:44 GMT Message-Id: <202508261645.57QGjiof022718@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 7b7646260a63 - main - databases/tdb1413: Update to 1.4.13 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b7646260a63d35848d2a3c0bc25037b7361b460 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b7646260a63d35848d2a3c0bc25037b7361b460 commit 7b7646260a63d35848d2a3c0bc25037b7361b460 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-08-26 15:54:01 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-08-26 16:44:03 +0000 databases/tdb1413: Update to 1.4.13 - Lint with portclippy and portfmt. - Remove unnecessary NO_COLOR-related settings. It is not clear what the purpose of those really is nowadays. - Update CONFLICTS_INSTALL in databases/tdb1410. PR: 287985 Reported by: Andrej Ebert Sponsored by: Klara, Inc. --- databases/Makefile | 1 + databases/tdb1410/Makefile | 4 +- databases/tdb1413/Makefile | 96 +++++++++++----------- databases/tdb1413/distinfo | 6 +- .../patch-buildtools_wafsamba_samba__autoconf.py | 35 -------- 5 files changed, 52 insertions(+), 90 deletions(-) diff --git a/databases/Makefile b/databases/Makefile index ffc50810e604..4c7bc1198675 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1113,6 +1113,7 @@ SUBDIR += tcl-sqlite3 SUBDIR += tdb SUBDIR += tdb1410 + SUBDIR += tdb1413 SUBDIR += tdbc SUBDIR += tile38 SUBDIR += tiledb diff --git a/databases/tdb1410/Makefile b/databases/tdb1410/Makefile index 0068a797592f..8fa05a1798ea 100644 --- a/databases/tdb1410/Makefile +++ b/databases/tdb1410/Makefile @@ -1,6 +1,6 @@ PORTNAME= tdb DISTVERSION= 1.4.10 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SAMBA @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --disable-rpath \ CONFIGURE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1 -CONFLICTS_INSTALL= tdb +CONFLICTS_INSTALL= tdb tdb[0-9]* OPTIONS_DEFINE= MANPAGES DEBUG PYTHON OPTIONS_DEFAULT= MANPAGES PYTHON diff --git a/databases/tdb1413/Makefile b/databases/tdb1413/Makefile index 0068a797592f..164e9098a081 100644 --- a/databases/tdb1413/Makefile +++ b/databases/tdb1413/Makefile @@ -1,72 +1,68 @@ -PORTNAME= tdb -DISTVERSION= 1.4.10 -PORTREVISION= 2 -PORTEPOCH= 1 -CATEGORIES= databases -MASTER_SITES= SAMBA -PKGNAMESUFFIX= 1410 +PORTNAME= tdb +DISTVERSION= 1.4.13 +PORTEPOCH= 1 +PORTREVISION= 1 +CATEGORIES= databases +MASTER_SITES= SAMBA +PKGNAMESUFFIX= 1413 -MAINTAINER= samba@FreeBSD.org -COMMENT= Trivial Database +MAINTAINER= samba@FreeBSD.org +COMMENT= Trivial Database WWW= https://tdb.samba.org/ -LICENSE= GPLv3 +LICENSE= GPLv3 -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 tdb'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= tdb +CONFLICTS_INSTALL= tdb tdb[0-9]* -OPTIONS_DEFINE= MANPAGES DEBUG 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_USE+= python=py3kplist -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 tdb'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_USE= PYTHON=py3kplist +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}/bin/tdb* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtdb.so.1 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tdb* + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtdb.so.1 post-install-PYTHON-on: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb*.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb*.so .include diff --git a/databases/tdb1413/distinfo b/databases/tdb1413/distinfo index 9cbac66b6b89..8cb615a62b1f 100644 --- a/databases/tdb1413/distinfo +++ b/databases/tdb1413/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737641302 -SHA256 (tdb-1.4.10.tar.gz) = 02338e33c16c21c9e29571cef523e76b2b708636254f6f30c6cf195d48c62daf -SIZE (tdb-1.4.10.tar.gz) = 747139 +TIMESTAMP = 1751383287 +SHA256 (tdb-1.4.13.tar.gz) = 5ee276e7644d713e19e4b6adc00b440afb5851ff21e65821ffaed89e15a5e167 +SIZE (tdb-1.4.13.tar.gz) = 751677 diff --git a/databases/tdb1413/files/patch-buildtools_wafsamba_samba__autoconf.py b/databases/tdb1413/files/patch-buildtools_wafsamba_samba__autoconf.py deleted file mode 100644 index d0ab789743f0..000000000000 --- a/databases/tdb1413/files/patch-buildtools_wafsamba_samba__autoconf.py +++ /dev/null @@ -1,35 +0,0 @@ ---- buildtools/wafsamba/samba_autoconf.py.orig 2019-08-20 15:35:08 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: -@@ -949,5 +952,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c - 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']