Update to a more recent snapshot.

Fix build with EXTRAS disabled.

5 files changed, 40 insertions, 33 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 4cd2d13735c8..35761e3980f7 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -186,9 +186,14 @@ STRIP_LIBS=	BugpointPasses.so \
 
 EXTRAS_LIBS=	\
 		libclangApplyReplacements \
+		libclangChangeNamespace \
+		libclangDaemon \
+		libclangDoc \
 		libclangIncludeFixer \
-		libclangRename \
+		libclangMove \
 		libclangQuery \
+		libclangRename \
+		libclangReorderFields \
 		libclangTidy \
 		libclangTidyGoogleModule \
 		libclangTidyLLVMModule \
@@ -197,7 +202,8 @@ EXTRAS_LIBS=	\
 		libclangTidyUtils \
 		libfindAllSymbols \
 		libmodernizeCore
-EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}
+EXTRAS_FILES=	index.js
+EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}|${EXTRAS_FILES:tW:C/  */|/g}
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/llvm-devel/Makefile.COMMANDS b/devel/llvm-devel/Makefile.COMMANDS
index a8c069c141e8..bf4a78de5ce0 100644
--- a/devel/llvm-devel/Makefile.COMMANDS
+++ b/devel/llvm-devel/Makefile.COMMANDS
@@ -52,7 +52,6 @@ LLVM_COMMANDS=	\
 		llvm-undname \
 		llvm-xray \
 		opt \
-		pp-trace \
 		sancov
 
 CLANG_COMMANDS=	\
@@ -64,27 +63,28 @@ CLANG_COMMANDS=	\
 		clang-extdef-mapping \
 		clang-format \
 		clang-import-test \
-		clang-move \
 		clang-offload-bundler \
 		clang-offload-wrapper \
 		clang-scan-deps \
-		clangd \
 		diagtool \
 		hmaptool \
 		scan-build \
 		scan-view
 
 EXTRAS_COMMANDS= \
+		clangd \
 		clang-apply-replacements \
 		clang-change-namespace \
 		clang-doc \
 		clang-include-fixer \
+		clang-move \
 		clang-query \
 		clang-rename \
 		clang-reorder-fields \
 		clang-tidy \
 		find-all-symbols \
-		modularize
+		modularize \
+		pp-trace
 
 LIT_COMMANDS=	\
 		FileCheck \
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 5f93a1947e7f..8c0e3a8f59f4 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -6,12 +6,12 @@
 #
 LLVM_MAJOR=	10
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20191021
+SNAPDATE=	20191029
 
-LLVM_COMMIT=		1e4c44b0d4d0c9febe6859b43ca0dcdfffa810a1
-CLANG_COMMIT=		73e476646bdaeb2ad2d40254ce64c2dfe8c78873
-COMPILER_RT_COMMIT=	89a8e62c03aa2cfe044c9023ec3bbaefb835a7df
+LLVM_COMMIT=		2c4ca6832fa6b306ee6a7010bfb80a3f2596f824
+CLANG_COMMIT=		65acf43270ea2894dffa0d0b292b92402f80c8cb
+COMPILER_RT_COMMIT=	69445f095c22aac2388f939bedebf224a6efcdaf
 EXTRAS_COMMIT=		5c40544fa40bfb85ec888b6a03421b3905e4a4e7
 LLD_COMMIT=		64b024a57c56c3528d6be3d14be5e3da42614a6f
-LLDB_COMMIT=		5b4e00f1d6dc2ab5847452ca969e8d0362e3671e
+LLDB_COMMIT=		d01083a850f577b85501a0902b52fd0930de72c7
 OPENMP_COMMIT=		56d941a8cede7c0d6aa4dc19e8f0b95de6f97e1b
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 8cbefeee84bf..07f598c864e3 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1571698502
-SHA256 (llvm-mirror-llvm-10.0.d20191021-1e4c44b0d4d0c9febe6859b43ca0dcdfffa810a1_GH0.tar.gz) = a24826131e1260b561c99994d5ccfa7cda333892bd2b4a68737307b6eba26727
-SIZE (llvm-mirror-llvm-10.0.d20191021-1e4c44b0d4d0c9febe6859b43ca0dcdfffa810a1_GH0.tar.gz) = 51949645
-SHA256 (llvm-mirror-clang-73e476646bdaeb2ad2d40254ce64c2dfe8c78873_GH0.tar.gz) = 6d0f6a5c7820cd99284989a7d37d674d4784fb512aa3280702c7deb5676f5608
-SIZE (llvm-mirror-clang-73e476646bdaeb2ad2d40254ce64c2dfe8c78873_GH0.tar.gz) = 19599471
-SHA256 (llvm-mirror-compiler-rt-89a8e62c03aa2cfe044c9023ec3bbaefb835a7df_GH0.tar.gz) = 6dc8101c34a5fe3240709a39fbbe0cce6c95835a5b0cd8e40f12f9d0e94c04f4
-SIZE (llvm-mirror-compiler-rt-89a8e62c03aa2cfe044c9023ec3bbaefb835a7df_GH0.tar.gz) = 3453848
+TIMESTAMP = 1572371098
+SHA256 (llvm-mirror-llvm-10.0.d20191029-2c4ca6832fa6b306ee6a7010bfb80a3f2596f824_GH0.tar.gz) = 228859642c1b07e25b91b3581a12808fe4584d21add13d814a939ceb587fd40b
+SIZE (llvm-mirror-llvm-10.0.d20191029-2c4ca6832fa6b306ee6a7010bfb80a3f2596f824_GH0.tar.gz) = 51961491
+SHA256 (llvm-mirror-clang-65acf43270ea2894dffa0d0b292b92402f80c8cb_GH0.tar.gz) = 07e307ed8e540e81812db4b335f656a9b53b33bc88cd9afba94d87c4e77eb247
+SIZE (llvm-mirror-clang-65acf43270ea2894dffa0d0b292b92402f80c8cb_GH0.tar.gz) = 19603384
+SHA256 (llvm-mirror-compiler-rt-69445f095c22aac2388f939bedebf224a6efcdaf_GH0.tar.gz) = c09c6522bb3d998c3eab09eae8cbf1bc17c99f1b1fc4173ffd436a22b9c575f7
+SIZE (llvm-mirror-compiler-rt-69445f095c22aac2388f939bedebf224a6efcdaf_GH0.tar.gz) = 3453859
 SHA256 (llvm-mirror-clang-tools-extra-5c40544fa40bfb85ec888b6a03421b3905e4a4e7_GH0.tar.gz) = ef9443d7502d0a274efc7f488ce3fe6ad62c3e42cbe900f2fe9f953ddf14e076
 SIZE (llvm-mirror-clang-tools-extra-5c40544fa40bfb85ec888b6a03421b3905e4a4e7_GH0.tar.gz) = 3008864
 SHA256 (llvm-mirror-lld-64b024a57c56c3528d6be3d14be5e3da42614a6f_GH0.tar.gz) = 05d444d2aaf5d08caed1912441d022584596c5138af7a763704127229653ed75
 SIZE (llvm-mirror-lld-64b024a57c56c3528d6be3d14be5e3da42614a6f_GH0.tar.gz) = 1607912
-SHA256 (llvm-mirror-lldb-5b4e00f1d6dc2ab5847452ca969e8d0362e3671e_GH0.tar.gz) = 84be84d6a398beab8818a90d9ad7771e134529808a8b50bb2a30abbee97a6f6b
-SIZE (llvm-mirror-lldb-5b4e00f1d6dc2ab5847452ca969e8d0362e3671e_GH0.tar.gz) = 13378059
+SHA256 (llvm-mirror-lldb-d01083a850f577b85501a0902b52fd0930de72c7_GH0.tar.gz) = bcaa323f9d6c34b28ee63a195d6efbc6e0388ef3220eaaeb14edfc634e46e418
+SIZE (llvm-mirror-lldb-d01083a850f577b85501a0902b52fd0930de72c7_GH0.tar.gz) = 13377188
 SHA256 (llvm-mirror-openmp-56d941a8cede7c0d6aa4dc19e8f0b95de6f97e1b_GH0.tar.gz) = 88a04ad329b0c4685d93d3e787a7bfa524987e3535045a47360f6ce4c8ec4348
 SIZE (llvm-mirror-openmp-56d941a8cede7c0d6aa4dc19e8f0b95de6f97e1b_GH0.tar.gz) = 1475009
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 0800e0288fb9..4e67c5993d6f 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -51,7 +51,6 @@ bin/llvm-tblgen-devel
 bin/llvm-undname-devel
 bin/llvm-xray-devel
 bin/opt-devel
-bin/pp-trace-devel
 bin/sancov-devel
 %%CLANG%%bin/c-index-test-devel
 %%CLANG%%bin/clang-devel
@@ -61,25 +60,26 @@ bin/sancov-devel
 %%CLANG%%bin/clang-extdef-mapping-devel
 %%CLANG%%bin/clang-format-devel
 %%CLANG%%bin/clang-import-test-devel
-%%CLANG%%bin/clang-move-devel
 %%CLANG%%bin/clang-offload-bundler-devel
 %%CLANG%%bin/clang-offload-wrapper-devel
 %%CLANG%%bin/clang-scan-deps-devel
-%%CLANG%%bin/clangd-devel
 %%CLANG%%bin/diagtool-devel
 %%CLANG%%bin/hmaptool-devel
 %%CLANG%%bin/scan-build-devel
 %%CLANG%%bin/scan-view-devel
+%%EXTRAS%%bin/clangd-devel
 %%EXTRAS%%bin/clang-apply-replacements-devel
 %%EXTRAS%%bin/clang-change-namespace-devel
 %%EXTRAS%%bin/clang-doc-devel
 %%EXTRAS%%bin/clang-include-fixer-devel
+%%EXTRAS%%bin/clang-move-devel
 %%EXTRAS%%bin/clang-query-devel
 %%EXTRAS%%bin/clang-rename-devel
 %%EXTRAS%%bin/clang-reorder-fields-devel
 %%EXTRAS%%bin/clang-tidy-devel
 %%EXTRAS%%bin/find-all-symbols-devel
 %%EXTRAS%%bin/modularize-devel
+%%EXTRAS%%bin/pp-trace-devel
 %%LLD%%bin/ld.lld-devel
 %%LLD%%bin/ld64.lld-devel
 %%LLD%%bin/lld-devel
@@ -128,7 +128,7 @@ llvm-devel/bin/bugpoint
 %%CLANG%%llvm-devel/bin/clang-format
 %%CLANG%%llvm-devel/bin/clang-import-test
 %%EXTRAS%%llvm-devel/bin/clang-include-fixer
-%%CLANG%%llvm-devel/bin/clang-move
+%%EXTRAS%%llvm-devel/bin/clang-move
 %%CLANG%%llvm-devel/bin/clang-offload-bundler
 %%CLANG%%llvm-devel/bin/clang-offload-wrapper
 %%EXTRAS%%llvm-devel/bin/clang-query
@@ -137,7 +137,7 @@ llvm-devel/bin/bugpoint
 %%EXTRAS%%llvm-devel/bin/clang-reorder-fields
 %%CLANG%%llvm-devel/bin/clang-scan-deps
 %%EXTRAS%%llvm-devel/bin/clang-tidy
-%%CLANG%%llvm-devel/bin/clangd
+%%EXTRAS%%llvm-devel/bin/clangd
 %%CLANG%%llvm-devel/bin/diagtool
 llvm-devel/bin/dsymutil
 %%EXTRAS%%llvm-devel/bin/find-all-symbols
@@ -210,7 +210,7 @@ llvm-devel/bin/llvm-xray
 %%EXTRAS%%llvm-devel/bin/modularize
 llvm-devel/bin/obj2yaml
 llvm-devel/bin/opt
-llvm-devel/bin/pp-trace
+%%EXTRAS%%llvm-devel/bin/pp-trace
 llvm-devel/bin/sancov
 llvm-devel/bin/sanstats
 %%CLANG%%llvm-devel/bin/scan-build
@@ -760,6 +760,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Tooling/Core/Replacement.h
 %%CLANG%%llvm-devel/include/clang/Tooling/DependencyScanning/DependencyScanningFilesystem.h
 %%CLANG%%llvm-devel/include/clang/Tooling/DependencyScanning/DependencyScanningService.h
+%%CLANG%%llvm-devel/include/clang/Tooling/DependencyScanning/DependencyScanningTool.h
 %%CLANG%%llvm-devel/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h
 %%CLANG%%llvm-devel/include/clang/Tooling/DiagnosticsYaml.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Execution.h
@@ -3103,14 +3104,14 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%svn
 %%CLANG%%llvm-devel/lib/libclangAnalysis.a
 %%EXTRAS%%llvm-devel/lib/libclangApplyReplacements.a
 %%CLANG%%llvm-devel/lib/libclangBasic.a
-%%CLANG%%llvm-devel/lib/libclangChangeNamespace.a
+%%EXTRAS%%llvm-devel/lib/libclangChangeNamespace.a
 %%CLANG%%llvm-devel/lib/libclangCodeGen.a
 %%CLANG%%llvm-devel/lib/libclangCrossTU.a
-%%CLANG%%llvm-devel/lib/libclangDaemon.a
-%%CLANG%%llvm-devel/lib/libclangDaemonTweaks.a
+%%EXTRAS%%llvm-devel/lib/libclangDaemon.a
+%%EXTRAS%%llvm-devel/lib/libclangDaemonTweaks.a
 %%CLANG%%llvm-devel/lib/libclangDependencyScanning.a
 %%CLANG%%llvm-devel/lib/libclangDirectoryWatcher.a
-%%CLANG%%llvm-devel/lib/libclangDoc.a
+%%EXTRAS%%llvm-devel/lib/libclangDoc.a
 %%CLANG%%llvm-devel/lib/libclangDriver.a
 %%CLANG%%llvm-devel/lib/libclangDynamicASTMatchers.a
 %%CLANG%%llvm-devel/lib/libclangEdit.a
@@ -3123,10 +3124,10 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%svn
 %%EXTRAS%%llvm-devel/lib/libclangIncludeFixerPlugin.a
 %%CLANG%%llvm-devel/lib/libclangIndex.a
 %%CLANG%%llvm-devel/lib/libclangLex.a
-%%CLANG%%llvm-devel/lib/libclangMove.a
+%%EXTRAS%%llvm-devel/lib/libclangMove.a
 %%CLANG%%llvm-devel/lib/libclangParse.a
 %%EXTRAS%%llvm-devel/lib/libclangQuery.a
-%%CLANG%%llvm-devel/lib/libclangReorderFields.a
+%%EXTRAS%%llvm-devel/lib/libclangReorderFields.a
 %%CLANG%%llvm-devel/lib/libclangRewrite.a
 %%CLANG%%llvm-devel/lib/libclangRewriteFrontend.a
 %%CLANG%%llvm-devel/lib/libclangSema.a
@@ -3197,7 +3198,7 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%svn
 %%EXTRAS%%llvm-devel/share/clang/clang-rename.el
 %%EXTRAS%%llvm-devel/share/clang/clang-rename.py
 %%EXTRAS%%llvm-devel/share/clang/clang-tidy-diff.py
-%%CLANG%%llvm-devel/share/clang/index.js
+%%EXTRAS%%llvm-devel/share/clang/index.js
 %%EXTRAS%%llvm-devel/share/clang/run-clang-tidy.py
 %%EXTRAS%%llvm-devel/share/clang/run-find-all-symbols.py
 llvm-devel/share/opt-viewer/opt-diff.py