11 files changed, 60 insertions, 82 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index ef26f12678fb..fafb24fbc4d8 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	llvm
-DISTVERSION=	2.9.r${SVN_REV}
+DISTVERSION=	3.0.r${SVN_REV}
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 .endif
 
-CONFLICTS=	llvm-2.[0-9]* llvm-etoile-2.[0-9]*
+CONFLICTS=	llvm-[23]* llvm-etoile-2*
 
 GNU_CONFIGURE=	yes
 USE_GCC=	4.2+
@@ -141,8 +141,8 @@ PLIST_FILE_LIST=	bin/bugpoint \
 			lib/libEnhancedDisassembly.a \
 			lib/libLTO.* \
 			lib/libLLVM* \
-			lib/libUnitTestMain.a \
-			lib/profile_rt.so
+			lib/libprofile_rt.so \
+			lib/libprofile_rt.a
 PLIST_DIR_LIST=		include/llvm-c \
 			include/llvm
 build-plist:
diff --git a/devel/llvm-devel/Makefile.svn_rev b/devel/llvm-devel/Makefile.svn_rev
index 087dda088c6f..80953b399c6c 100644
--- a/devel/llvm-devel/Makefile.svn_rev
+++ b/devel/llvm-devel/Makefile.svn_rev
@@ -1 +1 @@
-SVN_REV=	126497
+SVN_REV=	133062
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index f4b7674e666b..63aada52c399 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvm-2.9.r126497.tar.bz2) = 3b36386deb8f5b4f28d7ed93840ec3b039a2aca0a1afc227c62e869b15c4dc24
-SIZE (llvm-2.9.r126497.tar.bz2) = 7543516
+SHA256 (llvm-3.0.r133062.tar.bz2) = 8ad06ac907f6867739546f097c15af5a08f60342372cc8b5850cc9db0741b091
+SIZE (llvm-3.0.r133062.tar.bz2) = 7793259
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index b10c01ade7c9..b02540378c67 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -15,6 +15,7 @@ bin/llvm-nm
 bin/llvm-objdump
 bin/llvm-prof
 bin/llvm-ranlib
+bin/llvm-rtdyld
 bin/llvm-stub
 bin/llvmc
 bin/macho-dump
@@ -24,10 +25,12 @@ include/llvm-c/Analysis.h
 include/llvm-c/BitReader.h
 include/llvm-c/BitWriter.h
 include/llvm-c/Core.h
+include/llvm-c/Disassembler.h
 include/llvm-c/EnhancedDisassembly.h
 include/llvm-c/ExecutionEngine.h
 include/llvm-c/Initialization.h
 include/llvm-c/LinkTimeOptimizer.h
+include/llvm-c/Object.h
 include/llvm-c/Target.h
 include/llvm-c/Transforms/IPO.h
 include/llvm-c/Transforms/Scalar.h
@@ -58,6 +61,7 @@ include/llvm/ADT/IntrusiveRefCntPtr.h
 include/llvm/ADT/NullablePtr.h
 include/llvm/ADT/Optional.h
 include/llvm/ADT/OwningPtr.h
+include/llvm/ADT/PackedVector.h
 include/llvm/ADT/PointerIntPair.h
 include/llvm/ADT/PointerUnion.h
 include/llvm/ADT/PostOrderIterator.h
@@ -90,6 +94,7 @@ include/llvm/ADT/ilist_node.h
 include/llvm/AbstractTypeUser.h
 include/llvm/Analysis/AliasAnalysis.h
 include/llvm/Analysis/AliasSetTracker.h
+include/llvm/Analysis/BranchProbabilityInfo.h
 include/llvm/Analysis/CFGPrinter.h
 include/llvm/Analysis/CallGraph.h
 include/llvm/Analysis/CaptureTracking.h
@@ -114,7 +119,6 @@ include/llvm/Analysis/LazyValueInfo.h
 include/llvm/Analysis/LibCallAliasAnalysis.h
 include/llvm/Analysis/LibCallSemantics.h
 include/llvm/Analysis/Lint.h
-include/llvm/Analysis/LiveValues.h
 include/llvm/Analysis/Loads.h
 include/llvm/Analysis/LoopDependenceAnalysis.h
 include/llvm/Analysis/LoopInfo.h
@@ -155,7 +159,6 @@ include/llvm/Bitcode/BitstreamReader.h
 include/llvm/Bitcode/BitstreamWriter.h
 include/llvm/Bitcode/LLVMBitCodes.h
 include/llvm/Bitcode/ReaderWriter.h
-include/llvm/CMakeLists.txt
 include/llvm/CallGraphSCCPass.h
 include/llvm/CallingConv.h
 include/llvm/CodeGen/Analysis.h
@@ -244,11 +247,11 @@ include/llvm/Config/AsmPrinters.def
 include/llvm/Config/Disassemblers.def
 include/llvm/Config/Targets.def
 include/llvm/Config/config.h
-include/llvm/Config/config.h.cmake
 include/llvm/Config/llvm-config.h
-include/llvm/Config/llvm-config.h.cmake
 include/llvm/Constant.h
 include/llvm/Constants.h
+include/llvm/DebugInfoProbe.h
+include/llvm/DefaultPasses.h
 include/llvm/DerivedTypes.h
 include/llvm/ExecutionEngine/ExecutionEngine.h
 include/llvm/ExecutionEngine/GenericValue.h
@@ -257,6 +260,7 @@ include/llvm/ExecutionEngine/JIT.h
 include/llvm/ExecutionEngine/JITEventListener.h
 include/llvm/ExecutionEngine/JITMemoryManager.h
 include/llvm/ExecutionEngine/MCJIT.h
+include/llvm/ExecutionEngine/RuntimeDyld.h
 include/llvm/Function.h
 include/llvm/GVMaterializer.h
 include/llvm/GlobalAlias.h
@@ -275,6 +279,7 @@ include/llvm/Intrinsics.td
 include/llvm/IntrinsicsARM.td
 include/llvm/IntrinsicsAlpha.td
 include/llvm/IntrinsicsCellSPU.td
+include/llvm/IntrinsicsPTX.td
 include/llvm/IntrinsicsPowerPC.td
 include/llvm/IntrinsicsX86.td
 include/llvm/IntrinsicsXCore.td
@@ -318,6 +323,7 @@ include/llvm/MC/MCSectionMachO.h
 include/llvm/MC/MCStreamer.h
 include/llvm/MC/MCSymbol.h
 include/llvm/MC/MCValue.h
+include/llvm/MC/MCWin64EH.h
 include/llvm/MC/SectionKind.h
 include/llvm/Metadata.h
 include/llvm/Module.h
@@ -336,6 +342,7 @@ include/llvm/Support/AIXDataTypesFix.h
 include/llvm/Support/AlignOf.h
 include/llvm/Support/Allocator.h
 include/llvm/Support/Atomic.h
+include/llvm/Support/BranchProbability.h
 include/llvm/Support/CFG.h
 include/llvm/Support/COFF.h
 include/llvm/Support/CallSite.h
@@ -348,7 +355,6 @@ include/llvm/Support/CrashRecoveryContext.h
 include/llvm/Support/DOTGraphTraits.h
 include/llvm/Support/DataFlow.h
 include/llvm/Support/DataTypes.h
-include/llvm/Support/DataTypes.h.cmake
 include/llvm/Support/Debug.h
 include/llvm/Support/DebugLoc.h
 include/llvm/Support/Disassembler.h
@@ -383,6 +389,7 @@ include/llvm/Support/Mutex.h
 include/llvm/Support/MutexGuard.h
 include/llvm/Support/NoFolder.h
 include/llvm/Support/OutputBuffer.h
+include/llvm/Support/PassManagerBuilder.h
 include/llvm/Support/PassNameParser.h
 include/llvm/Support/Path.h
 include/llvm/Support/PathV1.h
@@ -404,7 +411,6 @@ include/llvm/Support/SMLoc.h
 include/llvm/Support/Signals.h
 include/llvm/Support/Solaris.h
 include/llvm/Support/SourceMgr.h
-include/llvm/Support/StandardPasses.h
 include/llvm/Support/StringPool.h
 include/llvm/Support/SwapByteOrder.h
 include/llvm/Support/SystemUtils.h
@@ -417,6 +423,7 @@ include/llvm/Support/ToolOutputFile.h
 include/llvm/Support/TypeBuilder.h
 include/llvm/Support/Valgrind.h
 include/llvm/Support/ValueHandle.h
+include/llvm/Support/Win64EH.h
 include/llvm/Support/circular_raw_ostream.h
 include/llvm/Support/raw_os_ostream.h
 include/llvm/Support/raw_ostream.h
@@ -530,6 +537,7 @@ lib/libLLVMPTXInfo.a
 lib/libLLVMPowerPCAsmPrinter.a
 lib/libLLVMPowerPCCodeGen.a
 lib/libLLVMPowerPCInfo.a
+lib/libLLVMRuntimeDyld.a
 lib/libLLVMScalarOpts.a
 lib/libLLVMSelectionDAG.a
 lib/libLLVMSparcCodeGen.a
@@ -551,8 +559,8 @@ lib/libLLVMipa.a
 lib/libLLVMipo.a
 lib/libLTO.a
 lib/libLTO.so
-lib/libUnitTestMain.a
-lib/profile_rt.so
+lib/libprofile_rt.a
+lib/libprofile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.html
 %%PORTDOCS%%%%DOCSDIR%%/html/BitCodeFormat.html
diff --git a/devel/llvm-etoile/Makefile b/devel/llvm-etoile/Makefile
index c7cf80e3ffa6..cb01d00c18df 100644
--- a/devel/llvm-etoile/Makefile
+++ b/devel/llvm-etoile/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	runtest:${PORTSDIR}/misc/dejagnu
 BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 .endif
 
-CONFLICTS=	llvm-devel-2* llvm-2*
+CONFLICTS=	llvm-devel-[23]* llvm-[23]*
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile
index c30e8bc10297..a6a5451c6a8e 100644
--- a/devel/llvm/Makefile
+++ b/devel/llvm/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 .endif
 
-CONFLICTS=	llvm-devel-2.[0-9]* llvm-etoile-2.[0-9]*
+CONFLICTS=	llvm-devel-[23]* llvm-etoile-2*
 
 GNU_CONFIGURE=	yes
 USE_GCC=	4.2+
diff --git a/devel/llvm29/Makefile b/devel/llvm29/Makefile
index c30e8bc10297..a6a5451c6a8e 100644
--- a/devel/llvm29/Makefile
+++ b/devel/llvm29/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 .endif
 
-CONFLICTS=	llvm-devel-2.[0-9]* llvm-etoile-2.[0-9]*
+CONFLICTS=	llvm-devel-[23]* llvm-etoile-2*
 
 GNU_CONFIGURE=	yes
 USE_GCC=	4.2+
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 236aaf364041..a719f8b3bb73 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clang
-PORTVERSION=	2.9.r${SVN_REV}
+PORTVERSION=	3.0.r${SVN_REV}
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -18,7 +18,7 @@ EXTRACT_ONLY=	${LLVM_SOURCE}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and (alpha-quality) C++ compiler
 
-CONFLICTS=	clang-2.[0-9]* llvm-2.[0-9]*
+CONFLICTS=	clang-[23]*
 
 CLANG_NAME=	clang-${PORTVERSION}
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
@@ -105,7 +105,7 @@ post-patch:
 
 pre-build:
 	${LN} -sf ${LOCALBASE}/include/llvm/Intrinsics.gen ${WRKSRC}/include/llvm/
-	cd ${WRKSRC}/utils/unittest/googletest && ${GMAKE}
+	cd ${WRKSRC}/utils/unittest && ${GMAKE}
 
 .if defined(NOPORTDOCS)
 post-build:
@@ -145,7 +145,6 @@ regression-test: ${BUILD_COOKIE}
 
 PLIST_FILE_LIST=	bin/ccc-analyzer \
 			bin/c++-analyzer \
-			bin/c-index-test \
 			bin/clang \
 			bin/clang++ \
 			bin/scan-build \
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index d6a0223930d0..9f42a4c9f78c 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-2.9.r126497.tar.bz2) = ed22aa61c1c3636a28aeb6fd1b7ba59530495e0f115850d9b258dd8d467005a8
-SIZE (clang-2.9.r126497.tar.bz2) = 5147416
-SHA256 (llvm-2.9.r126497.tar.bz2) = 3b36386deb8f5b4f28d7ed93840ec3b039a2aca0a1afc227c62e869b15c4dc24
-SIZE (llvm-2.9.r126497.tar.bz2) = 7543516
+SHA256 (clang-3.0.r133062.tar.bz2) = 65546eb6c0e206be8f853ba47d8a2bc8a75f3e9a548fdde0fa6f00e81b0538c5
+SIZE (clang-3.0.r133062.tar.bz2) = 5413538
+SHA256 (llvm-3.0.r133062.tar.bz2) = 8ad06ac907f6867739546f097c15af5a08f60342372cc8b5850cc9db0741b091
+SIZE (llvm-3.0.r133062.tar.bz2) = 7793259
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index cbf81821c245..d1655a10508e 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -1,5 +1,4 @@
 bin/c++-analyzer
-bin/c-index-test
 bin/ccc-analyzer
 bin/clang
 bin/clang++
@@ -38,6 +37,7 @@ include/clang/AST/Expr.h
 include/clang/AST/ExprCXX.h
 include/clang/AST/ExprObjC.h
 include/clang/AST/ExternalASTSource.h
+include/clang/AST/GlobalDecl.h
 include/clang/AST/Mangle.h
 include/clang/AST/NestedNameSpecifier.h
 include/clang/AST/OperationKinds.h
@@ -46,10 +46,6 @@ include/clang/AST/PrettyPrinter.h
 include/clang/AST/RecordLayout.h
 include/clang/AST/RecursiveASTVisitor.h
 include/clang/AST/Redeclarable.h
-include/clang/AST/Release+Asserts/AttrImpl.inc.tmp
-include/clang/AST/Release+Asserts/Attrs.inc.tmp
-include/clang/AST/Release+Asserts/DeclNodes.inc.tmp
-include/clang/AST/Release+Asserts/StmtNodes.inc.tmp
 include/clang/AST/Stmt.h
 include/clang/AST/StmtCXX.h
 include/clang/AST/StmtGraphTraits.h
@@ -74,7 +70,6 @@ include/clang/Analysis/Analyses/LiveVariables.h
 include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
 include/clang/Analysis/Analyses/ReachableCode.h
 include/clang/Analysis/Analyses/UninitializedValues.h
-include/clang/Analysis/Analyses/UninitializedValuesV2.h
 include/clang/Analysis/AnalysisContext.h
 include/clang/Analysis/AnalysisDiagnostic.h
 include/clang/Analysis/CFG.h
@@ -90,12 +85,14 @@ include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h
 include/clang/Analysis/Visitors/CFGRecStmtVisitor.h
 include/clang/Analysis/Visitors/CFGStmtVisitor.h
 include/clang/Basic/ABI.h
+include/clang/Basic/AddressSpaces.h
 include/clang/Basic/AttrKinds.h
 include/clang/Basic/AttrList.inc
 include/clang/Basic/Builtins.def
 include/clang/Basic/Builtins.h
 include/clang/Basic/BuiltinsARM.def
 include/clang/Basic/BuiltinsPPC.def
+include/clang/Basic/BuiltinsPTX.def
 include/clang/Basic/BuiltinsX86.def
 include/clang/Basic/ConvertUTF.h
 include/clang/Basic/Diagnostic.h
@@ -106,9 +103,12 @@ include/clang/Basic/DiagnosticDriverKinds.inc
 include/clang/Basic/DiagnosticFrontendKinds.inc
 include/clang/Basic/DiagnosticGroups.inc
 include/clang/Basic/DiagnosticIDs.h
+include/clang/Basic/DiagnosticIndexName.inc
 include/clang/Basic/DiagnosticLexKinds.inc
 include/clang/Basic/DiagnosticParseKinds.inc
 include/clang/Basic/DiagnosticSemaKinds.inc
+include/clang/Basic/ExceptionSpecificationType.h
+include/clang/Basic/ExpressionTraits.h
 include/clang/Basic/FileManager.h
 include/clang/Basic/FileSystemOptions.h
 include/clang/Basic/FileSystemStatCache.h
@@ -117,23 +117,12 @@ include/clang/Basic/LangOptions.h
 include/clang/Basic/Linkage.h
 include/clang/Basic/MacroBuilder.h
 include/clang/Basic/OnDiskHashTable.h
+include/clang/Basic/OpenCL.h
 include/clang/Basic/OpenCLExtensions.def
 include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
 include/clang/Basic/PartialDiagnostic.h
 include/clang/Basic/PrettyStackTrace.h
-include/clang/Basic/Release+Asserts/AttrList.inc.tmp
-include/clang/Basic/Release+Asserts/DiagnosticASTKinds.inc.tmp
-include/clang/Basic/Release+Asserts/DiagnosticAnalysisKinds.inc.tmp
-include/clang/Basic/Release+Asserts/DiagnosticCommonKinds.inc.tmp
-include/clang/Basic/Release+Asserts/DiagnosticDriverKinds.inc.tmp
-include/clang/Basic/Release+Asserts/DiagnosticFrontendKinds.inc.tmp
-include/clang/Basic/Release+Asserts/DiagnosticGroups.inc.tmp
-include/clang/Basic/Release+Asserts/DiagnosticLexKinds.inc.tmp
-include/clang/Basic/Release+Asserts/DiagnosticParseKinds.inc.tmp
-include/clang/Basic/Release+Asserts/DiagnosticSemaKinds.inc.tmp
-include/clang/Basic/Release+Asserts/Version.inc.tmp
-include/clang/Basic/Release+Asserts/arm_neon.inc.tmp
 include/clang/Basic/SourceLocation.h
 include/clang/Basic/SourceManager.h
 include/clang/Basic/SourceManagerInternals.h
@@ -147,12 +136,12 @@ include/clang/Basic/TokenKinds.h
 include/clang/Basic/TypeTraits.h
 include/clang/Basic/Version.h
 include/clang/Basic/Version.inc
+include/clang/Basic/VersionTuple.h
 include/clang/Basic/Visibility.h
 include/clang/Basic/arm_neon.inc
 include/clang/CodeGen/BackendUtil.h
 include/clang/CodeGen/CodeGenAction.h
 include/clang/CodeGen/ModuleBuilder.h
-include/clang/Config/config.h.cmake
 include/clang/Driver/Action.h
 include/clang/Driver/Arg.h
 include/clang/Driver/ArgList.h
@@ -171,9 +160,6 @@ include/clang/Driver/Option.h
 include/clang/Driver/Options.h
 include/clang/Driver/Options.inc
 include/clang/Driver/Phases.h
-include/clang/Driver/Release+Asserts/CC1AsOptions.inc.tmp
-include/clang/Driver/Release+Asserts/CC1Options.inc.tmp
-include/clang/Driver/Release+Asserts/Options.inc.tmp
 include/clang/Driver/Tool.h
 include/clang/Driver/ToolChain.h
 include/clang/Driver/Types.def
@@ -188,12 +174,8 @@ include/clang/Frontend/CodeGenOptions.h
 include/clang/Frontend/CommandLineSourceLoc.h
 include/clang/Frontend/CompilerInstance.h
 include/clang/Frontend/CompilerInvocation.h
-include/clang/Frontend/DeclContextXML.def
-include/clang/Frontend/DeclXML.def
 include/clang/Frontend/DependencyOutputOptions.h
 include/clang/Frontend/DiagnosticOptions.h
-include/clang/Frontend/DocumentXML.def
-include/clang/Frontend/DocumentXML.h
 include/clang/Frontend/FrontendAction.h
 include/clang/Frontend/FrontendActions.h
 include/clang/Frontend/FrontendDiagnostic.h
@@ -202,13 +184,12 @@ include/clang/Frontend/FrontendPluginRegistry.h
 include/clang/Frontend/HeaderSearchOptions.h
 include/clang/Frontend/LangStandard.h
 include/clang/Frontend/LangStandards.def
+include/clang/Frontend/LogDiagnosticPrinter.h
 include/clang/Frontend/MultiplexConsumer.h
 include/clang/Frontend/PreprocessorOptions.h
 include/clang/Frontend/PreprocessorOutputOptions.h
-include/clang/Frontend/StmtXML.def
 include/clang/Frontend/TextDiagnosticBuffer.h
 include/clang/Frontend/TextDiagnosticPrinter.h
-include/clang/Frontend/TypeXML.def
 include/clang/Frontend/Utils.h
 include/clang/Frontend/VerifyDiagnosticsClient.h
 include/clang/FrontendTool/Utils.h
@@ -243,7 +224,6 @@ include/clang/Lex/Pragma.h
 include/clang/Lex/PreprocessingRecord.h
 include/clang/Lex/Preprocessor.h
 include/clang/Lex/PreprocessorLexer.h
-include/clang/Lex/Release+Asserts/AttrSpellings.inc.tmp
 include/clang/Lex/ScratchBuffer.h
 include/clang/Lex/Token.h
 include/clang/Lex/TokenConcatenation.h
@@ -291,25 +271,21 @@ include/clang/Serialization/ASTSerializationListener.h
 include/clang/Serialization/ASTWriter.h
 include/clang/Serialization/AttrPCHRead.inc
 include/clang/Serialization/AttrPCHWrite.inc
-include/clang/Serialization/Release+Asserts/AttrPCHRead.inc.tmp
-include/clang/Serialization/Release+Asserts/AttrPCHWrite.inc.tmp
+include/clang/Serialization/ChainedIncludesSource.h
 include/clang/StaticAnalyzer/Checkers/DereferenceChecker.h
 include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
 include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
+include/clang/StaticAnalyzer/Core/Checker.h
 include/clang/StaticAnalyzer/Core/CheckerManager.h
 include/clang/StaticAnalyzer/Core/CheckerProvider.h
-include/clang/StaticAnalyzer/Core/CheckerV2.h
 include/clang/StaticAnalyzer/Core/PathDiagnosticClients.h
 include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
 include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h
-include/clang/StaticAnalyzer/Core/PathSensitive/Checker.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
-include/clang/StaticAnalyzer/Core/PathSensitive/CheckerVisitor.def
-include/clang/StaticAnalyzer/Core/PathSensitive/CheckerVisitor.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
 include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
@@ -323,6 +299,7 @@ include/clang/StaticAnalyzer/Core/PathSensitive/ObjCMessage.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
 include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
+include/clang/StaticAnalyzer/Core/PathSensitive/StoreRef.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SummaryManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
@@ -330,17 +307,18 @@ include/clang/StaticAnalyzer/Core/PathSensitive/TransferFuncs.h
 include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
 include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
 include/clang/StaticAnalyzer/Frontend/FrontendActions.h
-lib/clang/2.9/include/arm_neon.h
-lib/clang/2.9/include/emmintrin.h
-lib/clang/2.9/include/immintrin.h
-lib/clang/2.9/include/mm_malloc.h
-lib/clang/2.9/include/mmintrin.h
-lib/clang/2.9/include/nmmintrin.h
-lib/clang/2.9/include/pmmintrin.h
-lib/clang/2.9/include/smmintrin.h
-lib/clang/2.9/include/tmmintrin.h
-lib/clang/2.9/include/wmmintrin.h
-lib/clang/2.9/include/xmmintrin.h
+lib/clang/3.0/include/arm_neon.h
+lib/clang/3.0/include/emmintrin.h
+lib/clang/3.0/include/immintrin.h
+lib/clang/3.0/include/mm3dnow.h
+lib/clang/3.0/include/mm_malloc.h
+lib/clang/3.0/include/mmintrin.h
+lib/clang/3.0/include/nmmintrin.h
+lib/clang/3.0/include/pmmintrin.h
+lib/clang/3.0/include/smmintrin.h
+lib/clang/3.0/include/tmmintrin.h
+lib/clang/3.0/include/wmmintrin.h
+lib/clang/3.0/include/xmmintrin.h
 lib/libclang.a
 lib/libclang.so
 lib/libclangAST.a
@@ -373,7 +351,6 @@ lib/libclangStaticAnalyzerFrontend.a
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
 %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/libIndex.html
 %%PORTDOCS%%%%DOCSDIR%%/ps/clang.ps
 %%PYTHON_SITELIBDIR%%/Reporter.py
 %%PYTHON_SITELIBDIR%%/Resources/FileRadar.scpt
@@ -381,8 +358,8 @@ lib/libclangStaticAnalyzerFrontend.a
 %%PYTHON_SITELIBDIR%%/Resources/bugcatcher.ico
 %%PYTHON_SITELIBDIR%%/ScanView.py
 %%PYTHON_SITELIBDIR%%/startfile.py
-@dirrm lib/clang/2.9/include
-@dirrm lib/clang/2.9
+@dirrm lib/clang/3.0/include
+@dirrm lib/clang/3.0
 @dirrm lib/clang
 @dirrm include/clang/StaticAnalyzer/Frontend
 @dirrm include/clang/StaticAnalyzer/Core/PathSensitive
@@ -390,21 +367,16 @@ lib/libclangStaticAnalyzerFrontend.a
 @dirrm include/clang/StaticAnalyzer/Core
 @dirrm include/clang/StaticAnalyzer/Checkers
 @dirrm include/clang/StaticAnalyzer
-@dirrm include/clang/Serialization/Release+Asserts
 @dirrm include/clang/Serialization
 @dirrm include/clang/Sema
 @dirrm include/clang/Rewrite
 @dirrm include/clang/Parse
-@dirrm include/clang/Lex/Release+Asserts
 @dirrm include/clang/Lex
 @dirrm include/clang/Index
 @dirrm include/clang/FrontendTool
 @dirrm include/clang/Frontend
-@dirrm include/clang/Driver/Release+Asserts
 @dirrm include/clang/Driver
-@dirrm include/clang/Config
 @dirrm include/clang/CodeGen
-@dirrm include/clang/Basic/Release+Asserts
 @dirrm include/clang/Basic
 @dirrm include/clang/Analysis/Visitors
 @dirrm include/clang/Analysis/Support
@@ -412,7 +384,6 @@ lib/libclangStaticAnalyzerFrontend.a
 @dirrm include/clang/Analysis/DomainSpecific
 @dirrm include/clang/Analysis/Analyses
 @dirrm include/clang/Analysis
-@dirrm include/clang/AST/Release+Asserts
 @dirrm include/clang/AST
 @dirrm include/clang-c
 @dirrm include/clang
diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index c38ddd9bf5b1..7bde1b72a43d 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${LLVM_SOURCE}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and (alpha-quality) C++ compiler
 
-CONFLICTS=	clang-devel-2.[0-9]* llvm-devel-2.[0-9]*
+CONFLICTS=	clang-devel-[23]*
 
 CLANG_NAME=	clang-${PORTVERSION}
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}