diff --git a/science/py-arbor/Makefile b/science/py-arbor/Makefile index b6e559395a89..c08858163c7c 100644 --- a/science/py-arbor/Makefile +++ b/science/py-arbor/Makefile @@ -1,37 +1,37 @@ PORTNAME= arbor DISTVERSIONPREFIX= v -DISTVERSION= 0.9.0 +DISTVERSION= 0.10.0 CATEGORIES= science PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Multi-compartment neural network simulation library WWW= https://arbor-sim.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../LICENSE BUILD_DEPENDS= pybind11>0:devel/pybind11 \ nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= libarbor.so:science/arbor USES= cmake compiler:c++17-lang localbase:ldflags python USE_PYTHON= flavors USE_GITHUB= yes GH_ACCOUNT= arbor-sim WRKSRC_SUBDIR= python CMAKE_ARGS= -DPython3_EXECUTABLE=${PYTHON_CMD} \ -DARB_PYTHON_LIB_PATH=${PYTHONPREFIX_SITELIBDIR} CXXFLAGS+= -fPIC post-patch: @${ECHO} ${DISTVERSION} > ${WRKSRC}/VERSION post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/arbor/_arbor${PYTHON_EXT_SUFFIX}.so .include diff --git a/science/py-arbor/distinfo b/science/py-arbor/distinfo index 249aad786e70..5171a1ab39a6 100644 --- a/science/py-arbor/distinfo +++ b/science/py-arbor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691740349 -SHA256 (arbor-sim-arbor-v0.9.0_GH0.tar.gz) = 920c7926453379d367c6c8bb01ff867c03e44e8a7a6a5655d5eaa3d692618ca1 -SIZE (arbor-sim-arbor-v0.9.0_GH0.tar.gz) = 10164524 +TIMESTAMP = 1724615376 +SHA256 (arbor-sim-arbor-v0.10.0_GH0.tar.gz) = b1975da5dc89f830ef2148d57d98c44679cec6be009b34df48a4d8e0f6aa0abe +SIZE (arbor-sim-arbor-v0.10.0_GH0.tar.gz) = 10159008 diff --git a/science/py-arbor/files/patch-CMakeLists.txt b/science/py-arbor/files/patch-CMakeLists.txt index 988f55467741..b8d189dbb2b4 100644 --- a/science/py-arbor/files/patch-CMakeLists.txt +++ b/science/py-arbor/files/patch-CMakeLists.txt @@ -1,34 +1,35 @@ ---- CMakeLists.txt.orig 2023-08-10 09:47:38 UTC +--- CMakeLists.txt.orig 2024-08-09 10:22:00 UTC +++ CMakeLists.txt @@ -1,3 +1,7 @@ +cmake_minimum_required(VERSION 3.19) + +find_package(Python3 ${arb_py_version} COMPONENTS Interpreter Development REQUIRED) + include(GNUInstallDirs) set(PYBIND11_CPP_STANDARD -std=c++17) -@@ -80,14 +84,14 @@ if (ARB_WITH_MPI) +@@ -84,14 +88,14 @@ endif() endif() # For unit tests on C++ side of Python wrappers -add_subdirectory(test) +#add_subdirectory(test) # Create the Python module in the build directory. # The module contains the dynamic library, __init__.py and VERSION information. set(python_mod_path "${CMAKE_CURRENT_BINARY_DIR}/arbor") set_target_properties(pyarb PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${python_mod_path}") -file(COPY "${PROJECT_SOURCE_DIR}/python/__init__.py" DESTINATION "${python_mod_path}") -file(COPY "${PROJECT_SOURCE_DIR}/VERSION" DESTINATION "${python_mod_path}") +file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py" DESTINATION "${python_mod_path}") +file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" DESTINATION "${python_mod_path}") # Set the installation path -@@ -117,4 +121,4 @@ endif() +@@ -121,5 +125,4 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py install(TARGETS pyarb DESTINATION ${_python_module_install_path}) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py DESTINATION ${_python_module_install_path}) +-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stubs/arbor/ DESTINATION ${_python_module_install_path}) -install(FILES ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/README.md ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${_python_module_install_path}) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../VERSION DESTINATION ${_python_module_install_path})