diff --git a/devel/volk/Makefile b/devel/volk/Makefile
index 448680f4a740..89b131628f57 100644
--- a/devel/volk/Makefile
+++ b/devel/volk/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	volk
-DISTVERSION=	2.5.1
+DISTVERSION=	3.1.1
 CATEGORIES=	devel comms hamradio
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Vector-Optimized Library of Kernels
 WWW=		https://github.com/gnuradio/volk
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR}
-LIB_DEPENDS=	liborc-0.4.so:devel/orc \
-		libcpu_features.so:devel/cpu_features
+LIB_DEPENDS=	libcpu_features.so:devel/cpu_features \
+		liborc-0.4.so:devel/orc
 
-USES=		cmake:testing compiler:c++17-lang python
+USES=		cmake:testing compiler:c++17-lang pathfix python
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	gnuradio
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == armv7
 USE_GCC=	yes
 .endif
 
 # Otherwise the shebang doubles in installed version.
 # Found by running Q/A tests (stage-qa) with 'DEVELOPER=yes' in /etc/make.conf
 post-patch:
 	@${REINPLACE_CMD} -e '1d' \
 		${WRKSRC}/python/volk_modtool/volk_modtool
 
 # Replace by full version
 pre-install:
 	@${REINPLACE_CMD} -e 's|#!/usr/local/bin/python3|#!/usr/local/bin/python${PYTHON_VER}|' \
 		${WRKDIR}/.build/python/volk_modtool/volk_modtool.exe
 
 .include <bsd.port.post.mk>
diff --git a/devel/volk/distinfo b/devel/volk/distinfo
index e253a74e6faa..d9432a7067ed 100644
--- a/devel/volk/distinfo
+++ b/devel/volk/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1649305860
-SHA256 (volk-2.5.1.tar.gz) = 8f7f2f8918c6ba63ebe8375fe87add347046b8b3acbba2fb582577bebd8852df
-SIZE (volk-2.5.1.tar.gz) = 462907
-SHA256 (dbe88eb8fe3046745fac7afa17a92e8f47285a70.patch) = 6a92d660a56b2964c1eeb0ab1a3848291ed3064fa0c17cbd63438346bfe582ce
-SIZE (dbe88eb8fe3046745fac7afa17a92e8f47285a70.patch) = 846
-SHA256 (dd6d9bf51d98f699c54c783995fcf3cca60c38d8.patch) = db7d75afcaeae1c0b6f06665ed903c6c925c6b5e88757215db82b3183201ffe9
-SIZE (dd6d9bf51d98f699c54c783995fcf3cca60c38d8.patch) = 1379
+TIMESTAMP = 1706988658
+SHA256 (volk-3.1.1.tar.gz) = d8c25fad82243d69a653bb989eced8e404b12d7caec6baee16675ef9f77c27fa
+SIZE (volk-3.1.1.tar.gz) = 611934
diff --git a/devel/volk/pkg-plist b/devel/volk/pkg-plist
index a3f7bf5ddbb6..d71076886748 100644
--- a/devel/volk/pkg-plist
+++ b/devel/volk/pkg-plist
@@ -1,178 +1,188 @@
 bin/volk-config-info
 bin/volk_modtool
 bin/volk_profile
 include/volk/constants.h
 include/volk/saturation_arithmetic.h
 include/volk/volk.h
 include/volk/volk_16i_32fc_dot_prod_32fc.h
 include/volk/volk_16i_branch_4_state_8.h
 include/volk/volk_16i_convert_8i.h
 include/volk/volk_16i_max_star_16i.h
 include/volk/volk_16i_max_star_horizontal_16i.h
 include/volk/volk_16i_permute_and_scalar_add.h
 include/volk/volk_16i_s32f_convert_32f.h
 include/volk/volk_16i_x4_quad_max_star_16i.h
 include/volk/volk_16i_x5_add_quad_16i_x4.h
 include/volk/volk_16ic_convert_32fc.h
 include/volk/volk_16ic_deinterleave_16i_x2.h
 include/volk/volk_16ic_deinterleave_real_16i.h
 include/volk/volk_16ic_deinterleave_real_8i.h
 include/volk/volk_16ic_magnitude_16i.h
 include/volk/volk_16ic_s32f_deinterleave_32f_x2.h
 include/volk/volk_16ic_s32f_deinterleave_real_32f.h
 include/volk/volk_16ic_s32f_magnitude_32f.h
 include/volk/volk_16ic_x2_dot_prod_16ic.h
 include/volk/volk_16ic_x2_multiply_16ic.h
 include/volk/volk_16u_byteswap.h
 include/volk/volk_16u_byteswappuppet_16u.h
 include/volk/volk_32f_64f_add_64f.h
 include/volk/volk_32f_64f_multiply_64f.h
 include/volk/volk_32f_8u_polarbutterfly_32f.h
 include/volk/volk_32f_8u_polarbutterflypuppet_32f.h
 include/volk/volk_32f_accumulator_s32f.h
 include/volk/volk_32f_acos_32f.h
 include/volk/volk_32f_asin_32f.h
 include/volk/volk_32f_atan_32f.h
 include/volk/volk_32f_binary_slicer_32i.h
 include/volk/volk_32f_binary_slicer_8i.h
 include/volk/volk_32f_convert_64f.h
 include/volk/volk_32f_cos_32f.h
 include/volk/volk_32f_exp_32f.h
 include/volk/volk_32f_expfast_32f.h
 include/volk/volk_32f_index_max_16u.h
 include/volk/volk_32f_index_max_32u.h
 include/volk/volk_32f_index_min_16u.h
 include/volk/volk_32f_index_min_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_clamppuppet_32f.h
 include/volk/volk_32f_s32f_convert_16i.h
 include/volk/volk_32f_s32f_convert_32i.h
 include/volk/volk_32f_s32f_convert_8i.h
+include/volk/volk_32f_s32f_convertpuppet_8u.h
 include/volk/volk_32f_s32f_mod_rangepuppet_32f.h
 include/volk/volk_32f_s32f_multiply_32f.h
 include/volk/volk_32f_s32f_normalize.h
 include/volk/volk_32f_s32f_power_32f.h
 include/volk/volk_32f_s32f_s32f_mod_range_32f.h
 include/volk/volk_32f_s32f_stddev_32f.h
+include/volk/volk_32f_s32f_x2_clamp_32f.h
+include/volk/volk_32f_s32f_x2_convert_8u.h
 include/volk/volk_32f_sin_32f.h
 include/volk/volk_32f_sqrt_32f.h
 include/volk/volk_32f_stddev_and_mean_32f_x2.h
 include/volk/volk_32f_tan_32f.h
 include/volk/volk_32f_tanh_32f.h
 include/volk/volk_32f_x2_add_32f.h
 include/volk/volk_32f_x2_divide_32f.h
 include/volk/volk_32f_x2_dot_prod_16i.h
 include/volk/volk_32f_x2_dot_prod_32f.h
 include/volk/volk_32f_x2_fm_detectpuppet_32f.h
 include/volk/volk_32f_x2_interleave_32fc.h
 include/volk/volk_32f_x2_max_32f.h
 include/volk/volk_32f_x2_min_32f.h
 include/volk/volk_32f_x2_multiply_32f.h
 include/volk/volk_32f_x2_pow_32f.h
+include/volk/volk_32f_x2_powpuppet_32f.h
 include/volk/volk_32f_x2_s32f_interleave_16ic.h
 include/volk/volk_32f_x2_subtract_32f.h
 include/volk/volk_32f_x3_sum_of_poly_32f.h
 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
 include/volk/volk_32fc_deinterleave_64f_x2.h
 include/volk/volk_32fc_deinterleave_imag_32f.h
 include/volk/volk_32fc_deinterleave_real_32f.h
 include/volk/volk_32fc_deinterleave_real_64f.h
 include/volk/volk_32fc_index_max_16u.h
 include/volk/volk_32fc_index_max_32u.h
 include/volk/volk_32fc_index_min_16u.h
 include/volk/volk_32fc_index_min_32u.h
 include/volk/volk_32fc_magnitude_32f.h
 include/volk/volk_32fc_magnitude_squared_32f.h
 include/volk/volk_32fc_s32f_atan2_32f.h
 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_multiply2_32fc.h
 include/volk/volk_32fc_s32fc_multiply_32fc.h
-include/volk/volk_32fc_s32fc_rotatorpuppet_32fc.h
+include/volk/volk_32fc_s32fc_rotator2puppet_32fc.h
+include/volk/volk_32fc_s32fc_x2_rotator2_32fc.h
 include/volk/volk_32fc_s32fc_x2_rotator_32fc.h
 include/volk/volk_32fc_x2_add_32fc.h
 include/volk/volk_32fc_x2_conjugate_dot_prod_32fc.h
 include/volk/volk_32fc_x2_divide_32fc.h
 include/volk/volk_32fc_x2_dot_prod_32fc.h
 include/volk/volk_32fc_x2_multiply_32fc.h
 include/volk/volk_32fc_x2_multiply_conjugate_32fc.h
 include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f.h
+include/volk/volk_32fc_x2_s32fc_multiply_conjugate_add2_32fc.h
 include/volk/volk_32fc_x2_s32fc_multiply_conjugate_add_32fc.h
 include/volk/volk_32fc_x2_square_dist_32f.h
 include/volk/volk_32i_s32f_convert_32f.h
 include/volk/volk_32i_x2_and_32i.h
 include/volk/volk_32i_x2_or_32i.h
 include/volk/volk_32u_byteswap.h
 include/volk/volk_32u_byteswappuppet_32u.h
 include/volk/volk_32u_popcnt.h
 include/volk/volk_32u_popcntpuppet_32u.h
 include/volk/volk_32u_reverse_32u.h
 include/volk/volk_64f_convert_32f.h
 include/volk/volk_64f_x2_add_64f.h
 include/volk/volk_64f_x2_max_64f.h
 include/volk/volk_64f_x2_min_64f.h
 include/volk/volk_64f_x2_multiply_64f.h
 include/volk/volk_64u_byteswap.h
 include/volk/volk_64u_byteswappuppet_64u.h
 include/volk/volk_64u_popcnt.h
 include/volk/volk_64u_popcntpuppet_64u.h
 include/volk/volk_8i_convert_16i.h
 include/volk/volk_8i_s32f_convert_32f.h
 include/volk/volk_8ic_deinterleave_16i_x2.h
 include/volk/volk_8ic_deinterleave_real_16i.h
 include/volk/volk_8ic_deinterleave_real_8i.h
 include/volk/volk_8ic_s32f_deinterleave_32f_x2.h
 include/volk/volk_8ic_s32f_deinterleave_real_32f.h
 include/volk/volk_8ic_x2_multiply_conjugate_16ic.h
 include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc.h
 include/volk/volk_8u_conv_k7_r2puppet_8u.h
 include/volk/volk_8u_x2_encodeframepolar_8u.h
 include/volk/volk_8u_x3_encodepolar_8u_x2.h
 include/volk/volk_8u_x3_encodepolarpuppet_8u.h
 include/volk/volk_8u_x4_conv_k7_r2_8u.h
 include/volk/volk_alloc.hh
+include/volk/volk_avx2_fma_intrinsics.h
 include/volk/volk_avx2_intrinsics.h
 include/volk/volk_avx_intrinsics.h
 include/volk/volk_common.h
 include/volk/volk_complex.h
 include/volk/volk_config_fixed.h
 include/volk/volk_cpu.h
 include/volk/volk_malloc.h
 include/volk/volk_neon_intrinsics.h
 include/volk/volk_prefs.h
 include/volk/volk_sse3_intrinsics.h
 include/volk/volk_sse_intrinsics.h
 include/volk/volk_typedefs.h
 include/volk/volk_version.h
 lib/cmake/volk/VolkConfig.cmake
 lib/cmake/volk/VolkConfigVersion.cmake
 lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/volk/VolkTargets.cmake
 lib/libvolk.so
-lib/libvolk.so.2.5
-lib/libvolk.so.2.5.1
+lib/libvolk.so.3.1
+lib/libvolk.so.3.1.1
 %%PYTHON_SITELIBDIR%%/volk_modtool/__init__.py
 %%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyc
 %%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyo
 %%PYTHON_SITELIBDIR%%/volk_modtool/cfg.py
 %%PYTHON_SITELIBDIR%%/volk_modtool/cfg.pyc
 %%PYTHON_SITELIBDIR%%/volk_modtool/cfg.pyo
 %%PYTHON_SITELIBDIR%%/volk_modtool/volk_modtool_generate.py
 %%PYTHON_SITELIBDIR%%/volk_modtool/volk_modtool_generate.pyc
 %%PYTHON_SITELIBDIR%%/volk_modtool/volk_modtool_generate.pyo
 libdata/pkgconfig/volk.pc
 @dir include/volk/asm/neon
 @dir include/volk/asm/orc
+@dir include/volk/asm/riscv