5 files changed, 9 insertions, 15 deletions
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 8287e2901a95..87302325a1f4 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
@@ -8,10 +8,6 @@ MAINTAINER=	brooks@FreeBSD.org
 COMMENT?=	LLVM and Clang with support for the CHERI architecture
 WWW?=		https://cheri-cpu.org
 
-.if defined(LLVM_SUFFIX) && ${LLVM_SUFFIX:M-morello*}
-# XXX: really (LLVM_MAJOR < 16), but it's not defined here
-LICENSE_FILE_BSD3CLAUSE=${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT
-.endif
 .include "${.PARSEDIR}/../llvm-devel/Makefile.LICENSE"
 
 NOT_FOR_ARCHS=		i386 armv6 armv7 powerpc mips
@@ -219,10 +215,8 @@ post-install:
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${command}${COMMAND_SUFFIX}
 .endfor
-.if ${LLVM_SUFFIX} != "-cheriot"
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/CHERI/cheri-compressed-cap/.github/workflows
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/CHERI/cheri-compressed-cap/.github
-.endif
 
 post-install-DOCS-on:
 	${RM} -r ${STAGEDIR}${DOCSDIR}
diff --git a/devel/llvm-cheri/Makefile.COMMANDS b/devel/llvm-cheri/Makefile.COMMANDS
index aef58defb081..d3ae482efa0e 100644
--- a/devel/llvm-cheri/Makefile.COMMANDS
+++ b/devel/llvm-cheri/Makefile.COMMANDS
@@ -71,8 +71,7 @@ LLVM_COMMANDS=	\
 		llvm-xray \
 		nvptx-arch \
 		opt \
-		sancov \
-		split-file
+		sancov
 
 CLANG_COMMANDS=	\
 		analyze-build \
@@ -83,6 +82,7 @@ CLANG_COMMANDS=	\
 		clang-cpp \
 		clang-extdef-mapping \
 		clang-format \
+		clang-include-cleaner \
 		clang-linker-wrapper \
 		clang-offload-bundler \
 		clang-offload-packager \
diff --git a/devel/llvm-cheri/Makefile.snapshot b/devel/llvm-cheri/Makefile.snapshot
index 58029a287703..eddeb14463a9 100644
--- a/devel/llvm-cheri/Makefile.snapshot
+++ b/devel/llvm-cheri/Makefile.snapshot
@@ -4,6 +4,6 @@
 #
 LLVM_MAJOR=	17
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20250625
+SNAPDATE=	20250827
 
-LLVM_COMMIT=		f4d1513a0e4ae782ace5718a0dba19d340f16b91
+LLVM_COMMIT=		05c88511ae7c60ec12fc2e15dce91eba6783db04
diff --git a/devel/llvm-cheri/distinfo b/devel/llvm-cheri/distinfo
index 76265fca5468..e95aa606a416 100644
--- a/devel/llvm-cheri/distinfo
+++ b/devel/llvm-cheri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752097465
-SHA256 (CTSRD-CHERI-llvm-project-17.0.d20250625-f4d1513a0e4ae782ace5718a0dba19d340f16b91_GH0.tar.gz) = b7ab72506c8e2bd55f96a2bf9dee32c004435298842d6f782e46ba6af723b8c3
-SIZE (CTSRD-CHERI-llvm-project-17.0.d20250625-f4d1513a0e4ae782ace5718a0dba19d340f16b91_GH0.tar.gz) = 199971647
+TIMESTAMP = 1757577429
+SHA256 (CTSRD-CHERI-llvm-project-17.0.d20250827-05c88511ae7c60ec12fc2e15dce91eba6783db04_GH0.tar.gz) = 1a2b940bfa0b985f78b4f33395e582b23cde1c74aa9dd9702443b891adce6dd8
+SIZE (CTSRD-CHERI-llvm-project-17.0.d20250827-05c88511ae7c60ec12fc2e15dce91eba6783db04_GH0.tar.gz) = 199958930
diff --git a/devel/llvm-cheri/pkg-plist b/devel/llvm-cheri/pkg-plist
index a32e21ca4f76..2ff07bd8716b 100644
--- a/devel/llvm-cheri/pkg-plist
+++ b/devel/llvm-cheri/pkg-plist
@@ -71,7 +71,6 @@ bin/llvm-xray%%COMMAND_SUFFIX%%
 bin/nvptx-arch%%COMMAND_SUFFIX%%
 bin/opt%%COMMAND_SUFFIX%%
 bin/sancov%%COMMAND_SUFFIX%%
-bin/split-file%%COMMAND_SUFFIX%%
 %%CLANG%%bin/analyze-build%%COMMAND_SUFFIX%%
 %%CLANG%%bin/c-index-test%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang%%COMMAND_SUFFIX%%
@@ -80,6 +79,7 @@ bin/split-file%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-cpp%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-extdef-mapping%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-format%%COMMAND_SUFFIX%%
+%%CLANG%%bin/clang-include-cleaner%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-linker-wrapper%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-offload-bundler%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-offload-packager%%COMMAND_SUFFIX%%