Upgrade the llvm development ports to r193887. We're about two weeks

from the LLVM 3.4 branch starting.

Apply the clang portion of r255321 from base switching the default C++
library to libc++ on 10+.

Correct clang's notion of the underlying type of (u)intmax_t on MIPS64.

8 files changed, 719 insertions, 633 deletions

diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index fdee82df29fb..41630ee1f9f4 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -7,17 +7,14 @@ CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
 PKGNAMESUFFIX=	-devel
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+DISTFILES=	${CLANG_SOURCE} \
 		${LLVM_SOURCE}
-EXTRACT_ONLY=	${LLVM_SOURCE}
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler
 
-CONFLICTS=	clang-3.[012]* clang31-*
-
 CLANG_NAME=	clang-${PORTVERSION}
-CLANG_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
+CLANG_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}svn
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
 LLVM_NAME=	llvm-${PORTVERSION}
 LLVM_SOURCE=	${LLVM_NAME}${EXTRACT_SUFX}
@@ -26,32 +23,54 @@ WRKSRC=		${WRKDIR}/${LLVM_NAME}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
 INSTALL_WRKSRC=	${WRKSRC}/tools/clang
 
-BUILD_DEPENDS+=	llvm-devel>=${PORTVERSION}:${PORTSDIR}/devel/llvm-devel
-RUN_DEPENDS+=	llvm-devel>=${PORTVERSION}:${PORTSDIR}/devel/llvm-devel
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
-.endif
+BUILD_DEPENDS+=	llvm-config${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm-devel
+RUN_DEPENDS+=	llvm-config${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm-devel
+
+LLVM_SUFFIX=	-devel
+LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
 USES=		gmake perl5
 USE_BZIP2=	yes
-USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 
 MAKE_ARGS=	CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \
-		LLVMIncDir=${LOCALBASE}/include \
-		LLVMToolDir=${LOCALBASE}/bin \
-		LLVMLibDir=${LOCALBASE}/lib
+		LLVMIncDir=${LLVM_PREFIX}/include \
+		LLVMToolDir=${LLVM_PREFIX}/bin \
+		LLVMLibDir=${LLVM_PREFIX}/lib
 
-OPTIONS_DEFINE=	ASSERTS DOCS MIPS_FPHACK
+SUB_FILES=	llvm-wrapper.sh
+SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
+
+OPTIONS_DEFINE=	ASSERTS DOCS
 
 ASSERTS_DESC=	Enable assertions (thread unsafe)
-MIPS_FPHACK_DESC=	MIPS long double hack (breaks ABI)
 
-CONFIGURE_ARGS+=	--enable-optimized
+CONFIGURE_ARGS+=	--enable-optimized --enable-shared
+# Build some docs manually later
+CONFIGURE_ARGS+=	--disable-docs
 
 PLIST_SUB+=	CLANG_RELEASE=${CLANG_RELEASE}
 
+COMMANDS=	c-index-test \
+		clang \
+		clang++ \
+		clang-check \
+		clang-cpp \
+		clang-format \
+		clang-tblgen \
+		ccc-analyzer \
+		c++-analyzer \
+		scan-build \
+		scan-view
+FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
+
+PORTDATA=	scanview.css \
+		sorttable.js
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MASSERTS}
@@ -62,26 +81,22 @@ CONFIGURE_ARGS+=	--disable-assertions
 RELTYPE=		Release
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=	--enable-docs
-.else
-CONFIGURE_ARGS+=	--disable-docs
-.endif
-
-.if ${PORT_OPTIONS:MMIPS_FPHACK}
-EXTRA_PATCHES=	${FILESDIR}/mips-long-double-hack.diff
-.endif
-
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../../devel/llvm-devel/Makefile.svn_rev"
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
+# NB: I don't test arches I don't use so this may be out of date.
+BROKEN_sparc64=	YES
 
-.if ${OSVERSION} < 900033
-RUN_DEPENDS+=	${LOCALBASE}/bin/ld:${PORTSDIR}/devel/binutils
+.if ${PORT_OPTIONS:MASSERTS}
+pre-fetch:
+	@if [ "`llvm-config${LLVM_SUFFIX} --build-mode`" != ${RELTYPE} ]; then \
+		${ECHO_MSG}	;\
+		${ECHO_MSG} ASSERTS option enabled, but devel/llvm${LLVM_SUFFIX} was compiled without ASSERTS. ;\
+		${ECHO_MSG} Correct options mismatch to proceed. ;\
+		${ECHO_MSG}	;\
+		false	;\
+	fi
 .endif
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
@@ -99,15 +114,16 @@ do-fetch:
 .endif
 
 post-extract:
-	cd ${WRKSRC}/tools && \
-	    tar xf ${DISTDIR}/${CLANG_SOURCE} && \
-	    ${MV} ${CLANG_NAME} clang
+	${RM} -f ${BUILD_WRKSRC}
+	${MV} ${WRKDIR}/${CLANG_NAME} ${BUILD_WRKSRC}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
 	    ${WRKSRC}/Makefile.config.in
 	${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \
 	    ${WRKSRC}/Makefile.config.in
+	${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
+	    ${WRKSRC}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
 	${REINPLACE_CMD} -e 's|/usr/bin/env perl|${PERL}|' \
 	    -e 's|%%DATADIR%%|${DATADIR}|' \
 	    ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \
@@ -117,58 +133,51 @@ post-patch:
 	    ${WRKSRC}/tools/clang/tools/scan-view/scan-view
 
 pre-build:
-	${LN} -sf ${LOCALBASE}/include/llvm/IR/Intrinsics.gen \
+	${LN} -sf ${LLVM_PREFIX}/include/llvm/IR/Intrinsics.gen \
 	    ${WRKSRC}/include/llvm/IR/
 	${MKDIR} ${WRKSRC}/${RELTYPE}/lib
-	${LN} -sf ${LOCALBASE}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/
-	${LN} -sf ${LOCALBASE}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/
+	${LN} -sf ${LLVM_PREFIX}/lib/libLLVM-${CLANG_RELEASE}.so \
+	    ${WRKSRC}/${RELTYPE}/lib/
+	${LN} -sf ${LLVM_PREFIX}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/
+	${LN} -sf ${LLVM_PREFIX}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/
 	cd ${WRKSRC}/utils/unittest && ${GMAKE}
 
 post-build:
-	@cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} clang.1
+	@cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} man html ps
 
 post-install:
-	@${LN} -sf clang ${STAGEDIR}${PREFIX}/bin/clang-cpp
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \
-		${WRKSRC}/tools/clang/tools/scan-build/c++-analyzer \
-		${WRKSRC}/tools/clang/tools/scan-build/scan-build \
-		${WRKSRC}/tools/clang/tools/scan-view/scan-view \
-	    ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
-	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Resources
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/*.py \
+	${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \
+	    ${WRKSRC}/tools/clang/tools/scan-build/c++-analyzer \
+	    ${WRKSRC}/tools/clang/tools/scan-build/scan-build \
+	    ${WRKSRC}/tools/clang/tools/scan-view/scan-view \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
+	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
+.for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
+	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
+	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
+	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
+.endfor
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Resources
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/*.py \
 	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/Resources/* \
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/Resources/* \
 	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Resources
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css \
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css \
 	    ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js \
 	    ${STAGEDIR}${DATADIR}
-	@${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \
-	    ${STAGEDIR}${MANPREFIX}/man/man1/
-
-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} ${GMAKE} check)'
-regression-test: ${BUILD_COOKIE}
-	if [ `${ID} -u` = 0 ]; then \
-		${CHOWN} -R nobody ${WRKSRC}/test; \
-		su -m nobody -c ${TEST_CMD}; \
-	else \
-		${SH} -c ${TEST_CMD}; \
-	fi
+	cd ${WRKSRC}/tools/clang/docs/tools && \
+	    ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps
+	${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \
+	    ${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1
 
-PLIST_FILE_LIST=	bin/ccc-analyzer \
-			bin/c++-analyzer \
-			bin/c-index-test \
-			bin/clang \
-			bin/clang++ \
-			bin/clang-check \
-			bin/clang-cpp \
-			bin/clang-format \
-			bin/clang-tblgen \
-			bin/scan-build \
-			bin/scan-view \
-			lib/libclang* \
-			man/man1/clang.1.gz
+PLIST_FILE_LIST=	${COMMANDS:S|^|bin/|} \
+			lib/libclang*
 PLIST_DIR_LIST=		include/clang \
 			include/clang-c \
 			lib/clang
@@ -180,27 +189,27 @@ PLIST_PYDIR_LIST=	Resources
 
 build-plist:
 	${RM} -f ${PLIST}
-	cd ${PREFIX} && \
-	    (ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \
-	    ${SED} -e 's|${CLANG_RELEASE}|%%CLANG_RELEASE%%|' | \
+.for command in ${COMMANDS}
+	${ECHO_CMD} bin/${command}${LLVM_SUFFIX} >> ${PLIST}
+.endfor
+	(ls ${PLIST_FILE_LIST:S|^|${STAGEDIR}${LLVM_PREFIX}/|}; \
+	    ${FIND} ${PLIST_DIR_LIST:S|^|${STAGEDIR}${LLVM_PREFIX}/|} -type f) \
+	    | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' | ${SORT} >> ${PLIST}
+	echo man/man1/clang${LLVM_SUFFIX}.1.gz >> ${PLIST}
+	${FIND} ${STAGEDIR}${DOCSDIR} -type f | \
+	    ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
 	    ${SORT} >> ${PLIST}
-	${FIND} ${DATADIR} ${DOCSDIR} -type f | \
-	    ${SED} -e 's|${DATADIR}|%%DATADIR%%|' \
-	     -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | ${SORT} >> ${PLIST}
-	cd ${PYTHONPREFIX_SITELIBDIR} && \
+	${FIND} ${PLIST_DIR_LIST:S|^|${STAGEDIR}${LLVM_PREFIX}/|} -type d | \
+	    ${SED} -e 's|${STAGEDIR}${PREFIX}/|@dirrm |' | \
+	    ${SORT} -r >> ${PLIST}
+	${FIND} ${STAGEDIR}${DOCSDIR} -type d | ${SORT} -r | \
+	    ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' \
+	    >> ${PLIST}
+	cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} && \
 	    ls ${PLIST_PYFILE_LIST} | ${SORT} | \
 	    ${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} && \
+	cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} && \
 	    ${FIND} ${PLIST_PYDIR_LIST} -type d | ${SORT} -r | \
 	    ${SED} -e 's|^|@dirrm %%PYTHON_SITELIBDIR%%/|' >> ${PLIST}
-	echo "@dirrmtry %%PYTHON_SITELIBDIR%%" >> ${PLIST}
-	echo "@dirrmtry %%PYTHON_LIBDIR%%" >> ${PLIST}
-	${FIND} ${DATADIR} ${DOCSDIR} -type d | ${SORT} -r | \
-	    ${SED} -e 's|${DATADIR}|@dirrm %%DATADIR%%|' \
-	     -e 's|${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' >> ${PLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index aa6bf01bdee3..98ad985b706e 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.4.r191854.tar.bz2) = 37e9a613adcbdf556abff68d3df68e8a49e77d7110dce29e046702ed59fdff34
-SIZE (clang-3.4.r191854.tar.bz2) = 8163904
-SHA256 (llvm-3.4.r191854.tar.bz2) = 215e2f864549ea6299aa1b003c987f9a5d1a61ea2ad41b3445d2df109bb2c099
-SIZE (llvm-3.4.r191854.tar.bz2) = 11667946
+SHA256 (clang-3.4.r193887.tar.bz2) = ce034154e6ef98321b26c4c3fa82a1066fdfb49bd193e71767797c11eaea3f9c
+SIZE (clang-3.4.r193887.tar.bz2) = 8275346
+SHA256 (llvm-3.4.r193887.tar.bz2) = 175e3034a0f19c0ca9ce2fc75ccdc796f3c3bfd29b69f595aa4fc857f53db955
+SIZE (llvm-3.4.r193887.tar.bz2) = 11845136
diff --git a/lang/clang-devel/files/llvm-wrapper.sh.in b/lang/clang-devel/files/llvm-wrapper.sh.in
new file mode 100644
index 000000000000..0a460f3156e5
--- /dev/null
+++ b/lang/clang-devel/files/llvm-wrapper.sh.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+# $FreeBSD$
+
+LLVM_PREFIX="%%LLVM_PREFIX%%"
+LLVM_SUFFIX="%%LLVM_SUFFIX%%"
+
+tool=$(basename $0)
+tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
+    "${tool}" "${@}"
diff --git a/lang/clang-devel/files/mips-long-double-hack.diff b/lang/clang-devel/files/mips-long-double-hack.diff
deleted file mode 100644
index dbc45f6f85e3..000000000000
--- a/lang/clang-devel/files/mips-long-double-hack.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- tools/clang/lib/Basic/Targets.cpp.orig
-+++ tools/clang/lib/Basic/Targets.cpp
-@@ -3957,6 +3957,9 @@
-     PointerWidth = PointerAlign = 64;
-     LongDoubleWidth = LongDoubleAlign = 128;
-     LongDoubleFormat = &llvm::APFloat::IEEEquad;
-+    // FIXME: Ugly ABI-Breaking hack until the back end supports 128-bit floats
-+    LongDoubleWidth = LongDoubleAlign = 64;
-+    LongDoubleFormat = &llvm::APFloat::IEEEdouble;
-     SuitableAlign = 128;
-   }
-   virtual bool setABI(const std::string &Name) {
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp
new file mode 100644
index 000000000000..bb0f833e5a30
--- /dev/null
+++ b/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tools/clang/lib/Basic/Targets.cpp.orig
++++ tools/clang/lib/Basic/Targets.cpp
+@@ -4981,6 +4981,8 @@
+     LongDoubleWidth = LongDoubleAlign = 128;
+     LongDoubleFormat = &llvm::APFloat::IEEEquad;
+     if (getTriple().getOS() == llvm::Triple::FreeBSD) {
++      IntMaxType = SignedLong;
++      UIntMaxType = UnsignedLong;
+       LongDoubleWidth = LongDoubleAlign = 64;
+       LongDoubleFormat = &llvm::APFloat::IEEEdouble;
+     }
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.cpp
new file mode 100644
index 000000000000..d34e4d8781a4
--- /dev/null
+++ b/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.cpp
@@ -0,0 +1,44 @@
+
+$FreeBSD$
+
+--- tools/clang/lib/Driver/ToolChains.cpp.orig
++++ tools/clang/lib/Driver/ToolChains.cpp
+@@ -1950,6 +1950,38 @@
+   }
+ }
+ 
++ToolChain::CXXStdlibType
++FreeBSD::GetCXXStdlibType(const ArgList &Args) const {
++  if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) {
++    StringRef Value = A->getValue();
++    if (Value == "libc++")
++      return ToolChain::CST_Libcxx;
++    if (Value == "libstdc++")
++      return ToolChain::CST_Libstdcxx;
++    getDriver().Diag(diag::err_drv_invalid_stdlib_name)
++      << A->getAsString(Args);
++  }
++
++  return getTriple().getOSMajorVersion() >= 10 ? ToolChain::CST_Libcxx :
++         ToolChain::CST_Libstdcxx;
++}
++
++void FreeBSD::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
++                                          ArgStringList &CC1Args) const {
++  if (DriverArgs.hasArg(options::OPT_nostdlibinc) ||
++      DriverArgs.hasArg(options::OPT_nostdincxx))
++    return;
++
++  if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx)
++    addSystemInclude(DriverArgs, CC1Args,
++                     getDriver().SysRoot + "/usr/include/c++/v1");
++  else
++    addSystemInclude(DriverArgs, CC1Args,
++                     getDriver().SysRoot + "/usr/include/c++/4.2");
++  return;
++
++}
++
+ /// NetBSD - NetBSD tool chain which can call as(1) and ld(1) directly.
+ 
+ NetBSD::NetBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Args)
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.h b/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.h
new file mode 100644
index 000000000000..1c35a3f5f16d
--- /dev/null
+++ b/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.h
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- tools/clang/lib/Driver/ToolChains.h.orig
++++ tools/clang/lib/Driver/ToolChains.h
+@@ -515,9 +515,14 @@
+   FreeBSD(const Driver &D, const llvm::Triple &Triple,
+           const llvm::opt::ArgList &Args);
+ 
++  virtual CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const;
++
+   virtual bool IsMathErrnoDefault() const { return false; }
+   virtual bool IsObjCNonFragileABIDefault() const { return true; }
+ 
++  virtual void AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs,
++                                            llvm::opt::ArgStringList &CC1Args) const;
++
+   virtual bool UseSjLjExceptions() const;
+ protected:
+   virtual Tool *buildAssembler() const;
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index d79dc3c27203..99927b8f91c1 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -1,532 +1,536 @@
-bin/c++-analyzer
-bin/c-index-test
-bin/ccc-analyzer
-bin/clang
-bin/clang++
-bin/clang-check
-bin/clang-cpp
-bin/clang-format
-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
-include/clang/AST/APValue.h
-include/clang/AST/AST.h
-include/clang/AST/ASTConsumer.h
-include/clang/AST/ASTContext.h
-include/clang/AST/ASTDiagnostic.h
-include/clang/AST/ASTFwd.h
-include/clang/AST/ASTImporter.h
-include/clang/AST/ASTLambda.h
-include/clang/AST/ASTMutationListener.h
-include/clang/AST/ASTTypeTraits.h
-include/clang/AST/ASTUnresolvedSet.h
-include/clang/AST/ASTVector.h
-include/clang/AST/Attr.h
-include/clang/AST/AttrDump.inc
-include/clang/AST/AttrImpl.inc
-include/clang/AST/AttrIterator.h
-include/clang/AST/Attrs.inc
-include/clang/AST/BaseSubobject.h
-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/CommentCommandInfo.inc
-include/clang/AST/CommentCommandList.inc
-include/clang/AST/CommentCommandTraits.h
-include/clang/AST/CommentDiagnostic.h
-include/clang/AST/CommentHTMLNamedCharacterReferences.inc
-include/clang/AST/CommentHTMLTags.inc
-include/clang/AST/CommentHTMLTagsProperties.inc
-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
-include/clang/AST/DeclCXX.h
-include/clang/AST/DeclContextInternals.h
-include/clang/AST/DeclFriend.h
-include/clang/AST/DeclGroup.h
-include/clang/AST/DeclLookups.h
-include/clang/AST/DeclNodes.inc
-include/clang/AST/DeclObjC.h
-include/clang/AST/DeclOpenMP.h
-include/clang/AST/DeclTemplate.h
-include/clang/AST/DeclVisitor.h
-include/clang/AST/DeclarationName.h
-include/clang/AST/DependentDiagnostic.h
-include/clang/AST/EvaluatedExprVisitor.h
-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/MangleNumberingContext.h
-include/clang/AST/NSAPI.h
-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
-include/clang/AST/SelectorLocationsKind.h
-include/clang/AST/Stmt.h
-include/clang/AST/StmtCXX.h
-include/clang/AST/StmtGraphTraits.h
-include/clang/AST/StmtIterator.h
-include/clang/AST/StmtNodes.inc
-include/clang/AST/StmtObjC.h
-include/clang/AST/StmtOpenMP.h
-include/clang/AST/StmtVisitor.h
-include/clang/AST/TemplateBase.h
-include/clang/AST/TemplateName.h
-include/clang/AST/Type.h
-include/clang/AST/TypeLoc.h
-include/clang/AST/TypeLocNodes.def
-include/clang/AST/TypeLocVisitor.h
-include/clang/AST/TypeNodes.def
-include/clang/AST/TypeOrdering.h
-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/Dynamic/Diagnostics.h
-include/clang/ASTMatchers/Dynamic/Parser.h
-include/clang/ASTMatchers/Dynamic/Registry.h
-include/clang/ASTMatchers/Dynamic/VariantValue.h
-include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
-include/clang/Analysis/Analyses/Consumed.h
-include/clang/Analysis/Analyses/Dominators.h
-include/clang/Analysis/Analyses/FormatString.h
-include/clang/Analysis/Analyses/LiveVariables.h
-include/clang/Analysis/Analyses/PostOrderCFGView.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/AnalysisContext.h
-include/clang/Analysis/AnalysisDiagnostic.h
-include/clang/Analysis/CFG.h
-include/clang/Analysis/CFGStmtMap.h
-include/clang/Analysis/CallGraph.h
-include/clang/Analysis/DomainSpecific/CocoaConventions.h
-include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
-include/clang/Analysis/FlowSensitive/DataflowSolver.h
-include/clang/Analysis/FlowSensitive/DataflowValues.h
-include/clang/Analysis/ProgramPoint.h
-include/clang/Analysis/Support/BumpVector.h
-include/clang/Basic/ABI.h
-include/clang/Basic/AddressSpaces.h
-include/clang/Basic/AllDiagnostics.h
-include/clang/Basic/AttrKinds.h
-include/clang/Basic/AttrList.inc
-include/clang/Basic/Builtins.def
-include/clang/Basic/Builtins.h
-include/clang/Basic/BuiltinsAArch64.def
-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/BuiltinsX86.def
-include/clang/Basic/BuiltinsXCore.def
-include/clang/Basic/CapturedStmt.h
-include/clang/Basic/CharInfo.h
-include/clang/Basic/CommentOptions.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
-include/clang/Basic/DiagnosticGroups.inc
-include/clang/Basic/DiagnosticIDs.h
-include/clang/Basic/DiagnosticIndexName.inc
-include/clang/Basic/DiagnosticLexKinds.inc
-include/clang/Basic/DiagnosticOptions.def
-include/clang/Basic/DiagnosticOptions.h
-include/clang/Basic/DiagnosticParseKinds.inc
-include/clang/Basic/DiagnosticSemaKinds.inc
-include/clang/Basic/DiagnosticSerializationKinds.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/Lambda.h
-include/clang/Basic/LangOptions.def
-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
-include/clang/Basic/OpenMPKinds.def
-include/clang/Basic/OpenMPKinds.h
-include/clang/Basic/OperatorKinds.def
-include/clang/Basic/OperatorKinds.h
-include/clang/Basic/OperatorPrecedence.h
-include/clang/Basic/PartialDiagnostic.h
-include/clang/Basic/PrettyStackTrace.h
-include/clang/Basic/Sanitizers.def
-include/clang/Basic/SourceLocation.h
-include/clang/Basic/SourceManager.h
-include/clang/Basic/SourceManagerInternals.h
-include/clang/Basic/Specifiers.h
-include/clang/Basic/TargetBuiltins.h
-include/clang/Basic/TargetCXXABI.h
-include/clang/Basic/TargetInfo.h
-include/clang/Basic/TargetOptions.h
-include/clang/Basic/TemplateKinds.h
-include/clang/Basic/TokenKinds.def
-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
-include/clang/Driver/Action.h
-include/clang/Driver/CC1AsOptions.h
-include/clang/Driver/CC1AsOptions.inc
-include/clang/Driver/CC1Options.h
-include/clang/Driver/Compilation.h
-include/clang/Driver/Driver.h
-include/clang/Driver/DriverDiagnostic.h
-include/clang/Driver/Job.h
-include/clang/Driver/Options.h
-include/clang/Driver/Options.inc
-include/clang/Driver/Phases.h
-include/clang/Driver/SanitizerArgs.h
-include/clang/Driver/Tool.h
-include/clang/Driver/ToolChain.h
-include/clang/Driver/Types.def
-include/clang/Driver/Types.h
-include/clang/Driver/Util.h
-include/clang/Edit/Commit.h
-include/clang/Edit/EditedSource.h
-include/clang/Edit/EditsReceiver.h
-include/clang/Edit/FileOffset.h
-include/clang/Edit/Rewriters.h
-include/clang/Format/Format.h
-include/clang/Frontend/ASTConsumers.h
-include/clang/Frontend/ASTUnit.h
-include/clang/Frontend/ChainedDiagnosticConsumer.h
-include/clang/Frontend/ChainedIncludesSource.h
-include/clang/Frontend/CodeGenOptions.def
-include/clang/Frontend/CodeGenOptions.h
-include/clang/Frontend/CommandLineSourceLoc.h
-include/clang/Frontend/CompilerInstance.h
-include/clang/Frontend/CompilerInvocation.h
-include/clang/Frontend/DependencyOutputOptions.h
-include/clang/Frontend/DiagnosticRenderer.h
-include/clang/Frontend/FrontendAction.h
-include/clang/Frontend/FrontendActions.h
-include/clang/Frontend/FrontendDiagnostic.h
-include/clang/Frontend/FrontendOptions.h
-include/clang/Frontend/FrontendPluginRegistry.h
-include/clang/Frontend/LangStandard.h
-include/clang/Frontend/LangStandards.def
-include/clang/Frontend/LayoutOverrideSource.h
-include/clang/Frontend/LogDiagnosticPrinter.h
-include/clang/Frontend/MigratorOptions.h
-include/clang/Frontend/MultiplexConsumer.h
-include/clang/Frontend/PreprocessorOutputOptions.h
-include/clang/Frontend/SerializedDiagnosticPrinter.h
-include/clang/Frontend/TextDiagnostic.h
-include/clang/Frontend/TextDiagnosticBuffer.h
-include/clang/Frontend/TextDiagnosticPrinter.h
-include/clang/Frontend/Utils.h
-include/clang/Frontend/VerifyDiagnosticConsumer.h
-include/clang/FrontendTool/Utils.h
-include/clang/Index/USRGeneration.h
-include/clang/Lex/AttrSpellings.inc
-include/clang/Lex/CodeCompletionHandler.h
-include/clang/Lex/DirectoryLookup.h
-include/clang/Lex/ExternalPreprocessorSource.h
-include/clang/Lex/HeaderMap.h
-include/clang/Lex/HeaderSearch.h
-include/clang/Lex/HeaderSearchOptions.h
-include/clang/Lex/LexDiagnostic.h
-include/clang/Lex/Lexer.h
-include/clang/Lex/LiteralSupport.h
-include/clang/Lex/MacroArgs.h
-include/clang/Lex/MacroInfo.h
-include/clang/Lex/ModuleLoader.h
-include/clang/Lex/ModuleMap.h
-include/clang/Lex/MultipleIncludeOpt.h
-include/clang/Lex/PPCallbacks.h
-include/clang/Lex/PPConditionalDirectiveRecord.h
-include/clang/Lex/PTHLexer.h
-include/clang/Lex/PTHManager.h
-include/clang/Lex/Pragma.h
-include/clang/Lex/PreprocessingRecord.h
-include/clang/Lex/Preprocessor.h
-include/clang/Lex/PreprocessorLexer.h
-include/clang/Lex/PreprocessorOptions.h
-include/clang/Lex/ScratchBuffer.h
-include/clang/Lex/Token.h
-include/clang/Lex/TokenConcatenation.h
-include/clang/Lex/TokenLexer.h
-include/clang/Parse/AttrExprArgs.inc
-include/clang/Parse/AttrLateParsed.inc
-include/clang/Parse/ParseAST.h
-include/clang/Parse/ParseDiagnostic.h
-include/clang/Parse/Parser.h
-include/clang/Rewrite/Core/DeltaTree.h
-include/clang/Rewrite/Core/HTMLRewrite.h
-include/clang/Rewrite/Core/RewriteRope.h
-include/clang/Rewrite/Core/Rewriter.h
-include/clang/Rewrite/Core/TokenRewriter.h
-include/clang/Rewrite/Frontend/ASTConsumers.h
-include/clang/Rewrite/Frontend/FixItRewriter.h
-include/clang/Rewrite/Frontend/FrontendActions.h
-include/clang/Rewrite/Frontend/Rewriters.h
-include/clang/Sema/AnalysisBasedWarnings.h
-include/clang/Sema/AttrParsedAttrImpl.inc
-include/clang/Sema/AttrParsedAttrKinds.inc
-include/clang/Sema/AttrParsedAttrList.inc
-include/clang/Sema/AttrSpellingListIndex.inc
-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
-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/MultiplexExternalSemaSource.h
-include/clang/Sema/ObjCMethodList.h
-include/clang/Sema/Overload.h
-include/clang/Sema/Ownership.h
-include/clang/Sema/ParsedTemplate.h
-include/clang/Sema/PrettyDeclStackTrace.h
-include/clang/Sema/Scope.h
-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/ASTWriter.h
-include/clang/Serialization/AttrPCHRead.inc
-include/clang/Serialization/AttrPCHWrite.inc
-include/clang/Serialization/ContinuousRangeMap.h
-include/clang/Serialization/GlobalModuleIndex.h
-include/clang/Serialization/Module.h
-include/clang/Serialization/ModuleManager.h
-include/clang/Serialization/SerializationDiagnostic.h
-include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
-include/clang/StaticAnalyzer/Checkers/CommonBugCategories.h
-include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
-include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h
-include/clang/StaticAnalyzer/Core/Analyses.def
-include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
-include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
-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/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/CallEvent.h
-include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
-include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
-include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
-include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
-include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
-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/FunctionSummary.h
-include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
-include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
-include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h
-include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState_Fwd.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/TaintManager.h
-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/CommonOptionsParser.h
-include/clang/Tooling/CompilationDatabase.h
-include/clang/Tooling/CompilationDatabasePluginRegistry.h
-include/clang/Tooling/FileMatchTrie.h
-include/clang/Tooling/JSONCompilationDatabase.h
-include/clang/Tooling/Refactoring.h
-include/clang/Tooling/RefactoringCallbacks.h
-include/clang/Tooling/ReplacementsYaml.h
-include/clang/Tooling/Tooling.h
-lib/clang/%%CLANG_RELEASE%%/include/__wmmintrin_aes.h
-lib/clang/%%CLANG_RELEASE%%/include/__wmmintrin_pclmul.h
-lib/clang/%%CLANG_RELEASE%%/include/ammintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/arm_neon.h
-lib/clang/%%CLANG_RELEASE%%/include/avx2intrin.h
-lib/clang/%%CLANG_RELEASE%%/include/avxintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/bmi2intrin.h
-lib/clang/%%CLANG_RELEASE%%/include/bmiintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/emmintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/f16cintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/fma4intrin.h
-lib/clang/%%CLANG_RELEASE%%/include/fmaintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/immintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/lzcntintrin.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/popcntintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/prfchwintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/rdseedintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/rtmintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/shaintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/smmintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/tbmintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/tmmintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/wmmintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/x86intrin.h
-lib/clang/%%CLANG_RELEASE%%/include/xmmintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/xopintrin.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
-lib/libclangDriver.a
-lib/libclangDynamicASTMatchers.a
-lib/libclangEdit.a
-lib/libclangFormat.a
-lib/libclangFrontend.a
-lib/libclangFrontendTool.a
-lib/libclangIndex.a
-lib/libclangLex.a
-lib/libclangParse.a
-lib/libclangRewriteCore.a
-lib/libclangRewriteFrontend.a
-lib/libclangSema.a
-lib/libclangSerialization.a
-lib/libclangStaticAnalyzerCheckers.a
-lib/libclangStaticAnalyzerCore.a
-lib/libclangStaticAnalyzerFrontend.a
-lib/libclangTooling.a
-man/man1/clang.1.gz
-%%DATADIR%%/scanview.css
-%%DATADIR%%/sorttable.js
-%%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
-%%PORTDOCS%%%%DOCSDIR%%/html/LibASTMatchersReference.html
+bin/c-index-test-devel
+bin/clang-devel
+bin/clang++-devel
+bin/clang-check-devel
+bin/clang-cpp-devel
+bin/clang-format-devel
+bin/clang-tblgen-devel
+bin/ccc-analyzer-devel
+bin/c++-analyzer-devel
+bin/scan-build-devel
+bin/scan-view-devel
+llvm-devel/bin/c++-analyzer
+llvm-devel/bin/c-index-test
+llvm-devel/bin/ccc-analyzer
+llvm-devel/bin/clang
+llvm-devel/bin/clang++
+llvm-devel/bin/clang-check
+llvm-devel/bin/clang-cpp
+llvm-devel/bin/clang-format
+llvm-devel/bin/clang-tblgen
+llvm-devel/bin/scan-build
+llvm-devel/bin/scan-view
+llvm-devel/include/clang-c/CXCompilationDatabase.h
+llvm-devel/include/clang-c/CXString.h
+llvm-devel/include/clang-c/Index.h
+llvm-devel/include/clang-c/Platform.h
+llvm-devel/include/clang/ARCMigrate/ARCMT.h
+llvm-devel/include/clang/ARCMigrate/ARCMTActions.h
+llvm-devel/include/clang/ARCMigrate/FileRemapper.h
+llvm-devel/include/clang/AST/APValue.h
+llvm-devel/include/clang/AST/AST.h
+llvm-devel/include/clang/AST/ASTConsumer.h
+llvm-devel/include/clang/AST/ASTContext.h
+llvm-devel/include/clang/AST/ASTDiagnostic.h
+llvm-devel/include/clang/AST/ASTFwd.h
+llvm-devel/include/clang/AST/ASTImporter.h
+llvm-devel/include/clang/AST/ASTLambda.h
+llvm-devel/include/clang/AST/ASTMutationListener.h
+llvm-devel/include/clang/AST/ASTTypeTraits.h
+llvm-devel/include/clang/AST/ASTUnresolvedSet.h
+llvm-devel/include/clang/AST/ASTVector.h
+llvm-devel/include/clang/AST/Attr.h
+llvm-devel/include/clang/AST/AttrDump.inc
+llvm-devel/include/clang/AST/AttrImpl.inc
+llvm-devel/include/clang/AST/AttrIterator.h
+llvm-devel/include/clang/AST/Attrs.inc
+llvm-devel/include/clang/AST/BaseSubobject.h
+llvm-devel/include/clang/AST/BuiltinTypes.def
+llvm-devel/include/clang/AST/CXXInheritance.h
+llvm-devel/include/clang/AST/CanonicalType.h
+llvm-devel/include/clang/AST/CharUnits.h
+llvm-devel/include/clang/AST/Comment.h
+llvm-devel/include/clang/AST/CommentBriefParser.h
+llvm-devel/include/clang/AST/CommentCommandInfo.inc
+llvm-devel/include/clang/AST/CommentCommandList.inc
+llvm-devel/include/clang/AST/CommentCommandTraits.h
+llvm-devel/include/clang/AST/CommentDiagnostic.h
+llvm-devel/include/clang/AST/CommentHTMLNamedCharacterReferences.inc
+llvm-devel/include/clang/AST/CommentHTMLTags.inc
+llvm-devel/include/clang/AST/CommentHTMLTagsProperties.inc
+llvm-devel/include/clang/AST/CommentLexer.h
+llvm-devel/include/clang/AST/CommentNodes.inc
+llvm-devel/include/clang/AST/CommentParser.h
+llvm-devel/include/clang/AST/CommentSema.h
+llvm-devel/include/clang/AST/CommentVisitor.h
+llvm-devel/include/clang/AST/Decl.h
+llvm-devel/include/clang/AST/DeclAccessPair.h
+llvm-devel/include/clang/AST/DeclBase.h
+llvm-devel/include/clang/AST/DeclCXX.h
+llvm-devel/include/clang/AST/DeclContextInternals.h
+llvm-devel/include/clang/AST/DeclFriend.h
+llvm-devel/include/clang/AST/DeclGroup.h
+llvm-devel/include/clang/AST/DeclLookups.h
+llvm-devel/include/clang/AST/DeclNodes.inc
+llvm-devel/include/clang/AST/DeclObjC.h
+llvm-devel/include/clang/AST/DeclOpenMP.h
+llvm-devel/include/clang/AST/DeclTemplate.h
+llvm-devel/include/clang/AST/DeclVisitor.h
+llvm-devel/include/clang/AST/DeclarationName.h
+llvm-devel/include/clang/AST/DependentDiagnostic.h
+llvm-devel/include/clang/AST/EvaluatedExprVisitor.h
+llvm-devel/include/clang/AST/Expr.h
+llvm-devel/include/clang/AST/ExprCXX.h
+llvm-devel/include/clang/AST/ExprObjC.h
+llvm-devel/include/clang/AST/ExternalASTSource.h
+llvm-devel/include/clang/AST/GlobalDecl.h
+llvm-devel/include/clang/AST/Mangle.h
+llvm-devel/include/clang/AST/MangleNumberingContext.h
+llvm-devel/include/clang/AST/NSAPI.h
+llvm-devel/include/clang/AST/NestedNameSpecifier.h
+llvm-devel/include/clang/AST/OperationKinds.h
+llvm-devel/include/clang/AST/ParentMap.h
+llvm-devel/include/clang/AST/PrettyPrinter.h
+llvm-devel/include/clang/AST/RawCommentList.h
+llvm-devel/include/clang/AST/RecordLayout.h
+llvm-devel/include/clang/AST/RecursiveASTVisitor.h
+llvm-devel/include/clang/AST/Redeclarable.h
+llvm-devel/include/clang/AST/SelectorLocationsKind.h
+llvm-devel/include/clang/AST/Stmt.h
+llvm-devel/include/clang/AST/StmtCXX.h
+llvm-devel/include/clang/AST/StmtGraphTraits.h
+llvm-devel/include/clang/AST/StmtIterator.h
+llvm-devel/include/clang/AST/StmtNodes.inc
+llvm-devel/include/clang/AST/StmtObjC.h
+llvm-devel/include/clang/AST/StmtOpenMP.h
+llvm-devel/include/clang/AST/StmtVisitor.h
+llvm-devel/include/clang/AST/TemplateBase.h
+llvm-devel/include/clang/AST/TemplateName.h
+llvm-devel/include/clang/AST/Type.h
+llvm-devel/include/clang/AST/TypeLoc.h
+llvm-devel/include/clang/AST/TypeLocNodes.def
+llvm-devel/include/clang/AST/TypeLocVisitor.h
+llvm-devel/include/clang/AST/TypeNodes.def
+llvm-devel/include/clang/AST/TypeOrdering.h
+llvm-devel/include/clang/AST/TypeVisitor.h
+llvm-devel/include/clang/AST/UnresolvedSet.h
+llvm-devel/include/clang/AST/VTTBuilder.h
+llvm-devel/include/clang/AST/VTableBuilder.h
+llvm-devel/include/clang/ASTMatchers/ASTMatchFinder.h
+llvm-devel/include/clang/ASTMatchers/ASTMatchers.h
+llvm-devel/include/clang/ASTMatchers/ASTMatchersInternal.h
+llvm-devel/include/clang/ASTMatchers/ASTMatchersMacros.h
+llvm-devel/include/clang/ASTMatchers/Dynamic/Diagnostics.h
+llvm-devel/include/clang/ASTMatchers/Dynamic/Parser.h
+llvm-devel/include/clang/ASTMatchers/Dynamic/Registry.h
+llvm-devel/include/clang/ASTMatchers/Dynamic/VariantValue.h
+llvm-devel/include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
+llvm-devel/include/clang/Analysis/Analyses/Consumed.h
+llvm-devel/include/clang/Analysis/Analyses/Dominators.h
+llvm-devel/include/clang/Analysis/Analyses/FormatString.h
+llvm-devel/include/clang/Analysis/Analyses/LiveVariables.h
+llvm-devel/include/clang/Analysis/Analyses/PostOrderCFGView.h
+llvm-devel/include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
+llvm-devel/include/clang/Analysis/Analyses/ReachableCode.h
+llvm-devel/include/clang/Analysis/Analyses/ThreadSafety.h
+llvm-devel/include/clang/Analysis/Analyses/UninitializedValues.h
+llvm-devel/include/clang/Analysis/AnalysisContext.h
+llvm-devel/include/clang/Analysis/AnalysisDiagnostic.h
+llvm-devel/include/clang/Analysis/CFG.h
+llvm-devel/include/clang/Analysis/CFGStmtMap.h
+llvm-devel/include/clang/Analysis/CallGraph.h
+llvm-devel/include/clang/Analysis/DomainSpecific/CocoaConventions.h
+llvm-devel/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
+llvm-devel/include/clang/Analysis/FlowSensitive/DataflowSolver.h
+llvm-devel/include/clang/Analysis/FlowSensitive/DataflowValues.h
+llvm-devel/include/clang/Analysis/ProgramPoint.h
+llvm-devel/include/clang/Analysis/Support/BumpVector.h
+llvm-devel/include/clang/Basic/ABI.h
+llvm-devel/include/clang/Basic/AddressSpaces.h
+llvm-devel/include/clang/Basic/AllDiagnostics.h
+llvm-devel/include/clang/Basic/AttrKinds.h
+llvm-devel/include/clang/Basic/AttrList.inc
+llvm-devel/include/clang/Basic/Builtins.def
+llvm-devel/include/clang/Basic/Builtins.h
+llvm-devel/include/clang/Basic/BuiltinsAArch64.def
+llvm-devel/include/clang/Basic/BuiltinsARM.def
+llvm-devel/include/clang/Basic/BuiltinsHexagon.def
+llvm-devel/include/clang/Basic/BuiltinsMips.def
+llvm-devel/include/clang/Basic/BuiltinsNVPTX.def
+llvm-devel/include/clang/Basic/BuiltinsPPC.def
+llvm-devel/include/clang/Basic/BuiltinsX86.def
+llvm-devel/include/clang/Basic/BuiltinsXCore.def
+llvm-devel/include/clang/Basic/CapturedStmt.h
+llvm-devel/include/clang/Basic/CharInfo.h
+llvm-devel/include/clang/Basic/CommentOptions.h
+llvm-devel/include/clang/Basic/Diagnostic.h
+llvm-devel/include/clang/Basic/DiagnosticASTKinds.inc
+llvm-devel/include/clang/Basic/DiagnosticAnalysisKinds.inc
+llvm-devel/include/clang/Basic/DiagnosticCategories.h
+llvm-devel/include/clang/Basic/DiagnosticCommentKinds.inc
+llvm-devel/include/clang/Basic/DiagnosticCommonKinds.inc
+llvm-devel/include/clang/Basic/DiagnosticDriverKinds.inc
+llvm-devel/include/clang/Basic/DiagnosticFrontendKinds.inc
+llvm-devel/include/clang/Basic/DiagnosticGroups.inc
+llvm-devel/include/clang/Basic/DiagnosticIDs.h
+llvm-devel/include/clang/Basic/DiagnosticIndexName.inc
+llvm-devel/include/clang/Basic/DiagnosticLexKinds.inc
+llvm-devel/include/clang/Basic/DiagnosticOptions.def
+llvm-devel/include/clang/Basic/DiagnosticOptions.h
+llvm-devel/include/clang/Basic/DiagnosticParseKinds.inc
+llvm-devel/include/clang/Basic/DiagnosticSemaKinds.inc
+llvm-devel/include/clang/Basic/DiagnosticSerializationKinds.inc
+llvm-devel/include/clang/Basic/ExceptionSpecificationType.h
+llvm-devel/include/clang/Basic/ExpressionTraits.h
+llvm-devel/include/clang/Basic/FileManager.h
+llvm-devel/include/clang/Basic/FileSystemOptions.h
+llvm-devel/include/clang/Basic/FileSystemStatCache.h
+llvm-devel/include/clang/Basic/IdentifierTable.h
+llvm-devel/include/clang/Basic/LLVM.h
+llvm-devel/include/clang/Basic/Lambda.h
+llvm-devel/include/clang/Basic/LangOptions.def
+llvm-devel/include/clang/Basic/LangOptions.h
+llvm-devel/include/clang/Basic/Linkage.h
+llvm-devel/include/clang/Basic/MacroBuilder.h
+llvm-devel/include/clang/Basic/Module.h
+llvm-devel/include/clang/Basic/ObjCRuntime.h
+llvm-devel/include/clang/Basic/OnDiskHashTable.h
+llvm-devel/include/clang/Basic/OpenCL.h
+llvm-devel/include/clang/Basic/OpenCLExtensions.def
+llvm-devel/include/clang/Basic/OpenMPKinds.def
+llvm-devel/include/clang/Basic/OpenMPKinds.h
+llvm-devel/include/clang/Basic/OperatorKinds.def
+llvm-devel/include/clang/Basic/OperatorKinds.h
+llvm-devel/include/clang/Basic/OperatorPrecedence.h
+llvm-devel/include/clang/Basic/PartialDiagnostic.h
+llvm-devel/include/clang/Basic/PrettyStackTrace.h
+llvm-devel/include/clang/Basic/Sanitizers.def
+llvm-devel/include/clang/Basic/SourceLocation.h
+llvm-devel/include/clang/Basic/SourceManager.h
+llvm-devel/include/clang/Basic/SourceManagerInternals.h
+llvm-devel/include/clang/Basic/Specifiers.h
+llvm-devel/include/clang/Basic/TargetBuiltins.h
+llvm-devel/include/clang/Basic/TargetCXXABI.h
+llvm-devel/include/clang/Basic/TargetInfo.h
+llvm-devel/include/clang/Basic/TargetOptions.h
+llvm-devel/include/clang/Basic/TemplateKinds.h
+llvm-devel/include/clang/Basic/TokenKinds.def
+llvm-devel/include/clang/Basic/TokenKinds.h
+llvm-devel/include/clang/Basic/TypeTraits.h
+llvm-devel/include/clang/Basic/Version.h
+llvm-devel/include/clang/Basic/Version.inc
+llvm-devel/include/clang/Basic/VersionTuple.h
+llvm-devel/include/clang/Basic/Visibility.h
+llvm-devel/include/clang/Basic/arm_neon.inc
+llvm-devel/include/clang/CodeGen/BackendUtil.h
+llvm-devel/include/clang/CodeGen/CGFunctionInfo.h
+llvm-devel/include/clang/CodeGen/CodeGenABITypes.h
+llvm-devel/include/clang/CodeGen/CodeGenAction.h
+llvm-devel/include/clang/CodeGen/ModuleBuilder.h
+llvm-devel/include/clang/Config/config.h
+llvm-devel/include/clang/Driver/Action.h
+llvm-devel/include/clang/Driver/CC1AsOptions.h
+llvm-devel/include/clang/Driver/CC1AsOptions.inc
+llvm-devel/include/clang/Driver/CC1Options.h
+llvm-devel/include/clang/Driver/Compilation.h
+llvm-devel/include/clang/Driver/Driver.h
+llvm-devel/include/clang/Driver/DriverDiagnostic.h
+llvm-devel/include/clang/Driver/Job.h
+llvm-devel/include/clang/Driver/Options.h
+llvm-devel/include/clang/Driver/Options.inc
+llvm-devel/include/clang/Driver/Phases.h
+llvm-devel/include/clang/Driver/SanitizerArgs.h
+llvm-devel/include/clang/Driver/Tool.h
+llvm-devel/include/clang/Driver/ToolChain.h
+llvm-devel/include/clang/Driver/Types.def
+llvm-devel/include/clang/Driver/Types.h
+llvm-devel/include/clang/Driver/Util.h
+llvm-devel/include/clang/Edit/Commit.h
+llvm-devel/include/clang/Edit/EditedSource.h
+llvm-devel/include/clang/Edit/EditsReceiver.h
+llvm-devel/include/clang/Edit/FileOffset.h
+llvm-devel/include/clang/Edit/Rewriters.h
+llvm-devel/include/clang/Format/Format.h
+llvm-devel/include/clang/Frontend/ASTConsumers.h
+llvm-devel/include/clang/Frontend/ASTUnit.h
+llvm-devel/include/clang/Frontend/ChainedDiagnosticConsumer.h
+llvm-devel/include/clang/Frontend/ChainedIncludesSource.h
+llvm-devel/include/clang/Frontend/CodeGenOptions.def
+llvm-devel/include/clang/Frontend/CodeGenOptions.h
+llvm-devel/include/clang/Frontend/CommandLineSourceLoc.h
+llvm-devel/include/clang/Frontend/CompilerInstance.h
+llvm-devel/include/clang/Frontend/CompilerInvocation.h
+llvm-devel/include/clang/Frontend/DependencyOutputOptions.h
+llvm-devel/include/clang/Frontend/DiagnosticRenderer.h
+llvm-devel/include/clang/Frontend/FrontendAction.h
+llvm-devel/include/clang/Frontend/FrontendActions.h
+llvm-devel/include/clang/Frontend/FrontendDiagnostic.h
+llvm-devel/include/clang/Frontend/FrontendOptions.h
+llvm-devel/include/clang/Frontend/FrontendPluginRegistry.h
+llvm-devel/include/clang/Frontend/LangStandard.h
+llvm-devel/include/clang/Frontend/LangStandards.def
+llvm-devel/include/clang/Frontend/LayoutOverrideSource.h
+llvm-devel/include/clang/Frontend/LogDiagnosticPrinter.h
+llvm-devel/include/clang/Frontend/MigratorOptions.h
+llvm-devel/include/clang/Frontend/MultiplexConsumer.h
+llvm-devel/include/clang/Frontend/PreprocessorOutputOptions.h
+llvm-devel/include/clang/Frontend/SerializedDiagnosticPrinter.h
+llvm-devel/include/clang/Frontend/TextDiagnostic.h
+llvm-devel/include/clang/Frontend/TextDiagnosticBuffer.h
+llvm-devel/include/clang/Frontend/TextDiagnosticPrinter.h
+llvm-devel/include/clang/Frontend/Utils.h
+llvm-devel/include/clang/Frontend/VerifyDiagnosticConsumer.h
+llvm-devel/include/clang/FrontendTool/Utils.h
+llvm-devel/include/clang/Index/USRGeneration.h
+llvm-devel/include/clang/Lex/AttrSpellings.inc
+llvm-devel/include/clang/Lex/CodeCompletionHandler.h
+llvm-devel/include/clang/Lex/DirectoryLookup.h
+llvm-devel/include/clang/Lex/ExternalPreprocessorSource.h
+llvm-devel/include/clang/Lex/HeaderMap.h
+llvm-devel/include/clang/Lex/HeaderSearch.h
+llvm-devel/include/clang/Lex/HeaderSearchOptions.h
+llvm-devel/include/clang/Lex/LexDiagnostic.h
+llvm-devel/include/clang/Lex/Lexer.h
+llvm-devel/include/clang/Lex/LiteralSupport.h
+llvm-devel/include/clang/Lex/MacroArgs.h
+llvm-devel/include/clang/Lex/MacroInfo.h
+llvm-devel/include/clang/Lex/ModuleLoader.h
+llvm-devel/include/clang/Lex/ModuleMap.h
+llvm-devel/include/clang/Lex/MultipleIncludeOpt.h
+llvm-devel/include/clang/Lex/PPCallbacks.h
+llvm-devel/include/clang/Lex/PPConditionalDirectiveRecord.h
+llvm-devel/include/clang/Lex/PTHLexer.h
+llvm-devel/include/clang/Lex/PTHManager.h
+llvm-devel/include/clang/Lex/Pragma.h
+llvm-devel/include/clang/Lex/PreprocessingRecord.h
+llvm-devel/include/clang/Lex/Preprocessor.h
+llvm-devel/include/clang/Lex/PreprocessorLexer.h
+llvm-devel/include/clang/Lex/PreprocessorOptions.h
+llvm-devel/include/clang/Lex/ScratchBuffer.h
+llvm-devel/include/clang/Lex/Token.h
+llvm-devel/include/clang/Lex/TokenConcatenation.h
+llvm-devel/include/clang/Lex/TokenLexer.h
+llvm-devel/include/clang/Parse/AttrIdentifierArg.inc
+llvm-devel/include/clang/Parse/AttrLateParsed.inc
+llvm-devel/include/clang/Parse/ParseAST.h
+llvm-devel/include/clang/Parse/ParseDiagnostic.h
+llvm-devel/include/clang/Parse/Parser.h
+llvm-devel/include/clang/Rewrite/Core/DeltaTree.h
+llvm-devel/include/clang/Rewrite/Core/HTMLRewrite.h
+llvm-devel/include/clang/Rewrite/Core/RewriteRope.h
+llvm-devel/include/clang/Rewrite/Core/Rewriter.h
+llvm-devel/include/clang/Rewrite/Core/TokenRewriter.h
+llvm-devel/include/clang/Rewrite/Frontend/ASTConsumers.h
+llvm-devel/include/clang/Rewrite/Frontend/FixItRewriter.h
+llvm-devel/include/clang/Rewrite/Frontend/FrontendActions.h
+llvm-devel/include/clang/Rewrite/Frontend/Rewriters.h
+llvm-devel/include/clang/Sema/AnalysisBasedWarnings.h
+llvm-devel/include/clang/Sema/AttrParsedAttrImpl.inc
+llvm-devel/include/clang/Sema/AttrParsedAttrKinds.inc
+llvm-devel/include/clang/Sema/AttrParsedAttrList.inc
+llvm-devel/include/clang/Sema/AttrSpellingListIndex.inc
+llvm-devel/include/clang/Sema/AttrTemplateInstantiate.inc
+llvm-devel/include/clang/Sema/AttributeList.h
+llvm-devel/include/clang/Sema/CXXFieldCollector.h
+llvm-devel/include/clang/Sema/CodeCompleteConsumer.h
+llvm-devel/include/clang/Sema/CodeCompleteOptions.h
+llvm-devel/include/clang/Sema/DeclSpec.h
+llvm-devel/include/clang/Sema/DelayedDiagnostic.h
+llvm-devel/include/clang/Sema/Designator.h
+llvm-devel/include/clang/Sema/ExternalSemaSource.h
+llvm-devel/include/clang/Sema/IdentifierResolver.h
+llvm-devel/include/clang/Sema/Initialization.h
+llvm-devel/include/clang/Sema/LocInfoType.h
+llvm-devel/include/clang/Sema/Lookup.h
+llvm-devel/include/clang/Sema/MultiplexExternalSemaSource.h
+llvm-devel/include/clang/Sema/ObjCMethodList.h
+llvm-devel/include/clang/Sema/Overload.h
+llvm-devel/include/clang/Sema/Ownership.h
+llvm-devel/include/clang/Sema/ParsedTemplate.h
+llvm-devel/include/clang/Sema/PrettyDeclStackTrace.h
+llvm-devel/include/clang/Sema/Scope.h
+llvm-devel/include/clang/Sema/ScopeInfo.h
+llvm-devel/include/clang/Sema/Sema.h
+llvm-devel/include/clang/Sema/SemaConsumer.h
+llvm-devel/include/clang/Sema/SemaDiagnostic.h
+llvm-devel/include/clang/Sema/SemaFixItUtils.h
+llvm-devel/include/clang/Sema/SemaInternal.h
+llvm-devel/include/clang/Sema/Template.h
+llvm-devel/include/clang/Sema/TemplateDeduction.h
+llvm-devel/include/clang/Sema/TypoCorrection.h
+llvm-devel/include/clang/Sema/Weak.h
+llvm-devel/include/clang/Serialization/ASTBitCodes.h
+llvm-devel/include/clang/Serialization/ASTDeserializationListener.h
+llvm-devel/include/clang/Serialization/ASTReader.h
+llvm-devel/include/clang/Serialization/ASTWriter.h
+llvm-devel/include/clang/Serialization/AttrPCHRead.inc
+llvm-devel/include/clang/Serialization/AttrPCHWrite.inc
+llvm-devel/include/clang/Serialization/ContinuousRangeMap.h
+llvm-devel/include/clang/Serialization/GlobalModuleIndex.h
+llvm-devel/include/clang/Serialization/Module.h
+llvm-devel/include/clang/Serialization/ModuleManager.h
+llvm-devel/include/clang/Serialization/SerializationDiagnostic.h
+llvm-devel/include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
+llvm-devel/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
+llvm-devel/include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h
+llvm-devel/include/clang/StaticAnalyzer/Core/Analyses.def
+llvm-devel/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
+llvm-devel/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
+llvm-devel/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
+llvm-devel/include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
+llvm-devel/include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h
+llvm-devel/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
+llvm-devel/include/clang/StaticAnalyzer/Core/Checker.h
+llvm-devel/include/clang/StaticAnalyzer/Core/CheckerManager.h
+llvm-devel/include/clang/StaticAnalyzer/Core/CheckerOptInfo.h
+llvm-devel/include/clang/StaticAnalyzer/Core/CheckerRegistry.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/APSIntType.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/FunctionSummary.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState_Fwd.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/StoreRef.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SummaryManager.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/TaintManager.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/TaintTag.h
+llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
+llvm-devel/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
+llvm-devel/include/clang/StaticAnalyzer/Frontend/FrontendActions.h
+llvm-devel/include/clang/Tooling/ArgumentsAdjusters.h
+llvm-devel/include/clang/Tooling/CommonOptionsParser.h
+llvm-devel/include/clang/Tooling/CompilationDatabase.h
+llvm-devel/include/clang/Tooling/CompilationDatabasePluginRegistry.h
+llvm-devel/include/clang/Tooling/FileMatchTrie.h
+llvm-devel/include/clang/Tooling/JSONCompilationDatabase.h
+llvm-devel/include/clang/Tooling/Refactoring.h
+llvm-devel/include/clang/Tooling/RefactoringCallbacks.h
+llvm-devel/include/clang/Tooling/ReplacementsYaml.h
+llvm-devel/include/clang/Tooling/Tooling.h
+llvm-devel/lib/clang/3.4/include/__wmmintrin_aes.h
+llvm-devel/lib/clang/3.4/include/__wmmintrin_pclmul.h
+llvm-devel/lib/clang/3.4/include/ammintrin.h
+llvm-devel/lib/clang/3.4/include/arm_neon.h
+llvm-devel/lib/clang/3.4/include/avx2intrin.h
+llvm-devel/lib/clang/3.4/include/avxintrin.h
+llvm-devel/lib/clang/3.4/include/bmi2intrin.h
+llvm-devel/lib/clang/3.4/include/bmiintrin.h
+llvm-devel/lib/clang/3.4/include/emmintrin.h
+llvm-devel/lib/clang/3.4/include/f16cintrin.h
+llvm-devel/lib/clang/3.4/include/fma4intrin.h
+llvm-devel/lib/clang/3.4/include/fmaintrin.h
+llvm-devel/lib/clang/3.4/include/immintrin.h
+llvm-devel/lib/clang/3.4/include/lzcntintrin.h
+llvm-devel/lib/clang/3.4/include/mm3dnow.h
+llvm-devel/lib/clang/3.4/include/mm_malloc.h
+llvm-devel/lib/clang/3.4/include/mmintrin.h
+llvm-devel/lib/clang/3.4/include/module.map
+llvm-devel/lib/clang/3.4/include/nmmintrin.h
+llvm-devel/lib/clang/3.4/include/pmmintrin.h
+llvm-devel/lib/clang/3.4/include/popcntintrin.h
+llvm-devel/lib/clang/3.4/include/prfchwintrin.h
+llvm-devel/lib/clang/3.4/include/rdseedintrin.h
+llvm-devel/lib/clang/3.4/include/rtmintrin.h
+llvm-devel/lib/clang/3.4/include/shaintrin.h
+llvm-devel/lib/clang/3.4/include/smmintrin.h
+llvm-devel/lib/clang/3.4/include/tbmintrin.h
+llvm-devel/lib/clang/3.4/include/tmmintrin.h
+llvm-devel/lib/clang/3.4/include/wmmintrin.h
+llvm-devel/lib/clang/3.4/include/x86intrin.h
+llvm-devel/lib/clang/3.4/include/xmmintrin.h
+llvm-devel/lib/clang/3.4/include/xopintrin.h
+llvm-devel/lib/libclang.a
+llvm-devel/lib/libclang.so
+llvm-devel/lib/libclangARCMigrate.a
+llvm-devel/lib/libclangAST.a
+llvm-devel/lib/libclangASTMatchers.a
+llvm-devel/lib/libclangAnalysis.a
+llvm-devel/lib/libclangBasic.a
+llvm-devel/lib/libclangCodeGen.a
+llvm-devel/lib/libclangDriver.a
+llvm-devel/lib/libclangDynamicASTMatchers.a
+llvm-devel/lib/libclangEdit.a
+llvm-devel/lib/libclangFormat.a
+llvm-devel/lib/libclangFrontend.a
+llvm-devel/lib/libclangFrontendTool.a
+llvm-devel/lib/libclangIndex.a
+llvm-devel/lib/libclangLex.a
+llvm-devel/lib/libclangParse.a
+llvm-devel/lib/libclangRewriteCore.a
+llvm-devel/lib/libclangRewriteFrontend.a
+llvm-devel/lib/libclangSema.a
+llvm-devel/lib/libclangSerialization.a
+llvm-devel/lib/libclangStaticAnalyzerCheckers.a
+llvm-devel/lib/libclangStaticAnalyzerCore.a
+llvm-devel/lib/libclangStaticAnalyzerFrontend.a
+llvm-devel/lib/libclangTooling.a
+man/man1/clang-devel.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/ps/clang.ps
+@dirrm llvm-devel/lib/clang/3.4/include
+@dirrm llvm-devel/lib/clang/3.4
+@dirrm llvm-devel/lib/clang
+@dirrm llvm-devel/include/clang/Tooling
+@dirrm llvm-devel/include/clang/StaticAnalyzer/Frontend
+@dirrm llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive
+@dirrm llvm-devel/include/clang/StaticAnalyzer/Core/BugReporter
+@dirrm llvm-devel/include/clang/StaticAnalyzer/Core
+@dirrm llvm-devel/include/clang/StaticAnalyzer/Checkers
+@dirrm llvm-devel/include/clang/StaticAnalyzer
+@dirrm llvm-devel/include/clang/Serialization
+@dirrm llvm-devel/include/clang/Sema
+@dirrm llvm-devel/include/clang/Rewrite/Frontend
+@dirrm llvm-devel/include/clang/Rewrite/Core
+@dirrm llvm-devel/include/clang/Rewrite
+@dirrm llvm-devel/include/clang/Parse
+@dirrm llvm-devel/include/clang/Lex
+@dirrm llvm-devel/include/clang/Index
+@dirrm llvm-devel/include/clang/FrontendTool
+@dirrm llvm-devel/include/clang/Frontend
+@dirrm llvm-devel/include/clang/Format
+@dirrm llvm-devel/include/clang/Edit
+@dirrm llvm-devel/include/clang/Driver
+@dirrm llvm-devel/include/clang/Config
+@dirrm llvm-devel/include/clang/CodeGen
+@dirrm llvm-devel/include/clang/Basic
+@dirrm llvm-devel/include/clang/Analysis/Support
+@dirrm llvm-devel/include/clang/Analysis/FlowSensitive
+@dirrm llvm-devel/include/clang/Analysis/DomainSpecific
+@dirrm llvm-devel/include/clang/Analysis/Analyses
+@dirrm llvm-devel/include/clang/Analysis
+@dirrm llvm-devel/include/clang/ASTMatchers/Dynamic
+@dirrm llvm-devel/include/clang/ASTMatchers
+@dirrm llvm-devel/include/clang/AST
+@dirrm llvm-devel/include/clang/ARCMigrate
+@dirrm llvm-devel/include/clang-c
+@dirrm llvm-devel/include/clang
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/clang
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PYTHON_SITELIBDIR%%/Reporter.py
 %%PYTHON_SITELIBDIR%%/Resources/FileRadar.scpt
 %%PYTHON_SITELIBDIR%%/Resources/GetRadarVersion.scpt
 %%PYTHON_SITELIBDIR%%/Resources/bugcatcher.ico
 %%PYTHON_SITELIBDIR%%/ScanView.py
 %%PYTHON_SITELIBDIR%%/startfile.py
-@dirrm lib/clang/%%CLANG_RELEASE%%/include
-@dirrm lib/clang/%%CLANG_RELEASE%%
-@dirrm lib/clang
-@dirrm include/clang/Tooling
-@dirrm include/clang/StaticAnalyzer/Frontend
-@dirrm include/clang/StaticAnalyzer/Core/PathSensitive
-@dirrm include/clang/StaticAnalyzer/Core/BugReporter
-@dirrm include/clang/StaticAnalyzer/Core
-@dirrm include/clang/StaticAnalyzer/Checkers
-@dirrm include/clang/StaticAnalyzer
-@dirrm include/clang/Serialization
-@dirrm include/clang/Sema
-@dirrm include/clang/Rewrite/Frontend
-@dirrm include/clang/Rewrite/Core
-@dirrm include/clang/Rewrite
-@dirrm include/clang/Parse
-@dirrm include/clang/Lex
-@dirrm include/clang/Index
-@dirrm include/clang/FrontendTool
-@dirrm include/clang/Frontend
-@dirrm include/clang/Format
-@dirrm include/clang/Edit
-@dirrm include/clang/Driver
-@dirrm include/clang/Config
-@dirrm include/clang/CodeGen
-@dirrm include/clang/Basic
-@dirrm include/clang/Analysis/Support
-@dirrm include/clang/Analysis/FlowSensitive
-@dirrm include/clang/Analysis/DomainSpecific
-@dirrm include/clang/Analysis/Analyses
-@dirrm include/clang/Analysis
-@dirrm include/clang/ASTMatchers/Dynamic
-@dirrm include/clang/ASTMatchers
-@dirrm include/clang/AST
-@dirrm include/clang/ARCMigrate
-@dirrm include/clang-c
-@dirrm include/clang
 @dirrm %%PYTHON_SITELIBDIR%%/Resources
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/img
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/clang
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%