4 files changed, 334 insertions, 31 deletions

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index a07989493ba3..106825fff8b5 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	clang
-PORTVERSION=	2.6
-PORTREVISION=	3
+PORTVERSION=	2.7
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${LLVM_SOURCE}
 EXTRACT_ONLY=	${LLVM_SOURCE}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	brooks@FreeBSD.org
-COMMENT=	C, Objective-C, and (soon) C++ compiler
+COMMENT=	C, Objective-C, and (alpha-quality) C++ compiler
 
 CONFLICTS=      clang-devel-2.[0-9]* llvm-devel-2.[0-9]*
 
@@ -75,17 +75,17 @@ post-patch:
 	${REINPLACE_CMD} -e 's|%%DOCSRCDIR%%|${DOCSRCDIR}|' \
 	    ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|/usr/bin/env perl|${PERL}|' \
-	    ${WRKSRC}/tools/clang/utils/ccc-analyzer \
-	    ${WRKSRC}/tools/clang/utils/scan-build
+	    ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \
+	    ${WRKSRC}/tools/clang/tools/scan-build/scan-build
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/utils/ccc-analyzer \
+	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \
 	    ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/utils/scan-build \
+	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-build/scan-build \
 	    ${PREFIX}/bin
 	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/tools/clang/utils/scanview.css ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/tools/clang/utils/sorttable.js ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js ${DATADIR}
 
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} ${GMAKE} check)'
 regression-test: ${BUILD_COOKIE}
@@ -98,9 +98,14 @@ regression-test: ${BUILD_COOKIE}
 
 PLIST_FILE_LIST=	bin/ccc-analyzer \
 			bin/clang \
+			bin/clang++ \
 			bin/scan-build \
-			libexec/clang-cc
-PLIST_DIR_LIST=		lib/clang
+			lib/libCIndex.* \
+			lib/libclang*
+PLIST_DIR_LIST=		include/clang \
+			include/clang-c \
+			lib/clang
+			
 build-plist:
 	${RM} -f ${PLIST}
 	cd ${PREFIX} && \
diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index 2ca85665166e..d48949c9279d 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,6 +1,6 @@
-MD5 (llvm-2.6.tar.gz) = 34a11e807add0f4555f691944e1a404a
-SHA256 (llvm-2.6.tar.gz) = 4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84
-SIZE (llvm-2.6.tar.gz) = 7790380
-MD5 (clang-2.6.tar.gz) = 09d696bf23bb4a3cf6af3c7341cdd946
-SHA256 (clang-2.6.tar.gz) = 98e22f4f5877fb3c73abb9ddcb3065ba9c94a21146387da7f905e6fd559d39ea
-SIZE (clang-2.6.tar.gz) = 3857138
+MD5 (clang-2.7.tgz) = b83260aa8c13494adf8978b5f238bf1b
+SHA256 (clang-2.7.tgz) = fb349471947f155c1cda1c8a4a3bbc7fa437b86f6875d9978f86c915dfed623a
+SIZE (clang-2.7.tgz) = 4953739
+MD5 (llvm-2.7.tgz) = ac322661f20e7d6c810b1869f886ad9b
+SHA256 (llvm-2.7.tgz) = 99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5
+SIZE (llvm-2.7.tgz) = 8374297
diff --git a/lang/clang/files/patch-Makefile b/lang/clang/files/patch-Makefile
index 59fe73be2c8e..2c887b01275d 100644
--- a/lang/clang/files/patch-Makefile
+++ b/lang/clang/files/patch-Makefile
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- Makefile.orig
 +++ Makefile
-@@ -24,7 +24,7 @@
+@@ -31,7 +31,7 @@
    OPTIONAL_DIRS :=
  else
-   DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
--          tools runtime docs
-+          tools runtime %%DOCSRCDIR%%
-   OPTIONAL_DIRS := examples projects bindings
+   DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-shlib \
+-          tools/llvm-config tools runtime docs unittests
++          tools/llvm-config tools runtime %%DOCSRCDIR%% unittests
+   OPTIONAL_DIRS := projects bindings
  endif
  
diff --git a/lang/clang/pkg-plist b/lang/clang/pkg-plist
index 20a7a0d350e2..993b51329aa5 100644
--- a/lang/clang/pkg-plist
+++ b/lang/clang/pkg-plist
@@ -1,13 +1,287 @@
 bin/ccc-analyzer
 bin/clang
+bin/clang++
 bin/scan-build
-lib/clang/1.0/include/emmintrin.h
-lib/clang/1.0/include/mm_malloc.h
-lib/clang/1.0/include/mmintrin.h
-lib/clang/1.0/include/pmmintrin.h
-lib/clang/1.0/include/tmmintrin.h
-lib/clang/1.0/include/xmmintrin.h
-libexec/clang-cc
+include/clang-c/Index.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/ASTImporter.h
+include/clang/AST/Attr.h
+include/clang/AST/CXXInheritance.h
+include/clang/AST/CanonicalType.h
+include/clang/AST/CharUnits.h
+include/clang/AST/Decl.h
+include/clang/AST/DeclBase.h
+include/clang/AST/DeclCXX.h
+include/clang/AST/DeclContextInternals.h
+include/clang/AST/DeclGroup.h
+include/clang/AST/DeclNodes.def
+include/clang/AST/DeclObjC.h
+include/clang/AST/DeclTemplate.h
+include/clang/AST/DeclVisitor.h
+include/clang/AST/DeclarationName.h
+include/clang/AST/Expr.h
+include/clang/AST/ExprCXX.h
+include/clang/AST/ExprObjC.h
+include/clang/AST/ExternalASTSource.h
+include/clang/AST/FullExpr.h
+include/clang/AST/NestedNameSpecifier.h
+include/clang/AST/ParentMap.h
+include/clang/AST/PrettyPrinter.h
+include/clang/AST/RecordLayout.h
+include/clang/AST/Redeclarable.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.def
+include/clang/AST/StmtObjC.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/TypeLocBuilder.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/Analysis/Analyses/LiveVariables.h
+include/clang/Analysis/Analyses/PrintfFormatString.h
+include/clang/Analysis/Analyses/ReachableCode.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/FlowSensitive/DataflowSolver.h
+include/clang/Analysis/FlowSensitive/DataflowValues.h
+include/clang/Analysis/ProgramPoint.h
+include/clang/Analysis/Support/BlkExprDeclBitVector.h
+include/clang/Analysis/Support/BumpVector.h
+include/clang/Analysis/Support/Optional.h
+include/clang/Analysis/Support/SaveAndRestore.h
+include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h
+include/clang/Analysis/Visitors/CFGRecStmtVisitor.h
+include/clang/Analysis/Visitors/CFGStmtVisitor.h
+include/clang/Basic/Builtins.def
+include/clang/Basic/Builtins.h
+include/clang/Basic/BuiltinsARM.def
+include/clang/Basic/BuiltinsPPC.def
+include/clang/Basic/BuiltinsX86.def
+include/clang/Basic/ConvertUTF.h
+include/clang/Basic/Diagnostic.h
+include/clang/Basic/DiagnosticASTKinds.inc
+include/clang/Basic/DiagnosticAnalysisKinds.inc
+include/clang/Basic/DiagnosticCommonKinds.inc
+include/clang/Basic/DiagnosticDriverKinds.inc
+include/clang/Basic/DiagnosticFrontendKinds.inc
+include/clang/Basic/DiagnosticGroups.inc
+include/clang/Basic/DiagnosticLexKinds.inc
+include/clang/Basic/DiagnosticParseKinds.inc
+include/clang/Basic/DiagnosticSemaKinds.inc
+include/clang/Basic/FileManager.h
+include/clang/Basic/IdentifierTable.h
+include/clang/Basic/LangOptions.h
+include/clang/Basic/Linkage.h
+include/clang/Basic/MacroBuilder.h
+include/clang/Basic/OnDiskHashTable.h
+include/clang/Basic/OperatorKinds.def
+include/clang/Basic/OperatorKinds.h
+include/clang/Basic/PartialDiagnostic.h
+include/clang/Basic/PrettyStackTrace.h
+include/clang/Basic/Release/DiagnosticASTKinds.inc.tmp
+include/clang/Basic/Release/DiagnosticAnalysisKinds.inc.tmp
+include/clang/Basic/Release/DiagnosticCommonKinds.inc.tmp
+include/clang/Basic/Release/DiagnosticDriverKinds.inc.tmp
+include/clang/Basic/Release/DiagnosticFrontendKinds.inc.tmp
+include/clang/Basic/Release/DiagnosticGroups.inc.tmp
+include/clang/Basic/Release/DiagnosticLexKinds.inc.tmp
+include/clang/Basic/Release/DiagnosticParseKinds.inc.tmp
+include/clang/Basic/Release/DiagnosticSemaKinds.inc.tmp
+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/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/Checker/BugReporter/BugReporter.h
+include/clang/Checker/BugReporter/BugType.h
+include/clang/Checker/BugReporter/PathDiagnostic.h
+include/clang/Checker/Checkers/DereferenceChecker.h
+include/clang/Checker/Checkers/LocalCheckers.h
+include/clang/Checker/DomainSpecific/CocoaConventions.h
+include/clang/Checker/ManagerRegistry.h
+include/clang/Checker/PathSensitive/AnalysisManager.h
+include/clang/Checker/PathSensitive/BasicValueFactory.h
+include/clang/Checker/PathSensitive/Checker.h
+include/clang/Checker/PathSensitive/CheckerVisitor.def
+include/clang/Checker/PathSensitive/CheckerVisitor.h
+include/clang/Checker/PathSensitive/ConstraintManager.h
+include/clang/Checker/PathSensitive/Environment.h
+include/clang/Checker/PathSensitive/ExplodedGraph.h
+include/clang/Checker/PathSensitive/GRAuditor.h
+include/clang/Checker/PathSensitive/GRBlockCounter.h
+include/clang/Checker/PathSensitive/GRCoreEngine.h
+include/clang/Checker/PathSensitive/GRExprEngine.h
+include/clang/Checker/PathSensitive/GRExprEngineBuilders.h
+include/clang/Checker/PathSensitive/GRSimpleAPICheck.h
+include/clang/Checker/PathSensitive/GRState.h
+include/clang/Checker/PathSensitive/GRStateTrait.h
+include/clang/Checker/PathSensitive/GRSubEngine.h
+include/clang/Checker/PathSensitive/GRTransferFuncs.h
+include/clang/Checker/PathSensitive/GRWorkList.h
+include/clang/Checker/PathSensitive/MemRegion.h
+include/clang/Checker/PathSensitive/SVals.h
+include/clang/Checker/PathSensitive/SValuator.h
+include/clang/Checker/PathSensitive/Store.h
+include/clang/Checker/PathSensitive/SummaryManager.h
+include/clang/Checker/PathSensitive/SymbolManager.h
+include/clang/Checker/PathSensitive/ValueManager.h
+include/clang/CodeGen/CodeGenOptions.h
+include/clang/CodeGen/ModuleBuilder.h
+include/clang/Driver/Action.h
+include/clang/Driver/Arg.h
+include/clang/Driver/ArgList.h
+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/HostInfo.h
+include/clang/Driver/Job.h
+include/clang/Driver/OptSpecifier.h
+include/clang/Driver/OptTable.h
+include/clang/Driver/Option.h
+include/clang/Driver/Options.h
+include/clang/Driver/Options.inc
+include/clang/Driver/Phases.h
+include/clang/Driver/Release/CC1Options.inc.tmp
+include/clang/Driver/Release/Options.inc.tmp
+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/Frontend/ASTConsumers.h
+include/clang/Frontend/ASTUnit.h
+include/clang/Frontend/Analyses.def
+include/clang/Frontend/AnalysisConsumer.h
+include/clang/Frontend/ChainedDiagnosticClient.h
+include/clang/Frontend/CodeGenAction.h
+include/clang/Frontend/CommandLineSourceLoc.h
+include/clang/Frontend/CompilerInstance.h
+include/clang/Frontend/CompilerInvocation.h
+include/clang/Frontend/DeclContextXML.def
+include/clang/Frontend/DeclXML.def
+include/clang/Frontend/DependencyOutputOptions.h
+include/clang/Frontend/DiagnosticOptions.h
+include/clang/Frontend/DocumentXML.def
+include/clang/Frontend/DocumentXML.h
+include/clang/Frontend/FixItRewriter.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/HeaderSearchOptions.h
+include/clang/Frontend/LangStandard.h
+include/clang/Frontend/LangStandards.def
+include/clang/Frontend/PCHBitCodes.h
+include/clang/Frontend/PCHReader.h
+include/clang/Frontend/PCHWriter.h
+include/clang/Frontend/PathDiagnosticClients.h
+include/clang/Frontend/PreprocessorOptions.h
+include/clang/Frontend/PreprocessorOutputOptions.h
+include/clang/Frontend/StmtXML.def
+include/clang/Frontend/TextDiagnosticBuffer.h
+include/clang/Frontend/TextDiagnosticPrinter.h
+include/clang/Frontend/TypeXML.def
+include/clang/Frontend/Utils.h
+include/clang/Frontend/VerifyDiagnosticsClient.h
+include/clang/Index/ASTLocation.h
+include/clang/Index/Analyzer.h
+include/clang/Index/CallGraph.h
+include/clang/Index/DeclReferenceMap.h
+include/clang/Index/Entity.h
+include/clang/Index/GlobalSelector.h
+include/clang/Index/Handlers.h
+include/clang/Index/IndexProvider.h
+include/clang/Index/Indexer.h
+include/clang/Index/Program.h
+include/clang/Index/STLExtras.h
+include/clang/Index/SelectorMap.h
+include/clang/Index/TranslationUnit.h
+include/clang/Index/Utils.h
+include/clang/Lex/DirectoryLookup.h
+include/clang/Lex/ExternalPreprocessorSource.h
+include/clang/Lex/HeaderMap.h
+include/clang/Lex/HeaderSearch.h
+include/clang/Lex/LexDiagnostic.h
+include/clang/Lex/Lexer.h
+include/clang/Lex/LiteralSupport.h
+include/clang/Lex/MacroInfo.h
+include/clang/Lex/MultipleIncludeOpt.h
+include/clang/Lex/PPCallbacks.h
+include/clang/Lex/PTHLexer.h
+include/clang/Lex/PTHManager.h
+include/clang/Lex/Pragma.h
+include/clang/Lex/Preprocessor.h
+include/clang/Lex/PreprocessorLexer.h
+include/clang/Lex/ScratchBuffer.h
+include/clang/Lex/Token.h
+include/clang/Lex/TokenConcatenation.h
+include/clang/Lex/TokenLexer.h
+include/clang/Parse/Action.h
+include/clang/Parse/AttributeList.h
+include/clang/Parse/DeclSpec.h
+include/clang/Parse/Designator.h
+include/clang/Parse/Ownership.h
+include/clang/Parse/ParseDiagnostic.h
+include/clang/Parse/Parser.h
+include/clang/Parse/Scope.h
+include/clang/Parse/Template.h
+include/clang/Rewrite/DeltaTree.h
+include/clang/Rewrite/HTMLRewrite.h
+include/clang/Rewrite/RewriteRope.h
+include/clang/Rewrite/Rewriter.h
+include/clang/Rewrite/TokenRewriter.h
+include/clang/Sema/CodeCompleteConsumer.h
+include/clang/Sema/ExternalSemaSource.h
+include/clang/Sema/ParseAST.h
+include/clang/Sema/SemaConsumer.h
+include/clang/Sema/SemaDiagnostic.h
+lib/clang/1.1/include/emmintrin.h
+lib/clang/1.1/include/mm_malloc.h
+lib/clang/1.1/include/mmintrin.h
+lib/clang/1.1/include/pmmintrin.h
+lib/clang/1.1/include/smmintrin.h
+lib/clang/1.1/include/tmmintrin.h
+lib/clang/1.1/include/xmmintrin.h
+lib/libCIndex.a
+lib/libCIndex.so
+lib/libclangAST.a
+lib/libclangAnalysis.a
+lib/libclangBasic.a
+lib/libclangChecker.a
+lib/libclangCodeGen.a
+lib/libclangDriver.a
+lib/libclangFrontend.a
+lib/libclangIndex.a
+lib/libclangLex.a
+lib/libclangParse.a
+lib/libclangRewrite.a
+lib/libclangSema.a
 %%DATADIR%%/scanview.css
 %%DATADIR%%/sorttable.js
 %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
@@ -24,9 +298,33 @@ libexec/clang-cc
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/libIndex.html
 %%PORTDOCS%%%%DOCSDIR%%/ps/clang.ps
-@dirrm lib/clang/1.0/include
-@dirrm lib/clang/1.0
+@dirrm lib/clang/1.1/include
+@dirrm lib/clang/1.1
 @dirrm lib/clang
+@dirrm include/clang/Sema
+@dirrm include/clang/Rewrite
+@dirrm include/clang/Parse
+@dirrm include/clang/Lex
+@dirrm include/clang/Index
+@dirrm include/clang/Frontend
+@dirrm include/clang/Driver/Release
+@dirrm include/clang/Driver
+@dirrm include/clang/CodeGen
+@dirrm include/clang/Checker/PathSensitive
+@dirrm include/clang/Checker/DomainSpecific
+@dirrm include/clang/Checker/Checkers
+@dirrm include/clang/Checker/BugReporter
+@dirrm include/clang/Checker
+@dirrm include/clang/Basic/Release
+@dirrm include/clang/Basic
+@dirrm include/clang/Analysis/Visitors
+@dirrm include/clang/Analysis/Support
+@dirrm include/clang/Analysis/FlowSensitive
+@dirrm include/clang/Analysis/Analyses
+@dirrm include/clang/Analysis
+@dirrm include/clang/AST
+@dirrm include/clang-c
+@dirrm include/clang
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/clang