diff --git a/science/thermofun/Makefile b/science/thermofun/Makefile index 6e9e9d4e39f0..652e289dbc1c 100644 --- a/science/thermofun/Makefile +++ b/science/thermofun/Makefile @@ -1,48 +1,48 @@ PORTNAME= thermofun DISTVERSIONPREFIX= v -DISTVERSION= 0.5.0 +DISTVERSION= 0.5.1 CATEGORIES= science # chemistry MAINTAINER= yuri@FreeBSD.org COMMENT= Code for calculating thermodynamic properties of materials WWW= https://github.com/thermohub/thermofun/ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json \ spdlog>0:devel/spdlog LIB_DEPENDS= libChemicalFun.so:science/chemicalfun USES= cmake USE_GITHUB= yes GH_ACCOUNT= thermohub TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} CXXFLAGS+= -DSPDLOG_FMT_EXTERNAL # see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258073#c3 TEST_WRKSRC= ${WRKSRC} OPTIONS_DEFINE= PYTHON OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes PYTHON_BUILD_DEPENDS= pybind11>0:devel/pybind11 \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} PYTHON_USES= python PYTHON_USE= PYTHON=pytest PYTHON_CMAKE_BOOL= TFUN_BUILD_PYTHON PYTHON_CMAKE_ON= -DFREEBSD_STAGEDIR=${STAGEDIR} -DFREEBSD_PREFIX=${PREFIX} 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 diff --git a/science/thermofun/distinfo b/science/thermofun/distinfo index b37f2129f913..59f3dc735b4f 100644 --- a/science/thermofun/distinfo +++ b/science/thermofun/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1721889621 -SHA256 (thermohub-thermofun-v0.5.0_GH0.tar.gz) = 620f42a1f11753a0e6c5bfa8b9ce8b7319cd5582859da41f0fcddea4f60db536 -SIZE (thermohub-thermofun-v0.5.0_GH0.tar.gz) = 2087924 +TIMESTAMP = 1746512235 +SHA256 (thermohub-thermofun-v0.5.1_GH0.tar.gz) = 9f3bcd20112155f5b0d65e39768eceaef3f041485812c9211c281a318b3f057d +SIZE (thermohub-thermofun-v0.5.1_GH0.tar.gz) = 2087867 diff --git a/science/thermofun/files/patch-python_thermofun_CMakeLists.txt b/science/thermofun/files/patch-python_thermofun_CMakeLists.txt index 96ea83360240..1f43ef2f810b 100644 --- a/science/thermofun/files/patch-python_thermofun_CMakeLists.txt +++ b/science/thermofun/files/patch-python_thermofun_CMakeLists.txt @@ -1,20 +1,20 @@ ---- python/thermofun/CMakeLists.txt.orig 2023-03-02 11:19:26 UTC +--- python/thermofun/CMakeLists.txt.orig 2025-05-05 07:34:58 UTC +++ python/thermofun/CMakeLists.txt @@ -26,7 +26,7 @@ add_custom_target(thermofun 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 thermofun target -@@ -54,7 +54,7 @@ install(CODE +@@ -71,7 +71,7 @@ install(CODE endif() execute_process( -- 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}) +- COMMAND \"${PYTHON_EXECUTABLE}\" -m pip install --prefix \"${THERMOFUN_PYTHON_INSTALL_PREFIX}\" \"${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}\") " )