From nobody Tue Mar 07 09:37:54 2023 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 4PW9NL485Xz3x8wd; Tue, 7 Mar 2023 09:37:54 +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 4PW9NL2dGZz3HGw; Tue, 7 Mar 2023 09:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678181874; 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=FzLDgH7LW9UGeS9LIDC/naC7hjO2kDHEHZTBbaQ+un8=; b=sKdcYG+oHUsDxAfeccpS07OeNnkwB7BxMNvCnhrhFDbnxpLlKVTCn1Oa9b2i3dG/VOvH5U H4p8/tvtgPTDMhExTyvLSieTQfblJBUs1q2V8TFNg9MZBb3mZnSZcAZKi0b8mCvdGBS4nd c7MeMiZmut8BVva/RS80b8IH1MGCtkghokrCKxzqSxjJ/ddzoMeMqc7tkV16wNXs4S7E7Q hKEnt5H/1RhBSRNVvLefMQbHpHuig7sWFXyC/C2SjMWo90JRk2F6d1gh28WzVy9oDJIFVX z2ZQl5qhEvKNeH7AI+f2OQHqZ2OrdXcQMuq0djh0wwqv1zHUaKkRggB8nECXrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678181874; 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=FzLDgH7LW9UGeS9LIDC/naC7hjO2kDHEHZTBbaQ+un8=; b=btwvbX4Ns0WWoCvwzs5LFUpE1nyxBtv/lT86N84HnmgvRz55qjGrzO1xvUqUklDISYFfrO IklStnGDOR32q4R8d3GtaFqoTnC3nXcnN7RofQ+VYijRO4P97X6ii7QTzjWxHJnzkdNmab bLC9urC2F3eaIy8fom2VmYhKPcr5neQhuoGqs+t76OEHeSW8HVw+ZggQmJ6ABAaiEdMtxn pUrjCFQN4FmFS1dFoiyhuHhwk1bwajAXKJAun77K7B/9nC8k8ArkCKXWhpxN+HdMVItA3v KSkpqBR++bXDm85nufS/JR76idAqNSZG1AoWyETvJsqybIinTsLfvRcNumxqxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678181874; a=rsa-sha256; cv=none; b=JoPuGfqbImuRCQIhgrXi5xB9j5Xerxnhri3iiNLyfpETbzKqeHatEM9kCdQ5kAb3Rjkcbl Mf1gaZcQqgPXuUs/Scx2eL22JNdlTFEo8xgfVhZm8OXY494HBYxJY7UHtLinzQIkKziuUn tAOXg/ez4U9SgAL9n8ShrJnuvdpSS03ddPebi/pjhEH/5zvJv7xRE8QQK0w5OUXhBKoJqp PtWgV54kXuXYJvx5n8ghCP9e4lNvVP4HpyjkgIP4GXUYu40jdmWki1gIetN0SNWw+bwVN/ pV8t6abzUuaQhY5zk13o1evPUp7yrzJ7BW7svuOHr4aHP/7W0zcErS33c65i8g== 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 4PW9NL1j1yzfGr; Tue, 7 Mar 2023 09:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3279bsDf000599; Tue, 7 Mar 2023 09:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3279bsAL000598; Tue, 7 Mar 2023 09:37:54 GMT (envelope-from git) Date: Tue, 7 Mar 2023 09:37:54 GMT Message-Id: <202303070937.3279bsAL000598@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: bd2fe235ab9b - main - =?utf-8?Q?science/chemicalfun:=20Update=200.1.7=20=E2=86=92=200.1.8?= 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd2fe235ab9b715811db34c804c07778f2bcf2ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd2fe235ab9b715811db34c804c07778f2bcf2ee commit bd2fe235ab9b715811db34c804c07778f2bcf2ee Author: Yuri Victorovich AuthorDate: 2023-03-07 09:26:49 +0000 Commit: Yuri Victorovich CommitDate: 2023-03-07 09:37:50 +0000 science/chemicalfun: Update 0.1.7 → 0.1.8 --- science/chemicalfun/Makefile | 16 ++++++++++++---- science/chemicalfun/distinfo | 6 +++--- .../files/patch-python_chemicalfun_CMakeLists.txt | 17 +++++++++++++---- science/chemicalfun/pkg-plist | 9 +++++++-- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/science/chemicalfun/Makefile b/science/chemicalfun/Makefile index 1b6b39050c28..6f1d9755098f 100644 --- a/science/chemicalfun/Makefile +++ b/science/chemicalfun/Makefile @@ -1,5 +1,5 @@ PORTNAME= chemicalfun -DISTVERSION= 0.1.7 +DISTVERSION= 0.1.8 CATEGORIES= science # chemistry MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${PORTNAME}/get/${BB_COMMIT}${EXTRACT_SUFX}?dummy=/:src DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:src @@ -8,17 +8,21 @@ MAINTAINER= yuri@FreeBSD.org COMMENT= C++ library for working with chemical reactions and formulas WWW= https://bitbucket.org/gems4/chemicalfun/src/master/ -BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json +BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} LIB_DEPENDS= libfmt.so:devel/libfmt # due to SPDLOG_FMT_EXTERNAL LIB_DEPENDS+= libspdlog.so:devel/spdlog USES= cmake:testing compiler:c++17-lang eigen:3 localbase BB_ACCOUNT= gems4 -BB_COMMIT= 7b43744ec72d +BB_COMMIT= 46c628fef376 WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${PORTNAME}-${BB_COMMIT} +CMAKE_ARGS= -DFREEBSD_PREFIX=${PREFIX} -DFREEBSD_STAGEDIR=${STAGEDIR} \ + -DPython_EXECUTABLE=${PYTHON_CMD} CMAKE_TESTING_ON= CHEMICALFUN_BUILD_TESTS # tests fail to compile, BitBucket offers no easy way to report this CMAKE_TESTING_TARGET= ${ALL_TARGET} # hack to prevent test run @@ -31,10 +35,14 @@ OPTIONS_SUB= yes PYTHON_USES= python PYTHON_CMAKE_BOOL= CHEMICALFUN_BUILD_PYTHON -PYTHON_CMAKE_ON= -DFREEBSD_STAGEDIR=${STAGEDIR} +PYTHON_CMAKE_ON= -DFREEBSD_PREFIX=${PREFIX} PYTHON_BUILD_DEPENDS= pybind11>0:devel/pybind11 post-install-PYTHON-on: + # remove wrong *.pyc, see related bug https://bitbucket.org/gems4/chemicalfun/issues/1/please-support-stagedir + @${FIND} ${STAGEDIR} -name "*.pyc" -delete + @${FIND} ${STAGEDIR} -name __pycache__ -delete + # strip binary @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/chemicalfun/PyChemicalFun${PYTHON_EXT_SUFFIX}.so post-test: diff --git a/science/chemicalfun/distinfo b/science/chemicalfun/distinfo index c20ba32c0c19..677b1b6d4fb2 100644 --- a/science/chemicalfun/distinfo +++ b/science/chemicalfun/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672213422 -SHA256 (chemicalfun-0.1.7.tar.gz) = 1f25409cba68bdf3fda4e01ca8e2e50d8402b986236c0eb52845238602487710 -SIZE (chemicalfun-0.1.7.tar.gz) = 935004 +TIMESTAMP = 1678175797 +SHA256 (chemicalfun-0.1.8.tar.gz) = c260f2b23a0bd75019eb35ced4db8ec6f88627f839fde64ad2b87ec629c272c2 +SIZE (chemicalfun-0.1.8.tar.gz) = 939981 diff --git a/science/chemicalfun/files/patch-python_chemicalfun_CMakeLists.txt b/science/chemicalfun/files/patch-python_chemicalfun_CMakeLists.txt index 1153bd6914ff..cf20bea619f2 100644 --- a/science/chemicalfun/files/patch-python_chemicalfun_CMakeLists.txt +++ b/science/chemicalfun/files/patch-python_chemicalfun_CMakeLists.txt @@ -1,11 +1,20 @@ ---- python/chemicalfun/CMakeLists.txt.orig 2022-07-17 18:29:23 UTC +--- python/chemicalfun/CMakeLists.txt.orig 2023-03-01 15:14:05 UTC +++ python/chemicalfun/CMakeLists.txt -@@ -43,7 +43,7 @@ install(CODE +@@ -31,7 +31,7 @@ add_custom_target(chemicalfun ALL + COMMAND ${CMAKE_COMMAND} -E copy $ + ${CMAKE_CURRENT_BINARY_DIR}/$ + #COMMAND ${PYTHON_EXECUTABLE} -m pip install ${_PIP_ARG} -e ${CMAKE_CURRENT_BINARY_DIR} +- COMMAND ${PYTHON_EXECUTABLE} -m pip install --prefix ${CMAKE_BINARY_DIR} --ignore-installed . ++ COMMAND ${PYTHON_EXECUTABLE} -m pip install --root ${FREEBSD_STAGEDIR} --prefix ${FREEBSD_PREFIX} --ignore-installed . + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + + # Set dependencies of PyChemicalFun target +@@ -60,7 +60,7 @@ install(CODE endif() execute_process( -- COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --prefix=\${CHEMICALFUN_PYTHON_INSTALL_PREFIX_NATIVE} -+ COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --root=${FREEBSD_STAGEDIR} --prefix=\${CHEMICALFUN_PYTHON_INSTALL_PREFIX_NATIVE} +- COMMAND ${PYTHON_EXECUTABLE} -m pip install --prefix \${CHEMICALFUN_PYTHON_INSTALL_PREFIX_NATIVE} ${CMAKE_CURRENT_BINARY_DIR} ++ COMMAND ${PYTHON_EXECUTABLE} -m pip install --root ${FREEBSD_STAGEDIR} --prefix ${FREEBSD_PREFIX} ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) " ) diff --git a/science/chemicalfun/pkg-plist b/science/chemicalfun/pkg-plist index b5b2c6ef3830..b730080e8561 100644 --- a/science/chemicalfun/pkg-plist +++ b/science/chemicalfun/pkg-plist @@ -13,7 +13,12 @@ lib/cmake/ChemicalFun/ChemicalFunConfigVersion.cmake lib/cmake/ChemicalFun/ChemicalFunTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/ChemicalFun/ChemicalFunTargets.cmake lib/libChemicalFun.so +%%PYTHON_SITELIBDIR%%/chemicalfun-0.1.8.dist-info/INSTALLER +%%PYTHON_SITELIBDIR%%/chemicalfun-0.1.8.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/chemicalfun-0.1.8.dist-info/RECORD +%%PYTHON_SITELIBDIR%%/chemicalfun-0.1.8.dist-info/REQUESTED +%%PYTHON_SITELIBDIR%%/chemicalfun-0.1.8.dist-info/WHEEL +%%PYTHON_SITELIBDIR%%/chemicalfun-0.1.8.dist-info/direct_url.json +%%PYTHON_SITELIBDIR%%/chemicalfun-0.1.8.dist-info/top_level.txt %%PYTHON_SITELIBDIR%%/chemicalfun/PyChemicalFun%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/chemicalfun/__init__.py -%%PYTHON_SITELIBDIR%%/chemicalfun/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/chemicalfun-0.1.7-py%%PYTHON_VER%%.egg-info