devel/llvm-{cheri,cheriot,morello}: new snapshots

Major changes:
    llvm-cheri: merge LLVM 15
    llvm-cheriot: switch the fork at github.com/CHERIoT-Platform
    llvm-morello: merge LLVM 14

Rework patching and filtering of commands and man pages to better
accomdate version skew between the different ports now that all three
have different bases.

Centralize the addition of ${.CURDIR}/files to EXTRA_PATCHS.

devel/llvm-cheri/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
@@ -114,7 +114,10 @@ STRIP_LIBS=	BugpointPasses.so \
 		${LIBNAME}.0 \
 		libLTO.so
 
-EXTRA_PATCHES+=	${PATCHDIR}/llvm${LLVM_MAJOR}-backport-version-fixes
+EXTRA_PATCHES+=	${PATCHDIR}/llvm${LLVM_MAJOR}
+.if ${.PARSEDIR} != ${.CURDIR} && exists(${.CURDIR}/files)
+EXTRA_PATCHES+=	${.CURDIR}/files
+.endif
 
 .include <bsd.port.options.mk>
 

devel/llvm-cheri/Makefile.COMMANDS

@@ -14,11 +14,13 @@ LLVM_COMMANDS=	\
 		llvm-cov \
 		llvm-cvtres \
 		llvm-cxxmap \
+		llvm-debuginfod \
 		llvm-debuginfod-find \
 		llvm-diff \
 		llvm-dis \
 		llvm-dlltool \
 		llvm-dwarfdump \
+		llvm-dwarfutil \
 		llvm-dwp \
 		llvm-exegesis \
 		llvm-extract \
@@ -47,6 +49,7 @@ LLVM_COMMANDS=	\
 		llvm-readelf \
 		llvm-readobj \
 		llvm-reduce \
+		llvm-remark-size-diff \
 		llvm-rtdyld \
 		llvm-sim \
 		llvm-size \
@@ -77,6 +80,7 @@ CLANG_COMMANDS=	\
 		clang-linker-wrapper \
 		clang-nvlink-wrapper \
 		clang-offload-bundler \
+		clang-offload-packager \
 		clang-offload-wrapper \
 		clang-rename \
 		clang-repl \

devel/llvm-cheri/Makefile.MAN1SRCS

@@ -14,8 +14,10 @@ LLVM_MAN1SRCS= \
 	llvm-diff.1 \
 	llvm-dis.1 \
 	llvm-dwarfdump.1 \
+	llvm-dwarfutil.1 \
 	llvm-exegesis.1 \
 	llvm-extract.1 \
+	llvm-ifs.1 \
 	llvm-install-name-tool.1 \
 	llvm-lib.1 \
 	llvm-libtool-darwin.1 \
@@ -33,6 +35,7 @@ LLVM_MAN1SRCS= \
 	llvm-ranlib.1 \
 	llvm-readelf.1 \
 	llvm-readobj.1 \
+	llvm-remark-size-diff.1 \
 	llvm-size.1 \
 	llvm-stress.1 \
 	llvm-strings.1 \

devel/llvm-cheri/Makefile.snapshot

@@ -2,8 +2,8 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	14
+LLVM_MAJOR=	15
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20230818
+SNAPDATE=	20231212
 
-LLVM_COMMIT=		2f2dd3114669e891b64ce53edd070796bcb4e98c
+LLVM_COMMIT=		3e7aad709c172e384fccecafd1061e0b8bf514e8

devel/llvm-cheri/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1694711086
-SHA256 (CTSRD-CHERI-llvm-project-14.0.d20230818-2f2dd3114669e891b64ce53edd070796bcb4e98c_GH0.tar.gz) = c36ea5dcfda9bd109296acf27db293296b0ec6b58c74954580e5b32d79bcb5e4
-SIZE (CTSRD-CHERI-llvm-project-14.0.d20230818-2f2dd3114669e891b64ce53edd070796bcb4e98c_GH0.tar.gz) = 163056259
+TIMESTAMP = 1706026686
+SHA256 (CTSRD-CHERI-llvm-project-15.0.d20231212-3e7aad709c172e384fccecafd1061e0b8bf514e8_GH0.tar.gz) = 455f3c93f973c91b7e955edf8cab354373f1d4419f4a0dfa2447714993d40307
+SIZE (CTSRD-CHERI-llvm-project-15.0.d20231212-3e7aad709c172e384fccecafd1061e0b8bf514e8_GH0.tar.gz) = 171205571

devel/llvm-cheri/files/gen-Makefile.snapshot.sh

@@ -36,7 +36,7 @@ cat <<EOF > Makefile.snapshot
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	14
+LLVM_MAJOR=	15
 LLVM_RELEASE=	\${LLVM_MAJOR}.0.0
 SNAPDATE=	${MAX_DATE}
 

devel/llvm-cheri/files/llvm14/patch-clang_lib_Headers_CMakeLists.txt

@@ -0,0 +1,33 @@
+--- clang/lib/Headers/CMakeLists.txt.orig
++++ clang/lib/Headers/CMakeLists.txt
+@@ -75,7 +75,6 @@
+   invpcidintrin.h
+   iso646.h
+   keylockerintrin.h
+-  limits.h
+   lwpintrin.h
+   lzcntintrin.h
+   mm3dnow.h
+@@ -101,14 +100,7 @@
+   s390intrin.h
+   shaintrin.h
+   smmintrin.h
+-  stdalign.h
+-  stdarg.h
+-  stdatomic.h
+-  stdbool.h
+-  stddef.h
+   __stddef_max_align_t.h
+-  stdint.h
+-  stdnoreturn.h
+   tbmintrin.h
+   tgmath.h
+   tmmintrin.h
+@@ -117,7 +109,6 @@
+   unwind.h
+   vadefs.h
+   vaesintrin.h
+-  varargs.h
+   vecintrin.h
+   vpclmulqdqintrin.h
+   waitpkgintrin.h