Date: Tue, 26 May 2026 03:06:59 +0000
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: 31d321ac0bed - main - science/{,py-}arbor: update 0.=?utf-8?Q?11.0 =E2=86=92?= 0.12.1
Message-ID: <6a150e53.30582.4daeb8d0@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=31d321ac0bed3a49086ffbeff3ef1d70ab1f8220 commit 31d321ac0bed3a49086ffbeff3ef1d70ab1f8220 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2026-05-26 03:05:19 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2026-05-26 03:06:38 +0000 science/{,py-}arbor: update 0.11.0 → 0.12.1 --- science/arbor/Makefile | 9 ++-- science/arbor/distinfo | 8 +-- science/arbor/files/patch-CMakeLists.txt | 77 ++++++++++++++++++++++++++--- science/arbor/pkg-plist | 2 +- science/py-arbor/Makefile | 8 +-- science/py-arbor/distinfo | 6 +-- science/py-arbor/files/patch-CMakeLists.txt | 3 ++ science/py-arbor/files/patch-pyarb.hpp | 11 ----- 8 files changed, 86 insertions(+), 38 deletions(-) diff --git a/science/arbor/Makefile b/science/arbor/Makefile index e507aab7bd79..309220d39b3b 100644 --- a/science/arbor/Makefile +++ b/science/arbor/Makefile @@ -1,7 +1,6 @@ PORTNAME= arbor DISTVERSIONPREFIX= v -DISTVERSION= 0.11.0 -PORTREVISION= 1 +DISTVERSION= 0.12.1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -12,8 +11,6 @@ WWW= https://arbor-sim.org/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -#BROKEN_armv7= compilation fails: unknown type name 'float64x2_t' - BUILD_DEPENDS= bash:shells/bash \ libfmt>0:devel/libfmt \ nlohmann-json>0:devel/nlohmann-json \ @@ -31,12 +28,12 @@ USES= cmake compiler:c++20-lang localbase pkgconfig python shebangfix USE_GITHUB= yes GH_ACCOUNT= arbor-sim -GH_TUPLE= cpm-cmake:CPM.cmake:v0.39.0:cpm +GH_TUPLE= cpm-cmake:CPM.cmake:v0.39.0:cpm \ + martinus:unordered_dense:v4.5.0:unordered_dense/external/unordered_dense SHEBANG_FILES= scripts/arbor-build-catalogue CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_OFF= ARB_USE_BUNDLED_UNITS CMAKE_ARGS= -DPython3_EXECUTABLE=${PYTHON_CMD} CONFIGURE_ENV= CPM_REPO=${WRKSRC_cpm} diff --git a/science/arbor/distinfo b/science/arbor/distinfo index ddd22577d041..0529d05af6a9 100644 --- a/science/arbor/distinfo +++ b/science/arbor/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1762075604 -SHA256 (arbor-sim-arbor-v0.11.0_GH0.tar.gz) = 6df68b308dd629df993eda40319676cd43407ae211d0846100b0cf42e8c9ad22 -SIZE (arbor-sim-arbor-v0.11.0_GH0.tar.gz) = 12511038 +TIMESTAMP = 1779763178 +SHA256 (arbor-sim-arbor-v0.12.1_GH0.tar.gz) = 6584ccfaef1c8f9eab6c8794d0f4f06745cbfb7c2d701815c74ed9e6a101a3dc +SIZE (arbor-sim-arbor-v0.12.1_GH0.tar.gz) = 12968222 SHA256 (cpm-cmake-CPM.cmake-v0.39.0_GH0.tar.gz) = 621cfca03a5a0fcf316f08aee37d775a71620879e768ebf74be8495773f6b578 SIZE (cpm-cmake-CPM.cmake-v0.39.0_GH0.tar.gz) = 100981 +SHA256 (martinus-unordered_dense-v4.5.0_GH0.tar.gz) = 2364ce4bc4c23bd02549bbb3a7572d881684cd46057f3737fd53be53669743aa +SIZE (martinus-unordered_dense-v4.5.0_GH0.tar.gz) = 901624 diff --git a/science/arbor/files/patch-CMakeLists.txt b/science/arbor/files/patch-CMakeLists.txt index 9a056733f8ea..944c1447fec3 100644 --- a/science/arbor/files/patch-CMakeLists.txt +++ b/science/arbor/files/patch-CMakeLists.txt @@ -1,5 +1,16 @@ ---- CMakeLists.txt.orig 2025-04-24 10:33:03 UTC +-- Lower CMake requirement to 3.31.10 +-- Disable -march=native +-- Use system libraries for nlohmann_json, random123, tinyopt, and googletest +-- Use bundled unordered_dense + +--- CMakeLists.txt.orig 2026-05-26 02:41:15 UTC +++ CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 4.0.0) ++cmake_minimum_required(VERSION 3.31.10) + include(CMakeDependentOption) + include(CheckIPOSupported) + @@ -60,7 +60,7 @@ check_cxx_compiler_flag("-march=native" CXX_HAS_NATIVE # Specify target architecture. @@ -9,16 +20,66 @@ set(ARB_DEFAULT_ARCH "native") else() set(ARB_DEFAULT_ARCH "none") -@@ -302,11 +302,7 @@ install(TARGETS ext-hwloc EXPORT arbor-targets) +@@ -302,22 +302,16 @@ install(TARGETS ext-hwloc EXPORT arbor-targets) endif() install(TARGETS ext-hwloc EXPORT arbor-targets) --CPMFindPackage(NAME json -- GITHUB_REPOSITORY nlohmann/json -- VERSION 3.12.0 -- OPTIONS "CMAKE_SUPPRESS_DEVELOPER_WARNINGS ON") --install(TARGETS nlohmann_json EXPORT arbor-targets) +-CPMFindPackage(NAME nlohmann_json +- GITHUB_REPOSITORY nlohmann/json +- VERSION 3.12.0) +find_package(nlohmann_json REQUIRED) + add_library(ext-json INTERFACE) + target_link_libraries(ext-json INTERFACE nlohmann_json::nlohmann_json) + install(TARGETS ext-json EXPORT arbor-targets) +-if(nlohmann_json_ADDED) +- install(TARGETS nlohmann_json EXPORT arbor-targets) +-endif() + add_library(ext-random123 INTERFACE) - CPMFindPackage(NAME random123 +-CPMFindPackage(NAME random123 +- DOWNLOAD_ONLY YES +- GITHUB_REPOSITORY DEShawResearch/random123 +- VERSION 1.14.0) ++set(random123_SOURCE_DIR /usr/local) ++set(random123_ADDED TRUE) ++ + if(random123_ADDED) + target_include_directories(ext-random123 INTERFACE $<BUILD_INTERFACE:${random123_SOURCE_DIR}/include>) + else() +@@ -360,10 +354,8 @@ if (BUILD_TESTING) + GITHUB_REPOSITORY google/benchmark + VERSION 1.8.3 + OPTIONS "BENCHMARK_ENABLE_TESTING OFF" "CMAKE_BUILD_TYPE release" "BUILD_SHARED_LIBS OFF") +- CPMFindPackage(NAME googletest +- GITHUB_REPOSITORY google/googletest +- VERSION 1.17.0 +- OPTIONS "INSTALL_GTEST OFF" "BUILD_GMOCK OFF") ++ find_package(GTest REQUIRED) ++set(googletest_ADDED FALSE) + if(benchmark_ADDED) + target_link_libraries(ext-bench INTERFACE benchmark) + else() +@@ -395,16 +387,13 @@ list(APPEND arbor_export_dependencies units) + endif() + list(APPEND arbor_export_dependencies units) + +-CPMFindPackage(NAME unordered_dense +- GITHUB_REPOSITORY martinus/unordered_dense +- VERSION 4.5.0 +- SYSTEM YES +- EXCLUDE_FROM_ALL YES) ++set(unordered_dense_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/unordered_dense) ++set(unordered_dense_ADDED TRUE) + +-CPMFindPackage(NAME tinyopt +- GITHUB_REPOSITORY halfflat/tinyopt +- GIT_TAG 7e6d707d49c6cb4be27ebd253856be65293288df +- DOWNLOAD_ONLY YES) ++ ++set(tinyopt_SOURCE_DIR /usr/local) ++set(tinyopt_ADDED TRUE) ++ + + add_library(ext-tinyopt INTERFACE) + if(tinyopt_ADDED) diff --git a/science/arbor/pkg-plist b/science/arbor/pkg-plist index e01333db8354..e83a92df1c19 100644 --- a/science/arbor/pkg-plist +++ b/science/arbor/pkg-plist @@ -1,6 +1,7 @@ bin/arbor-build-catalogue bin/lmorpho bin/modcc +include/arbor/adex_cell.hpp include/arbor/arb_types.h include/arbor/arb_types.hpp include/arbor/arb_types.inc @@ -90,7 +91,6 @@ include/arbor/util/handle_set.hpp include/arbor/util/hash_def.hpp include/arbor/util/pp_util.hpp include/arbor/util/scope_exit.hpp -include/arbor/util/typed_map.hpp include/arbor/util/uninitialized.hpp include/arbor/util/unique_any.hpp include/arbor/util/visibility.hpp diff --git a/science/py-arbor/Makefile b/science/py-arbor/Makefile index abab73f7c1f3..516011a0e577 100644 --- a/science/py-arbor/Makefile +++ b/science/py-arbor/Makefile @@ -1,7 +1,6 @@ PORTNAME= arbor DISTVERSIONPREFIX= v -DISTVERSION= 0.11.0 -PORTREVISION= 2 +DISTVERSION= 0.12.1 CATEGORIES= science PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,8 +12,7 @@ WWW= https://arbor-sim.org/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../LICENSE -BUILD_DEPENDS= gmake:devel/gmake \ - pybind11>0:devel/pybind11 \ +BUILD_DEPENDS= pybind11>0:devel/pybind11 \ nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= libarbor.so:science/arbor RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} @@ -37,8 +35,6 @@ TEST_WRKSRC= ${WRKSRC}/test/unit_distributed TEST_ENV= ${MAKE_ENV} \ PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -BINARY_ALIAS= make=${GMAKE} - post-patch: @${ECHO} ${DISTVERSION} > ${WRKSRC}/VERSION diff --git a/science/py-arbor/distinfo b/science/py-arbor/distinfo index a707d5b502e0..9f2ee3e81697 100644 --- a/science/py-arbor/distinfo +++ b/science/py-arbor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1762102979 -SHA256 (arbor-sim-arbor-v0.11.0_GH0.tar.gz) = 6df68b308dd629df993eda40319676cd43407ae211d0846100b0cf42e8c9ad22 -SIZE (arbor-sim-arbor-v0.11.0_GH0.tar.gz) = 12511038 +TIMESTAMP = 1779761416 +SHA256 (arbor-sim-arbor-v0.12.1_GH0.tar.gz) = 6584ccfaef1c8f9eab6c8794d0f4f06745cbfb7c2d701815c74ed9e6a101a3dc +SIZE (arbor-sim-arbor-v0.12.1_GH0.tar.gz) = 12968222 diff --git a/science/py-arbor/files/patch-CMakeLists.txt b/science/py-arbor/files/patch-CMakeLists.txt index e8b0d0cf39e4..e8629681df85 100644 --- a/science/py-arbor/files/patch-CMakeLists.txt +++ b/science/py-arbor/files/patch-CMakeLists.txt @@ -1,3 +1,6 @@ +-- Lower CMake requirement and use system pybind11 +-- Fix installation paths for __init__.py and VERSION + --- CMakeLists.txt.orig 2025-04-24 10:33:03 UTC +++ CMakeLists.txt @@ -1,3 +1,13 @@ diff --git a/science/py-arbor/files/patch-pyarb.hpp b/science/py-arbor/files/patch-pyarb.hpp deleted file mode 100644 index ab3bb94cf316..000000000000 --- a/science/py-arbor/files/patch-pyarb.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- pyarb.hpp.orig 2025-11-02 17:35:26 UTC -+++ pyarb.hpp -@@ -19,7 +19,7 @@ static_assert((PYBIND11_VERSION_HEX >= 0x02080100) - #define PB11_ERR(M, m, p) "Required version of pybind11 is 2.8.1 <= version < 3.0.0 Found " mk_ver(M, m, p) - static_assert((PYBIND11_VERSION_HEX >= 0x02080100) - && -- (PYBIND11_VERSION_HEX < 0x03000000), -+ (PYBIND11_VERSION_HEX < 0x04000000), - PB11_ERR(PYBIND11_VERSION_MAJOR, PYBIND11_VERSION_MINOR, PYBIND11_VERSION_PATCH)); - #undef PB11_ERR - #undef mk_verhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a150e53.30582.4daeb8d0>