6 files changed, 192 insertions, 85 deletions

diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile
index a6a5451c6a8e..d2dc8fd4f4cc 100644
--- a/devel/llvm/Makefile
+++ b/devel/llvm/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	llvm
-PORTVERSION=	2.9
+PORTVERSION=	3.0
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Low Level Virtual Machine
@@ -24,6 +23,8 @@ BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 
 CONFLICTS=	llvm-devel-[23]* llvm-etoile-2*
 
+WRKSRC=		${WRKDIR}/${DISTNAME}.src
+
 GNU_CONFIGURE=	yes
 USE_GCC=	4.2+
 USE_GMAKE=	yes
@@ -31,6 +32,9 @@ USE_LDCONFIG=	yes
 USE_PERL5=	yes
 MAKE_JOBS_SAFE=	yes
 
+CONFIGURE_ARGS+=	--enable-shared
+MAKE_ARGS+=		REQUIRES_RTTI=1
+
 .if defined(MAINTAINER_MODE)
 CONFIGURE_ARGS+=	--with-f2c=${LOCALBASE}
 .else
@@ -48,8 +52,7 @@ CONFIGURE_ARGS+=	--disable-docs
 MAN1=		bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 \
 		llvm-as.1 llvm-bcanalyzer.1 llvm-config.1 llvm-diff.1 \
 		llvm-dis.1 llvm-extract.1 llvm-ld.1 llvm-link.1 llvm-nm.1 \
-		llvm-prof.1 llvm-ranlib.1 llvmc.1 llvmgcc.1 \
-		llvmgxx.1 opt.1 tblgen.1
+		llvm-prof.1 llvm-ranlib.1 opt.1 tblgen.1
 
 .include <bsd.port.pre.mk>
 
@@ -71,6 +74,8 @@ CONFIGURE_ARGS+=	--enable-assertions
 CONFIGURE_ARGS+=	--disable-assertions
 .endif
 
+PLIST_SUB+=		PORTVERSION=${PORTVERSION}
+
 post-patch:
 	${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
 	    ${WRKSRC}/Makefile.config.in
@@ -103,21 +108,20 @@ PLIST_FILE_LIST=	bin/bugpoint \
 			bin/llvm* \
 			bin/macho-dump \
 			bin/opt \
-			bin/tblgen \
 			lib/BugpointPasses.so \
-			lib/libCompilerDriver.a \
-			lib/libEnhancedDisassembly.so \
-			lib/libEnhancedDisassembly.a \
 			lib/LLVMHello.so \
+			lib/libEnhancedDisassembly.a \
 			lib/libLTO.* \
 			lib/libLLVM* \
-			lib/profile_rt.so
+			lib/libprofile_rt.a \
+			lib/libprofile_rt.so
 PLIST_DIR_LIST=		include/llvm-c \
 			include/llvm
 build-plist:
 	${RM} -f ${PLIST}
 	cd ${PREFIX} && \
 	    (ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \
+	    ${SED} -e 's|${PORTVERSION}|%%PORTVERSION%%|' | \
 	    ${SORT} >> ${PLIST}
 	${FIND} ${DOCSDIR} -type f | \
 	    ${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
diff --git a/devel/llvm/distinfo b/devel/llvm/distinfo
index 324c661a74d9..6843ae4a2fa7 100644
--- a/devel/llvm/distinfo
+++ b/devel/llvm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvm-2.9.tgz) = 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
-SIZE (llvm-2.9.tgz) = 9574781
+SHA256 (llvm-3.0.tar.gz) = 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477
+SIZE (llvm-3.0.tar.gz) = 10350539
diff --git a/devel/llvm/pkg-plist b/devel/llvm/pkg-plist
index fa8d3c179435..61f95517ceac 100644
--- a/devel/llvm/pkg-plist
+++ b/devel/llvm/pkg-plist
@@ -5,8 +5,10 @@ bin/llvm-ar
 bin/llvm-as
 bin/llvm-bcanalyzer
 bin/llvm-config
+bin/llvm-cov
 bin/llvm-diff
 bin/llvm-dis
+bin/llvm-dwarfdump
 bin/llvm-extract
 bin/llvm-ld
 bin/llvm-link
@@ -15,21 +17,25 @@ bin/llvm-nm
 bin/llvm-objdump
 bin/llvm-prof
 bin/llvm-ranlib
+bin/llvm-rtdyld
+bin/llvm-size
 bin/llvm-stub
-bin/llvmc
+bin/llvm-tblgen
 bin/macho-dump
 bin/opt
-bin/tblgen
 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/PassManagerBuilder.h
 include/llvm-c/Transforms/Scalar.h
 include/llvm-c/lto.h
 include/llvm/ADT/APFloat.h
@@ -58,6 +64,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
@@ -79,6 +86,7 @@ include/llvm/ADT/StringMap.h
 include/llvm/ADT/StringRef.h
 include/llvm/ADT/StringSet.h
 include/llvm/ADT/StringSwitch.h
+include/llvm/ADT/TinyPtrVector.h
 include/llvm/ADT/Trie.h
 include/llvm/ADT/Triple.h
 include/llvm/ADT/Twine.h
@@ -87,9 +95,11 @@ include/llvm/ADT/ValueMap.h
 include/llvm/ADT/VectorExtras.h
 include/llvm/ADT/ilist.h
 include/llvm/ADT/ilist_node.h
-include/llvm/AbstractTypeUser.h
 include/llvm/Analysis/AliasAnalysis.h
 include/llvm/Analysis/AliasSetTracker.h
+include/llvm/Analysis/BlockFrequencyImpl.h
+include/llvm/Analysis/BlockFrequencyInfo.h
+include/llvm/Analysis/BranchProbabilityInfo.h
 include/llvm/Analysis/CFGPrinter.h
 include/llvm/Analysis/CallGraph.h
 include/llvm/Analysis/CaptureTracking.h
@@ -117,6 +127,7 @@ include/llvm/Analysis/Lint.h
 include/llvm/Analysis/Loads.h
 include/llvm/Analysis/LoopDependenceAnalysis.h
 include/llvm/Analysis/LoopInfo.h
+include/llvm/Analysis/LoopIterator.h
 include/llvm/Analysis/LoopPass.h
 include/llvm/Analysis/MemoryBuiltins.h
 include/llvm/Analysis/MemoryDependenceAnalysis.h
@@ -172,6 +183,7 @@ include/llvm/CodeGen/ISDOpcodes.h
 include/llvm/CodeGen/IntrinsicLowering.h
 include/llvm/CodeGen/JITCodeEmitter.h
 include/llvm/CodeGen/LatencyPriorityQueue.h
+include/llvm/CodeGen/LexicalScopes.h
 include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 include/llvm/CodeGen/LinkAllCodegenComponents.h
 include/llvm/CodeGen/LiveInterval.h
@@ -180,6 +192,8 @@ include/llvm/CodeGen/LiveStackAnalysis.h
 include/llvm/CodeGen/LiveVariables.h
 include/llvm/CodeGen/MachORelocation.h
 include/llvm/CodeGen/MachineBasicBlock.h
+include/llvm/CodeGen/MachineBlockFrequencyInfo.h
+include/llvm/CodeGen/MachineBranchProbabilityInfo.h
 include/llvm/CodeGen/MachineCodeEmitter.h
 include/llvm/CodeGen/MachineCodeInfo.h
 include/llvm/CodeGen/MachineConstantPool.h
@@ -191,7 +205,6 @@ include/llvm/CodeGen/MachineFunctionPass.h
 include/llvm/CodeGen/MachineInstr.h
 include/llvm/CodeGen/MachineInstrBuilder.h
 include/llvm/CodeGen/MachineJumpTableInfo.h
-include/llvm/CodeGen/MachineLocation.h
 include/llvm/CodeGen/MachineLoopInfo.h
 include/llvm/CodeGen/MachineLoopRanges.h
 include/llvm/CodeGen/MachineMemOperand.h
@@ -214,7 +227,6 @@ include/llvm/CodeGen/ProcessImplicitDefs.h
 include/llvm/CodeGen/PseudoSourceValue.h
 include/llvm/CodeGen/RegAllocPBQP.h
 include/llvm/CodeGen/RegAllocRegistry.h
-include/llvm/CodeGen/RegisterCoalescer.h
 include/llvm/CodeGen/RegisterScavenging.h
 include/llvm/CodeGen/RuntimeLibcalls.h
 include/llvm/CodeGen/ScheduleDAG.h
@@ -228,15 +240,6 @@ include/llvm/CodeGen/SlotIndexes.h
 include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
 include/llvm/CodeGen/ValueTypes.h
 include/llvm/CodeGen/ValueTypes.td
-include/llvm/CompilerDriver/Action.h
-include/llvm/CompilerDriver/AutoGenerated.h
-include/llvm/CompilerDriver/BuiltinOptions.h
-include/llvm/CompilerDriver/Common.td
-include/llvm/CompilerDriver/CompilationGraph.h
-include/llvm/CompilerDriver/Error.h
-include/llvm/CompilerDriver/Main.h
-include/llvm/CompilerDriver/Main.inc
-include/llvm/CompilerDriver/Tool.h
 include/llvm/Config/AsmParsers.def
 include/llvm/Config/AsmPrinters.def
 include/llvm/Config/Disassemblers.def
@@ -245,6 +248,9 @@ include/llvm/Config/config.h
 include/llvm/Config/llvm-config.h
 include/llvm/Constant.h
 include/llvm/Constants.h
+include/llvm/DebugInfo/DIContext.h
+include/llvm/DebugInfoProbe.h
+include/llvm/DefaultPasses.h
 include/llvm/DerivedTypes.h
 include/llvm/ExecutionEngine/ExecutionEngine.h
 include/llvm/ExecutionEngine/GenericValue.h
@@ -253,6 +259,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
@@ -280,12 +287,15 @@ include/llvm/LinkAllPasses.h
 include/llvm/LinkAllVMCore.h
 include/llvm/Linker.h
 include/llvm/MC/EDInstInfo.h
+include/llvm/MC/MCAsmBackend.h
 include/llvm/MC/MCAsmInfo.h
 include/llvm/MC/MCAsmInfoCOFF.h
 include/llvm/MC/MCAsmInfoDarwin.h
 include/llvm/MC/MCAsmLayout.h
 include/llvm/MC/MCAssembler.h
+include/llvm/MC/MCAtom.h
 include/llvm/MC/MCCodeEmitter.h
+include/llvm/MC/MCCodeGenInfo.h
 include/llvm/MC/MCContext.h
 include/llvm/MC/MCDirectives.h
 include/llvm/MC/MCDisassembler.h
@@ -297,9 +307,15 @@ include/llvm/MC/MCFixup.h
 include/llvm/MC/MCFixupKindInfo.h
 include/llvm/MC/MCInst.h
 include/llvm/MC/MCInstPrinter.h
+include/llvm/MC/MCInstrAnalysis.h
+include/llvm/MC/MCInstrDesc.h
+include/llvm/MC/MCInstrInfo.h
+include/llvm/MC/MCInstrItineraries.h
 include/llvm/MC/MCLabel.h
 include/llvm/MC/MCMachOSymbolFlags.h
 include/llvm/MC/MCMachObjectWriter.h
+include/llvm/MC/MCModule.h
+include/llvm/MC/MCObjectFileInfo.h
 include/llvm/MC/MCObjectStreamer.h
 include/llvm/MC/MCObjectWriter.h
 include/llvm/MC/MCParser/AsmCond.h
@@ -308,16 +324,28 @@ include/llvm/MC/MCParser/MCAsmLexer.h
 include/llvm/MC/MCParser/MCAsmParser.h
 include/llvm/MC/MCParser/MCAsmParserExtension.h
 include/llvm/MC/MCParser/MCParsedAsmOperand.h
+include/llvm/MC/MCRegisterInfo.h
 include/llvm/MC/MCSection.h
 include/llvm/MC/MCSectionCOFF.h
 include/llvm/MC/MCSectionELF.h
 include/llvm/MC/MCSectionMachO.h
 include/llvm/MC/MCStreamer.h
+include/llvm/MC/MCSubtargetInfo.h
 include/llvm/MC/MCSymbol.h
+include/llvm/MC/MCTargetAsmLexer.h
+include/llvm/MC/MCTargetAsmParser.h
 include/llvm/MC/MCValue.h
+include/llvm/MC/MCWin64EH.h
+include/llvm/MC/MachineLocation.h
 include/llvm/MC/SectionKind.h
+include/llvm/MC/SubtargetFeature.h
 include/llvm/Metadata.h
 include/llvm/Module.h
+include/llvm/Object/Archive.h
+include/llvm/Object/Binary.h
+include/llvm/Object/COFF.h
+include/llvm/Object/Error.h
+include/llvm/Object/MachO.h
 include/llvm/Object/MachOFormat.h
 include/llvm/Object/MachOObject.h
 include/llvm/Object/ObjectFile.h
@@ -333,16 +361,21 @@ include/llvm/Support/AIXDataTypesFix.h
 include/llvm/Support/AlignOf.h
 include/llvm/Support/Allocator.h
 include/llvm/Support/Atomic.h
+include/llvm/Support/BlockFrequency.h
+include/llvm/Support/BranchProbability.h
 include/llvm/Support/CFG.h
 include/llvm/Support/COFF.h
 include/llvm/Support/CallSite.h
+include/llvm/Support/Capacity.h
 include/llvm/Support/Casting.h
+include/llvm/Support/CodeGen.h
 include/llvm/Support/CommandLine.h
 include/llvm/Support/Compiler.h
 include/llvm/Support/ConstantFolder.h
 include/llvm/Support/ConstantRange.h
 include/llvm/Support/CrashRecoveryContext.h
 include/llvm/Support/DOTGraphTraits.h
+include/llvm/Support/DataExtractor.h
 include/llvm/Support/DataFlow.h
 include/llvm/Support/DataTypes.h
 include/llvm/Support/Debug.h
@@ -359,6 +392,7 @@ include/llvm/Support/FileSystem.h
 include/llvm/Support/FileUtilities.h
 include/llvm/Support/Format.h
 include/llvm/Support/FormattedStream.h
+include/llvm/Support/GCOV.h
 include/llvm/Support/GetElementPtrTypeIterator.h
 include/llvm/Support/GraphWriter.h
 include/llvm/Support/Host.h
@@ -400,11 +434,12 @@ 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
 include/llvm/Support/TargetFolder.h
+include/llvm/Support/TargetRegistry.h
+include/llvm/Support/TargetSelect.h
 include/llvm/Support/ThreadLocal.h
 include/llvm/Support/Threading.h
 include/llvm/Support/TimeValue.h
@@ -413,27 +448,26 @@ 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
 include/llvm/Support/system_error.h
 include/llvm/Support/type_traits.h
 include/llvm/SymbolTableListTraits.h
+include/llvm/TableGen/Error.h
+include/llvm/TableGen/Main.h
+include/llvm/TableGen/Record.h
+include/llvm/TableGen/TableGenAction.h
+include/llvm/TableGen/TableGenBackend.h
 include/llvm/Target/Mangler.h
-include/llvm/Target/SubtargetFeature.h
 include/llvm/Target/Target.td
-include/llvm/Target/TargetAsmBackend.h
-include/llvm/Target/TargetAsmInfo.h
-include/llvm/Target/TargetAsmLexer.h
-include/llvm/Target/TargetAsmParser.h
 include/llvm/Target/TargetCallingConv.h
 include/llvm/Target/TargetCallingConv.td
 include/llvm/Target/TargetData.h
 include/llvm/Target/TargetELFWriterInfo.h
 include/llvm/Target/TargetFrameLowering.h
-include/llvm/Target/TargetInstrDesc.h
 include/llvm/Target/TargetInstrInfo.h
-include/llvm/Target/TargetInstrItineraries.h
 include/llvm/Target/TargetIntrinsicInfo.h
 include/llvm/Target/TargetJITInfo.h
 include/llvm/Target/TargetLibraryInfo.h
@@ -443,14 +477,13 @@ include/llvm/Target/TargetMachine.h
 include/llvm/Target/TargetOpcodes.h
 include/llvm/Target/TargetOptions.h
 include/llvm/Target/TargetRegisterInfo.h
-include/llvm/Target/TargetRegistry.h
 include/llvm/Target/TargetSchedule.td
-include/llvm/Target/TargetSelect.h
 include/llvm/Target/TargetSelectionDAG.td
 include/llvm/Target/TargetSelectionDAGInfo.h
-include/llvm/Target/TargetSubtarget.h
+include/llvm/Target/TargetSubtargetInfo.h
 include/llvm/Transforms/IPO.h
 include/llvm/Transforms/IPO/InlinerPass.h
+include/llvm/Transforms/IPO/PassManagerBuilder.h
 include/llvm/Transforms/Instrumentation.h
 include/llvm/Transforms/Scalar.h
 include/llvm/Transforms/Utils/AddrModeMatcher.h
@@ -463,26 +496,27 @@ include/llvm/Transforms/Utils/Local.h
 include/llvm/Transforms/Utils/PromoteMemToReg.h
 include/llvm/Transforms/Utils/SSAUpdater.h
 include/llvm/Transforms/Utils/SSAUpdaterImpl.h
+include/llvm/Transforms/Utils/SimplifyIndVar.h
 include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
 include/llvm/Transforms/Utils/UnrollLoop.h
 include/llvm/Transforms/Utils/ValueMapper.h
 include/llvm/Type.h
-include/llvm/TypeSymbolTable.h
 include/llvm/Use.h
 include/llvm/User.h
 include/llvm/Value.h
 include/llvm/ValueSymbolTable.h
 lib/BugpointPasses.so
 lib/LLVMHello.so
-lib/libCompilerDriver.a
 lib/libEnhancedDisassembly.a
-lib/libEnhancedDisassembly.so
+lib/libLLVM-%%PORTVERSION%%.so
 lib/libLLVMARMAsmParser.a
 lib/libLLVMARMAsmPrinter.a
 lib/libLLVMARMCodeGen.a
+lib/libLLVMARMDesc.a
 lib/libLLVMARMDisassembler.a
 lib/libLLVMARMInfo.a
 lib/libLLVMAlphaCodeGen.a
+lib/libLLVMAlphaDesc.a
 lib/libLLVMAlphaInfo.a
 lib/libLLVMAnalysis.a
 lib/libLLVMArchive.a
@@ -491,15 +525,18 @@ lib/libLLVMAsmPrinter.a
 lib/libLLVMBitReader.a
 lib/libLLVMBitWriter.a
 lib/libLLVMBlackfinCodeGen.a
+lib/libLLVMBlackfinDesc.a
 lib/libLLVMBlackfinInfo.a
 lib/libLLVMCBackend.a
 lib/libLLVMCBackendInfo.a
 lib/libLLVMCellSPUCodeGen.a
+lib/libLLVMCellSPUDesc.a
 lib/libLLVMCellSPUInfo.a
 lib/libLLVMCodeGen.a
 lib/libLLVMCore.a
 lib/libLLVMCppBackend.a
 lib/libLLVMCppBackendInfo.a
+lib/libLLVMDebugInfo.a
 lib/libLLVMExecutionEngine.a
 lib/libLLVMInstCombine.a
 lib/libLLVMInstrumentation.a
@@ -509,6 +546,7 @@ lib/libLLVMLinker.a
 lib/libLLVMMBlazeAsmParser.a
 lib/libLLVMMBlazeAsmPrinter.a
 lib/libLLVMMBlazeCodeGen.a
+lib/libLLVMMBlazeDesc.a
 lib/libLLVMMBlazeDisassembler.a
 lib/libLLVMMBlazeInfo.a
 lib/libLLVMMC.a
@@ -517,40 +555,55 @@ lib/libLLVMMCJIT.a
 lib/libLLVMMCParser.a
 lib/libLLVMMSP430AsmPrinter.a
 lib/libLLVMMSP430CodeGen.a
+lib/libLLVMMSP430Desc.a
 lib/libLLVMMSP430Info.a
+lib/libLLVMMipsAsmPrinter.a
 lib/libLLVMMipsCodeGen.a
+lib/libLLVMMipsDesc.a
 lib/libLLVMMipsInfo.a
 lib/libLLVMObject.a
+lib/libLLVMPTXAsmPrinter.a
 lib/libLLVMPTXCodeGen.a
+lib/libLLVMPTXDesc.a
 lib/libLLVMPTXInfo.a
 lib/libLLVMPowerPCAsmPrinter.a
 lib/libLLVMPowerPCCodeGen.a
+lib/libLLVMPowerPCDesc.a
 lib/libLLVMPowerPCInfo.a
+lib/libLLVMRuntimeDyld.a
 lib/libLLVMScalarOpts.a
 lib/libLLVMSelectionDAG.a
 lib/libLLVMSparcCodeGen.a
+lib/libLLVMSparcDesc.a
 lib/libLLVMSparcInfo.a
 lib/libLLVMSupport.a
 lib/libLLVMSystemZCodeGen.a
+lib/libLLVMSystemZDesc.a
 lib/libLLVMSystemZInfo.a
+lib/libLLVMTableGen.a
 lib/libLLVMTarget.a
 lib/libLLVMTransformUtils.a
 lib/libLLVMX86AsmParser.a
 lib/libLLVMX86AsmPrinter.a
 lib/libLLVMX86CodeGen.a
+lib/libLLVMX86Desc.a
 lib/libLLVMX86Disassembler.a
 lib/libLLVMX86Info.a
 lib/libLLVMX86Utils.a
 lib/libLLVMXCoreCodeGen.a
+lib/libLLVMXCoreDesc.a
 lib/libLLVMXCoreInfo.a
 lib/libLLVMipa.a
 lib/libLLVMipo.a
 lib/libLTO.a
 lib/libLTO.so
-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/Atomics.html
 %%PORTDOCS%%%%DOCSDIR%%/html/BitCodeFormat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/BranchWeightMetadata.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Bugpoint.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CFEBuildInstrs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CMake.html
@@ -574,15 +627,10 @@ lib/profile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-nm.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-prof.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-ranlib.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvmc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvmgcc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvmgxx.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/manpage.css
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/opt.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/tblgen.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandLine.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CompilerDriver.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CompilerDriverTutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CompilerWriterInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/DebuggingJITedCode.html
 %%PORTDOCS%%%%DOCSDIR%%/html/DeveloperPolicy.html
@@ -606,6 +654,7 @@ lib/profile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersManual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Projects.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/SegmentedStacks.html
 %%PORTDOCS%%%%DOCSDIR%%/html/SourceLevelDebugging.html
 %%PORTDOCS%%%%DOCSDIR%%/html/SystemLibrary.html
 %%PORTDOCS%%%%DOCSDIR%%/html/TableGenFundamentals.html
@@ -625,6 +674,7 @@ lib/profile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl5-cfg.png
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl5.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl6.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl7.html
@@ -655,22 +705,20 @@ lib/profile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/ps/llvm-nm.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/llvm-prof.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/llvm-ranlib.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvmc.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvmgcc.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvmgxx.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/opt.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/tblgen.ps
 @dirrm include/llvm/Transforms/Utils
 @dirrm include/llvm/Transforms/IPO
 @dirrm include/llvm/Transforms
 @dirrm include/llvm/Target
+@dirrm include/llvm/TableGen
 @dirrm include/llvm/Support
 @dirrm include/llvm/Object
 @dirrm include/llvm/MC/MCParser
 @dirrm include/llvm/MC
 @dirrm include/llvm/ExecutionEngine
+@dirrm include/llvm/DebugInfo
 @dirrm include/llvm/Config
-@dirrm include/llvm/CompilerDriver
 @dirrm include/llvm/CodeGen/PBQP/Heuristics
 @dirrm include/llvm/CodeGen/PBQP
 @dirrm include/llvm/CodeGen
diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index 7bde1b72a43d..302be2fc332c 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	clang
-PORTVERSION=	2.9
+PORTVERSION=	3.0
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
-EXTRACT_SUFX=	.tgz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${LLVM_SOURCE}
 EXTRACT_ONLY=	${LLVM_SOURCE}
@@ -24,7 +23,7 @@ CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
 LLVM_NAME=	llvm-${PORTVERSION}
 LLVM_SOURCE=	${LLVM_NAME}${EXTRACT_SUFX}
 
-WRKSRC=		${WRKDIR}/${LLVM_NAME}
+WRKSRC=		${WRKDIR}/${LLVM_NAME}.src
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
 INSTALL_WRKSRC=	${WRKSRC}/tools/clang
 
@@ -45,10 +44,13 @@ USE_PERL5=	yes
 USE_PYTHON=	yes
 MAKE_JOBS_SAFE=	yes
 
-MAKE_ARGS=	LLVMIncDir=${LOCALBASE}/include \
+MAKE_ARGS=	CLANG_TBLGEN=${WRKSRC}/Release/bin/clang-tblgen \
+		LLVMIncDir=${LOCALBASE}/include \
 		LLVMToolDir=${LOCALBASE}/bin \
 		LLVMLibDir=${LOCALBASE}/lib
 
+CONFIGURE_ARGS+=	--enable-shared
+
 .if defined(MAINTAINER_MODE)
 CONFIGURE_ARGS+=	--with-f2c=${LOCALBASE}
 .else
@@ -59,6 +61,8 @@ CONFIGURE_ARGS+=	--enable-optimized
 CONFIGURE_ARGS+=	--disable-docs
 .endif
 
+PLIST_SUB+=		PORTVERSION=${PORTVERSION}
+
 MAN1=		clang.1
 
 .include <bsd.port.pre.mk>
@@ -70,7 +74,7 @@ BROKEN=		Does not compile on sparc64
 post-extract:
 	cd ${WRKSRC}/tools && \
 	    tar xf ${DISTDIR}/${CLANG_SOURCE} && \
-	    ${MV} ${CLANG_NAME} clang
+	    ${MV} ${CLANG_NAME}.src clang
 
 post-patch:
 	${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
@@ -86,8 +90,17 @@ post-patch:
 	    ${WRKSRC}/tools/clang/tools/scan-view/scan-view
 
 pre-build:
-	${LN} -sf ${LOCALBASE}/include/llvm/Intrinsics.gen ${WRKSRC}/include/llvm/
-	cd ${WRKSRC}/utils/unittest && ${GMAKE}
+	${LN} -sf ${LOCALBASE}/include/llvm/Intrinsics.gen \
+	    ${WRKSRC}/include/llvm/
+	${MKDIR} ${WRKSRC}/Release/lib
+	${LN} -sf ${LOCALBASE}/lib/libLLVM-${PORTVERSION}.so \
+	    ${WRKSRC}/Release/lib/
+	${LN} -sf ${LOCALBASE}/lib/libLLVMTableGen.a \
+	    ${WRKSRC}/Release/lib/
+	${LN} -sf ${LOCALBASE}/lib/libLLVMSupport.a \
+	    ${WRKSRC}/Release/lib/
+	cd ${WRKSRC}/utils/unittest/UnitTestMain && ${GMAKE}
+	cd ${WRKSRC}/utils/unittest/googletest && ${GMAKE}
 
 .if defined(NOPORTDOCS)
 post-build:
@@ -129,6 +142,8 @@ PLIST_FILE_LIST=	bin/ccc-analyzer \
 			bin/c++-analyzer \
 			bin/clang \
 			bin/clang++ \
+			bin/clang-tblgen \
+			bin/c-index-test \
 			bin/scan-build \
 			bin/scan-view \
 			lib/libclang*
@@ -145,7 +160,7 @@ build-plist:
 	${RM} -f ${PLIST}
 	cd ${PREFIX} && \
 	    (ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \
-	    ${SORT} >> ${PLIST}
+	     ${SED} -e 's|${PORTVERSION}|%%PORTVERSION%%|' | ${SORT} >> ${PLIST}
 	${FIND} ${DATADIR} ${DOCSDIR} -type f | \
 	    ${SED} -e 's|${DATADIR}|%%DATADIR%%|' \
 	     -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | ${SORT} >> ${PLIST}
@@ -154,6 +169,7 @@ build-plist:
 	    ${SED} -e 's|^|%%PYTHON_SITELIBDIR%%/|' >> ${PLIST}
 	cd ${PREFIX} && \
 	    ${FIND} ${PLIST_DIR_LIST} -type d | \
+	    ${SED} -e 's|${PORTVERSION}|%%PORTVERSION%%|' | \
 	    ${SORT} -r | ${SED} -e 's|^|@dirrm |' >> ${PLIST}
 	cd ${PYTHONPREFIX_SITELIBDIR} && \
 	    ${FIND} ${PLIST_PYDIR_LIST} -type d | ${SORT} -r | \
diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index 2702663a0017..1a058a452db6 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-2.9.tgz) = 70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df
-SIZE (clang-2.9.tgz) = 6243772
-SHA256 (llvm-2.9.tgz) = 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
-SIZE (llvm-2.9.tgz) = 9574781
+SHA256 (clang-3.0.tar.gz) = b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d
+SIZE (clang-3.0.tar.gz) = 7240578
+SHA256 (llvm-3.0.tar.gz) = 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477
+SIZE (llvm-3.0.tar.gz) = 10350539
diff --git a/lang/clang/pkg-plist b/lang/clang/pkg-plist
index 2af2781663cc..e8de5def3ee8 100644
--- a/lang/clang/pkg-plist
+++ b/lang/clang/pkg-plist
@@ -1,10 +1,15 @@
 bin/c++-analyzer
+bin/c-index-test
 bin/ccc-analyzer
 bin/clang
 bin/clang++
+bin/clang-tblgen
 bin/scan-build
 bin/scan-view
 include/clang-c/Index.h
+include/clang/ARCMigrate/ARCMT.h
+include/clang/ARCMigrate/ARCMTActions.h
+include/clang/ARCMigrate/FileRemapper.h
 include/clang/AST/APValue.h
 include/clang/AST/AST.h
 include/clang/AST/ASTConsumer.h
@@ -16,6 +21,7 @@ include/clang/AST/ASTVector.h
 include/clang/AST/Attr.h
 include/clang/AST/AttrImpl.inc
 include/clang/AST/Attrs.inc
+include/clang/AST/BaseSubobject.h
 include/clang/AST/CXXInheritance.h
 include/clang/AST/CanonicalType.h
 include/clang/AST/CharUnits.h
@@ -37,6 +43,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
@@ -45,6 +52,7 @@ include/clang/AST/PrettyPrinter.h
 include/clang/AST/RecordLayout.h
 include/clang/AST/RecursiveASTVisitor.h
 include/clang/AST/Redeclarable.h
+include/clang/AST/SelectorLocationsKind.h
 include/clang/AST/Stmt.h
 include/clang/AST/StmtCXX.h
 include/clang/AST/StmtGraphTraits.h
@@ -63,13 +71,15 @@ include/clang/AST/TypeOrdering.h
 include/clang/AST/TypeVisitor.h
 include/clang/AST/UnresolvedSet.h
 include/clang/AST/UsuallyTinyPtrVector.h
+include/clang/AST/VTTBuilder.h
+include/clang/AST/VTableBuilder.h
 include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
 include/clang/Analysis/Analyses/FormatString.h
 include/clang/Analysis/Analyses/LiveVariables.h
 include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
 include/clang/Analysis/Analyses/ReachableCode.h
+include/clang/Analysis/Analyses/ThreadSafety.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
@@ -85,33 +95,43 @@ 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/DelayedCleanupPool.h
 include/clang/Basic/Diagnostic.h
 include/clang/Basic/DiagnosticASTKinds.inc
 include/clang/Basic/DiagnosticAnalysisKinds.inc
+include/clang/Basic/DiagnosticCategories.h
 include/clang/Basic/DiagnosticCommonKinds.inc
 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
 include/clang/Basic/IdentifierTable.h
+include/clang/Basic/LLVM.h
+include/clang/Basic/LangOptions.def
 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
@@ -130,6 +150,7 @@ 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
@@ -147,6 +168,7 @@ include/clang/Driver/Driver.h
 include/clang/Driver/DriverDiagnostic.h
 include/clang/Driver/HostInfo.h
 include/clang/Driver/Job.h
+include/clang/Driver/ObjCRuntime.h
 include/clang/Driver/OptSpecifier.h
 include/clang/Driver/OptTable.h
 include/clang/Driver/Option.h
@@ -162,7 +184,7 @@ include/clang/Frontend/ASTConsumers.h
 include/clang/Frontend/ASTUnit.h
 include/clang/Frontend/Analyses.def
 include/clang/Frontend/AnalyzerOptions.h
-include/clang/Frontend/ChainedDiagnosticClient.h
+include/clang/Frontend/ChainedDiagnosticConsumer.h
 include/clang/Frontend/CodeGenOptions.h
 include/clang/Frontend/CommandLineSourceLoc.h
 include/clang/Frontend/CompilerInstance.h
@@ -177,13 +199,14 @@ 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/TextDiagnosticBuffer.h
 include/clang/Frontend/TextDiagnosticPrinter.h
 include/clang/Frontend/Utils.h
-include/clang/Frontend/VerifyDiagnosticsClient.h
+include/clang/Frontend/VerifyDiagnosticConsumer.h
 include/clang/FrontendTool/Utils.h
 include/clang/Index/ASTLocation.h
 include/clang/Index/Analyzer.h
@@ -208,6 +231,7 @@ include/clang/Lex/LexDiagnostic.h
 include/clang/Lex/Lexer.h
 include/clang/Lex/LiteralSupport.h
 include/clang/Lex/MacroInfo.h
+include/clang/Lex/ModuleLoader.h
 include/clang/Lex/MultipleIncludeOpt.h
 include/clang/Lex/PPCallbacks.h
 include/clang/Lex/PTHLexer.h
@@ -220,6 +244,7 @@ include/clang/Lex/ScratchBuffer.h
 include/clang/Lex/Token.h
 include/clang/Lex/TokenConcatenation.h
 include/clang/Lex/TokenLexer.h
+include/clang/Parse/AttrLateParsed.inc
 include/clang/Parse/ParseAST.h
 include/clang/Parse/ParseDiagnostic.h
 include/clang/Parse/Parser.h
@@ -242,7 +267,9 @@ include/clang/Sema/Designator.h
 include/clang/Sema/ExternalSemaSource.h
 include/clang/Sema/IdentifierResolver.h
 include/clang/Sema/Initialization.h
+include/clang/Sema/LocInfoType.h
 include/clang/Sema/Lookup.h
+include/clang/Sema/MultiInitializer.h
 include/clang/Sema/ObjCMethodList.h
 include/clang/Sema/Overload.h
 include/clang/Sema/Ownership.h
@@ -253,25 +280,34 @@ include/clang/Sema/ScopeInfo.h
 include/clang/Sema/Sema.h
 include/clang/Sema/SemaConsumer.h
 include/clang/Sema/SemaDiagnostic.h
+include/clang/Sema/SemaFixItUtils.h
 include/clang/Sema/SemaInternal.h
 include/clang/Sema/Template.h
 include/clang/Sema/TemplateDeduction.h
+include/clang/Sema/TypoCorrection.h
+include/clang/Sema/Weak.h
 include/clang/Serialization/ASTBitCodes.h
 include/clang/Serialization/ASTDeserializationListener.h
 include/clang/Serialization/ASTReader.h
-include/clang/Serialization/ASTSerializationListener.h
 include/clang/Serialization/ASTWriter.h
 include/clang/Serialization/AttrPCHRead.inc
 include/clang/Serialization/AttrPCHWrite.inc
+include/clang/Serialization/ChainedIncludesSource.h
+include/clang/Serialization/ContinuousRangeMap.h
+include/clang/Serialization/Module.h
+include/clang/Serialization/ModuleManager.h
+include/clang/StaticAnalyzer/Checkers/ClangCheckers.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/BugReporterVisitor.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/PathDiagnosticClients.h
+include/clang/StaticAnalyzer/Core/CheckerOptInfo.h
+include/clang/StaticAnalyzer/Core/CheckerRegistry.h
+include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
 include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
 include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h
@@ -283,33 +319,35 @@ include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngineBuilders.h
-include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h
-include/clang/StaticAnalyzer/Core/PathSensitive/GRStateTrait.h
 include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ObjCMessage.h
+include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
+include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.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
-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/%%PORTVERSION%%/include/arm_neon.h
+lib/clang/%%PORTVERSION%%/include/emmintrin.h
+lib/clang/%%PORTVERSION%%/include/immintrin.h
+lib/clang/%%PORTVERSION%%/include/mm3dnow.h
+lib/clang/%%PORTVERSION%%/include/mm_malloc.h
+lib/clang/%%PORTVERSION%%/include/mmintrin.h
+lib/clang/%%PORTVERSION%%/include/nmmintrin.h
+lib/clang/%%PORTVERSION%%/include/pmmintrin.h
+lib/clang/%%PORTVERSION%%/include/smmintrin.h
+lib/clang/%%PORTVERSION%%/include/tmmintrin.h
+lib/clang/%%PORTVERSION%%/include/wmmintrin.h
+lib/clang/%%PORTVERSION%%/include/xmmintrin.h
 lib/libclang.a
 lib/libclang.so
+lib/libclangARCMigrate.a
 lib/libclangAST.a
 lib/libclangAnalysis.a
 lib/libclangBasic.a
@@ -330,17 +368,17 @@ lib/libclangStaticAnalyzerFrontend.a
 %%DATADIR%%/sorttable.js
 %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/AnalyzerRegions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/AutomaticReferenceCounting.html
 %%PORTDOCS%%%%DOCSDIR%%/html/DriverInternals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/InternalsManual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LanguageExtensions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/PCHInternals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/PTHInternals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersManual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
 %%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
@@ -348,8 +386,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/%%PORTVERSION%%/include
+@dirrm lib/clang/%%PORTVERSION%%
 @dirrm lib/clang
 @dirrm include/clang/StaticAnalyzer/Frontend
 @dirrm include/clang/StaticAnalyzer/Core/PathSensitive
@@ -375,6 +413,7 @@ lib/libclangStaticAnalyzerFrontend.a
 @dirrm include/clang/Analysis/Analyses
 @dirrm include/clang/Analysis
 @dirrm include/clang/AST
+@dirrm include/clang/ARCMigrate
 @dirrm include/clang-c
 @dirrm include/clang
 @dirrm %%PYTHON_SITELIBDIR%%/Resources