Date: Tue, 7 Mar 2023 09:37:55 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fcafe6faabe5 - main - =?utf-8?Q?science/thermofun:=20Update=200.4.1=20=E2=86=92=200.4.3?= Message-ID: <202303070937.3279bt4x000622@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=fcafe6faabe53481af5f327ca2d5932c9d421279 commit fcafe6faabe53481af5f327ca2d5932c9d421279 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2023-03-07 09:37:25 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2023-03-07 09:37:50 +0000 science/thermofun: Update 0.4.1 → 0.4.3 Reported by: portscout --- science/thermofun/Makefile | 14 ++++++++++---- science/thermofun/distinfo | 6 +++--- .../files/patch-python_thermofun_CMakeLists.txt | 17 +++++++++++++---- science/thermofun/pkg-plist | 12 +++++++----- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/science/thermofun/Makefile b/science/thermofun/Makefile index 16573bf51c04..743fb672df7c 100644 --- a/science/thermofun/Makefile +++ b/science/thermofun/Makefile @@ -1,6 +1,6 @@ PORTNAME= thermofun DISTVERSIONPREFIX= v -DISTVERSION= 0.4.1 +DISTVERSION= 0.4.3 CATEGORIES= science # chemistry MAINTAINER= yuri@FreeBSD.org @@ -8,10 +8,12 @@ COMMENT= Code for calculating thermodynamic properties of materials WWW= https://github.com/thermohub/thermofun LICENSE= LGPL3 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json \ - spdlog>0:devel/spdlog + spdlog>0:devel/spdlog \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} LIB_DEPENDS= libChemicalFun.so:science/chemicalfun USES= cmake compiler:c++14-lang @@ -31,11 +33,15 @@ OPTIONS_SUB= yes PYTHON_USES= python PYTHON_USE= PYTHON=pytest PYTHON_CMAKE_BOOL= TFUN_BUILD_PYTHON -PYTHON_CMAKE_ON= -DFREEBSD_STAGEDIR=${STAGEDIR} +PYTHON_CMAKE_ON= -DFREEBSD_STAGEDIR=${STAGEDIR} -DFREEBSD_PREFIX=${PREFIX} PYTHON_BUILD_DEPENDS= pybind11>0:devel/pybind11 \ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} 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}/thermofun/PyThermoFun${PYTHON_EXT_SUFFIX}.so .include <bsd.port.mk> diff --git a/science/thermofun/distinfo b/science/thermofun/distinfo index add6b515ddbb..675495a4c1d7 100644 --- a/science/thermofun/distinfo +++ b/science/thermofun/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669583901 -SHA256 (thermohub-thermofun-v0.4.1_GH0.tar.gz) = 4f0cf27876a18e9be1c0d882b1ec0a031c41c29d6b6cb541f058ea9be958c2a0 -SIZE (thermohub-thermofun-v0.4.1_GH0.tar.gz) = 1341676 +TIMESTAMP = 1678178602 +SHA256 (thermohub-thermofun-v0.4.3_GH0.tar.gz) = 76c02ba5c0f417e14153ffa98004190d20bc1c526f7b5c43e2237fb649940e3c +SIZE (thermohub-thermofun-v0.4.3_GH0.tar.gz) = 2084591 diff --git a/science/thermofun/files/patch-python_thermofun_CMakeLists.txt b/science/thermofun/files/patch-python_thermofun_CMakeLists.txt index 9919f4931845..96ea83360240 100644 --- a/science/thermofun/files/patch-python_thermofun_CMakeLists.txt +++ b/science/thermofun/files/patch-python_thermofun_CMakeLists.txt @@ -1,11 +1,20 @@ ---- python/thermofun/CMakeLists.txt.orig 2022-07-17 19:24:14 UTC +--- python/thermofun/CMakeLists.txt.orig 2023-03-02 11:19:26 UTC +++ python/thermofun/CMakeLists.txt -@@ -43,7 +43,7 @@ install(CODE +@@ -26,7 +26,7 @@ add_custom_target(thermofun ALL + COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:PyThermoFun> + ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_NAME:PyThermoFun> + #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 thermofun target +@@ -54,7 +54,7 @@ install(CODE endif() execute_process( -- COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --prefix=\${THERMOFUN_PYTHON_INSTALL_PREFIX_NATIVE} -+ COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --root=${FREEBSD_STAGEDIR} --prefix=\${THERMOFUN_PYTHON_INSTALL_PREFIX_NATIVE} +- COMMAND ${PYTHON_EXECUTABLE} -m pip install --prefix \${THERMOFUN_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/thermofun/pkg-plist b/science/thermofun/pkg-plist index ec205216f226..c11f3bece961 100644 --- a/science/thermofun/pkg-plist +++ b/science/thermofun/pkg-plist @@ -68,10 +68,12 @@ lib/cmake/ThermoFun/ThermoFunConfigVersion.cmake lib/cmake/ThermoFun/ThermoFunTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/ThermoFun/ThermoFunTargets.cmake lib/libThermoFun.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.1-py%%PYTHON_VER%%.egg-info/PKG-INFO -%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.1-py%%PYTHON_VER%%.egg-info/SOURCES.txt -%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.1-py%%PYTHON_VER%%.egg-info/dependency_links.txt -%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.1-py%%PYTHON_VER%%.egg-info/top_level.txt +%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.3.dist-info/INSTALLER +%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.3.dist-info/METADATA +%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.3.dist-info/RECORD +%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.3.dist-info/REQUESTED +%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.3.dist-info/WHEEL +%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.3.dist-info/direct_url.json +%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun-0.4.3.dist-info/top_level.txt %%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun/PyThermoFun%%PYTHON_EXT_SUFFIX%%.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/thermofun/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303070937.3279bt4x000622>