git: 549225619e86 - main - devel/llvm15: Fix plist without EXTRAS

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=549225619e86c7926476b16a7c71a0fe383fb0e8

commit 549225619e86c7926476b16a7c71a0fe383fb0e8
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2022-09-28 17:36:22 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2022-09-28 17:38:13 +0000

    devel/llvm15: Fix plist without EXTRAS
    
    With CLANG enabled and EXTRAS disabled, packaging would fail due some
    clang-extras files being listed as clang files.
    
    Reported by:    naddy
---
 devel/llvm15/Makefile  |  2 ++
 devel/llvm15/pkg-plist | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile
index aef6323b6277..a8bcd43e9bd8 100644
--- a/devel/llvm15/Makefile
+++ b/devel/llvm15/Makefile
@@ -202,8 +202,10 @@ EXTRAS_LIBS=	libclangApplyReplacements \
 		libclangChangeNamespace \
 		libclangDaemon \
 		libclangDoc \
+		libclangIncludeCleaner \
 		libclangIncludeFixer \
 		libclangMove \
+		libclangPseudo \
 		libclangQuery \
 		libclangRename \
 		libclangReorderFields \
diff --git a/devel/llvm15/pkg-plist b/devel/llvm15/pkg-plist
index 09934f20c541..b50ca2521204 100644
--- a/devel/llvm15/pkg-plist
+++ b/devel/llvm15/pkg-plist
@@ -5544,7 +5544,7 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontendTool.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleCXX.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleLLVM.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIncludeCleaner.a
+%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangIncludeCleaner.a
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangIncludeFixer.a
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangIncludeFixerPlugin.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndex.a
@@ -5553,10 +5553,10 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangLex.a
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangMove.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangParse.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangPseudo.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangPseudoCLI.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangPseudoCXX.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangPseudoGrammar.a
+%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangPseudo.a
+%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangPseudoCLI.a
+%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangPseudoCXX.a
+%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangPseudoGrammar.a
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangQuery.a
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangReorderFields.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewrite.a