3 files changed, 15 insertions, 11 deletions

diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 9e12863495bb..642a1c45c5c1 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	clang
 PORTVERSION=	3.6.r${SVN_REV}
-PORTREVISION=	1
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -52,6 +51,8 @@ ASSERTS_DESC=	Enable assertions (thread unsafe)
 CONFIGURE_ARGS+=	--enable-optimized --enable-shared
 # Build some docs manually later
 CONFIGURE_ARGS+=	--disable-docs
+# Don't build bindings, the ocaml ones break
+CONFIGURE_ARGS+=	--enable-bindings=none
 
 PLIST_SUB+=	CLANG_RELEASE=${CLANG_RELEASE}
 
@@ -192,11 +193,5 @@ build-plist:
 	${FIND} ${STAGEDIR}${DOCSDIR} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
 	    ${SORT} >> ${PLIST}
-	${FIND} ${PLIST_DIR_LIST:S|^|${STAGEDIR}${LLVM_PREFIX}/|} -type d | \
-	    ${SED} -e 's|${STAGEDIR}${PREFIX}/|@dirrm |' | \
-	    ${SORT} -r >> ${PLIST}
-	${FIND} ${STAGEDIR}${DOCSDIR} -type d | ${SORT} -r | \
-	    ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' \
-	    >> ${PLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index ff27b736cc94..dd520f59cefd 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.6.r218451.tar.bz2) = 9bed7bb78ded4cd5724471ed7c267343c477d99482d73c1f2cc250209edbb39b
-SIZE (clang-3.6.r218451.tar.bz2) = 9253945
-SHA256 (llvm-3.6.r218451.tar.bz2) = 6a59280d79529333e8ae86eeb48f389a9bbb630e590bde62f7e6491e5d30eda1
-SIZE (llvm-3.6.r218451.tar.bz2) = 13830528
+SHA256 (clang-3.6.r222267.tar.bz2) = 20c4b61b0d14adf051d038349fcbd230fd2978ed58363751497514dbc11a0160
+SIZE (clang-3.6.r222267.tar.bz2) = 9374829
+SHA256 (llvm-3.6.r222267.tar.bz2) = e2d4c12750c5ac3a4617f492841baef62eeca665469990f48925becad20c61e8
+SIZE (llvm-3.6.r222267.tar.bz2) = 14140626
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index 792c58baaf3e..878ac2c7ffd0 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -222,7 +222,9 @@ llvm-devel/include/clang/Basic/OperatorPrecedence.h
 llvm-devel/include/clang/Basic/PartialDiagnostic.h
 llvm-devel/include/clang/Basic/PlistSupport.h
 llvm-devel/include/clang/Basic/PrettyStackTrace.h
+llvm-devel/include/clang/Basic/SanitizerBlacklist.h
 llvm-devel/include/clang/Basic/Sanitizers.def
+llvm-devel/include/clang/Basic/Sanitizers.h
 llvm-devel/include/clang/Basic/SourceLocation.h
 llvm-devel/include/clang/Basic/SourceManager.h
 llvm-devel/include/clang/Basic/SourceManagerInternals.h
@@ -291,6 +293,8 @@ llvm-devel/include/clang/Frontend/MigratorOptions.h
 llvm-devel/include/clang/Frontend/MultiplexConsumer.h
 llvm-devel/include/clang/Frontend/PreprocessorOutputOptions.h
 llvm-devel/include/clang/Frontend/SerializedDiagnosticPrinter.h
+llvm-devel/include/clang/Frontend/SerializedDiagnosticReader.h
+llvm-devel/include/clang/Frontend/SerializedDiagnostics.h
 llvm-devel/include/clang/Frontend/TextDiagnostic.h
 llvm-devel/include/clang/Frontend/TextDiagnosticBuffer.h
 llvm-devel/include/clang/Frontend/TextDiagnosticPrinter.h
@@ -438,6 +442,7 @@ llvm-devel/include/clang/Tooling/ArgumentsAdjusters.h
 llvm-devel/include/clang/Tooling/CommonOptionsParser.h
 llvm-devel/include/clang/Tooling/CompilationDatabase.h
 llvm-devel/include/clang/Tooling/CompilationDatabasePluginRegistry.h
+llvm-devel/include/clang/Tooling/Core/Replacement.h
 llvm-devel/include/clang/Tooling/FileMatchTrie.h
 llvm-devel/include/clang/Tooling/JSONCompilationDatabase.h
 llvm-devel/include/clang/Tooling/Refactoring.h
@@ -451,8 +456,11 @@ llvm-devel/lib/clang/3.6.0/include/altivec.h
 llvm-devel/lib/clang/3.6.0/include/ammintrin.h
 llvm-devel/lib/clang/3.6.0/include/arm_neon.h
 llvm-devel/lib/clang/3.6.0/include/avx2intrin.h
+llvm-devel/lib/clang/3.6.0/include/avx512bwintrin.h
 llvm-devel/lib/clang/3.6.0/include/avx512erintrin.h
 llvm-devel/lib/clang/3.6.0/include/avx512fintrin.h
+llvm-devel/lib/clang/3.6.0/include/avx512vlbwintrin.h
+llvm-devel/lib/clang/3.6.0/include/avx512vlintrin.h
 llvm-devel/lib/clang/3.6.0/include/avxintrin.h
 llvm-devel/lib/clang/3.6.0/include/bmi2intrin.h
 llvm-devel/lib/clang/3.6.0/include/bmiintrin.h
@@ -507,6 +515,7 @@ llvm-devel/lib/libclangStaticAnalyzerCheckers.a
 llvm-devel/lib/libclangStaticAnalyzerCore.a
 llvm-devel/lib/libclangStaticAnalyzerFrontend.a
 llvm-devel/lib/libclangTooling.a
+llvm-devel/lib/libclangToolingCore.a
 llvm-devel/lib/python/Reporter.py
 llvm-devel/lib/python/Resources/FileRadar.scpt
 llvm-devel/lib/python/Resources/GetRadarVersion.scpt