From nobody Tue Nov 14 17:23:49 2023 X-Original-To: dev-commits-ports-all@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 4SVCnd5rv4z51b9S; Tue, 14 Nov 2023 17:23:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SVCnd29zXz3Hdn; Tue, 14 Nov 2023 17:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699982629; 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=/Hz37mnXSWUC9pGSSy9K754mLRxowTOxWKfEt9+Gv/s=; b=cb4arZLDIbHmTUS6WyguiFsykB7C0vLdTNBp9vXxVW8yzzTFg9vgKOgs+jVcXDXPlXjyxc O/bKV/1Ky5efj6OPQhun1F22kR5MsBwQBhYvgwhyMWoDqzkou2VjaOU39Y9DuMDzeF4pIF +oFp7SvG3OqSpgtbr0QZjDd87lmCa+ZuAnVCwRLd0JjClOxAd7QputHYbG8O1fVbu/g1gA rx6bvM8CAXkIVXEsmGpT5MqhtD7qxjdnjaBl0HDZYTq4zvARy0MFmR3uGwQwZir3NS/JOh wazZIMbrpCvr60DTXCWyqtmD+yTmou4gYh7eaBHV+9oc9NyEZUNhbvb/9iOjRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699982629; 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=/Hz37mnXSWUC9pGSSy9K754mLRxowTOxWKfEt9+Gv/s=; b=PwGHeQCNJ1WyDo0KQGU+wp18QtSlvpQAZBHSsixtOzhthC3o4jz3pBfElw7NH84tgKP9zI 0WCVFSoCm5uAaYrLL9EIr2HISnYiwK7eJalZjAJE0EYCC6d8FooX4VAVH2SdJuMSUlJed8 477hYTuW/rZQlTlSzsDpiIhBW5Cilf5jDHwQ5N8e/gBkuQQ+z0mzjVkGWtoxYajYjfmYYu TkMoJYrBMNgfaZDfDxstaxIo7oJ6HhyL58scpu5M4cmTH8ISu3raPOUeGXz/DmGgxhIfgy WRk79mte7X8nnoj2D0EoNLPlYQOxzI/NBfdowX/PKluBsXdjyLZAyxmpnng/ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699982629; a=rsa-sha256; cv=none; b=G3hrbeTv41LxLLrOr6tA5S9clMloHbUjHLpDLUurZtbd8w09b0Q6NW9y8tUs16xKop4aQu s2p7BNMbw0sinvn/23NlpFU6CfUlnFt+s3SnaFw/UruheRST7Vxs+qVMjVIAS0ylnXBenD Jv3b+LOqji3vkOE1S4eATkivI89a18Sg9TScZ8hpCdcad7wurGTlRonYm+j0gFZAs85q9l 74hmkNWQ9M62YRYYXX61ARr1uTxN+15Es5AFBFHvJ7UAfkpm7Se1dtgz9ZYLJmHg2BywTN yuW9UmDb4UYuDwcNycagw8HPQ3/2BYUxkozYJayZ1u7vbahKzVFWN3YKmFaJdw== 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 4SVCnd15Vdzxf6; Tue, 14 Nov 2023 17:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AEHNnYZ085181; Tue, 14 Nov 2023 17:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AEHNn1b085178; Tue, 14 Nov 2023 17:23:49 GMT (envelope-from git) Date: Tue, 14 Nov 2023 17:23:49 GMT Message-Id: <202311141723.3AEHNn1b085178@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 93343a157453 - main - science/cantera: Fix build with scons 4.5.2+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93343a157453fa6f16b29578e127e040d8a57282 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=93343a157453fa6f16b29578e127e040d8a57282 commit 93343a157453fa6f16b29578e127e040d8a57282 Author: Po-Chuan Hsieh AuthorDate: 2023-11-14 16:54:00 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-14 17:16:50 +0000 science/cantera: Fix build with scons 4.5.2+ from SConstruct: try: from packaging.version import parse as parse_version except ImportError: from pkg_resources import parse_version Reference: https://pkg-status.freebsd.org/pb2/data/124i386-default-foo/2023-11-02_15h08m17s/logs/errors/cantera-3.0.0.log PR: 274524 --- science/cantera/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/science/cantera/Makefile b/science/cantera/Makefile index c25ad53ef304..7fea4f5d81c0 100644 --- a/science/cantera/Makefile +++ b/science/cantera/Makefile @@ -12,7 +12,8 @@ LICENSE_FILE= ${WRKSRC}/License.txt BUILD_DEPENDS= googletest>0:devel/googletest \ ${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs \ - highfive>0:science/highfive + highfive>0:science/highfive \ + ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} LIB_DEPENDS= libfmt.so:devel/libfmt \ libhdf5.so:science/hdf5 \ libopenblas.so:math/openblas \ @@ -54,6 +55,7 @@ OCTAVE_USES= octave:env OCTAVE_BROKEN= Octave support needs to be updated PYTHON_USES= python +PYTHON_USES_OFF= python:env PYTHON_USE= PYTHON=cython PYTHON_MAKE_ARGS= python_cmd=${PYTHON_CMD} python_package=full PYTHON_MAKE_ARGS_OFF= python_package="none"