diff --git a/devel/spirv-llvm-translator/Makefile b/devel/spirv-llvm-translator/Makefile
index 28dddb242cc6..5a5ba449f015 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.2
-DISTVERSION_llvm21=	21.1.7
-DISTVERSION_llvm20=	20.1.13
-DISTVERSION_llvm19=	19.1.18
-DISTVERSION_llvm18=	18.1.23
-DISTVERSION_llvm17=	17.0.23
-DISTVERSION_llvm16=	16.0.24
-DISTVERSION_llvm15=	15.0.23
-DISTVERSION_llvm14=	14.0.23
+DISTVERSION_llvm22=	22.1.3
+DISTVERSION_llvm21=	21.1.8
+DISTVERSION_llvm20=	20.1.14
+DISTVERSION_llvm19=	19.1.19
+DISTVERSION_llvm18=	18.1.24
+DISTVERSION_llvm17=	17.0.24
+DISTVERSION_llvm16=	16.0.25
+DISTVERSION_llvm15=	15.0.24
+DISTVERSION_llvm14=	14.0.24
 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-448-g9268f30:headers/projects/SPIRV-Headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-473-gb8a3296: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 13b775e0ad16..5146d7602b32 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm14
+++ b/devel/spirv-llvm-translator/distinfo.llvm14
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777564020
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v14.0.23_GH0.tar.gz) = 24266971c74783dc6c1c746129ef46ab5df2df064d253181ceae5090fc94928e
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v14.0.23_GH0.tar.gz) = 1659818
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = bb2053664df521b7fe117bf69f03d01044c32f421a732901e7916e6988abfc58
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = 546092
+TIMESTAMP = 1779792052
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v14.0.24_GH0.tar.gz) = 78314af317969a2436bc204932c48e87674e46e0d70d1712db6a9229fcaa2c29
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v14.0.24_GH0.tar.gz) = 1664055
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 66386ef682f9229bab22616ecdda5799402f784c5775976dece677f842aefda5
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 566133
diff --git a/devel/spirv-llvm-translator/distinfo.llvm15 b/devel/spirv-llvm-translator/distinfo.llvm15
index c61f4a504a8f..19fb03704b77 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm15
+++ b/devel/spirv-llvm-translator/distinfo.llvm15
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777563509
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v15.0.23_GH0.tar.gz) = cedd85a67f57b968acbd7edfb35f5eebe4b1a26fc82c1a7be257da53005da1cd
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v15.0.23_GH0.tar.gz) = 1676352
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = bb2053664df521b7fe117bf69f03d01044c32f421a732901e7916e6988abfc58
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = 546092
+TIMESTAMP = 1779796503
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v15.0.24_GH0.tar.gz) = f7224f7be14c1eb52171b18fea59aecbcec381bcb09cef546dc25c33028b3db2
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v15.0.24_GH0.tar.gz) = 1681703
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 66386ef682f9229bab22616ecdda5799402f784c5775976dece677f842aefda5
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 566133
diff --git a/devel/spirv-llvm-translator/distinfo.llvm16 b/devel/spirv-llvm-translator/distinfo.llvm16
index 3c5dbcde3b68..3655b8b81edf 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm16
+++ b/devel/spirv-llvm-translator/distinfo.llvm16
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777563930
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v16.0.24_GH0.tar.gz) = b63fc0272a2b355ca419c66d4f6071ab1bd23084649c7e133ad87fd124679543
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v16.0.24_GH0.tar.gz) = 1717826
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = bb2053664df521b7fe117bf69f03d01044c32f421a732901e7916e6988abfc58
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = 546092
+TIMESTAMP = 1779791437
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v16.0.25_GH0.tar.gz) = 5708672d3c7b28fe0d1ea58e56242917f2d3e96eb1809570a81bb60508afd3b7
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v16.0.25_GH0.tar.gz) = 1722536
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 66386ef682f9229bab22616ecdda5799402f784c5775976dece677f842aefda5
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 566133
diff --git a/devel/spirv-llvm-translator/distinfo.llvm17 b/devel/spirv-llvm-translator/distinfo.llvm17
index 2b22134fc3c4..3712058b6b1f 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm17
+++ b/devel/spirv-llvm-translator/distinfo.llvm17
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777563907
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v17.0.23_GH0.tar.gz) = 74130b31498c8bba7f0b164635ae46b255573d72fee9b483312ae88eb663a216
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v17.0.23_GH0.tar.gz) = 1714332
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = bb2053664df521b7fe117bf69f03d01044c32f421a732901e7916e6988abfc58
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = 546092
+TIMESTAMP = 1779790320
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v17.0.24_GH0.tar.gz) = a36a58b92a53505183cb672e1dbdbe05933725634ab18ccf3c9eac585b006471
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v17.0.24_GH0.tar.gz) = 1719948
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 66386ef682f9229bab22616ecdda5799402f784c5775976dece677f842aefda5
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 566133
diff --git a/devel/spirv-llvm-translator/distinfo.llvm18 b/devel/spirv-llvm-translator/distinfo.llvm18
index 5eff92c0b97b..05eaedd8c5c0 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm18
+++ b/devel/spirv-llvm-translator/distinfo.llvm18
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777563891
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v18.1.23_GH0.tar.gz) = 0968d6e2afd65f380e8b714d49fac4593a40eb99c715762913980fcb6ed762e8
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v18.1.23_GH0.tar.gz) = 1778523
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = bb2053664df521b7fe117bf69f03d01044c32f421a732901e7916e6988abfc58
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = 546092
+TIMESTAMP = 1779790148
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v18.1.24_GH0.tar.gz) = da140bc2197540458fe82dceee6e6bbd7bfd59dfbd7870b49011ab1441d5d17c
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v18.1.24_GH0.tar.gz) = 1785011
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 66386ef682f9229bab22616ecdda5799402f784c5775976dece677f842aefda5
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 566133
diff --git a/devel/spirv-llvm-translator/distinfo.llvm19 b/devel/spirv-llvm-translator/distinfo.llvm19
index b71531da740b..732c1b3b7654 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm19
+++ b/devel/spirv-llvm-translator/distinfo.llvm19
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777563875
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v19.1.18_GH0.tar.gz) = ce9a4424a6373a274f8df9611aa53e7457a58b56ff36acaa74b946178acaffac
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v19.1.18_GH0.tar.gz) = 1820279
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = bb2053664df521b7fe117bf69f03d01044c32f421a732901e7916e6988abfc58
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = 546092
+TIMESTAMP = 1779790020
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v19.1.19_GH0.tar.gz) = 930f422d454e5fca4ef401f8d4e0b0ee3af7024b0cbc277e0e79245ed4ed77f5
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v19.1.19_GH0.tar.gz) = 1823023
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 66386ef682f9229bab22616ecdda5799402f784c5775976dece677f842aefda5
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 566133
diff --git a/devel/spirv-llvm-translator/distinfo.llvm20 b/devel/spirv-llvm-translator/distinfo.llvm20
index 63f5277c7621..e374b3845122 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm20
+++ b/devel/spirv-llvm-translator/distinfo.llvm20
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777563858
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v20.1.13_GH0.tar.gz) = ee0297e1ea75c35cf3c544b5283810afb5361c7a15f0c43d02ead6da6ea608f9
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v20.1.13_GH0.tar.gz) = 1853486
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = bb2053664df521b7fe117bf69f03d01044c32f421a732901e7916e6988abfc58
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = 546092
+TIMESTAMP = 1779285301
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v20.1.14_GH0.tar.gz) = ef5cc72054caeb9afea709a51fe4c13a1934cf8233513109dfb8bd736705286e
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v20.1.14_GH0.tar.gz) = 1854392
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 66386ef682f9229bab22616ecdda5799402f784c5775976dece677f842aefda5
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 566133
diff --git a/devel/spirv-llvm-translator/distinfo.llvm21 b/devel/spirv-llvm-translator/distinfo.llvm21
index cb40525d39b3..7fd3b726a0e1 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm21
+++ b/devel/spirv-llvm-translator/distinfo.llvm21
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777563844
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v21.1.7_GH0.tar.gz) = 1a00e06eba69c24ded4ed5708ef3c55ad8786227017271fc335d3cc9abad2def
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v21.1.7_GH0.tar.gz) = 1855026
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = bb2053664df521b7fe117bf69f03d01044c32f421a732901e7916e6988abfc58
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = 546092
+TIMESTAMP = 1779285338
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v21.1.8_GH0.tar.gz) = 3c5720d37a767933ccfaf521fe24e498369baafd384b599b102bc6980820c722
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v21.1.8_GH0.tar.gz) = 1855872
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 66386ef682f9229bab22616ecdda5799402f784c5775976dece677f842aefda5
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 566133
diff --git a/devel/spirv-llvm-translator/distinfo.llvm22 b/devel/spirv-llvm-translator/distinfo.llvm22
index 3130637574a4..96dd9037f63d 100644
--- a/devel/spirv-llvm-translator/distinfo.llvm22
+++ b/devel/spirv-llvm-translator/distinfo.llvm22
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777563826
-SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v22.1.2_GH0.tar.gz) = b37196b1a1a60282a24cf937ab7d6807d7d54dc718f2a37a78e211be26df57ac
-SIZE (KhronosGroup-SPIRV-LLVM-Translator-v22.1.2_GH0.tar.gz) = 1870249
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = bb2053664df521b7fe117bf69f03d01044c32f421a732901e7916e6988abfc58
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-448-g9268f30_GH0.tar.gz) = 546092
+TIMESTAMP = 1779285355
+SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v22.1.3_GH0.tar.gz) = 8d3d5c31c1ff355dbbf87046f1b94cd1ab5390439a817679ec71484df74cac18
+SIZE (KhronosGroup-SPIRV-LLVM-Translator-v22.1.3_GH0.tar.gz) = 1871217
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 66386ef682f9229bab22616ecdda5799402f784c5775976dece677f842aefda5
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-473-gb8a3296_GH0.tar.gz) = 566133