devel/onetbb: Update to 2023.0.0

and fix building of two dependent ports [1].

Release notes:	https://github.com/uxlfoundation/oneTBB/blob/v2023.0.0/RELEASE_NOTES.md
Approved by:	blanket [1]

15 files changed, 37 insertions, 215 deletions

diff --git a/devel/onetbb/Makefile b/devel/onetbb/Makefile
index b3aa564c554e..1ef858eb920b 100644
--- a/devel/onetbb/Makefile
+++ b/devel/onetbb/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	onetbb
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2022.3.0
-PORTREVISION=	3
+DISTVERSION=	2023.0.0
 CATEGORIES=	devel
 
 MAINTAINER=	martymac@FreeBSD.org
diff --git a/devel/onetbb/distinfo b/devel/onetbb/distinfo
index 488566db547f..9b0952ccf81c 100644
--- a/devel/onetbb/distinfo
+++ b/devel/onetbb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1762198167
-SHA256 (uxlfoundation-oneTBB-v2022.3.0_GH0.tar.gz) = 01598a46c1162c27253a0de0236f520fd8ee8166e9ebb84a4243574f88e6e50a
-SIZE (uxlfoundation-oneTBB-v2022.3.0_GH0.tar.gz) = 6836514
+TIMESTAMP = 1778754323
+SHA256 (uxlfoundation-oneTBB-v2023.0.0_GH0.tar.gz) = f8767b971ec6aea25dde58ae0f593e94e7aa75a739a86f67967012f69e2199b1
+SIZE (uxlfoundation-oneTBB-v2023.0.0_GH0.tar.gz) = 7554268
diff --git a/devel/onetbb/files/patch-include_oneapi_tbb_detail__exception.h b/devel/onetbb/files/patch-include_oneapi_tbb_detail__exception.h
deleted file mode 100644
index 0299b72a06b2..000000000000
--- a/devel/onetbb/files/patch-include_oneapi_tbb_detail__exception.h
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix unsafe_wait visibility
-
-Fixes tests 66 and 74:
-
-66 - test_global_control (Subprocess aborted)
-74 - test_tbb_header (Failed)
-
---- include/oneapi/tbb/detail/_exception.h.orig	2025-10-29 11:31:36 UTC
-+++ include/oneapi/tbb/detail/_exception.h
-@@ -66,14 +66,14 @@ class TBB_EXPORT missing_wait : public std::exception 
- };
- 
- //! Exception for impossible finalization of task_sheduler_handle
--#if __APPLE__
-+#if __APPLE__ || __FreeBSD__
-     #pragma GCC visibility push(default)
- #endif
- class TBB_EXPORT unsafe_wait : public std::runtime_error {
- public:
-     unsafe_wait(const char* msg) : std::runtime_error(msg) {}
- };
--#if __APPLE__
-+#if __APPLE__ || __FreeBSD__
-     #pragma GCC visibility pop
- #endif
- 
diff --git a/devel/onetbb/files/patch-src_tbb_co_context.h b/devel/onetbb/files/patch-src_tbb_co_context.h
deleted file mode 100644
index 7d46c4c2f1b0..000000000000
--- a/devel/onetbb/files/patch-src_tbb_co_context.h
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix mmap() call: MAP_STACK needs at least PROT_READ and PROT_WRITE
-
-Fixes tests 29, 67 and 105:
-
- 29 - test_resumable_tasks (SEGFAULT)
- 67 - test_task (SEGFAULT)
-105 - conformance_resumable_tasks (SEGFAULT)
-
---- src/tbb/co_context.h.orig	2026-01-22 10:49:57 UTC
-+++ src/tbb/co_context.h
-@@ -310,7 +310,12 @@ inline void create_coroutine(coroutine_type& c, std::s
-     const std::size_t protected_stack_size = page_aligned_stack_size + 2 * REG_PAGE_SIZE;
- 
-     // Allocate the stack with protection property
-+#if __FreeBSD__
-+    // MAP_STACK needs at least PROT_READ and PROT_WRITE
-+    std::uintptr_t stack_ptr = (std::uintptr_t)mmap(nullptr, protected_stack_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0);
-+#else
-     std::uintptr_t stack_ptr = (std::uintptr_t)mmap(nullptr, protected_stack_size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0);
-+#endif
-     __TBB_ASSERT((void*)stack_ptr != MAP_FAILED, nullptr);
- 
-     // Allow read write on our stack (guarded pages are still protected)
diff --git a/devel/onetbb/files/patch-test_CMakeLists.txt b/devel/onetbb/files/patch-test_CMakeLists.txt
deleted file mode 100644
index fc236b0630c8..000000000000
--- a/devel/onetbb/files/patch-test_CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- test/CMakeLists.txt.orig	2026-01-12 07:56:34 UTC
-+++ test/CMakeLists.txt
-@@ -86,6 +86,10 @@ function(tbb_add_test)
- 
-     target_link_libraries(${_tbb_test_TARGET_NAME} PRIVATE ${_tbb_test_DEPENDENCIES} Threads::Threads ${TBB_COMMON_LINK_LIBS})
- 
-+    if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+        target_link_libraries(${_tbb_test_TARGET_NAME} PRIVATE util)
-+    endif()
-+
-     if (COMMAND _tbb_run_memcheck)
-         _tbb_run_memcheck(${_tbb_test_NAME} ${_tbb_test_SUBDIR})
-     endif()
-@@ -706,6 +710,10 @@ if (TARGET TBB::tbbmalloc)
-                 target_link_libraries(test_malloc_whitebox PRIVATE ${TBB_COMMON_LINK_FLAGS})
-             endif()
-             target_link_libraries(test_malloc_whitebox PRIVATE Threads::Threads ${TBB_COMMON_LINK_LIBS})
-+
-+            if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+                target_link_libraries(test_malloc_whitebox PRIVATE util)
-+            endif()
-         endif()
-         # ------------------------------------------------------------------------------------------
- 
diff --git a/devel/onetbb/files/patch-test_common_memory_usage.h b/devel/onetbb/files/patch-test_common_memory_usage.h
deleted file mode 100644
index b3d8459524b8..000000000000
--- a/devel/onetbb/files/patch-test_common_memory_usage.h
+++ /dev/null
@@ -1,34 +0,0 @@
---- test/common/memory_usage.h.orig	2025-10-29 11:31:36 UTC
-+++ test/common/memory_usage.h
-@@ -26,6 +26,13 @@
- #include "utils.h"
- #include "utils_assert.h"
- 
-+#if __FreeBSD__
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/user.h>
-+#include <libutil.h>
-+#endif
-+
- #if __unix__ || __sun
- #include <sys/resource.h>
- #include <unistd.h>
-@@ -93,6 +100,17 @@ namespace utils {
-         bool status = GetProcessMemoryInfo(GetCurrentProcess(), &mem, sizeof(mem)) != 0;
-         ASSERT(status, nullptr);
-         return stat == currentUsage ? mem.PagefileUsage : mem.PeakPagefileUsage;
-+#elif __FreeBSD__
-+        /* Inspired from sys/compat/linprocfs/linprocfs.c */
-+        long unsigned size = 0;
-+        struct kinfo_proc *kip = kinfo_getproc(getpid());
-+        ASSERT(kip != nullptr, "Failed to get process info.");
-+        size = (long unsigned)kip->ki_size;
-+        free (kip);
-+        // VmPeak not supported
-+        if (stat == peakUsage)
-+            ASSERT(size, "VmPeak not supported.");
-+        return size;
- #elif __unix__
-         long unsigned size = 0;
-         FILE* fst = fopen("/proc/self/status", "r");
diff --git a/devel/onetbb/files/patch-test_common_utils_concurrency_limit.h b/devel/onetbb/files/patch-test_common_utils_concurrency_limit.h
deleted file mode 100644
index 8d3fca822a9e..000000000000
--- a/devel/onetbb/files/patch-test_common_utils_concurrency_limit.h
+++ /dev/null
@@ -1,24 +0,0 @@
-Avoid dereferencing a NULL pointer
-
-Makes the following test output cleaner:
-
-63 - test_hw_concurrency (ILLEGAL)
-(changed to)
-63 - test_hw_concurrency (Subprocess aborted)
-
-and adds the following message:
-
-test/common/utils_concurrency_limit.h:380, assertion !cpuset_indices.empty(): Empty cpuset returned
-
-A call to get_cpuset_indices() currently always fails on FreeBSD (not implemented).
-
---- test/common/utils_concurrency_limit.h.orig	2026-01-22 11:53:36 UTC
-+++ test/common/utils_concurrency_limit.h
-@@ -377,6 +377,7 @@ int limit_number_of_threads( int max_threads ) {
- 
-     ASSERT(max_threads <= int(sizeof(mask_t) * CHAR_BIT), "The mask size is not enough to set the requested number of threads.");
-     std::vector<int> cpuset_indices = get_cpuset_indices();
-+    ASSERT(!cpuset_indices.empty(), "Empty cpuset returned.");
- 
-     for (int i = 0; i < max_threads; ++i) {
-         CPU_SET(cpuset_indices[i], &new_mask);
diff --git a/devel/onetbb/files/patch-test_common_utils_concurrency_limit.h-affinity b/devel/onetbb/files/patch-test_common_utils_concurrency_limit.h-affinity
deleted file mode 100644
index 3a1e9a401bf4..000000000000
--- a/devel/onetbb/files/patch-test_common_utils_concurrency_limit.h-affinity
+++ /dev/null
@@ -1,57 +0,0 @@
-Add affinity support
-
-Fixes test 63:
-
-63 - test_hw_concurrency (Subprocess aborted)
-
---- test/common/utils_concurrency_limit.h.orig	2026-01-24 10:55:17 UTC
-+++ test/common/utils_concurrency_limit.h
-@@ -91,16 +91,21 @@ static int get_max_procs() {
-                 ++nproc;
-         }
-         maxProcs = nproc;
--#elif __linux__
--        cpu_set_t mask;
-+#elif __linux__ || __FreeBSD__
-         int result = 0;
-+#if __linux__
-+        cpu_set_t mask;
-         sched_getaffinity(0, sizeof(cpu_set_t), &mask);
-+#else /* __FreeBSD__ */
-+        cpuset_t mask;
-+        sched_getaffinity(0, sizeof(cpuset_t), &mask);
-+#endif
-         int nproc = sysconf(_SC_NPROCESSORS_ONLN);
-         for (int i = 0; i < nproc; ++i) {
-             if (CPU_ISSET(i, &mask)) ++result;
-         }
-         maxProcs = result;
--#else // FreeBSD
-+#else
-         maxProcs = sysconf(_SC_NPROCESSORS_ONLN);
- #endif
-     }
-@@ -328,9 +333,14 @@ std::vector<int> get_cpuset_indices() {
- 
- std::vector<int> get_cpuset_indices() {
-     std::vector<int> result;
-+#if __linux__ || __FreeBSD__
- #if __linux__
-     cpu_set_t mask;
-     sched_getaffinity(0, sizeof(cpu_set_t), &mask);
-+#else /* __FreeBSD__ */
-+    cpuset_t mask;
-+    sched_getaffinity(0, sizeof(cpuset_t), &mask);
-+#endif
-     int nproc = sysconf(_SC_NPROCESSORS_ONLN);
-     for (int i = 0; i < nproc; ++i) {
-         if (CPU_ISSET(i, &mask)) {
-@@ -339,7 +349,7 @@ std::vector<int> get_cpuset_indices() {
-     }
-     ASSERT(!result.empty(), nullptr);
- #else
--    // TODO: add affinity support for Windows and FreeBSD
-+    // TODO: add affinity support for Windows
- #endif
-     return result;
- }
diff --git a/devel/onetbb/files/patch-test_tbbmalloc_test_malloc_compliance.cpp b/devel/onetbb/files/patch-test_tbbmalloc_test_malloc_compliance.cpp
deleted file mode 100644
index 6d57f5a6c665..000000000000
--- a/devel/onetbb/files/patch-test_tbbmalloc_test_malloc_compliance.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-Calling utils::LinuxKernelVersion() is only relevant on Linux
-
-This fixes test 131:
-
-131 - test_malloc_compliance (Subprocess aborted)
-
---- test/tbbmalloc/test_malloc_compliance.cpp.orig	2025-10-29 11:31:36 UTC
-+++ test/tbbmalloc/test_malloc_compliance.cpp
-@@ -1032,7 +1032,7 @@ TEST_CASE("MAIN TEST") {
-     // Check if we were called to test standard behavior
-     // TODO: enable this mode
-     // setSystemAllocs();
--#if __unix__
-+#if __linux__
-     /* According to man pthreads
-        "NPTL threads do not share resource limits (fixed in kernel 2.6.10)".
-        Use per-threads limits for affected systems.
diff --git a/devel/onetbb/pkg-plist b/devel/onetbb/pkg-plist
index c1160a9a4beb..7c2b1535832c 100644
--- a/devel/onetbb/pkg-plist
+++ b/devel/onetbb/pkg-plist
@@ -37,6 +37,7 @@ include/oneapi/tbb/detail/_flow_graph_join_impl.h
 include/oneapi/tbb/detail/_flow_graph_node_impl.h
 include/oneapi/tbb/detail/_flow_graph_node_set_impl.h
 include/oneapi/tbb/detail/_flow_graph_nodes_deduction.h
+include/oneapi/tbb/detail/_flow_graph_resource_limiting.h
 include/oneapi/tbb/detail/_flow_graph_tagged_buffer_impl.h
 include/oneapi/tbb/detail/_flow_graph_trace_impl.h
 include/oneapi/tbb/detail/_flow_graph_types_impl.h
@@ -148,14 +149,14 @@ lib/cmake/TBB/TBBTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/TBB/TBBTargets.cmake
 lib/libtbb%%DBGSUFX%%.so
 lib/libtbb%%DBGSUFX%%.so.12
-lib/libtbb%%DBGSUFX%%.so.12.17
+lib/libtbb%%DBGSUFX%%.so.12.18
 lib/libtbbbind_2_5%%DBGSUFX%%.so
 lib/libtbbbind_2_5%%DBGSUFX%%.so.3
-lib/libtbbbind_2_5%%DBGSUFX%%.so.3.17
+lib/libtbbbind_2_5%%DBGSUFX%%.so.3.18
 lib/libtbbmalloc%%DBGSUFX%%.so
 lib/libtbbmalloc%%DBGSUFX%%.so.2
-lib/libtbbmalloc%%DBGSUFX%%.so.2.17
+lib/libtbbmalloc%%DBGSUFX%%.so.2.18
 lib/libtbbmalloc_proxy%%DBGSUFX%%.so
 lib/libtbbmalloc_proxy%%DBGSUFX%%.so.2
-lib/libtbbmalloc_proxy%%DBGSUFX%%.so.2.17
+lib/libtbbmalloc_proxy%%DBGSUFX%%.so.2.18
 libdata/pkgconfig/tbb%%PCSUFX%%.pc
diff --git a/graphics/openusd/Makefile b/graphics/openusd/Makefile
index 1118e8ba43cb..bf7870f7f99c 100644
--- a/graphics/openusd/Makefile
+++ b/graphics/openusd/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openusd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	26.05
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/graphics/openusd/files/patch-pxr-base-work-workTBB-detachedTask_impl.h b/graphics/openusd/files/patch-pxr-base-work-workTBB-detachedTask_impl.h
new file mode 100644
index 000000000000..28f0f355f89b
--- /dev/null
+++ b/graphics/openusd/files/patch-pxr-base-work-workTBB-detachedTask_impl.h
@@ -0,0 +1,10 @@
+--- pxr/base/work/workTBB/detachedTask_impl.h.orig	2026-05-13 12:49:49 UTC
++++ pxr/base/work/workTBB/detachedTask_impl.h
+@@ -11,6 +11,7 @@
+ #include "pxr/base/work/workTBB/dispatcher_impl.h"
+ #include "pxr/base/work/api.h"
+ 
++#include <tbb/version.h>
+ #if TBB_INTERFACE_VERSION_MAJOR >= 12
+ #include <tbb/task_group.h>
+ #else
diff --git a/graphics/openusd/files/patch-pxr-base-work-workTBB-dispatcher_impl.h b/graphics/openusd/files/patch-pxr-base-work-workTBB-dispatcher_impl.h
new file mode 100644
index 000000000000..42cf2afc8bec
--- /dev/null
+++ b/graphics/openusd/files/patch-pxr-base-work-workTBB-dispatcher_impl.h
@@ -0,0 +1,10 @@
+--- pxr/base/work/workTBB/dispatcher_impl.h.orig	2026-05-13 12:42:10 UTC
++++ pxr/base/work/workTBB/dispatcher_impl.h
+@@ -10,6 +10,7 @@
+ #include "pxr/pxr.h"
+ #include "pxr/base/work/api.h"
+ 
++#include <tbb/version.h>
+ // Blocked range is not used in this file, but this header happens to pull in
+ // the TBB version header in a way that works in all TBB versions.
+ #include <tbb/blocked_range.h>
diff --git a/misc/openvdb/Makefile b/misc/openvdb/Makefile
index 846766898ec5..2badf2314271 100644
--- a/misc/openvdb/Makefile
+++ b/misc/openvdb/Makefile
@@ -1,8 +1,12 @@
 PORTNAME=	openvdb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	13.0.0
+PORTREVISION=	1
 CATEGORIES=	misc
 
+PATCH_SITES=	https://github.com/AcademySoftwareFoundation/openvdb/commit/
+PATCHFILES=	d68d0914fc6ed41cadd363bd4330c39a7fb5b1f1.diff:-p1 # TBB 2023 fix
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tools for storage and manipulation of sparse volumetric data
 WWW=		https://www.openvdb.org/ \
diff --git a/misc/openvdb/distinfo b/misc/openvdb/distinfo
index 84f702aa2c6c..618c84a8d0fc 100644
--- a/misc/openvdb/distinfo
+++ b/misc/openvdb/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1762232553
+TIMESTAMP = 1778754355
 SHA256 (AcademySoftwareFoundation-openvdb-v13.0.0_GH0.tar.gz) = 4d6a91df5f347017496fe8d22c3dbb7c4b5d7289499d4eb4d53dd2c75bb454e1
 SIZE (AcademySoftwareFoundation-openvdb-v13.0.0_GH0.tar.gz) = 4891966
+SHA256 (d68d0914fc6ed41cadd363bd4330c39a7fb5b1f1.diff) = e9035e3be3acdd2247206a8ef5be48837ddcda0aa48e863566e57f4f2588885b
+SIZE (d68d0914fc6ed41cadd363bd4330c39a7fb5b1f1.diff) = 1517