diff --git a/math/onednn/Makefile b/math/onednn/Makefile
index 08e0ac728ab8..699f8a729b89 100644
--- a/math/onednn/Makefile
+++ b/math/onednn/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	onednn
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.4
+DISTVERSION=	2.5
 CATEGORIES=	math # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Intel(R) Math Kernel Library for Deep Neural Networks
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	armv6 armv7 i386 mips powerpc powerpcspe
 BROKEN_aarch64=	error: sys/prctl.h file not found
 
 TEST_DEPENDS=	bash:shells/bash \
 		libsysinfo>0:devel/libsysinfo
 
 USES=		cmake compiler:c++11-lang localbase:ldflags
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	oneapi-src
 GH_PROJECT=	oneDNN
 
 CMAKE_OFF=	DNNL_BUILD_TESTS DNNL_BUILD_EXAMPLES
 
 OPTIONS_DEFAULT=		SIMD_DEFAULT OPENMP
 OPTIONS_SINGLE=			SIMD CPU_RUNTIME
 OPTIONS_SINGLE_SIMD=		SIMD_DEFAULT SIMD_NATIVE
 OPTIONS_SINGLE_CPU_RUNTIME=	OPENMP TBB SEQ THREADPOOL_STANDALONE THREADPOOL_EIGEN THREADPOOL_TBB
 CPU_RUNTIME_DESC=		Threading runtime for CPU engines
 
 OPENMP_CMAKE_ON=	-DDNNL_CPU_RUNTIME=OMP
 
 SEQ_DESC=		Sequential (no parallelism)
 SEQ_CMAKE_ON=		-DDNNL_CPU_RUNTIME=SEQ
 
 SIMD_DEFAULT_DESC=	Default, no non-default SIMD instructions are used
 
 SIMD_NATIVE_DESC=	Optimize for this CPU
 SIMD_NATIVE_CXXFLAGS=	-march=native
 
 SIMD_SSE41_DESC=	Use SSE4.1 instructions
 SIMD_SSE41_CXXFLAGS=	-msse4.1
 
 TBB_DESC=		Threading Building Blocks
 TBB_CMAKE_ON=		-DDNNL_CPU_RUNTIME=TBB
 TBB_BROKEN=		https://github.com/oneapi-src/oneDNN/issues/876
 
 THREADPOOL_STANDALONE_DESC=	Threadpool based on the standalone implementation
 THREADPOOL_STANDALONE_CMAKE_ON=	-DDNNL_CPU_RUNTIME=THREADPOOL -D_DNNL_TEST_THREADPOOL_IMPL=STANDALONE
 THREADPOOL_STANDALONE_BROKEN=	https://github.com/oneapi-src/oneDNN/issues/877
 THREADPOOL_EIGEN_DESC=		Threadpool based on the Eigen implementation
 THREADPOOL_EIGEN_CMAKE_ON=	-DDNNL_CPU_RUNTIME=THREADPOOL -D_DNNL_TEST_THREADPOOL_IMPL=EIGEN
 THREADPOOL_TBB_DESC=		Threadpool based on the TBB implementation
 THREADPOOL_TBB_CMAKE_ON=	-DDNNL_CPU_RUNTIME=THREADPOOL -D_DNNL_TEST_THREADPOOL_IMPL=TBB
 THREADPOOL_TBB_BROKEN=		https://github.com/oneapi-src/oneDNN/issues/876
 
 ARCH_LOCAL!=	/usr/bin/uname -p # because OPTIONS_SINGLE_SIMD doesn't support per-ARCH values OPTIONS_SINGLE_SIMD_{arch}, like OPTIONS_DEFINE_{arch}
 
 .if ${ARCH_LOCAL} == i386 || ${ARCH_LOCAL} == amd64
 OPTIONS_SINGLE_SIMD+=	SIMD_SSE41
 .endif
 
 CXXFLAGS:=	${CXXFLAGS:S/-O2/-O3/} # clang writes wrong binary code when -O2 optimization is used and one testcase is failing, see https://bugs.llvm.org/show_bug.cgi?id=48104
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc
 
 do-test: # some tests are known to fail: https://github.com/intel/mkl-dnn/issues/350 (the upstream failed to reproduce it and closed the report)
 	@${REINPLACE_CMD} 's| /bin/bash | ${LOCALBASE}/bin/bash |' ${WRKSRC}/tests/CMakeLists.txt
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDNNL_BUILD_TESTS=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/math/onednn/distinfo b/math/onednn/distinfo
index 69bece172445..474ec4c76005 100644
--- a/math/onednn/distinfo
+++ b/math/onednn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637870317
-SHA256 (oneapi-src-oneDNN-v2.4.4_GH0.tar.gz) = 29ce33da3eaf48cbc39cfd9e9af0d7d00e256dcd84168b906df48fb75f5f844e
-SIZE (oneapi-src-oneDNN-v2.4.4_GH0.tar.gz) = 5800188
+TIMESTAMP = 1640073289
+SHA256 (oneapi-src-oneDNN-v2.5_GH0.tar.gz) = d7a47caeb28d2c67dc8fa0d0f338b11fbf25b473a608f04cfed913aea88815a9
+SIZE (oneapi-src-oneDNN-v2.5_GH0.tar.gz) = 5805400
diff --git a/math/onednn/files/patch-cmake_platform.cmake b/math/onednn/files/patch-cmake_platform.cmake
index ac31cbbdf369..390741db48ac 100644
--- a/math/onednn/files/patch-cmake_platform.cmake
+++ b/math/onednn/files/patch-cmake_platform.cmake
@@ -1,51 +1,60 @@
---- cmake/platform.cmake.orig	2021-06-29 20:12:52 UTC
+--- cmake/platform.cmake.orig	2021-12-07 19:00:25 UTC
 +++ cmake/platform.cmake
-@@ -171,7 +171,7 @@ elseif(UNIX OR MINGW)
+@@ -175,7 +175,7 @@ elseif(UNIX OR MINGW)
                   set(DEF_ARCH_OPT_FLAGS "-O3")
               endif()
               # For native compilation tune for the host processor
 -             if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
 +             if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
                   append(DEF_ARCH_OPT_FLAGS "-mcpu=native")
               endif()
          elseif(DNNL_TARGET_ARCH STREQUAL "PPC64")
-@@ -179,7 +179,7 @@ elseif(UNIX OR MINGW)
+@@ -183,7 +183,7 @@ elseif(UNIX OR MINGW)
                   set(DEF_ARCH_OPT_FLAGS "-O3")
               endif()
               # For native compilation tune for the host processor
 -             if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
 +             if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
                   append(DEF_ARCH_OPT_FLAGS "-mcpu=native")
               endif()
          elseif(DNNL_TARGET_ARCH STREQUAL "S390X")
-@@ -187,10 +187,10 @@ elseif(UNIX OR MINGW)
+@@ -191,10 +191,10 @@ elseif(UNIX OR MINGW)
                   set(DEF_ARCH_OPT_FLAGS "-O3")
               endif()
               # For native compilation tune for the host processor
 -             if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
 +             if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
                   append(DEF_ARCH_OPT_FLAGS "-march=native")
               endif()
 -        elseif(DNNL_TARGET_ARCH STREQUAL "X64")
 +        elseif(FALSE AND DNNL_TARGET_ARCH STREQUAL "X64")
               set(DEF_ARCH_OPT_FLAGS "-msse4.1")
          endif()
          # Clang cannot vectorize some loops with #pragma omp simd and gets
-@@ -262,7 +262,7 @@ elseif(UNIX OR MINGW)
-                  set(DEF_ARCH_OPT_FLAGS "-O3")
-              endif()
-              # For native compilation tune for the host processor
--             if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
-+             if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
-                  append(DEF_ARCH_OPT_FLAGS "-mcpu=native")
-              endif()
+@@ -272,7 +272,7 @@ elseif(UNIX OR MINGW)
+                 set(DEF_ARCH_OPT_FLAGS "-O3")
+             endif()
+             # For native compilation tune for the host processor
+-            if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
++            if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
+                 append(DEF_ARCH_OPT_FLAGS "-mcpu=native")
+             endif()
          elseif(DNNL_TARGET_ARCH STREQUAL "PPC64")
-@@ -271,7 +271,7 @@ elseif(UNIX OR MINGW)
-              endif()
-              # In GCC, -ftree-vectorize is turned on under -O3 since 2007.
-              # For native compilation tune for the host processor
--             if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
-+             if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
-                  append(DEF_ARCH_OPT_FLAGS "-mcpu=native")
-              endif()
+@@ -281,7 +281,7 @@ elseif(UNIX OR MINGW)
+             endif()
+             # In GCC, -ftree-vectorize is turned on under -O3 since 2007.
+             # For native compilation tune for the host processor
+-            if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
++            if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
+                 append(DEF_ARCH_OPT_FLAGS "-mcpu=native")
+             endif()
          elseif(DNNL_TARGET_ARCH STREQUAL "S390X")
+@@ -290,7 +290,7 @@ elseif(UNIX OR MINGW)
+             endif()
+             # In GCC, -ftree-vectorize is turned on under -O3 since 2007.
+             # For native compilation tune for the host processor
+-            if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
++            if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
+                 append(DEF_ARCH_OPT_FLAGS "-march=native")
+             endif()
+         elseif(DNNL_TARGET_ARCH STREQUAL "RV64")
diff --git a/math/onednn/pkg-plist b/math/onednn/pkg-plist
index 4ace68bc7bff..24bd772e4f67 100644
--- a/math/onednn/pkg-plist
+++ b/math/onednn/pkg-plist
@@ -1,50 +1,36 @@
 include/dnnl.h
 include/dnnl.hpp
 include/dnnl_config.h
 include/dnnl_debug.h
 include/dnnl_ocl.h
 include/dnnl_ocl.hpp
 include/dnnl_sycl.h
 include/dnnl_sycl.hpp
 include/dnnl_sycl_types.h
 include/dnnl_threadpool.h
 include/dnnl_threadpool.hpp
 include/dnnl_threadpool_iface.hpp
 include/dnnl_types.h
 include/dnnl_version.h
-include/mkldnn.h
-include/mkldnn.hpp
-include/mkldnn_config.h
-include/mkldnn_debug.h
-include/mkldnn_dnnl_mangling.h
-include/mkldnn_types.h
-include/mkldnn_version.h
 include/oneapi/dnnl/dnnl.h
 include/oneapi/dnnl/dnnl.hpp
 include/oneapi/dnnl/dnnl_config.h
 include/oneapi/dnnl/dnnl_debug.h
 include/oneapi/dnnl/dnnl_ocl.h
 include/oneapi/dnnl/dnnl_ocl.hpp
 include/oneapi/dnnl/dnnl_ocl_types.h
 include/oneapi/dnnl/dnnl_sycl.h
 include/oneapi/dnnl/dnnl_sycl.hpp
 include/oneapi/dnnl/dnnl_sycl_types.h
 include/oneapi/dnnl/dnnl_threadpool.h
 include/oneapi/dnnl/dnnl_threadpool.hpp
 include/oneapi/dnnl/dnnl_threadpool_iface.hpp
 include/oneapi/dnnl/dnnl_types.h
 include/oneapi/dnnl/dnnl_version.h
 lib/cmake/dnnl/dnnl-config-version.cmake
 lib/cmake/dnnl/dnnl-config.cmake
 lib/cmake/dnnl/dnnl-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/dnnl/dnnl-targets.cmake
-lib/cmake/mkldnn/mkldnn-config-version.cmake
-lib/cmake/mkldnn/mkldnn-config.cmake
-lib/cmake/mkldnn/mkldnn-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/mkldnn/mkldnn-targets.cmake
 lib/libdnnl.so
 lib/libdnnl.so.2
-lib/libdnnl.so.2.4
-lib/libmkldnn.so
-lib/libmkldnn.so.2
-lib/libmkldnn.so.2.4
+lib/libdnnl.so.2.5