diff --git a/devel/spirv-llvm-translator/Makefile b/devel/spirv-llvm-translator/Makefile
index 94c260435f40..451d936b2539 100644
--- a/devel/spirv-llvm-translator/Makefile
+++ b/devel/spirv-llvm-translator/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	spirv-llvm-translator
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${DISTVERSION_${FLAVOR}}
-DISTVERSION_llvm22=	22.1.4
-DISTVERSION_llvm21=	21.1.9
-DISTVERSION_llvm20=	20.1.15
-DISTVERSION_llvm19=	19.1.20
-DISTVERSION_llvm18=	18.1.25
-DISTVERSION_llvm17=	17.0.25
-DISTVERSION_llvm16=	16.0.26
-DISTVERSION_llvm15=	15.0.25
-DISTVERSION_llvm14=	14.0.25
+DISTVERSION_llvm22=	22.1.5
+DISTVERSION_llvm21=	21.1.10
+DISTVERSION_llvm20=	20.1.16
+DISTVERSION_llvm19=	19.1.21
+DISTVERSION_llvm18=	18.1.26
+DISTVERSION_llvm17=	17.0.26
+DISTVERSION_llvm16=	16.0.27
+DISTVERSION_llvm15=	15.0.26
+DISTVERSION_llvm14=	14.0.26
 DISTVERSION_llvm13=	13.0.5
 DISTVERSION_llvm12=	12.0.1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Bi-directional translation between SPIR-V and LLVM IR
 WWW=		https://github.com/KhronosGroup/SPIRV-LLVM-Translator
 
 LICENSE=	NCSA
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 LIB_DEPENDS=	libLLVM-${FLAVOR:S/llvm//}.so:devel/${FLAVOR}
 
 FLAVORS=	${22 21 20 19 18 17 16 15 14 13 12:L:S/^/llvm/}
 CONFLICTS_BUILD=${FLAVOR}-lite
 
 USES=		cmake compiler:c++11-lib
 USE_GITHUB=	yes
 USE_LDCONFIG=	${PREFIX}/${FLAVOR}/lib
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	SPIRV-LLVM-Translator
 .if ${FLAVOR:U:Mllvm1[12]}
 # empty
 .elif ${FLAVOR:U} == llvm13
 GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-411-gaa6cef1:headers/projects/SPIRV-Headers
 .else
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-474-g948a3b0:headers/projects/SPIRV-Headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-493-g575b651:headers/projects/SPIRV-Headers
 .endif
 DISTINFO_FILE=	${.CURDIR}/distinfo.${FLAVOR}
 PATCHDIR=	${.CURDIR}/files.${FLAVOR}
 CXXFLAGS+=	${${FLAVOR:S/llvm//} < 16 && ${COMPILER_TYPE} == clang:?-Wno-enum-constexpr-conversion:}
 CMAKE_ON=	BUILD_SHARED_LIBS LLVM_BUILD_TOOLS LLVM_TOOL_SPIRV_HEADERS_BUILD
 CMAKE_ARGS=	-DLLVM_DIR:PATH="${LOCALBASE}/${FLAVOR}"
 CMAKE_INSTALL_PREFIX=		${PREFIX}/${FLAVOR}
 _PLIST_FILES=	bin/llvm-spirv \
 		include/LLVMSPIRVLib/LLVMSPIRVExtensions.inc \
 		include/LLVMSPIRVLib/LLVMSPIRVLib.h \
 		include/LLVMSPIRVLib/LLVMSPIRVOpts.h \
 		lib/libLLVMSPIRVLib.so \
 		lib/libLLVMSPIRVLib.so.${SOVERSION} \
 		libdata/pkgconfig/LLVMSPIRVLib.pc
 PLIST_FILES=	${_PLIST_FILES:S,^,${FLAVOR}/,}
 SOVERSION=	${${FLAVOR:S/llvm//}<18:?${DISTVERSION:R:R}:${DISTVERSION:R}}
 
 pre-everything::
 	@for f in ${.CURDIR}/files/patch-*; do if [ -e $$f ]; then \
 		${ECHO_MSG} "Error: patch-* under \"files\" aren't supported. Move under \"files.<flavor>\" instead."; \
 		exit 1; \
 	fi; done
 
 post-patch:
 	@${REINPLACE_CMD} -e '/pkgconfig/s/lib/&data/' \
 		${WRKSRC}/CMakeLists.txt
 
 .if !defined(DEFAULT_MAKESUM)
 makesum:
 . for f in ${FLAVORS}
 	${MAKE} -C${.CURDIR} FLAVOR=$f DEFAULT_MAKESUM=1 ${.TARGET}
 . endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/spirv-llvm-translator/distinfo.llvm14 b/devel/spirv-llvm-translator/distinfo.llvm14
index 9e03f47037b6..43e7d00a2dea 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm14
+++ b/devel/spirv-llvm-translator/distinfo.llvm14
@@ -1,5 +1,5 @@
-TIMESTAMP = 1782852101
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v14.0.25_GH0.tar.gz) = 36a42b0930dd3e7f79d74f029f556987c876e0d54fddfa80cef28a500549e071
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v14.0.25_GH0.tar.gz) = 1667793
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 05ecd0b1f8513059d6780425aa54491fb713af6a0330b202abdc09f1bc3eca10
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 566370
+TIMESTAMP = 1785302942
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v14.0.26_GH0.tar.gz) = abbc8431a9bea50805f16b8e0a2c906d9459785dd02c81a3117d985efe8b066c
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v14.0.26_GH0.tar.gz) = 1676172
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 16157dd90023cd01e3c2c8b34924cfe34d72a399455d15ba4bfd289ec7b340f3
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 570216
diff --git a/devel/spirv-llvm-translator/distinfo.llvm15 b/devel/spirv-llvm-translator/distinfo.llvm15
index 3de15198d4a3..6a07bec3c6d5 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm15
+++ b/devel/spirv-llvm-translator/distinfo.llvm15
@@ -1,5 +1,5 @@
-TIMESTAMP = 1782851597
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v15.0.25_GH0.tar.gz) = ffb8d8f8b5eed1c7e1990512e8a58492512280cd47715abd9f43022c97d5a25d
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v15.0.25_GH0.tar.gz) = 1686998
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 05ecd0b1f8513059d6780425aa54491fb713af6a0330b202abdc09f1bc3eca10
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 566370
+TIMESTAMP = 1785302976
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v15.0.26_GH0.tar.gz) = 646a325a445366e66dbc4cd6654f3aa21c57acd24e6f7fc8a1c0b973bf18b2e2
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v15.0.26_GH0.tar.gz) = 1693632
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 16157dd90023cd01e3c2c8b34924cfe34d72a399455d15ba4bfd289ec7b340f3
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 570216
diff --git a/devel/spirv-llvm-translator/distinfo.llvm16 b/devel/spirv-llvm-translator/distinfo.llvm16
index f4eb75696f5b..4ed2de32dd9b 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm16
+++ b/devel/spirv-llvm-translator/distinfo.llvm16
@@ -1,5 +1,5 @@
-TIMESTAMP = 1782848676
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v16.0.26_GH0.tar.gz) = 514d21f069fb6ff4bbe7b6ba1fb899693b08589cada73469010b22a49dc31de6
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v16.0.26_GH0.tar.gz) = 1727449
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 05ecd0b1f8513059d6780425aa54491fb713af6a0330b202abdc09f1bc3eca10
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 566370
+TIMESTAMP = 1785302997
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v16.0.27_GH0.tar.gz) = c454126d136babe67f7e921df7e8a240fc8f03fb7e4133b11ecb5844716b24f9
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v16.0.27_GH0.tar.gz) = 1736748
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 16157dd90023cd01e3c2c8b34924cfe34d72a399455d15ba4bfd289ec7b340f3
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 570216
diff --git a/devel/spirv-llvm-translator/distinfo.llvm17 b/devel/spirv-llvm-translator/distinfo.llvm17
index 244a00a53d4f..cf20a5b15490 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm17
+++ b/devel/spirv-llvm-translator/distinfo.llvm17
@@ -1,5 +1,5 @@
-TIMESTAMP = 1782847926
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v17.0.25_GH0.tar.gz) = f7402f05cdb43254e97c0214fdcc9c8f359f1940005e520cbfbbbfb326752fa9
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v17.0.25_GH0.tar.gz) = 1723900
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 05ecd0b1f8513059d6780425aa54491fb713af6a0330b202abdc09f1bc3eca10
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 566370
+TIMESTAMP = 1785303018
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v17.0.26_GH0.tar.gz) = 0edab1022f49267e9ed29cdaa158e3fd02c9583f3ed21b3be8a941efe968eb5a
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v17.0.26_GH0.tar.gz) = 1733278
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 16157dd90023cd01e3c2c8b34924cfe34d72a399455d15ba4bfd289ec7b340f3
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 570216
diff --git a/devel/spirv-llvm-translator/distinfo.llvm18 b/devel/spirv-llvm-translator/distinfo.llvm18
index ca7092142887..5b27b90d922b 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm18
+++ b/devel/spirv-llvm-translator/distinfo.llvm18
@@ -1,5 +1,5 @@
-TIMESTAMP = 1782824310
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v18.1.25_GH0.tar.gz) = 0780013e9ce7223467a0af0ae6c448fab2f2636f66d9316f37577512a6f361fc
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v18.1.25_GH0.tar.gz) = 1790275
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 05ecd0b1f8513059d6780425aa54491fb713af6a0330b202abdc09f1bc3eca10
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 566370
+TIMESTAMP = 1785303038
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v18.1.26_GH0.tar.gz) = f23e8ef00ff32bfc5b12c8b89df3b108b33acefe69eea8686d416b1f995862e1
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v18.1.26_GH0.tar.gz) = 1799687
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 16157dd90023cd01e3c2c8b34924cfe34d72a399455d15ba4bfd289ec7b340f3
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 570216
diff --git a/devel/spirv-llvm-translator/distinfo.llvm19 b/devel/spirv-llvm-translator/distinfo.llvm19
index a47f1a809de7..a075512208d7 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm19
+++ b/devel/spirv-llvm-translator/distinfo.llvm19
@@ -1,5 +1,5 @@
-TIMESTAMP = 1782823883
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v19.1.20_GH0.tar.gz) = 257895206cb42c4e3be986138aa7da5dc372d800ece5b854a3baaee2c0047625
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v19.1.20_GH0.tar.gz) = 1827922
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 05ecd0b1f8513059d6780425aa54491fb713af6a0330b202abdc09f1bc3eca10
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 566370
+TIMESTAMP = 1785303056
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v19.1.21_GH0.tar.gz) = be1456db370f21eb5fe9d82b54565565f199ab9c6f410f7baff2811c3887f801
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v19.1.21_GH0.tar.gz) = 1838292
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 16157dd90023cd01e3c2c8b34924cfe34d72a399455d15ba4bfd289ec7b340f3
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 570216
diff --git a/devel/spirv-llvm-translator/distinfo.llvm20 b/devel/spirv-llvm-translator/distinfo.llvm20
index 2370573084f9..0d85ee7e85e1 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm20
+++ b/devel/spirv-llvm-translator/distinfo.llvm20
@@ -1,5 +1,5 @@
-TIMESTAMP = 1782823366
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v20.1.15_GH0.tar.gz) = 0a06bfada7cd34d0f994b579a2fb3c62f31c27057afbc97bc3bbfdd957e1774a
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v20.1.15_GH0.tar.gz) = 1858066
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 05ecd0b1f8513059d6780425aa54491fb713af6a0330b202abdc09f1bc3eca10
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 566370
+TIMESTAMP = 1785303074
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v20.1.16_GH0.tar.gz) = 24f71c28728693456c250dd30e60ea489d408268bab9e691ce63c11e9bb948aa
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v20.1.16_GH0.tar.gz) = 1864511
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 16157dd90023cd01e3c2c8b34924cfe34d72a399455d15ba4bfd289ec7b340f3
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 570216
diff --git a/devel/spirv-llvm-translator/distinfo.llvm21 b/devel/spirv-llvm-translator/distinfo.llvm21
index 7c460d8cbfbe..39b444736aa5 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm21
+++ b/devel/spirv-llvm-translator/distinfo.llvm21
@@ -1,5 +1,5 @@
-TIMESTAMP = 1782823000
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v21.1.9_GH0.tar.gz) = e3c292966ad2750fda94ce569e571325fd50b4959c70d32552c6dd249b59dde8
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v21.1.9_GH0.tar.gz) = 1862146
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 05ecd0b1f8513059d6780425aa54491fb713af6a0330b202abdc09f1bc3eca10
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 566370
+TIMESTAMP = 1785303091
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v21.1.10_GH0.tar.gz) = 1d3d149e1caac803e2d3fbf2a2935066ad7a3fe61b0a0b036988b2e35462d448
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v21.1.10_GH0.tar.gz) = 1869465
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 16157dd90023cd01e3c2c8b34924cfe34d72a399455d15ba4bfd289ec7b340f3
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 570216
diff --git a/devel/spirv-llvm-translator/distinfo.llvm22 b/devel/spirv-llvm-translator/distinfo.llvm22
index 7715a7416c6b..58f136059787 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm22
+++ b/devel/spirv-llvm-translator/distinfo.llvm22
@@ -1,5 +1,5 @@
-TIMESTAMP = 1782822534
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v22.1.4_GH0.tar.gz) = 77888f4e22e312d1ac05737407c45dffcc6d0c9c725f9d08bbeb04a6dbe1a5f2
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v22.1.4_GH0.tar.gz) = 1875796
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 05ecd0b1f8513059d6780425aa54491fb713af6a0330b202abdc09f1bc3eca10
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-474-g948a3b0_GH0.tar.gz) = 566370
+TIMESTAMP = 1785303124
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v22.1.5_GH0.tar.gz) = 3c6dffb4b8d67f5c544370e0c869ec7d22c013d4bb798f24655ec903f26cc5d5
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v22.1.5_GH0.tar.gz) = 1884166
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 16157dd90023cd01e3c2c8b34924cfe34d72a399455d15ba4bfd289ec7b340f3
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-493-g575b651_GH0.tar.gz) = 570216