4 files changed, 16 insertions, 25 deletions

diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 2fd4cf69b7a3..05a73262959a 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -18,7 +18,7 @@ EXTRACT_ONLY=	${LLVM_SOURCE}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler
 
-CONFLICTS=	clang-[23]* clang31-*
+CONFLICTS=	clang-3.[012]* clang31-*
 
 CLANG_NAME=	clang-${PORTVERSION}
 CLANG_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index 5454d40f2e1f..a827f144cd73 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.4.r182968.tar.bz2) = 6efec3ebdccfb8c19acc7ca9fc72c2406f262dd937cdba1c98b4ded35be63917
-SIZE (clang-3.4.r182968.tar.bz2) = 7716534
-SHA256 (llvm-3.4.r182968.tar.bz2) = 5ec2af44c24ea5d0a2c0ebf9955e4653d4acf80a7cd1bd6e39296b0e0ca65e4e
-SIZE (llvm-3.4.r182968.tar.bz2) = 10669218
+SHA256 (clang-3.4.r189172.tar.bz2) = 5b2d5a479316b856e95bfa09ac63e005977a0b948326fe2c6b7209ffc0b324c7
+SIZE (clang-3.4.r189172.tar.bz2) = 8040234
+SHA256 (llvm-3.4.r189172.tar.bz2) = b96be5856796b77747ea8cb1559b7806d96372f70f82f0b4727fa6353e2d3724
+SIZE (llvm-3.4.r189172.tar.bz2) = 11364615
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp
deleted file mode 100644
index 31432876d6ee..000000000000
--- a/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/clang/lib/Basic/Targets.cpp.orig
-+++ tools/clang/lib/Basic/Targets.cpp
-@@ -271,6 +271,8 @@
-           break;
-         case llvm::Triple::mips:
-         case llvm::Triple::mipsel:
-+        case llvm::Triple::mips64:
-+        case llvm::Triple::mips64el:
-         case llvm::Triple::ppc:
-         case llvm::Triple::ppc64:
-           this->MCountName = "_mcount";
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index 163ec7b62db6..321f9faf8d7c 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -21,6 +21,7 @@ include/clang/AST/AST.h
 include/clang/AST/ASTConsumer.h
 include/clang/AST/ASTContext.h
 include/clang/AST/ASTDiagnostic.h
+include/clang/AST/ASTFwd.h
 include/clang/AST/ASTImporter.h
 include/clang/AST/ASTMutationListener.h
 include/clang/AST/ASTTypeTraits.h
@@ -71,8 +72,8 @@ include/clang/AST/ExprCXX.h
 include/clang/AST/ExprObjC.h
 include/clang/AST/ExternalASTSource.h
 include/clang/AST/GlobalDecl.h
-include/clang/AST/LambdaMangleContext.h
 include/clang/AST/Mangle.h
+include/clang/AST/MangleNumberingContext.h
 include/clang/AST/NSAPI.h
 include/clang/AST/NestedNameSpecifier.h
 include/clang/AST/OperationKinds.h
@@ -89,6 +90,7 @@ include/clang/AST/StmtGraphTraits.h
 include/clang/AST/StmtIterator.h
 include/clang/AST/StmtNodes.inc
 include/clang/AST/StmtObjC.h
+include/clang/AST/StmtOpenMP.h
 include/clang/AST/StmtVisitor.h
 include/clang/AST/TemplateBase.h
 include/clang/AST/TemplateName.h
@@ -111,6 +113,7 @@ include/clang/ASTMatchers/Dynamic/Parser.h
 include/clang/ASTMatchers/Dynamic/Registry.h
 include/clang/ASTMatchers/Dynamic/VariantValue.h
 include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
+include/clang/Analysis/Analyses/Consumed.h
 include/clang/Analysis/Analyses/Dominators.h
 include/clang/Analysis/Analyses/FormatString.h
 include/clang/Analysis/Analyses/LiveVariables.h
@@ -144,6 +147,7 @@ include/clang/Basic/BuiltinsMips.def
 include/clang/Basic/BuiltinsNVPTX.def
 include/clang/Basic/BuiltinsPPC.def
 include/clang/Basic/BuiltinsX86.def
+include/clang/Basic/BuiltinsXCore.def
 include/clang/Basic/CapturedStmt.h
 include/clang/Basic/CharInfo.h
 include/clang/Basic/CommentOptions.h
@@ -211,8 +215,6 @@ include/clang/CodeGen/CodeGenAction.h
 include/clang/CodeGen/ModuleBuilder.h
 include/clang/Config/config.h
 include/clang/Driver/Action.h
-include/clang/Driver/Arg.h
-include/clang/Driver/ArgList.h
 include/clang/Driver/CC1AsOptions.h
 include/clang/Driver/CC1AsOptions.inc
 include/clang/Driver/CC1Options.h
@@ -220,12 +222,10 @@ include/clang/Driver/Compilation.h
 include/clang/Driver/Driver.h
 include/clang/Driver/DriverDiagnostic.h
 include/clang/Driver/Job.h
-include/clang/Driver/OptSpecifier.h
-include/clang/Driver/OptTable.h
-include/clang/Driver/Option.h
 include/clang/Driver/Options.h
 include/clang/Driver/Options.inc
 include/clang/Driver/Phases.h
+include/clang/Driver/SanitizerArgs.h
 include/clang/Driver/Tool.h
 include/clang/Driver/ToolChain.h
 include/clang/Driver/Types.def
@@ -267,6 +267,7 @@ include/clang/Frontend/TextDiagnosticPrinter.h
 include/clang/Frontend/Utils.h
 include/clang/Frontend/VerifyDiagnosticConsumer.h
 include/clang/FrontendTool/Utils.h
+include/clang/Index/USRGeneration.h
 include/clang/Lex/AttrSpellings.inc
 include/clang/Lex/CodeCompletionHandler.h
 include/clang/Lex/DirectoryLookup.h
@@ -357,6 +358,7 @@ include/clang/Serialization/SerializationDiagnostic.h
 include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
 include/clang/StaticAnalyzer/Checkers/CommonBugCategories.h
 include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
+include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h
 include/clang/StaticAnalyzer/Core/Analyses.def
 include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
@@ -406,6 +408,7 @@ include/clang/Tooling/FileMatchTrie.h
 include/clang/Tooling/JSONCompilationDatabase.h
 include/clang/Tooling/Refactoring.h
 include/clang/Tooling/RefactoringCallbacks.h
+include/clang/Tooling/ReplacementsYaml.h
 include/clang/Tooling/Tooling.h
 lib/clang/%%CLANG_RELEASE%%/include/__wmmintrin_aes.h
 lib/clang/%%CLANG_RELEASE%%/include/__wmmintrin_pclmul.h
@@ -451,6 +454,7 @@ lib/libclangEdit.a
 lib/libclangFormat.a
 lib/libclangFrontend.a
 lib/libclangFrontendTool.a
+lib/libclangIndex.a
 lib/libclangLex.a
 lib/libclangParse.a
 lib/libclangRewriteCore.a
@@ -492,6 +496,7 @@ lib/libclangTooling.a
 @dirrm include/clang/Rewrite
 @dirrm include/clang/Parse
 @dirrm include/clang/Lex
+@dirrm include/clang/Index
 @dirrm include/clang/FrontendTool
 @dirrm include/clang/Frontend
 @dirrm include/clang/Format