4 files changed, 21 insertions, 34 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 47aa8fe02e9e..aa41ba4ebdc0 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--with-f2c=${LOCALBASE}
 CONFIGURE_ARGS+=	--enable-optimized
 .endif
 
-MAN1=		bugpoint.1 llc.1 lli.1 llvmc.1 llvm-ar.1 \
+MAN1=		bugpoint.1 clang.1 llc.1 lli.1 llvmc.1 llvm-ar.1 \
 		llvm-as.1 llvm-bcanalyzer.1 llvm-config.1 llvm-db.1 \
 		llvm-dis.1 llvm-extract.1 llvm-ld.1 llvm-link.1 llvm-nm.1 \
 		llvm-prof.1 llvm-ranlib.1 llvmgcc.1 \
@@ -80,8 +80,6 @@ post-patch:
 		${WRKSRC}/Makefile.config.in
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
 		${WRKSRC}/tools/clang/utils/scan-build
-	${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
-	    ${WRKSRC}/tools/clang/tools/ccc/ccc
 	${REINPLACE_CMD} -e 's|/usr/bin/env perl|${PERL}|' \
 	    ${WRKSRC}/tools/clang/utils/ccc-analyzer \
 	    ${WRKSRC}/tools/clang/utils/scan-build
@@ -105,7 +103,6 @@ regression-test: ${BUILD_COOKIE}
 	fi
 
 PLIST_FILE_LIST=	bin/bugpoint \
-			bin/ccc \
 			bin/ccc-analyzer \
 			bin/clang* \
 			bin/gccas \
@@ -122,8 +119,7 @@ PLIST_FILE_LIST=	bin/bugpoint \
 			lib/libclang* \
 			lib/plugin_llvm* \
 			libexec/clang-cc
-PLIST_DIR_LIST=		bin/ccclib \
-			include/llvm-c \
+PLIST_DIR_LIST=		include/llvm-c \
 			include/llvm \
 			lib/clang
 build-plist:
diff --git a/devel/llvm-devel/Makefile.svn_rev b/devel/llvm-devel/Makefile.svn_rev
index e84de8854fcf..2f314c22ae16 100644
--- a/devel/llvm-devel/Makefile.svn_rev
+++ b/devel/llvm-devel/Makefile.svn_rev
@@ -1 +1 @@
-SVN_REV=	68053
+SVN_REV=	71086
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 01db5a26c4a5..fcc8342e9dde 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (llvm-2.6.r68053.tar.bz2) = d68ab814a4fbec9ca2b230b2d797ddb8
-SHA256 (llvm-2.6.r68053.tar.bz2) = b2449648ceb67a1d51ca4b7065bfd9f51950c5e405dc89c63bb6f49c84fa5cf5
-SIZE (llvm-2.6.r68053.tar.bz2) = 7624682
+MD5 (llvm-2.6.r71086.tar.bz2) = 3de4eaa54bdd398ffc0eab23a4fba376
+SHA256 (llvm-2.6.r71086.tar.bz2) = b39c9e110192498a4e6fbd07ba95d98925e069c2a087cd36242822fe238dc618
+SIZE (llvm-2.6.r71086.tar.bz2) = 7927312
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 9393ee129a2c..7633627d6d22 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -1,26 +1,5 @@
 bin/bugpoint
-bin/ccc
 bin/ccc-analyzer
-bin/ccclib/Arguments.py
-bin/ccclib/Arguments.pyc
-bin/ccclib/Driver.py
-bin/ccclib/Driver.pyc
-bin/ccclib/HostInfo.py
-bin/ccclib/HostInfo.pyc
-bin/ccclib/Jobs.py
-bin/ccclib/Jobs.pyc
-bin/ccclib/Phases.py
-bin/ccclib/Phases.pyc
-bin/ccclib/ToolChain.py
-bin/ccclib/ToolChain.pyc
-bin/ccclib/Tools.py
-bin/ccclib/Tools.pyc
-bin/ccclib/Types.py
-bin/ccclib/Types.pyc
-bin/ccclib/Util.py
-bin/ccclib/Util.pyc
-bin/ccclib/__init__.py
-bin/ccclib/__init__.pyc
 bin/clang
 bin/gccas
 bin/gccld
@@ -89,6 +68,7 @@ include/llvm/ADT/StringMap.h
 include/llvm/ADT/StringSet.h
 include/llvm/ADT/Tree.h
 include/llvm/ADT/Trie.h
+include/llvm/ADT/Triple.h
 include/llvm/ADT/UniqueVector.h
 include/llvm/ADT/VectorExtras.h
 include/llvm/ADT/ilist.h
@@ -309,6 +289,8 @@ include/llvm/Support/StringPool.h
 include/llvm/Support/SystemUtils.h
 include/llvm/Support/TargetFolder.h
 include/llvm/Support/Timer.h
+include/llvm/Support/TypeBuilder.h
+include/llvm/Support/ValueHandle.h
 include/llvm/Support/raw_ostream.h
 include/llvm/Support/type_traits.h
 include/llvm/SymbolTableListTraits.h
@@ -381,11 +363,14 @@ lib/LLVMCellSPUAsmPrinter.o
 lib/LLVMCellSPUCodeGen.o
 lib/LLVMCppBackend.o
 lib/LLVMExecutionEngine.o
-lib/LLVMIA64.o
+lib/LLVMIA64AsmPrinter.o
+lib/LLVMIA64CodeGen.o
 lib/LLVMInterpreter.o
 lib/LLVMJIT.o
 lib/LLVMMSIL.o
-lib/LLVMMips.o
+lib/LLVMMSP430.o
+lib/LLVMMipsAsmPrinter.o
+lib/LLVMMipsCodeGen.o
 lib/LLVMPIC16.o
 lib/LLVMPowerPCAsmPrinter.o
 lib/LLVMPowerPCCodeGen.o
@@ -438,6 +423,7 @@ libexec/clang-cc
 %%DATADIR%%/sorttable.js
 %%DOCSDIR%%/html.tar.gz
 %%DOCSDIR%%/html/AliasAnalysis.html
+%%DOCSDIR%%/html/AnalyzerRegions.html
 %%DOCSDIR%%/html/BitCodeFormat.html
 %%DOCSDIR%%/html/Bugpoint.html
 %%DOCSDIR%%/html/CFEBuildInstrs.html
@@ -489,6 +475,7 @@ libexec/clang-cc
 %%DOCSDIR%%/html/Lexicon.html
 %%DOCSDIR%%/html/LinkTimeOptimization.html
 %%DOCSDIR%%/html/MakefileGuide.html
+%%DOCSDIR%%/html/PTHInternals.html
 %%DOCSDIR%%/html/Passes.html
 %%DOCSDIR%%/html/ProgrammersManual.html
 %%DOCSDIR%%/html/Projects.html
@@ -497,9 +484,12 @@ libexec/clang-cc
 %%DOCSDIR%%/html/SystemLibrary.html
 %%DOCSDIR%%/html/TableGenFundamentals.html
 %%DOCSDIR%%/html/TestingGuide.html
+%%DOCSDIR%%/html/UsersManual.html
 %%DOCSDIR%%/html/UsingLibraries.html
 %%DOCSDIR%%/html/WritingAnLLVMBackend.html
 %%DOCSDIR%%/html/WritingAnLLVMPass.html
+%%DOCSDIR%%/html/clang/clang.html
+%%DOCSDIR%%/html/clang/manpage.css
 %%DOCSDIR%%/html/doxygen.css
 %%DOCSDIR%%/html/img/Debugging.gif
 %%DOCSDIR%%/html/img/libdeps.gif
@@ -527,6 +517,7 @@ libexec/clang-cc
 %%DOCSDIR%%/html/tutorial/OCamlLangImpl7.html
 %%DOCSDIR%%/html/tutorial/index.html
 %%DOCSDIR%%/ps/bugpoint.ps
+%%DOCSDIR%%/ps/clang.ps
 %%DOCSDIR%%/ps/llc.ps
 %%DOCSDIR%%/ps/lli.ps
 %%DOCSDIR%%/ps/llvm-ar.ps
@@ -567,11 +558,11 @@ libexec/clang-cc
 @dirrm include/llvm-c/Transforms
 @dirrm include/llvm-c
 @dirrm include/llvm
-@dirrm bin/ccclib
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%/ps
 @dirrm %%DOCSDIR%%/html/tutorial
 @dirrm %%DOCSDIR%%/html/img
+@dirrm %%DOCSDIR%%/html/clang
 @dirrm %%DOCSDIR%%/html/CommandGuide
 @dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%