diff --git a/graphics/oidn/Makefile b/graphics/oidn/Makefile
index f3bf553ca529..2098e2c26871 100644
--- a/graphics/oidn/Makefile
+++ b/graphics/oidn/Makefile
@@ -1,76 +1,75 @@
 PORTNAME=	oidn
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://freebsd.org/:weights # bogus URL to make the framework happy, the fetch uses Git URL below
 DISTFILES=	${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}:weights
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Intel(R) Open Image Denoise library
 WWW=		https://www.openimagedenoise.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	Intel(R) MKL-DNN supports x86 64 bit platforms only (oidn contains a custom version of mkl-dnn, see math/mkl-dnn), and ISPC has a limited availability
-BROKEN_FreeBSD_12=	error: unknown type name 'cpuset_t'; did you mean 'cpusetid_t'?
 
 FETCH_DEPENDS=	git:devel/git \
 		git-lfs:devel/git-lfs
 BUILD_DEPENDS=	ispc>=1.14.1:devel/ispc
 LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 USES=		cmake:noninja compiler:c++14-lang python:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageDenoise
 GH_TUPLE=	OpenImageDenoise:mkl-dnn:9bea36e:m/external/mkl-dnn \
 		ROCmSoftwarePlatform:composable_kernel:e85178b:composable_kernel/external/composable_kernel \
 		NVIDIA:cutlass:66d9cdd:cutlass/external/cutlass
 
 CMAKE_ARGS=	-DTBB_ROOT:STRING=${LOCALBASE} -DTBB_INCLUDE_DIR:STRING=${LOCALBASE}/include -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD}
 
 PLIST_SUB=	VER="${PORTVERSION}"
 
 OPTIONS_DEFINE=			APPS DOCS OPENIMAGEIO
 OPTIONS_DEFAULT=		APPS OPENIMAGEIO
 OPTIONS_SUB=			yes
 
 APPS_DESC=			Build example and test apps
 APPS_CMAKE_BOOL=		OIDN_APPS
 
 DOCSDIR=			share/doc/${GH_ACCOUNT}
 
 OPENIMAGEIO_DESC=		Build with OpenImageIO for image formats support
 OPENIMAGEIO_CMAKE_BOOL=		OIDN_APPS_OPENIMAGEIO
 OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENIMAGEIO_IMPLIES=		APPS # OpenImageIO is only used by apps and examples
 
 WEIGHTS_GIT_URL=	https://github.com/OpenImageDenoise/oidn-weights.git
 WEIGHTS_GIT_HASH=	4322c25e25a05584f65da1a4be5cef40a4b2e90b
 
 pre-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}" ]; then \
 		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
 		cd ${DISTDIR}/${DIST_SUBDIR} && \
 		${ECHO} "==> Fetching the oidn/weights subproject with large LFS files" && \
 		( \
 			${MKDIR} ${WRKDIR}; \
 			HOME=${WRKDIR}; \
 			git config --global filter.lfs.smudge "git-lfs smudge -- %f" && \
 			git clone -q ${WEIGHTS_GIT_URL} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} && \
 			(cd ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} && git reset -q --hard ${WEIGHTS_GIT_HASH} && ${RM} -r .git) && \
 			${RM} -r ${WRKDIR} \
 		) && \
 		${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
 		${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -print0 | LC_ALL=C ${SORT} -z | \
 		${TAR} czf ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
 		${RM} -r ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}; \
 	fi
 
 post-extract:
 	@cd ${WRKSRC} && ${RMDIR} weights && ${LN} -s ${WRKDIR}/${PORTNAME}-weights-${WEIGHTS_GIT_HASH} weights
 
 .include <bsd.port.mk>
diff --git a/graphics/oidn/files/patch-core_thread.h b/graphics/oidn/files/patch-core_thread.h
index 826c204631e7..86c7e1697ca5 100644
--- a/graphics/oidn/files/patch-core_thread.h
+++ b/graphics/oidn/files/patch-core_thread.h
@@ -1,22 +1,34 @@
 --- core/thread.h.orig	2023-05-24 17:03:47 UTC
 +++ core/thread.h
-@@ -130,7 +130,7 @@ OIDN_NAMESPACE_BEGIN
+@@ -8,6 +8,11 @@
+ #if !defined(_WIN32)
+   #include <pthread.h>
+   #include <sched.h>
++  #if __FreeBSD__ <= 12
++    #include <sys/cpuset.h>
++    struct _cpuset;
++    typedef struct _cpuset cpu_set_t;
++  #endif
+   #if defined(__APPLE__)
+     #include <mach/thread_policy.h>
+   #endif
+@@ -130,7 +135,7 @@ OIDN_NAMESPACE_BEGIN
      std::vector<GROUP_AFFINITY> oldAffinities; // original thread affinities
    };
  
 -#elif defined(__linux__)
 +#elif defined(__linux__) || defined(__FreeBSD__)
  
    // -----------------------------------------------------------------------------------------------
    // ThreadAffinity: Linux
-@@ -153,8 +153,8 @@ OIDN_NAMESPACE_BEGIN
+@@ -153,8 +158,8 @@ OIDN_NAMESPACE_BEGIN
      void restore(int threadIndex);
  
    private:
 -    std::vector<cpu_set_t> affinities;    // thread affinities
 -    std::vector<cpu_set_t> oldAffinities; // original thread affinities
 +    std::vector<cpuset_t> affinities;    // thread affinities
 +    std::vector<cpuset_t> oldAffinities; // original thread affinities
    };
  
  #elif defined(__APPLE__)