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

Fix the the python module name to use an '_' in place of '-' in the
port-specific module name.

PR:		270670, 269931
Sponsored by:	DARPA
Co-Authored-by:	Pawel Biernacki <kaktus@freebsd.org>

7 files changed, 59 insertions, 56 deletions

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 554483f3aa28..d8e762d9cb24 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -90,6 +90,8 @@ DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 DOCS_PORTDOCS=		llvm
 LIT_DESC=		Install lit and FileCheck test tools
+LIT_MOD_NAME=		lit${LLVM_SUFFIX:S/-/_/g}
+LIT_PLIST_SUB=		LIT_MOD_NAME=${LIT_MOD_NAME}
 LLD_DESC=		Install lld linker
 LLD_PORTDOCS=		lld
 LLDB_DESC=		Install lldb, the LLVM debugger
@@ -155,9 +157,9 @@ USES+=		${_USES_PYTHON}
 .include "${.CURDIR}/Makefile.MAN1SRCS"
 
 post-patch:
-	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
-	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
-	    -e 's|lit\.|lit${LLVM_SUFFIX}.|' \
+	${REINPLACE_CMD} -e 's|import lit|import ${LIT_MOD_NAME}|' \
+	    -e 's|from lit|from ${LIT_MOD_NAME}|' \
+	    -e 's|lit\.|${LIT_MOD_NAME}.|' \
 	    ${WRKSRC}/llvm/utils/lit/lit.py ${WRKSRC}/llvm/utils/lit/lit/*.py
 
 post-patch-LLD-on:
@@ -224,12 +226,12 @@ post-install-LIT-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
-	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}lit${COMMAND_SUFFIX}
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}lit${LLVM_SUFFIX}
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
-	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}llvm-lit${COMMAND_SUFFIX}
-	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}llvm-lit${LLVM_SUFFIX}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}
 	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \
-	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
+	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
@@ -265,8 +267,9 @@ build-plist:
 	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \
 	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' \
 	    | ${SORT} >> ${PLIST}.tmp
-	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${LIT_MOD_NAME} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
+	    -e 's|${LIT_MOD_NAME}|%%LIT_MOD_NAME%%|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \
 	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' \
diff --git a/devel/llvm-cheri/Makefile.snapshot b/devel/llvm-cheri/Makefile.snapshot
index 75c3b1e119c9..ced1cacedac6 100644
--- a/devel/llvm-cheri/Makefile.snapshot
+++ b/devel/llvm-cheri/Makefile.snapshot
@@ -4,6 +4,6 @@
 #
 LLVM_MAJOR=	14
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20230104
+SNAPDATE=	20230414
 
-LLVM_COMMIT=		086e03ef5a1e80fbfd8dbcf115897dfa7caa2197
+LLVM_COMMIT=		1a4ad71bedc205b3b4cafce9334c6b890cfe9282
diff --git a/devel/llvm-cheri/distinfo b/devel/llvm-cheri/distinfo
index 5d4a7ca24b3d..7d4d2a0f32f6 100644
--- a/devel/llvm-cheri/distinfo
+++ b/devel/llvm-cheri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675470307
-SHA256 (CTSRD-CHERI-llvm-project-14.0.d20230104-086e03ef5a1e80fbfd8dbcf115897dfa7caa2197_GH0.tar.gz) = 0adbae47fb463dcda08e573d7dab58519e0d3ccd96e224f251a1c719f67bc929
-SIZE (CTSRD-CHERI-llvm-project-14.0.d20230104-086e03ef5a1e80fbfd8dbcf115897dfa7caa2197_GH0.tar.gz) = 163044744
+TIMESTAMP = 1681511327
+SHA256 (CTSRD-CHERI-llvm-project-14.0.d20230414-1a4ad71bedc205b3b4cafce9334c6b890cfe9282_GH0.tar.gz) = e5d6757a168e6f2f8fa040bc23682246e64e95e2838835f6f03da2c5a9e7e498
+SIZE (CTSRD-CHERI-llvm-project-14.0.d20230414-1a4ad71bedc205b3b4cafce9334c6b890cfe9282_GH0.tar.gz) = 163053777
diff --git a/devel/llvm-cheri/pkg-plist b/devel/llvm-cheri/pkg-plist
index d1b3c4d24486..fdcd1aebc3e9 100644
--- a/devel/llvm-cheri/pkg-plist
+++ b/devel/llvm-cheri/pkg-plist
@@ -3048,24 +3048,24 @@ llvm%%LLVM_SUFFIX%%/share/scan-view/Reporter.py
 llvm%%LLVM_SUFFIX%%/share/scan-view/ScanView.py
 llvm%%LLVM_SUFFIX%%/share/scan-view/bugcatcher.ico
 llvm%%LLVM_SUFFIX%%/share/scan-view/startfile.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/BooleanExpression.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/LitConfig.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/LitTestCase.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ProgressBar.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ShCommands.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ShUtil.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/Test.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestRunner.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestTimes.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestingConfig.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/__init__.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/cl_arguments.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/discovery.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/display.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/main.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/reports.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/run.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/util.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/worker.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/BooleanExpression.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/LitConfig.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/LitTestCase.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/ProgressBar.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/ShCommands.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/ShUtil.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/Test.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/TestRunner.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/TestTimes.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/TestingConfig.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/__init__.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/cl_arguments.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/discovery.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/display.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/main.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/reports.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/run.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/util.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/worker.py
 @postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
diff --git a/devel/llvm-morello/Makefile.snapshot b/devel/llvm-morello/Makefile.snapshot
index a2560556537f..7819e5d7a9ed 100644
--- a/devel/llvm-morello/Makefile.snapshot
+++ b/devel/llvm-morello/Makefile.snapshot
@@ -1,5 +1,5 @@
 LLVM_MAJOR=	13
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20230213
+SNAPDATE=	20230411
 
-LLVM_COMMIT=	dbdd2cd3045f280c5f55c280c075f45710708ad6
+LLVM_COMMIT=	41fe07e4c2948369b8b89ebf0295fbb2dcffed09
diff --git a/devel/llvm-morello/distinfo b/devel/llvm-morello/distinfo
index cd8a870a35c6..2618d12f7957 100644
--- a/devel/llvm-morello/distinfo
+++ b/devel/llvm-morello/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676412241
-SHA256 (morello-llvm-project-dbdd2cd3045f280c5f55c280c075f45710708ad6_GL0.tar.gz) = 48f2a9d24dad8cb19a1ee96a539686a2c2f0003fc31e8c43be66ade8e22d01b6
-SIZE (morello-llvm-project-dbdd2cd3045f280c5f55c280c075f45710708ad6_GL0.tar.gz) = 152805974
+TIMESTAMP = 1681514407
+SHA256 (morello-llvm-project-41fe07e4c2948369b8b89ebf0295fbb2dcffed09_GL0.tar.gz) = 9f7e5e9db28d8bebae0bb7b3d2812a5e0ac257b336524fff1dbbf8144207eb42
+SIZE (morello-llvm-project-41fe07e4c2948369b8b89ebf0295fbb2dcffed09_GL0.tar.gz) = 152847995
diff --git a/devel/llvm-morello/pkg-plist b/devel/llvm-morello/pkg-plist
index 984fcdc36c58..5d4dc95d9f03 100644
--- a/devel/llvm-morello/pkg-plist
+++ b/devel/llvm-morello/pkg-plist
@@ -2970,24 +2970,24 @@ llvm%%LLVM_SUFFIX%%/share/scan-view/Reporter.py
 llvm%%LLVM_SUFFIX%%/share/scan-view/ScanView.py
 llvm%%LLVM_SUFFIX%%/share/scan-view/bugcatcher.ico
 llvm%%LLVM_SUFFIX%%/share/scan-view/startfile.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/BooleanExpression.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/LitConfig.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/LitTestCase.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ProgressBar.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ShCommands.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ShUtil.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/Test.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestRunner.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestTimes.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestingConfig.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/__init__.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/cl_arguments.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/discovery.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/display.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/main.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/reports.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/run.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/util.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/worker.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/BooleanExpression.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/LitConfig.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/LitTestCase.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/ProgressBar.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/ShCommands.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/ShUtil.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/Test.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/TestRunner.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/TestTimes.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/TestingConfig.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/__init__.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/cl_arguments.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/discovery.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/display.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/main.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/reports.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/run.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/util.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/%%LIT_MOD_NAME%%/worker.py
 @postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi