git: 76b33a81a38f - main - devel/llvm13: Update to 13.0.0rc4

[Brooks Davis]

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=76b33a81a38ff75a1fe15286abe6c1bf37314316

commit 76b33a81a38ff75a1fe15286abe6c1bf37314316
Author:     Brooks Davis <brooks at FreeBSD.org>
AuthorDate: 2021-09-30 22:49:06 +0000
Commit:     Brooks Davis <brooks at FreeBSD.org>
CommitDate: 2021-09-30 22:49:55 +0000

    devel/llvm13: Update to 13.0.0rc4
---
 devel/llvm13/Makefile                                         |  2 +-
 devel/llvm13/Makefile.COMMANDS                                |  1 +
 devel/llvm13/distinfo                                         |  6 +++---
 .../files/patch-clang_tools_scan-build_libexec_ccc-analyzer   | 11 +++++------
 devel/llvm13/pkg-plist                                        |  2 ++
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
index ad62fcc370d1..07e89a8d3960 100644
--- a/devel/llvm13/Makefile
+++ b/devel/llvm13/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	llvm
-DISTVERSION=	13.0.0rc3
+DISTVERSION=	13.0.0rc4
 PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
diff --git a/devel/llvm13/Makefile.COMMANDS b/devel/llvm13/Makefile.COMMANDS
index 091756696040..65fdcac20aaf 100644
--- a/devel/llvm13/Makefile.COMMANDS
+++ b/devel/llvm13/Makefile.COMMANDS
@@ -75,6 +75,7 @@ CLANG_COMMANDS=	\
 		clang-offload-bundler \
 		clang-offload-wrapper \
 		clang-rename \
+		clang-repl \
 		clang-scan-deps \
 		diagtool \
 		hmaptool \
diff --git a/devel/llvm13/distinfo b/devel/llvm13/distinfo
index 1df275221367..d92d781b0600 100644
--- a/devel/llvm13/distinfo
+++ b/devel/llvm13/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632436423
-SHA256 (llvm-project-13.0.0rc3.src.tar.xz) = e48d7ae488f56d1eedfb2dc10443376c230eb770704f508a8fa285a41549dca5
-SIZE (llvm-project-13.0.0rc3.src.tar.xz) = 97573684
+TIMESTAMP = 1633032166
+SHA256 (llvm-project-13.0.0rc4.src.tar.xz) = 21e60d76cd1efd6ee23d5e0bb74653f865f3a6cab538d27504a05137d9f42d93
+SIZE (llvm-project-13.0.0rc4.src.tar.xz) = 97569676
diff --git a/devel/llvm13/files/patch-clang_tools_scan-build_libexec_ccc-analyzer b/devel/llvm13/files/patch-clang_tools_scan-build_libexec_ccc-analyzer
index 64896e4fb2f0..48f39ac818cb 100644
--- a/devel/llvm13/files/patch-clang_tools_scan-build_libexec_ccc-analyzer
+++ b/devel/llvm13/files/patch-clang_tools_scan-build_libexec_ccc-analyzer
@@ -1,12 +1,11 @@
 --- clang/tools/scan-build/libexec/ccc-analyzer.orig
 +++ clang/tools/scan-build/libexec/ccc-analyzer
-@@ -81,6 +81,9 @@
+@@ -80,7 +80,7 @@
    if (-x "/usr/bin/xcrun") {
      $UseXCRUN = 1;
    }
-+} elsif (`uname -s` eq "FreeBSD\n") {
-+  $DefaultCCompiler = 'cc';
-+  $DefaultCXXCompiler = 'c++';
+-} elsif (`uname -a` =~ m/OpenBSD/) {
++} elsif (`uname -a` =~ m/(FreeBSD|OpenBSD)/) {
+   $DefaultCCompiler = 'cc';
+   $DefaultCXXCompiler = 'c++';
  } else {
-   $DefaultCCompiler = 'gcc';
-   $DefaultCXXCompiler = 'g++';
diff --git a/devel/llvm13/pkg-plist b/devel/llvm13/pkg-plist
index d356aa093b65..292d61bb7b76 100644
--- a/devel/llvm13/pkg-plist
+++ b/devel/llvm13/pkg-plist
@@ -74,6 +74,7 @@ bin/analyze-build%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-offload-bundler%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-offload-wrapper%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-rename%%LLVM_SUFFIX%%
+%%CLANG%%bin/clang-repl%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-scan-deps%%LLVM_SUFFIX%%
 %%CLANG%%bin/diagtool%%LLVM_SUFFIX%%
 %%CLANG%%bin/hmaptool%%LLVM_SUFFIX%%
@@ -171,6 +172,7 @@ llvm%%LLVM_SUFFIX%%/bin/bugpoint
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-refactor
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-rename
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clang-reorder-fields
+%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-repl
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-scan-deps
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-tblgen
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clang-tidy