Update to a 3.2 snapshot. OPTIONSng-ify. Reduce diffs with non-devel

ports.

7 files changed, 284 insertions, 162 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 406b94453616..17c08bb8828c 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	llvm
-DISTVERSION=	3.1.r${SVN_REV}
+DISTVERSION=	3.2.r${SVN_REV}
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -34,29 +34,52 @@ USE_PYTHON_BUILD=	yes
 MAKE_JOBS_SAFE=	yes
 
 # Suggested tweaks from http://llvm.org/docs/Packaging.html
-MAKE_ARGS+=		REQUIRES_RTTI=1
 CONFIGURE_ARGS+=	--enable-shared
+MAKE_ARGS+=		REQUIRES_RTTI=1
 LIBNAME=		libLLVM-${DISTVERSION:C/\.r[0-9]*//}svn.so
 
+CONFIGURE_ARGS+=	--enable-bindings=none
+
+OPTIONS_DEFINE=	ASSERTS DOCS LTOPLUGIN
+
+ASSERTS_DESC=	Enable assertions (thread unsafe)
+LTOPLUGIN_DESC=	Build LTO plugin (requires gold)
+
+MAN1=		bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
+		llvm-bcanalyzer.1 llvm-cov.1 llvm-config.1 llvm-diff.1 \
+		llvm-dis.1 llvm-extract.1 llvm-link.1 llvm-nm.1 \
+		llvm-prof.1 llvm-ranlib.1 llvm-stress.1 opt.1 tblgen.1
+
+LLVM_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
+PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}
+
+.include <bsd.port.options.mk>
+
 .if defined(MAINTAINER_MODE)
 CONFIGURE_ARGS+=	--with-f2c=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--enable-optimized
 .endif
 
-CONFIGURE_ARGS+=	--enable-bindings=none
-
-OPTIONS=	ASSERTS	"Enable assertions (thread unsafe)" off \
-		LTOPLUGIN "Build LTO plugin (requires gold)" off
-
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
+CONFIGURE_ARGS+=	--enable-docs
+BUILD_DEPENDS+=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+.else
 CONFIGURE_ARGS+=	--disable-docs
 .endif
 
-MAN1=		bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
-		llvm-bcanalyzer.1 llvm-cov.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 llvm-stress.1 opt.1 tblgen.1
+.if ${PORT_OPTIONS:MASSERTS}
+CONFIGURE_ARGS+=	--enable-assertions
+.else
+CONFIGURE_ARGS+=	--disable-assertions
+.endif
+
+.if ${PORT_OPTIONS:MLTOPLUGIN}
+BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
+RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
+CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
+PLIST_FILES+=		lib/LLVMgold.so
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -81,19 +104,6 @@ CONFIGURE_ARGS+=	--enable-pic --with-pic
 CONFIGURE_ARGS+=	--with-optimize-option=-O2
 .endif
 
-.ifdef(WITH_ASSERTS)
-CONFIGURE_ARGS+=	--enable-assertions
-.else
-CONFIGURE_ARGS+=	--disable-assertions
-.endif
-
-.ifdef(WITH_LTOPLUGIN)
-BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
-PLIST_FILES+=		lib/LLVMgold.so
-.endif
-
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
 FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 
@@ -115,17 +125,20 @@ post-patch:
 	${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \
 	    ${WRKSRC}/Makefile.config.in
 
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-build:
-	@cd ${WRKSRC}/docs/CommandGuide && ${GMAKE} ${MAN1}
+	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man html
 .endif
 
 post-install:
-	mv ${PREFIX}/lib/${LIBNAME} ${PREFIX}/lib/${LIBNAME}.0
-	ln -s ${LIBNAME}.0 ${PREFIX}/lib/${LIBNAME}
-.if defined(NOPORTDOCS)
+	${MV} ${PREFIX}/lib/${LIBNAME} ${PREFIX}/lib/${LIBNAME}.0
+	${LN} -s ${LIBNAME}.0 ${PREFIX}/lib/${LIBNAME}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}/html
+	find ${WRKSRC}/docs/_build/html -type f | \
+	    xargs -I _DOC_ ${INSTALL_DATA} _DOC_ ${DOCSDIR}/html/
 .for man in ${MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/docs/CommandGuide/${man} \
+	@${INSTALL_MAN} ${WRKSRC}/docs/_build/man/${man} \
 	     ${MANPREFIX}/man/man1/
 .endfor
 .endif
@@ -145,19 +158,19 @@ PLIST_FILE_LIST=	bin/bugpoint \
 			bin/llvm* \
 			bin/macho-dump \
 			bin/opt \
-			lib/LLVMHello.so \
 			lib/BugpointPasses.so \
+			lib/LLVMHello.so \
 			lib/libLTO.* \
 			lib/libLLVM* \
-			lib/libprofile_rt.so \
-			lib/libprofile_rt.a
+			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%%|' | \
+	    ${SED} -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' | \
 	    ${SORT} >> ${PLIST}
 	${FIND} ${DOCSDIR} -type f | \
 	    ${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
diff --git a/devel/llvm-devel/Makefile.svn_rev b/devel/llvm-devel/Makefile.svn_rev
index 9b88a515891a..6d7c115cd43f 100644
--- a/devel/llvm-devel/Makefile.svn_rev
+++ b/devel/llvm-devel/Makefile.svn_rev
@@ -1 +1 @@
-SVN_REV=	154687
+SVN_REV=	160283
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 5e2208cfbe91..7c2d76eac2e3 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvm-3.1.r154687.tar.bz2) = d63d8bb08c85076d3b7398b062370b3617eb25c24e4a275c1ada7d634b30dc24
-SIZE (llvm-3.1.r154687.tar.bz2) = 8631665
+SHA256 (llvm-3.2.r160283.tar.bz2) = 3dfae804e7765bfacfb4347ada59e174fa9f4a272ee86b17ae6882e5f3e56ca7
+SIZE (llvm-3.2.r160283.tar.bz2) = 8961712
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index dfb79eb60201..be25e6ca24db 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -10,7 +10,6 @@ bin/llvm-diff
 bin/llvm-dis
 bin/llvm-dwarfdump
 bin/llvm-extract
-bin/llvm-ld
 bin/llvm-link
 bin/llvm-mc
 bin/llvm-nm
@@ -21,7 +20,6 @@ bin/llvm-readobj
 bin/llvm-rtdyld
 bin/llvm-size
 bin/llvm-stress
-bin/llvm-stub
 bin/llvm-tblgen
 bin/macho-dump
 bin/opt
@@ -34,6 +32,7 @@ include/llvm-c/EnhancedDisassembly.h
 include/llvm-c/ExecutionEngine.h
 include/llvm-c/Initialization.h
 include/llvm-c/LinkTimeOptimizer.h
+include/llvm-c/Linker.h
 include/llvm-c/Object.h
 include/llvm-c/Target.h
 include/llvm-c/TargetMachine.h
@@ -113,9 +112,7 @@ include/llvm/Analysis/CaptureTracking.h
 include/llvm/Analysis/CodeMetrics.h
 include/llvm/Analysis/ConstantFolding.h
 include/llvm/Analysis/ConstantsScanner.h
-include/llvm/Analysis/DIBuilder.h
 include/llvm/Analysis/DOTGraphTraitsPass.h
-include/llvm/Analysis/DebugInfo.h
 include/llvm/Analysis/DomPrinter.h
 include/llvm/Analysis/DominanceFrontier.h
 include/llvm/Analysis/DominatorInternals.h
@@ -134,6 +131,7 @@ include/llvm/Analysis/Lint.h
 include/llvm/Analysis/Loads.h
 include/llvm/Analysis/LoopDependenceAnalysis.h
 include/llvm/Analysis/LoopInfo.h
+include/llvm/Analysis/LoopInfoImpl.h
 include/llvm/Analysis/LoopIterator.h
 include/llvm/Analysis/LoopPass.h
 include/llvm/Analysis/MemoryBuiltins.h
@@ -232,10 +230,11 @@ include/llvm/CodeGen/PBQP/Heuristics/Briggs.h
 include/llvm/CodeGen/PBQP/Math.h
 include/llvm/CodeGen/PBQP/Solution.h
 include/llvm/CodeGen/Passes.h
-include/llvm/CodeGen/ProcessImplicitDefs.h
 include/llvm/CodeGen/PseudoSourceValue.h
 include/llvm/CodeGen/RegAllocPBQP.h
 include/llvm/CodeGen/RegAllocRegistry.h
+include/llvm/CodeGen/RegisterClassInfo.h
+include/llvm/CodeGen/RegisterPressure.h
 include/llvm/CodeGen/RegisterScavenging.h
 include/llvm/CodeGen/ResourcePriorityQueue.h
 include/llvm/CodeGen/RuntimeLibcalls.h
@@ -259,6 +258,8 @@ include/llvm/Config/config.h
 include/llvm/Config/llvm-config.h
 include/llvm/Constant.h
 include/llvm/Constants.h
+include/llvm/DIBuilder.h
+include/llvm/DebugInfo.h
 include/llvm/DebugInfo/DIContext.h
 include/llvm/DefaultPasses.h
 include/llvm/DerivedTypes.h
@@ -277,6 +278,7 @@ include/llvm/GVMaterializer.h
 include/llvm/GlobalAlias.h
 include/llvm/GlobalValue.h
 include/llvm/GlobalVariable.h
+include/llvm/IRBuilder.h
 include/llvm/InitializePasses.h
 include/llvm/InlineAsm.h
 include/llvm/InstrTypes.h
@@ -290,8 +292,10 @@ include/llvm/Intrinsics.td
 include/llvm/IntrinsicsARM.td
 include/llvm/IntrinsicsCellSPU.td
 include/llvm/IntrinsicsHexagon.td
-include/llvm/IntrinsicsPTX.td
+include/llvm/IntrinsicsMips.td
+include/llvm/IntrinsicsNVVM.td
 include/llvm/IntrinsicsPowerPC.td
+include/llvm/IntrinsicsR600.td
 include/llvm/IntrinsicsX86.td
 include/llvm/IntrinsicsXCore.td
 include/llvm/LLVMContext.h
@@ -337,6 +341,7 @@ 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/MCSchedule.h
 include/llvm/MC/MCSection.h
 include/llvm/MC/MCSectionCOFF.h
 include/llvm/MC/MCSectionELF.h
@@ -352,6 +357,7 @@ include/llvm/MC/MCWinCOFFObjectWriter.h
 include/llvm/MC/MachineLocation.h
 include/llvm/MC/SectionKind.h
 include/llvm/MC/SubtargetFeature.h
+include/llvm/MDBuilder.h
 include/llvm/Metadata.h
 include/llvm/Module.h
 include/llvm/Object/Archive.h
@@ -411,14 +417,15 @@ include/llvm/Support/GCOV.h
 include/llvm/Support/GetElementPtrTypeIterator.h
 include/llvm/Support/GraphWriter.h
 include/llvm/Support/Host.h
-include/llvm/Support/IRBuilder.h
 include/llvm/Support/IRReader.h
 include/llvm/Support/IncludeFile.h
 include/llvm/Support/InstIterator.h
 include/llvm/Support/InstVisitor.h
-include/llvm/Support/JSONParser.h
+include/llvm/Support/IntegersSubset.h
+include/llvm/Support/IntegersSubsetMapping.h
 include/llvm/Support/LICENSE.TXT
 include/llvm/Support/LeakDetector.h
+include/llvm/Support/Locale.h
 include/llvm/Support/LockFileManager.h
 include/llvm/Support/MachO.h
 include/llvm/Support/ManagedStatic.h
@@ -464,7 +471,6 @@ include/llvm/Support/Threading.h
 include/llvm/Support/TimeValue.h
 include/llvm/Support/Timer.h
 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
@@ -478,6 +484,7 @@ include/llvm/SymbolTableListTraits.h
 include/llvm/TableGen/Error.h
 include/llvm/TableGen/Main.h
 include/llvm/TableGen/Record.h
+include/llvm/TableGen/StringMatcher.h
 include/llvm/TableGen/TableGenAction.h
 include/llvm/TableGen/TableGenBackend.h
 include/llvm/Target/Mangler.h
@@ -489,6 +496,7 @@ include/llvm/Target/TargetELFWriterInfo.h
 include/llvm/Target/TargetFrameLowering.h
 include/llvm/Target/TargetInstrInfo.h
 include/llvm/Target/TargetIntrinsicInfo.h
+include/llvm/Target/TargetItinerary.td
 include/llvm/Target/TargetJITInfo.h
 include/llvm/Target/TargetLibraryInfo.h
 include/llvm/Target/TargetLowering.h
@@ -511,7 +519,7 @@ include/llvm/Transforms/Utils/BasicBlockUtils.h
 include/llvm/Transforms/Utils/BuildLibCalls.h
 include/llvm/Transforms/Utils/Cloning.h
 include/llvm/Transforms/Utils/CmpInstAnalysis.h
-include/llvm/Transforms/Utils/FunctionUtils.h
+include/llvm/Transforms/Utils/CodeExtractor.h
 include/llvm/Transforms/Utils/Local.h
 include/llvm/Transforms/Utils/ModuleUtils.h
 include/llvm/Transforms/Utils/PromoteMemToReg.h
@@ -523,14 +531,18 @@ include/llvm/Transforms/Utils/UnrollLoop.h
 include/llvm/Transforms/Utils/ValueMapper.h
 include/llvm/Transforms/Vectorize.h
 include/llvm/Type.h
+include/llvm/TypeBuilder.h
 include/llvm/Use.h
 include/llvm/User.h
 include/llvm/Value.h
 include/llvm/ValueSymbolTable.h
 lib/BugpointPasses.so
 lib/LLVMHello.so
-lib/libLLVM-3.1svn.so
-lib/libLLVM-3.1svn.so.0
+lib/libLLVM-%%LLVM_RELEASE%%svn.so
+lib/libLLVM-%%LLVM_RELEASE%%svn.so.0
+lib/libLLVMAMDGPUCodeGen.a
+lib/libLLVMAMDGPUDesc.a
+lib/libLLVMAMDGPUInfo.a
 lib/libLLVMARMAsmParser.a
 lib/libLLVMARMAsmPrinter.a
 lib/libLLVMARMCodeGen.a
@@ -579,12 +591,13 @@ lib/libLLVMMipsAsmParser.a
 lib/libLLVMMipsAsmPrinter.a
 lib/libLLVMMipsCodeGen.a
 lib/libLLVMMipsDesc.a
+lib/libLLVMMipsDisassembler.a
 lib/libLLVMMipsInfo.a
+lib/libLLVMNVPTXAsmPrinter.a
+lib/libLLVMNVPTXCodeGen.a
+lib/libLLVMNVPTXDesc.a
+lib/libLLVMNVPTXInfo.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
@@ -616,121 +629,168 @@ lib/libLTO.a
 lib/libLTO.so
 lib/libprofile_rt.a
 lib/libprofile_rt.so
-%%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
+%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo
 %%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.html
+%%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/Atomics.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Atomics.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/BitCodeFormat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/BitCodeFormat.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/BranchWeightMetadata.html
+%%PORTDOCS%%%%DOCSDIR%%/html/BranchWeightMetadata.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/Bugpoint.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Bugpoint.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/CMake.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CMake.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/CodeGenerator.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CodingStandards.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/FileCheck.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/bugpoint.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/lit.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/lli.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-ar.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-as.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-bcanalyzer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-build.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-config.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-cov.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-diff.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-dis.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-extract.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-ld.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-link.html
-%%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/llvm-stress.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/manpage.css
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/opt.html
-%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/tblgen.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CodingStandards.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandLine.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CompilerWriterInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/DebuggingJITedCode.html
 %%PORTDOCS%%%%DOCSDIR%%/html/DeveloperPolicy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/DeveloperPolicy.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/ExceptionHandling.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ExceptionHandling.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/ExtendingLLVM.html
 %%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/FileCheck.html
+%%PORTDOCS%%%%DOCSDIR%%/html/FileCheck.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/GCCFEBuildInstrs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/GarbageCollection.html
 %%PORTDOCS%%%%DOCSDIR%%/html/GetElementPtr.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GetElementPtr.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/GettingStarted.html
 %%PORTDOCS%%%%DOCSDIR%%/html/GettingStartedVS.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GettingStartedVS.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/GoldPlugin.html
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToAddABuilder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToReleaseLLVM.html
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToSubmitABug.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LLVMBuild.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LangRef.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Lexicon.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Lexicon.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LinkTimeOptimization.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LinkTimeOptimization.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/MakefileGuide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/MakefileGuide.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Packaging.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Packaging.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/Passes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersManual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Projects.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Projects.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/SegmentedStacks.html
+%%PORTDOCS%%%%DOCSDIR%%/html/SegmentedStacks.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/SourceLevelDebugging.html
 %%PORTDOCS%%%%DOCSDIR%%/html/SystemLibrary.html
 %%PORTDOCS%%%%DOCSDIR%%/html/TableGenFundamentals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/TableGenFundamentals.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/TestSuiteMakefileGuide.html
 %%PORTDOCS%%%%DOCSDIR%%/html/TestingGuide.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WritingAnLLVMBackend.html
 %%PORTDOCS%%%%DOCSDIR%%/html/WritingAnLLVMPass.html
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/html/img/Debugging.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/libdeps.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/lines.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/objdeps.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/venusflytrap.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/ajax-loader.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/basic.css
+%%PORTDOCS%%%%DOCSDIR%%/html/bugpoint.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bugpoint.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/comment-bright.png
+%%PORTDOCS%%%%DOCSDIR%%/html/comment-close.png
+%%PORTDOCS%%%%DOCSDIR%%/html/comment.png
+%%PORTDOCS%%%%DOCSDIR%%/html/contents.png
+%%PORTDOCS%%%%DOCSDIR%%/html/design_and_overview.html
+%%PORTDOCS%%%%DOCSDIR%%/html/design_and_overview.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/development_process.html
+%%PORTDOCS%%%%DOCSDIR%%/html/development_process.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/doctools.js
+%%PORTDOCS%%%%DOCSDIR%%/html/down-pressed.png
+%%PORTDOCS%%%%DOCSDIR%%/html/down.png
+%%PORTDOCS%%%%DOCSDIR%%/html/file.png
+%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/html/lines.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/lit.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lit.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llc.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/lli.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lli.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-ar.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-ar.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-as.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-as.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-bcanalyzer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-bcanalyzer.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-build.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-build.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-config.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-config.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-cov.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-cov.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-diff.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-diff.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-dis.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-dis.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-extract.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-extract.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-link.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-link.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-nm.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-nm.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-prof.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-prof.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-ranlib.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-ranlib.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-stress.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-stress.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-theme.css
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm.css
-%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl1.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/LangImpl8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl6.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl7.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/OCamlLangImpl8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tutorial/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ps/FileCheck.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/bugpoint.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/lit.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llc.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/lli.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-ar.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-as.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-bcanalyzer.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-build.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-config.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-cov.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-diff.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-dis.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-extract.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-ld.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-link.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-nm.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-prof.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-ranlib.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/llvm-stress.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/opt.ps
-%%PORTDOCS%%%%DOCSDIR%%/ps/tblgen.ps
+%%PORTDOCS%%%%DOCSDIR%%/html/logo.png
+%%PORTDOCS%%%%DOCSDIR%%/html/mailing_lists.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mailing_lists.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/minus.png
+%%PORTDOCS%%%%DOCSDIR%%/html/navigation.png
+%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv
+%%PORTDOCS%%%%DOCSDIR%%/html/opt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/opt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/plus.png
+%%PORTDOCS%%%%DOCSDIR%%/html/programming.html
+%%PORTDOCS%%%%DOCSDIR%%/html/programming.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/pygments.css
+%%PORTDOCS%%%%DOCSDIR%%/html/search.html
+%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
+%%PORTDOCS%%%%DOCSDIR%%/html/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/html/subsystems.html
+%%PORTDOCS%%%%DOCSDIR%%/html/subsystems.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/tblgen.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tblgen.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/underscore.js
+%%PORTDOCS%%%%DOCSDIR%%/html/up-pressed.png
+%%PORTDOCS%%%%DOCSDIR%%/html/up.png
+%%PORTDOCS%%%%DOCSDIR%%/html/userguides.html
+%%PORTDOCS%%%%DOCSDIR%%/html/userguides.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/websupport.js
 @dirrm include/llvm/Transforms/Utils
 @dirrm include/llvm/Transforms/IPO
 @dirrm include/llvm/Transforms
@@ -753,9 +813,5 @@ lib/libprofile_rt.so
 @dirrm include/llvm-c/Transforms
 @dirrm include/llvm-c
 @dirrm include/llvm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/img
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/CommandGuide
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index ca1fb685aa24..f66c361578a2 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clang
-PORTVERSION=	3.1.r${SVN_REV}
+PORTVERSION=	3.2.r${SVN_REV}
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -21,6 +21,7 @@ COMMENT=	C, Objective-C, and (alpha-quality) C++ compiler
 CONFLICTS=	clang-[23]*
 
 CLANG_NAME=	clang-${PORTVERSION}
+CLANG_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
 LLVM_NAME=	llvm-${PORTVERSION}
 LLVM_SOURCE=	${LLVM_NAME}${EXTRACT_SUFX}
@@ -47,22 +48,40 @@ USE_PERL5=	yes
 USE_PYTHON=	yes
 MAKE_JOBS_SAFE=	yes
 
-MAKE_ARGS=	CLANG_TBLGEN=${WRKSRC}/Release+Asserts/bin/clang-tblgen \
+MAKE_ARGS=	CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \
 		LLVMIncDir=${LOCALBASE}/include \
 		LLVMToolDir=${LOCALBASE}/bin \
 		LLVMLibDir=${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	ASSERTS DOCS
+
+ASSERTS_DESC=	Enable assertions (thread unsafe)
+
+MAN1=		clang.1
+
+PLIST_SUB+=	CLANG_RELEASE=${CLANG_RELEASE}
+
+.include <bsd.port.options.mk>
+
 .if defined(MAINTAINER_MODE)
 CONFIGURE_ARGS+=	--with-f2c=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--enable-optimized
 .endif
 
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
+CONFIGURE_ARGS+=	--enable-docs
+.else
 CONFIGURE_ARGS+=	--disable-docs
 .endif
 
-MAN1=		clang.1
+.if ${PORT_OPTIONS:MASSERTS}
+CONFIGURE_ARGS+=	--enable-assertions
+RELTYPE=		Release+Asserts
+.else
+CONFIGURE_ARGS+=	--disable-assertions
+RELTYPE=		Release
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -106,12 +125,12 @@ post-patch:
 
 pre-build:
 	${LN} -sf ${LOCALBASE}/include/llvm/Intrinsics.gen ${WRKSRC}/include/llvm/
-	${MKDIR} ${WRKSRC}/Release+Asserts/lib
-	${LN} -sf ${LOCALBASE}/lib/libLLVMTableGen.a ${WRKSRC}/Release+Asserts/lib/
-	${LN} -sf ${LOCALBASE}/lib/libLLVMSupport.a ${WRKSRC}/Release+Asserts/lib/
+	${MKDIR} ${WRKSRC}/${RELTYPE}/lib
+	${LN} -sf ${LOCALBASE}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/
+	${LN} -sf ${LOCALBASE}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/
 	cd ${WRKSRC}/utils/unittest && ${GMAKE}
 
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-build:
 	@cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} clang.1
 .endif
@@ -131,7 +150,7 @@ post-install:
 	@${MKDIR} ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js ${DATADIR}
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \
 	    ${MANPREFIX}/man/man1/
 .else
@@ -169,6 +188,7 @@ build-plist:
 	${RM} -f ${PLIST}
 	cd ${PREFIX} && \
 	    (ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \
+	    ${SED} -e 's|${CLANG_RELEASE}|%%CLANG_RELEASE%%|' | \
 	    ${SORT} >> ${PLIST}
 	${FIND} ${DATADIR} ${DOCSDIR} -type f | \
 	    ${SED} -e 's|${DATADIR}|%%DATADIR%%|' \
@@ -178,6 +198,7 @@ build-plist:
 	    ${SED} -e 's|^|%%PYTHON_SITELIBDIR%%/|' >> ${PLIST}
 	cd ${PREFIX} && \
 	    ${FIND} ${PLIST_DIR_LIST} -type d | \
+	    ${SED} -e 's|${CLANG_RELEASE}|%%CLANG_RELEASE%%|' | \
 	    ${SORT} -r | ${SED} -e 's|^|@dirrm |' >> ${PLIST}
 	cd ${PYTHONPREFIX_SITELIBDIR} && \
 	    ${FIND} ${PLIST_PYDIR_LIST} -type d | ${SORT} -r | \
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index 19ae6a93454b..f4e65a4f516c 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.1.r154687.tar.bz2) = 02edca20dc4885da5a43b41054b0eee30fab7cb6da74be14e7f17d14a1df175b
-SIZE (clang-3.1.r154687.tar.bz2) = 6651541
-SHA256 (llvm-3.1.r154687.tar.bz2) = d63d8bb08c85076d3b7398b062370b3617eb25c24e4a275c1ada7d634b30dc24
-SIZE (llvm-3.1.r154687.tar.bz2) = 8631665
+SHA256 (clang-3.2.r160283.tar.bz2) = 953054836d50c2621e8e3268f8348c787e1b4f37377cb7808cd985e5e1be09dd
+SIZE (clang-3.2.r160283.tar.bz2) = 7027147
+SHA256 (llvm-3.2.r160283.tar.bz2) = 3dfae804e7765bfacfb4347ada59e174fa9f4a272ee86b17ae6882e5f3e56ca7
+SIZE (llvm-3.2.r160283.tar.bz2) = 8961712
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index fbc8b8ba7112..2783655c031e 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -6,7 +6,10 @@ bin/clang++
 bin/clang-tblgen
 bin/scan-build
 bin/scan-view
+include/clang-c/CXCompilationDatabase.h
+include/clang-c/CXString.h
 include/clang-c/Index.h
+include/clang-c/Platform.h
 include/clang/ARCMigrate/ARCMT.h
 include/clang/ARCMigrate/ARCMTActions.h
 include/clang/ARCMigrate/FileRemapper.h
@@ -26,6 +29,14 @@ include/clang/AST/BuiltinTypes.def
 include/clang/AST/CXXInheritance.h
 include/clang/AST/CanonicalType.h
 include/clang/AST/CharUnits.h
+include/clang/AST/Comment.h
+include/clang/AST/CommentBriefParser.h
+include/clang/AST/CommentDiagnostic.h
+include/clang/AST/CommentLexer.h
+include/clang/AST/CommentNodes.inc
+include/clang/AST/CommentParser.h
+include/clang/AST/CommentSema.h
+include/clang/AST/CommentVisitor.h
 include/clang/AST/Decl.h
 include/clang/AST/DeclAccessPair.h
 include/clang/AST/DeclBase.h
@@ -53,6 +64,7 @@ include/clang/AST/NestedNameSpecifier.h
 include/clang/AST/OperationKinds.h
 include/clang/AST/ParentMap.h
 include/clang/AST/PrettyPrinter.h
+include/clang/AST/RawCommentList.h
 include/clang/AST/RecordLayout.h
 include/clang/AST/RecursiveASTVisitor.h
 include/clang/AST/Redeclarable.h
@@ -76,6 +88,11 @@ include/clang/AST/TypeVisitor.h
 include/clang/AST/UnresolvedSet.h
 include/clang/AST/VTTBuilder.h
 include/clang/AST/VTableBuilder.h
+include/clang/ASTMatchers/ASTMatchFinder.h
+include/clang/ASTMatchers/ASTMatchers.h
+include/clang/ASTMatchers/ASTMatchersInternal.h
+include/clang/ASTMatchers/ASTMatchersMacros.h
+include/clang/ASTMatchers/RefactoringCallbacks.h
 include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
 include/clang/Analysis/Analyses/Dominators.h
 include/clang/Analysis/Analyses/FormatString.h
@@ -108,15 +125,16 @@ include/clang/Basic/Builtins.def
 include/clang/Basic/Builtins.h
 include/clang/Basic/BuiltinsARM.def
 include/clang/Basic/BuiltinsHexagon.def
+include/clang/Basic/BuiltinsMips.def
+include/clang/Basic/BuiltinsNVPTX.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/DiagnosticCommentKinds.inc
 include/clang/Basic/DiagnosticCommonKinds.inc
 include/clang/Basic/DiagnosticDriverKinds.inc
 include/clang/Basic/DiagnosticFrontendKinds.inc
@@ -140,6 +158,7 @@ include/clang/Basic/LangOptions.h
 include/clang/Basic/Linkage.h
 include/clang/Basic/MacroBuilder.h
 include/clang/Basic/Module.h
+include/clang/Basic/ObjCRuntime.h
 include/clang/Basic/OnDiskHashTable.h
 include/clang/Basic/OpenCL.h
 include/clang/Basic/OpenCLExtensions.def
@@ -173,12 +192,10 @@ include/clang/Driver/ArgList.h
 include/clang/Driver/CC1AsOptions.h
 include/clang/Driver/CC1AsOptions.inc
 include/clang/Driver/CC1Options.h
-include/clang/Driver/CC1Options.inc
 include/clang/Driver/Compilation.h
 include/clang/Driver/Driver.h
 include/clang/Driver/DriverDiagnostic.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
@@ -273,6 +290,7 @@ include/clang/Sema/AttrTemplateInstantiate.inc
 include/clang/Sema/AttributeList.h
 include/clang/Sema/CXXFieldCollector.h
 include/clang/Sema/CodeCompleteConsumer.h
+include/clang/Sema/CodeCompleteOptions.h
 include/clang/Sema/DeclSpec.h
 include/clang/Sema/DelayedDiagnostic.h
 include/clang/Sema/Designator.h
@@ -320,9 +338,11 @@ include/clang/StaticAnalyzer/Core/CheckerManager.h
 include/clang/StaticAnalyzer/Core/CheckerOptInfo.h
 include/clang/StaticAnalyzer/Core/CheckerRegistry.h
 include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
+include/clang/StaticAnalyzer/Core/PathSensitive/APSIntType.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/Calls.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
@@ -332,7 +352,6 @@ include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
 include/clang/StaticAnalyzer/Core/PathSensitive/FunctionSummary.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/ProgramState_Fwd.h
@@ -348,25 +367,30 @@ include/clang/StaticAnalyzer/Core/PathSensitive/TaintTag.h
 include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
 include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
 include/clang/StaticAnalyzer/Frontend/FrontendActions.h
+include/clang/Tooling/ArgumentsAdjusters.h
+include/clang/Tooling/CommandLineClangTool.h
 include/clang/Tooling/CompilationDatabase.h
+include/clang/Tooling/Refactoring.h
 include/clang/Tooling/Tooling.h
-lib/clang/3.1/include/arm_neon.h
-lib/clang/3.1/include/emmintrin.h
-lib/clang/3.1/include/immintrin.h
-lib/clang/3.1/include/mm3dnow.h
-lib/clang/3.1/include/mm_malloc.h
-lib/clang/3.1/include/mmintrin.h
-lib/clang/3.1/include/module.map
-lib/clang/3.1/include/nmmintrin.h
-lib/clang/3.1/include/pmmintrin.h
-lib/clang/3.1/include/smmintrin.h
-lib/clang/3.1/include/tmmintrin.h
-lib/clang/3.1/include/wmmintrin.h
-lib/clang/3.1/include/xmmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/ammintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/arm_neon.h
+lib/clang/%%CLANG_RELEASE%%/include/emmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/immintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/mm3dnow.h
+lib/clang/%%CLANG_RELEASE%%/include/mm_malloc.h
+lib/clang/%%CLANG_RELEASE%%/include/mmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/module.map
+lib/clang/%%CLANG_RELEASE%%/include/nmmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/pmmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/smmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/tmmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/wmmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/xmmintrin.h
 lib/libclang.a
 lib/libclang.so
 lib/libclangARCMigrate.a
 lib/libclangAST.a
+lib/libclangASTMatchers.a
 lib/libclangAnalysis.a
 lib/libclangBasic.a
 lib/libclangCodeGen.a
@@ -389,13 +413,20 @@ lib/libclangTooling.a
 %%PORTDOCS%%%%DOCSDIR%%/html/AddressSanitizer.html
 %%PORTDOCS%%%%DOCSDIR%%/html/AnalyzerRegions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/AutomaticReferenceCounting.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ClangPlugins.html
 %%PORTDOCS%%%%DOCSDIR%%/html/DriverInternals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/HowToSetupToolingForLLVM.html
 %%PORTDOCS%%%%DOCSDIR%%/html/InternalsManual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/JSONCompilationDatabase.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LanguageExtensions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LibTooling.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ObjectiveCLiterals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/PCHInternals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/PTHInternals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/RAVFrontendAction.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ThreadSanitizer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Tooling.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersManual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
@@ -407,8 +438,8 @@ lib/libclangTooling.a
 %%PYTHON_SITELIBDIR%%/Resources/bugcatcher.ico
 %%PYTHON_SITELIBDIR%%/ScanView.py
 %%PYTHON_SITELIBDIR%%/startfile.py
-@dirrm lib/clang/3.1/include
-@dirrm lib/clang/3.1
+@dirrm lib/clang/%%CLANG_RELEASE%%/include
+@dirrm lib/clang/%%CLANG_RELEASE%%
 @dirrm lib/clang
 @dirrm include/clang/Tooling
 @dirrm include/clang/StaticAnalyzer/Frontend
@@ -435,6 +466,7 @@ lib/libclangTooling.a
 @dirrm include/clang/Analysis/DomainSpecific
 @dirrm include/clang/Analysis/Analyses
 @dirrm include/clang/Analysis
+@dirrm include/clang/ASTMatchers
 @dirrm include/clang/AST
 @dirrm include/clang/ARCMigrate
 @dirrm include/clang-c