diff --git a/devel/ispc/Makefile b/devel/ispc/Makefile
index 0b41c6d165cd..5ecb24d307f4 100644
--- a/devel/ispc/Makefile
+++ b/devel/ispc/Makefile
@@ -1,84 +1,84 @@
 PORTNAME=	ispc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.28.2
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Intel's compiler for high-performance SIMD programming
 WWW=		https://ispc.github.io/ \
 		https://github.com/ispc/ispc
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=		aarch64 amd64 i386
 ONLY_FOR_ARCHS_REASON=	only available for these architectures
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		m4:devel/m4
 LIB_DEPENDS=	libLLVM.so:devel/llvm${LLVM_VERSION} \
 		libtbb.so:devel/onetbb
 
 USES=		bison cmake compiler:c++17-lang llvm:lib,min=19,max=19 python:build,test shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_TUPLE=	google:googletest:6a7ed31:googletest/ispcrt/tests/vendor/google/googletest
 
 SHEBANG_GLOB=	*.py
 
 CONFIGURE_ENV=	PATH=${LOCALBASE}/llvm${LLVM_VERSION}/bin:${PATH} # see https://github.com/ispc/ispc/issues/2318
 CMAKE_OFF=	ISPC_NO_DUMPS ISPCRT_BUILD_GPU ISPC_INCLUDE_TESTS ISPCRT_BUILD_TESTS ISPC_INCLUDE_EXAMPLES
 CMAKE_ARGS=	-DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config
 
 BINARY_ALIAS=	flex=${LOCALBASE}/bin/flex python=${PYTHON_CMD} m4=${LOCALBASE}/bin/gm4
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE_amd64=	ARM XE
 OPTIONS_DEFINE_i386=	ARM
 
 ARM_DESC=		Enable ARM support - requires ARM backend in LLVM
 ARM_CMAKE_BOOL=		ARM_ENABLED
 
 XE_DESC=		Enable Intel Xe support
 XE_BUILD_DEPENDS=	${LOCALBASE}/llvm${LLVM_VERSION}/lib/libLLVMGenXIntrinsics.a:devel/vc-intrinsics@llvm${LLVM_VERSION}
 XE_LIB_DEPENDS=		libze_loader.so:devel/level-zero \
 			libLLVMSPIRVLib.so.${LLVM_VERSION}:devel/spirv-llvm-translator@llvm${LLVM_VERSION}
 XE_CMAKE_BOOL=		XE_ENABLED
 XE_CMAKE_BOOL_OFF=	ISPCRT_BUILD_TESTS
 XE_CMAKE_ON=		-DXE_DEPS_DIR:PATH="${LOCALBASE}/llvm${LLVM_VERSION}" -DISPC_INCLUDE_XE_EXAMPLES=OFF
 XE_PLIST_FILES=		include/ispcrt/ispcrt.h \
 			include/ispcrt/ispcrt.hpp \
 			include/ispcrt/ispcrt.isph \
 			lib/cmake/ispcrt-${PORTVERSION}/Finddpcpp_compiler.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/Findlevel_zero.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/interop.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/ispc.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/ispcrtConfig.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/ispcrt_Exports-%%CMAKE_BUILD_TYPE%%.cmake \
 			lib/cmake/ispcrt-${PORTVERSION}/ispcrt_Exports.cmake \
 			lib/libispcrt.so \
 			lib/libispcrt.so.1 \
 			lib/libispcrt.so.${PORTVERSION} \
 			lib/libispcrt_static.a
 XE_BROKEN=		Unknown architecture
 
 do-test: # all tests pass
 	@cd ${WRKSRC} && ISPC_HOME=${BUILD_WRKSRC}/bin ./scripts/run_tests.py
 
 test-check-all: # the upstream claims that some of these checks are broken without using their patched llvm version, hence using llvm-devel
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check-all
 
 run-examples: build
-	@[ -f ${LOCALBASE}/lib/libtbb.so ] || ! echo "ERROR run-examples target requires devel/tbb package installed"
+	@[ -f ${LOCALBASE}/lib/libtbb.so ] || ! echo "ERROR run-examples target requires devel/onetbb package installed"
 .for e in simple sort mandelbrot stencil
 	@cd ${WRKSRC}/examples/${e} && \
 	${ECHO} "===> Running example ${e}" && \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} && \
 	./${e}
 .endfor
 
 # tests as of 1.28.2: PASSRATE (1568/1568) = 100%
 
 .include <bsd.port.mk>
diff --git a/devel/tbb/Makefile b/devel/tbb/Makefile
index 86801c22f0af..6849c3b59481 100644
--- a/devel/tbb/Makefile
+++ b/devel/tbb/Makefile
@@ -1,89 +1,92 @@
 PORTNAME=	tbb
 PORTVERSION=	2020.3
 DISTVERSIONPREFIX=	v
 PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Library that provides thread building blocks (legacy version)
 WWW=		https://threadingbuildingblocks.org/
 
 LICENSE=	APACHE20
 
+DEPRECATED=	Project moved to devel/onetbb
+EXPIRATION_DATE=	2026-03-01
+
 ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le powerpcspe
 ONLY_FOR_ARCHS_REASON=	has not been ported to this platform
 
 USES=	compiler gmake tar:tgz
 
 CONFLICTS=	onetbb
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	oneapi-src
 GH_PROJECT=	oneTBB
 
 SUB_FILES=	tbb.pc
 SUB_LIST=	prefix="${PREFIX}" \
 		name="${PORTNAME}" \
 		description="${COMMENT}" \
 		version="${PORTVERSION}"
 
 PLIST=	${WRKDIR}/.PLIST.more
 
 OPTIONS_DEFINE=	DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 		dot:graphics/graphviz
 
 USE_LDCONFIG=	yes
 ALL_TARGET=	default
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	@if [ "${COMPILER_TYPE}" != "${CC:T}" ]; then \
 	   ${LN} -sf FreeBSD.${COMPILER_TYPE}.inc \
 	     ${WRKSRC}/build/FreeBSD.${CC:T}.inc; \
 	 fi
 	@${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '/^CONLY =/s|^CONLY =.*|CONLY = ${CC}|' \
 		-e '/^CPLUS =/s|^CPLUS =.*|CPLUS = ${CXX}|' \
 			${WRKSRC}/build/FreeBSD.${COMPILER_TYPE}.inc
 
 post-build-DOCS-on:
 	cd ${WRKSRC}; \
 		${MAKE_CMD} doxygen
 
 pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
 .if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC}/html && \
 		${FIND} . -type f | \
 		${SED} 's|^\.|%%PORTDOCS%%%%DOCSDIR%%|' >>${PLIST}
 .endif
 
 do-install:
 	cd ${WRKSRC}; \
 	${INSTALL_LIB} build/FreeBSD*release/libtbb.so \
 		${STAGEDIR}${PREFIX}/lib/libtbb.so.2; \
 	${LN} -sf libtbb.so.2 \
 		${STAGEDIR}${PREFIX}/lib/libtbb.so; \
 	${INSTALL_LIB} build/FreeBSD*release/libtbbmalloc.so \
 		${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so.2; \
 	${LN} -sf libtbbmalloc.so.2 \
 		${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so; \
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/tbb/; \
 	cd include/tbb/ && \
 		${COPYTREE_SHARE} \
 			. ${STAGEDIR}${PREFIX}/include/tbb/ "! -name *\.html"
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/tbb.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>