Index: devel/volk/Makefile
===================================================================
--- devel/volk/Makefile
+++ devel/volk/Makefile
@@ -1,27 +1,33 @@
 PORTNAME=	volk
-DISTVERSIONPREFIX=	v
-DISTVERSION=	2.2.1
+DISTVERSION=	2.5.0
 CATEGORIES=	devel comms hamradio
+MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
+PATCHFILES=	dbe88eb8fe3046745fac7afa17a92e8f47285a70.patch:-p1 \
+		dd6d9bf51d98f699c54c783995fcf3cca60c38d8.patch:-p1
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Vector-Optimized Library of Kernels
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	liborc-0.4.so:devel/orc
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR}
-
-USES=		cmake compiler:c++11-lang python:3.5+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mako>=0.4.2:textproc/py-mako@${PY_FLAVOR}
+LIB_DEPENDS=	liborc-0.4.so:devel/orc \
+		libboost_filesystem.so:devel/boost-libs
 
-.include <bsd.port.pre.mk>
+USES=		cmake:testing compiler:c++17-lang python:3.7+ tar:xz
 
-.if ${ARCH} == armv7
-USE_GCC=	yes
-.endif
-
-USE_GITHUB=	yes
+USE_GITHUB=	nodefault
 GH_ACCOUNT=	gnuradio
+GH_TUPLE=	google:cpu_features:69d3993:cpu_features
 
 USE_LDCONFIG=	yes
 
-.include <bsd.port.post.mk>
+post-extract:
+	@${RM} -r ${WRKSRC}/cpu_features
+	@${MV} ${WRKSRC_cpu_features} ${WRKSRC}/cpu_features
+
+.include <bsd.port.mk>
Index: devel/volk/distinfo
===================================================================
--- devel/volk/distinfo
+++ devel/volk/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1585921652
-SHA256 (gnuradio-volk-v2.2.1_GH0.tar.gz) = 283d088f93774a55cb8be058b3d3b4a06d8bd44d6bc0016416f5a7818dd05db4
-SIZE (gnuradio-volk-v2.2.1_GH0.tar.gz) = 330676
+TIMESTAMP = 1641238012
+SHA256 (volk-2.5.0.tar.xz) = ddc84d2396e9d3899ff0411a0659f64ba19d75b2210cce83bc2eaa7767429252
+SIZE (volk-2.5.0.tar.xz) = 322280
+SHA256 (google-cpu_features-69d3993_GH0.tar.gz) = 65dccf65727e62c111db6ec32ab4bf149bf3d03d2d0f8d133d6809f505a5c655
+SIZE (google-cpu_features-69d3993_GH0.tar.gz) = 83241
+SHA256 (dbe88eb8fe3046745fac7afa17a92e8f47285a70.patch) = 6a92d660a56b2964c1eeb0ab1a3848291ed3064fa0c17cbd63438346bfe582ce
+SIZE (dbe88eb8fe3046745fac7afa17a92e8f47285a70.patch) = 846
+SHA256 (dd6d9bf51d98f699c54c783995fcf3cca60c38d8.patch) = db7d75afcaeae1c0b6f06665ed903c6c925c6b5e88757215db82b3183201ffe9
+SIZE (dd6d9bf51d98f699c54c783995fcf3cca60c38d8.patch) = 1379
Index: devel/volk/pkg-plist
===================================================================
--- devel/volk/pkg-plist
+++ devel/volk/pkg-plist
@@ -1,6 +1,10 @@
+bin/list_cpu_features
 bin/volk-config-info
 bin/volk_modtool
 bin/volk_profile
+include/cpu_features/cpu_features_cache_info.h
+include/cpu_features/cpu_features_macros.h
+include/cpu_features/cpuinfo_x86.h
 include/volk/constants.h
 include/volk/saturation_arithmetic.h
 include/volk/volk.h
@@ -38,12 +42,14 @@
 include/volk/volk_32f_convert_64f.h
 include/volk/volk_32f_cos_32f.h
 include/volk/volk_32f_expfast_32f.h
+include/volk/volk_32f_exp_32f.h
 include/volk/volk_32f_index_max_16u.h
 include/volk/volk_32f_index_max_32u.h
 include/volk/volk_32f_invsqrt_32f.h
 include/volk/volk_32f_log2_32f.h
 include/volk/volk_32f_null_32f.h
 include/volk/volk_32f_s32f_32f_fm_detect_32f.h
+include/volk/volk_32f_s32f_add_32f.h
 include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f.h
 include/volk/volk_32f_s32f_convert_16i.h
 include/volk/volk_32f_s32f_convert_32i.h
@@ -75,6 +81,7 @@
 include/volk/volk_32fc_32f_add_32fc.h
 include/volk/volk_32fc_32f_dot_prod_32fc.h
 include/volk/volk_32fc_32f_multiply_32fc.h
+include/volk/volk_32fc_accumulator_s32fc.h
 include/volk/volk_32fc_conjugate_32fc.h
 include/volk/volk_32fc_convert_16ic.h
 include/volk/volk_32fc_deinterleave_32f_x2.h
@@ -90,6 +97,7 @@
 include/volk/volk_32fc_s32f_deinterleave_real_16i.h
 include/volk/volk_32fc_s32f_magnitude_16i.h
 include/volk/volk_32fc_s32f_power_32fc.h
+include/volk/volk_32fc_s32f_power_spectral_densitypuppet_32f.h
 include/volk/volk_32fc_s32f_power_spectrum_32f.h
 include/volk/volk_32fc_s32f_x2_power_spectral_density_32f.h
 include/volk/volk_32fc_s32fc_multiply_32fc.h
@@ -149,12 +157,18 @@
 include/volk/volk_sse_intrinsics.h
 include/volk/volk_typedefs.h
 include/volk/volk_version.h
+lib/cmake/CpuFeatures/CpuFeaturesConfig.cmake
+lib/cmake/CpuFeatures/CpuFeaturesConfigVersion.cmake
+lib/cmake/CpuFeatures/CpuFeaturesTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/CpuFeatures/CpuFeaturesTargets.cmake
 lib/cmake/volk/VolkConfig.cmake
 lib/cmake/volk/VolkConfigVersion.cmake
 lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/volk/VolkTargets.cmake
+lib/libcpu_features.a
 lib/libvolk.so
-lib/libvolk.so.2.2.1
+lib/libvolk.so.2.5
+lib/libvolk.so.2.5.0
 %%PYTHON_SITELIBDIR%%/volk_modtool/__init__.py
 %%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyc
 %%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyo