update to 2.7

many fixes and improvements, eg C++ support
see the release notes for details

7 files changed, 405 insertions, 130 deletions

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index 8ce260947a1..ad40092ceb5 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2009/11/25 12:32:30 hasso Exp $
+# $NetBSD: Makefile,v 1.4 2010/04/27 15:12:08 drochner Exp $
 #
 
-DISTNAME=	clang-2.6
-PKGREVISION=	2
+DISTNAME=	clang-2.7
 CATEGORIES=	lang
 MASTER_SITES=	http://llvm.org/releases/${PKGVERSION_NOREV}/
-DISTFILES=	llvm-2.6.tar.gz clang-2.6.tar.gz
+DISTFILES=	llvm-2.7.tgz clang-2.7.tgz
 
 MAINTAINER=	adam.hoka@gmail.com
 HOMEPAGE=	http://llvm.org/
@@ -13,7 +12,7 @@ COMMENT=	Low Level Virtual Machine compiler infrastructure
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/llvm-2.6
+WRKSRC=		${WRKDIR}/llvm-2.7
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake perl:build chown
 USE_LANGUAGES+=	c c++
@@ -29,12 +28,11 @@ CONFIGURE_ARGS+= --enable-targets=host-only
 #CONFIGURE_ARGS+= --disable-optimized
 
 CHECK_PORTABILITY_SKIP=	utils/buildit/build_llvm
-CHECK_PORTABILITY_SKIP+= utils/buildit/.svn/text-base/build_llvm.svn-base
 
 TEST_TARGET=	check unittests
 
 post-extract:
-	${MV} ${WRKDIR}/clang-2.6 ${WRKDIR}/llvm-2.6/tools/clang
+	${MV} ${WRKDIR}/clang-2.7 ${WRKDIR}/llvm-2.7/tools/clang
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/clang/PLIST b/lang/clang/PLIST
index 2148795a4ba..276f0b2b8fb 100644
--- a/lang/clang/PLIST
+++ b/lang/clang/PLIST
@@ -1,15 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/11/16 23:24:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/04/27 15:12:08 drochner Exp $
 bin/bugpoint
 bin/clang
-bin/gccas
-bin/gccld
+bin/clang++
 bin/llc
 bin/lli
 bin/llvm-ar
 bin/llvm-as
 bin/llvm-bcanalyzer
 bin/llvm-config
-bin/llvm-db
 bin/llvm-dis
 bin/llvm-extract
 bin/llvm-ld
@@ -21,10 +19,270 @@ bin/llvm-stub
 bin/llvmc
 bin/opt
 bin/tblgen
+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
 include/llvm-c/Analysis.h
 include/llvm-c/BitReader.h
 include/llvm-c/BitWriter.h
 include/llvm-c/Core.h
+include/llvm-c/EnhancedDisassembly.h
 include/llvm-c/ExecutionEngine.h
 include/llvm-c/LinkTimeOptimizer.h
 include/llvm-c/Target.h
@@ -35,6 +293,7 @@ include/llvm/ADT/APFloat.h
 include/llvm/ADT/APInt.h
 include/llvm/ADT/APSInt.h
 include/llvm/ADT/BitVector.h
+include/llvm/ADT/DeltaAlgorithm.h
 include/llvm/ADT/DenseMap.h
 include/llvm/ADT/DenseMapInfo.h
 include/llvm/ADT/DenseSet.h
@@ -42,7 +301,7 @@ include/llvm/ADT/DepthFirstIterator.h
 include/llvm/ADT/EquivalenceClasses.h
 include/llvm/ADT/FoldingSet.h
 include/llvm/ADT/GraphTraits.h
-include/llvm/ADT/HashExtras.h
+include/llvm/ADT/ImmutableIntervalMap.h
 include/llvm/ADT/ImmutableList.h
 include/llvm/ADT/ImmutableMap.h
 include/llvm/ADT/ImmutableSet.h
@@ -58,6 +317,7 @@ include/llvm/ADT/STLExtras.h
 include/llvm/ADT/ScopedHashTable.h
 include/llvm/ADT/SetOperations.h
 include/llvm/ADT/SetVector.h
+include/llvm/ADT/SmallBitVector.h
 include/llvm/ADT/SmallPtrSet.h
 include/llvm/ADT/SmallSet.h
 include/llvm/ADT/SmallString.h
@@ -68,15 +328,15 @@ include/llvm/ADT/StringExtras.h
 include/llvm/ADT/StringMap.h
 include/llvm/ADT/StringRef.h
 include/llvm/ADT/StringSet.h
+include/llvm/ADT/StringSwitch.h
 include/llvm/ADT/Trie.h
 include/llvm/ADT/Triple.h
 include/llvm/ADT/Twine.h
 include/llvm/ADT/UniqueVector.h
+include/llvm/ADT/ValueMap.h
 include/llvm/ADT/VectorExtras.h
 include/llvm/ADT/ilist.h
 include/llvm/ADT/ilist_node.h
-include/llvm/ADT/iterator.cmake
-include/llvm/ADT/iterator.h
 include/llvm/AbstractTypeUser.h
 include/llvm/Analysis/AliasAnalysis.h
 include/llvm/Analysis/AliasSetTracker.h
@@ -85,22 +345,28 @@ include/llvm/Analysis/CallGraph.h
 include/llvm/Analysis/CaptureTracking.h
 include/llvm/Analysis/ConstantFolding.h
 include/llvm/Analysis/ConstantsScanner.h
+include/llvm/Analysis/DOTGraphTraitsPass.h
 include/llvm/Analysis/DebugInfo.h
+include/llvm/Analysis/DomPrinter.h
 include/llvm/Analysis/DominatorInternals.h
 include/llvm/Analysis/Dominators.h
 include/llvm/Analysis/FindUsedTypes.h
 include/llvm/Analysis/IVUsers.h
+include/llvm/Analysis/InlineCost.h
+include/llvm/Analysis/InstructionSimplify.h
 include/llvm/Analysis/Interval.h
 include/llvm/Analysis/IntervalIterator.h
 include/llvm/Analysis/IntervalPartition.h
+include/llvm/Analysis/LazyValueInfo.h
 include/llvm/Analysis/LibCallAliasAnalysis.h
 include/llvm/Analysis/LibCallSemantics.h
 include/llvm/Analysis/LiveValues.h
 include/llvm/Analysis/LoopDependenceAnalysis.h
 include/llvm/Analysis/LoopInfo.h
 include/llvm/Analysis/LoopPass.h
-include/llvm/Analysis/LoopVR.h
+include/llvm/Analysis/MemoryBuiltins.h
 include/llvm/Analysis/MemoryDependenceAnalysis.h
+include/llvm/Analysis/PHITransAddr.h
 include/llvm/Analysis/Passes.h
 include/llvm/Analysis/PointerTracking.h
 include/llvm/Analysis/PostDominators.h
@@ -126,25 +392,18 @@ include/llvm/Bitcode/Archive.h
 include/llvm/Bitcode/BitCodes.h
 include/llvm/Bitcode/BitstreamReader.h
 include/llvm/Bitcode/BitstreamWriter.h
-include/llvm/Bitcode/Deserialize.h
 include/llvm/Bitcode/LLVMBitCodes.h
 include/llvm/Bitcode/ReaderWriter.h
-include/llvm/Bitcode/Serialization.h
-include/llvm/Bitcode/SerializationFwd.h
-include/llvm/Bitcode/Serialize.h
 include/llvm/CMakeLists.txt
 include/llvm/CallGraphSCCPass.h
 include/llvm/CallingConv.h
 include/llvm/CodeGen/AsmPrinter.h
 include/llvm/CodeGen/BinaryObject.h
-include/llvm/CodeGen/BreakCriticalMachineEdge.h
+include/llvm/CodeGen/CalcSpillWeights.h
 include/llvm/CodeGen/CallingConvLower.h
-include/llvm/CodeGen/DAGISelHeader.h
-include/llvm/CodeGen/Dump.h
 include/llvm/CodeGen/DwarfWriter.h
 include/llvm/CodeGen/ELFRelocation.h
 include/llvm/CodeGen/FastISel.h
-include/llvm/CodeGen/FileWriters.h
 include/llvm/CodeGen/GCMetadata.h
 include/llvm/CodeGen/GCMetadataPrinter.h
 include/llvm/CodeGen/GCStrategy.h
@@ -152,7 +411,6 @@ include/llvm/CodeGen/GCs.h
 include/llvm/CodeGen/IntrinsicLowering.h
 include/llvm/CodeGen/JITCodeEmitter.h
 include/llvm/CodeGen/LatencyPriorityQueue.h
-include/llvm/CodeGen/LazyLiveness.h
 include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 include/llvm/CodeGen/LinkAllCodegenComponents.h
 include/llvm/CodeGen/LiveInterval.h
@@ -176,12 +434,15 @@ include/llvm/CodeGen/MachineLocation.h
 include/llvm/CodeGen/MachineLoopInfo.h
 include/llvm/CodeGen/MachineMemOperand.h
 include/llvm/CodeGen/MachineModuleInfo.h
+include/llvm/CodeGen/MachineModuleInfoImpls.h
 include/llvm/CodeGen/MachineOperand.h
 include/llvm/CodeGen/MachinePassRegistry.h
 include/llvm/CodeGen/MachineRegisterInfo.h
 include/llvm/CodeGen/MachineRelocation.h
+include/llvm/CodeGen/MachineSSAUpdater.h
 include/llvm/CodeGen/ObjectCodeEmitter.h
 include/llvm/CodeGen/Passes.h
+include/llvm/CodeGen/ProcessImplicitDefs.h
 include/llvm/CodeGen/PseudoSourceValue.h
 include/llvm/CodeGen/RegAllocRegistry.h
 include/llvm/CodeGen/RegisterCoalescer.h
@@ -193,6 +454,8 @@ include/llvm/CodeGen/SchedulerRegistry.h
 include/llvm/CodeGen/SelectionDAG.h
 include/llvm/CodeGen/SelectionDAGISel.h
 include/llvm/CodeGen/SelectionDAGNodes.h
+include/llvm/CodeGen/SlotIndexes.h
+include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
 include/llvm/CodeGen/ValueTypes.h
 include/llvm/CodeGen/ValueTypes.td
 include/llvm/CompilerDriver/Action.h
@@ -207,18 +470,12 @@ include/llvm/CompilerDriver/Plugin.h
 include/llvm/CompilerDriver/Tool.h
 include/llvm/Config/AsmParsers.def
 include/llvm/Config/AsmPrinters.def
+include/llvm/Config/Disassemblers.def
 include/llvm/Config/Targets.def
-include/llvm/Config/alloca.h
 include/llvm/Config/config.h
 include/llvm/Config/config.h.cmake
 include/llvm/Constant.h
 include/llvm/Constants.h
-include/llvm/Debugger/Debugger.h
-include/llvm/Debugger/InferiorProcess.h
-include/llvm/Debugger/ProgramInfo.h
-include/llvm/Debugger/RuntimeInfo.h
-include/llvm/Debugger/SourceFile.h
-include/llvm/Debugger/SourceLanguage.h
 include/llvm/DerivedTypes.h
 include/llvm/ExecutionEngine/ExecutionEngine.h
 include/llvm/ExecutionEngine/GenericValue.h
@@ -227,6 +484,7 @@ include/llvm/ExecutionEngine/JIT.h
 include/llvm/ExecutionEngine/JITEventListener.h
 include/llvm/ExecutionEngine/JITMemoryManager.h
 include/llvm/Function.h
+include/llvm/GVMaterializer.h
 include/llvm/GlobalAlias.h
 include/llvm/GlobalValue.h
 include/llvm/GlobalVariable.h
@@ -241,7 +499,6 @@ include/llvm/Intrinsics.h
 include/llvm/Intrinsics.td
 include/llvm/IntrinsicsARM.td
 include/llvm/IntrinsicsAlpha.td
-include/llvm/IntrinsicsBlackfin.td
 include/llvm/IntrinsicsCellSPU.td
 include/llvm/IntrinsicsPowerPC.td
 include/llvm/IntrinsicsX86.td
@@ -250,11 +507,24 @@ include/llvm/LLVMContext.h
 include/llvm/LinkAllPasses.h
 include/llvm/LinkAllVMCore.h
 include/llvm/Linker.h
-include/llvm/MC/MCAsmLexer.h
-include/llvm/MC/MCAsmParser.h
+include/llvm/MC/MCAsmInfo.h
+include/llvm/MC/MCAsmInfoCOFF.h
+include/llvm/MC/MCAsmInfoDarwin.h
 include/llvm/MC/MCAssembler.h
+include/llvm/MC/MCCodeEmitter.h
 include/llvm/MC/MCContext.h
+include/llvm/MC/MCDirectives.h
+include/llvm/MC/MCDisassembler.h
+include/llvm/MC/MCExpr.h
+include/llvm/MC/MCFixup.h
 include/llvm/MC/MCInst.h
+include/llvm/MC/MCInstPrinter.h
+include/llvm/MC/MCParser/AsmCond.h
+include/llvm/MC/MCParser/AsmLexer.h
+include/llvm/MC/MCParser/AsmParser.h
+include/llvm/MC/MCParser/MCAsmLexer.h
+include/llvm/MC/MCParser/MCAsmParser.h
+include/llvm/MC/MCParser/MCParsedAsmOperand.h
 include/llvm/MC/MCSection.h
 include/llvm/MC/MCSectionELF.h
 include/llvm/MC/MCSectionMachO.h
@@ -264,7 +534,6 @@ include/llvm/MC/MCValue.h
 include/llvm/MC/SectionKind.h
 include/llvm/Metadata.h
 include/llvm/Module.h
-include/llvm/ModuleProvider.h
 include/llvm/OperandTraits.h
 include/llvm/Operator.h
 include/llvm/Pass.h
@@ -272,7 +541,6 @@ include/llvm/PassAnalysisSupport.h
 include/llvm/PassManager.h
 include/llvm/PassManagers.h
 include/llvm/PassSupport.h
-include/llvm/Support/AIXDataTypesFix.h
 include/llvm/Support/AlignOf.h
 include/llvm/Support/Allocator.h
 include/llvm/Support/CFG.h
@@ -284,8 +552,6 @@ include/llvm/Support/ConstantFolder.h
 include/llvm/Support/ConstantRange.h
 include/llvm/Support/DOTGraphTraits.h
 include/llvm/Support/DataFlow.h
-include/llvm/Support/DataTypes.h
-include/llvm/Support/DataTypes.h.cmake
 include/llvm/Support/Debug.h
 include/llvm/Support/DebugLoc.h
 include/llvm/Support/Dwarf.h
@@ -298,11 +564,12 @@ include/llvm/Support/FormattedStream.h
 include/llvm/Support/GetElementPtrTypeIterator.h
 include/llvm/Support/GraphWriter.h
 include/llvm/Support/IRBuilder.h
+include/llvm/Support/IRReader.h
 include/llvm/Support/InstIterator.h
 include/llvm/Support/InstVisitor.h
 include/llvm/Support/LeakDetector.h
+include/llvm/Support/MachO.h
 include/llvm/Support/ManagedStatic.h
-include/llvm/Support/Mangler.h
 include/llvm/Support/MathExtras.h
 include/llvm/Support/MemoryBuffer.h
 include/llvm/Support/MemoryObject.h
@@ -317,24 +584,30 @@ include/llvm/Support/PredIteratorCache.h
 include/llvm/Support/PrettyStackTrace.h
 include/llvm/Support/Recycler.h
 include/llvm/Support/RecyclingAllocator.h
+include/llvm/Support/Regex.h
 include/llvm/Support/Registry.h
 include/llvm/Support/RegistryParser.h
+include/llvm/Support/SMLoc.h
 include/llvm/Support/SlowOperationInformer.h
 include/llvm/Support/SourceMgr.h
 include/llvm/Support/StableBasicBlockNumbering.h
 include/llvm/Support/StandardPasses.h
-include/llvm/Support/Streams.h
 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/circular_raw_ostream.h
+include/llvm/Support/raw_os_ostream.h
 include/llvm/Support/raw_ostream.h
 include/llvm/Support/type_traits.h
 include/llvm/SymbolTableListTraits.h
+include/llvm/System/AIXDataTypesFix.h
 include/llvm/System/Alarm.h
 include/llvm/System/Atomic.h
+include/llvm/System/DataTypes.h
+include/llvm/System/DataTypes.h.cmake
 include/llvm/System/Disassembler.h
 include/llvm/System/DynamicLibrary.h
 include/llvm/System/Errno.h
@@ -352,11 +625,11 @@ include/llvm/System/Solaris.h
 include/llvm/System/ThreadLocal.h
 include/llvm/System/Threading.h
 include/llvm/System/TimeValue.h
-include/llvm/Target/COFFTargetAsmInfo.h
-include/llvm/Target/DarwinTargetAsmInfo.h
+include/llvm/Target/Mangler.h
 include/llvm/Target/SubtargetFeature.h
 include/llvm/Target/Target.td
-include/llvm/Target/TargetAsmInfo.h
+include/llvm/Target/TargetAsmBackend.h
+include/llvm/Target/TargetAsmLexer.h
 include/llvm/Target/TargetAsmParser.h
 include/llvm/Target/TargetCallingConv.td
 include/llvm/Target/TargetData.h
@@ -369,8 +642,8 @@ include/llvm/Target/TargetIntrinsicInfo.h
 include/llvm/Target/TargetJITInfo.h
 include/llvm/Target/TargetLowering.h
 include/llvm/Target/TargetLoweringObjectFile.h
-include/llvm/Target/TargetMachOWriterInfo.h
 include/llvm/Target/TargetMachine.h
+include/llvm/Target/TargetOpcodes.h
 include/llvm/Target/TargetOptions.h
 include/llvm/Target/TargetRegisterInfo.h
 include/llvm/Target/TargetRegistry.h
@@ -386,11 +659,12 @@ include/llvm/Transforms/Scalar.h
 include/llvm/Transforms/Utils/AddrModeMatcher.h
 include/llvm/Transforms/Utils/BasicBlockUtils.h
 include/llvm/Transforms/Utils/BasicInliner.h
+include/llvm/Transforms/Utils/BuildLibCalls.h
 include/llvm/Transforms/Utils/Cloning.h
 include/llvm/Transforms/Utils/FunctionUtils.h
-include/llvm/Transforms/Utils/InlineCost.h
 include/llvm/Transforms/Utils/Local.h
 include/llvm/Transforms/Utils/PromoteMemToReg.h
+include/llvm/Transforms/Utils/SSAUpdater.h
 include/llvm/Transforms/Utils/SSI.h
 include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
 include/llvm/Transforms/Utils/UnrollLoop.h
@@ -401,21 +675,26 @@ include/llvm/Use.h
 include/llvm/User.h
 include/llvm/Value.h
 include/llvm/ValueSymbolTable.h
-lib/clang/1.0/include/emmintrin.h
-lib/clang/1.0/include/float.h
-lib/clang/1.0/include/iso646.h
-lib/clang/1.0/include/limits.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/stdarg.h
-lib/clang/1.0/include/stdbool.h
-lib/clang/1.0/include/stddef.h
-lib/clang/1.0/include/stdint.h
-lib/clang/1.0/include/tgmath.h
-lib/clang/1.0/include/tmmintrin.h
-lib/clang/1.0/include/xmmintrin.h
+lib/clang/1.1/include/emmintrin.h
+lib/clang/1.1/include/float.h
+lib/clang/1.1/include/iso646.h
+lib/clang/1.1/include/limits.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/stdarg.h
+lib/clang/1.1/include/stdbool.h
+lib/clang/1.1/include/stddef.h
+lib/clang/1.1/include/stdint.h
+lib/clang/1.1/include/tgmath.h
+lib/clang/1.1/include/tmmintrin.h
+lib/clang/1.1/include/xmmintrin.h
+lib/libCIndex.a
+lib/libCIndex.so
 lib/libCompilerDriver.a
+lib/libEnhancedDisassembly.a
+lib/libEnhancedDisassembly.so
 lib/libLLVMAnalysis.a
 lib/libLLVMArchive.a
 lib/libLLVMAsmParser.a
@@ -424,14 +703,15 @@ lib/libLLVMBitReader.a
 lib/libLLVMBitWriter.a
 lib/libLLVMCodeGen.a
 lib/libLLVMCore.a
-lib/libLLVMDebugger.a
 lib/libLLVMExecutionEngine.a
 lib/libLLVMHello.so
+lib/libLLVMInstCombine.a
 lib/libLLVMInstrumentation.a
 lib/libLLVMInterpreter.a
 lib/libLLVMJIT.a
 lib/libLLVMLinker.a
 lib/libLLVMMC.a
+lib/libLLVMMCParser.a
 lib/libLLVMScalarOpts.a
 lib/libLLVMSelectionDAG.a
 lib/libLLVMSupport.a
@@ -441,24 +721,37 @@ lib/libLLVMTransformUtils.a
 lib/libLLVMX86AsmParser.a
 lib/libLLVMX86AsmPrinter.a
 lib/libLLVMX86CodeGen.a
+lib/libLLVMX86Disassembler.a
 lib/libLLVMX86Info.a
 lib/libLLVMipa.a
 lib/libLLVMipo.a
 lib/libLTO.a
 lib/libLTO.so
+lib/libUnitTestMain.a
+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
 lib/libplugin_llvmc_Base.a
 lib/libplugin_llvmc_Clang.a
 lib/libprofile_rt.so
-libexec/clang-cc
 man/man1/bugpoint.1
 man/man1/clang.1
+man/man1/lit.1
 man/man1/llc.1
 man/man1/lli.1
 man/man1/llvm-ar.1
 man/man1/llvm-as.1
 man/man1/llvm-bcanalyzer.1
 man/man1/llvm-config.1
-man/man1/llvm-db.1
 man/man1/llvm-dis.1
 man/man1/llvm-extract.1
 man/man1/llvm-ld.1
@@ -483,13 +776,13 @@ share/doc/llvm/html/CodingStandards.html
 share/doc/llvm/html/CommandGuide/FileCheck.html
 share/doc/llvm/html/CommandGuide/bugpoint.html
 share/doc/llvm/html/CommandGuide/index.html
+share/doc/llvm/html/CommandGuide/lit.html
 share/doc/llvm/html/CommandGuide/llc.html
 share/doc/llvm/html/CommandGuide/lli.html
 share/doc/llvm/html/CommandGuide/llvm-ar.html
 share/doc/llvm/html/CommandGuide/llvm-as.html
 share/doc/llvm/html/CommandGuide/llvm-bcanalyzer.html
 share/doc/llvm/html/CommandGuide/llvm-config.html
-share/doc/llvm/html/CommandGuide/llvm-db.html
 share/doc/llvm/html/CommandGuide/llvm-dis.html
 share/doc/llvm/html/CommandGuide/llvm-extract.html
 share/doc/llvm/html/CommandGuide/llvm-ld.html
@@ -507,6 +800,7 @@ share/doc/llvm/html/CommandLine.html
 share/doc/llvm/html/CompilerDriver.html
 share/doc/llvm/html/CompilerDriverTutorial.html
 share/doc/llvm/html/CompilerWriterInfo.html
+share/doc/llvm/html/DebuggingJITedCode.html
 share/doc/llvm/html/DeveloperPolicy.html
 share/doc/llvm/html/DriverInternals.html
 share/doc/llvm/html/ExceptionHandling.html
@@ -528,12 +822,11 @@ share/doc/llvm/html/LinkTimeOptimization.html
 share/doc/llvm/html/MakefileGuide.html
 share/doc/llvm/html/PCHInternals.html
 share/doc/llvm/html/PTHInternals.html
+share/doc/llvm/html/Packaging.html
 share/doc/llvm/html/Passes.html
 share/doc/llvm/html/ProgrammersManual.html
 share/doc/llvm/html/Projects.html
-share/doc/llvm/html/ReleaseNotes-${PKGVERSION}.html
 share/doc/llvm/html/ReleaseNotes.html
-share/doc/llvm/html/ReleaseNotes-2.6.html
 share/doc/llvm/html/SourceLevelDebugging.html
 share/doc/llvm/html/SystemLibrary.html
 share/doc/llvm/html/TableGenFundamentals.html
@@ -553,8 +846,6 @@ share/doc/llvm/html/img/venusflytrap.jpg
 share/doc/llvm/html/index.html
 share/doc/llvm/html/libIndex.html
 share/doc/llvm/html/llvm.css
-share/doc/llvm/html/tutorial/JITTutorial1.html
-share/doc/llvm/html/tutorial/JITTutorial2.html
 share/doc/llvm/html/tutorial/LangImpl1.html
 share/doc/llvm/html/tutorial/LangImpl2.html
 share/doc/llvm/html/tutorial/LangImpl3.html
@@ -574,13 +865,13 @@ share/doc/llvm/html/tutorial/index.html
 share/doc/llvm/ps/FileCheck.ps
 share/doc/llvm/ps/bugpoint.ps
 share/doc/llvm/ps/clang.ps
+share/doc/llvm/ps/lit.ps
 share/doc/llvm/ps/llc.ps
 share/doc/llvm/ps/lli.ps
 share/doc/llvm/ps/llvm-ar.ps
 share/doc/llvm/ps/llvm-as.ps
 share/doc/llvm/ps/llvm-bcanalyzer.ps
 share/doc/llvm/ps/llvm-config.ps
-share/doc/llvm/ps/llvm-db.ps
 share/doc/llvm/ps/llvm-dis.ps
 share/doc/llvm/ps/llvm-extract.ps
 share/doc/llvm/ps/llvm-ld.ps
diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index bc4b9363c61..8a801459b2f 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.2 2009/11/25 12:32:30 hasso Exp $
+$NetBSD: distinfo,v 1.3 2010/04/27 15:12:08 drochner Exp $
 
-SHA1 (clang-2.6.tar.gz) = 188f29ad3b2c64fcdc791aa34b323ed06452d7ae
-RMD160 (clang-2.6.tar.gz) = b7e44abbf28902ff8e3fd4578a5ff9dd34f40817
-Size (clang-2.6.tar.gz) = 3857138 bytes
-SHA1 (llvm-2.6.tar.gz) = 547471147cbf6d3e49539e01196ffada2c79c250
-RMD160 (llvm-2.6.tar.gz) = 24d58cb052ab5879aae59eaf4885ec41186ee22a
-Size (llvm-2.6.tar.gz) = 7790380 bytes
-SHA1 (patch-aa) = 173c470dbeab1912d29e97e9d91ec1581ed625b1
-SHA1 (patch-ac) = 08bf497cae798e65100fde06e294b4b31eedbec3
-SHA1 (patch-ad) = b7f4da294510666063b655540991f51c9044d618
-SHA1 (patch-ae) = 61b4d1c103ba3a3332ef748998c2a8930028d780
+SHA1 (clang-2.7.tgz) = 4d8326bfe2308a7355a5e4ca2eb172bffd761e1e
+RMD160 (clang-2.7.tgz) = 177fdcf59be4a60c37cf0dfb058535c9cdbbad4e
+Size (clang-2.7.tgz) = 4953739 bytes
+SHA1 (llvm-2.7.tgz) = 059fc21b0ec1b649c4a3dec81756e5f92aa131a2
+RMD160 (llvm-2.7.tgz) = 0fa2f362dd6a45efec35ce8fa0f8d36d98f32c8f
+Size (llvm-2.7.tgz) = 8374297 bytes
+SHA1 (patch-ac) = 3b8b72035d391456c58ffb787284b1fb873b6732
+SHA1 (patch-ad) = b90fa4fa75ef1f7c8cb9475798bf7f8e53e6baa9
+SHA1 (patch-ae) = 7ace4a3835f5998fbd9582f531237977dc948849
diff --git a/lang/clang/patches/patch-aa b/lang/clang/patches/patch-aa
deleted file mode 100644
index d7395e782d6..00000000000
--- a/lang/clang/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/11/25 12:32:30 hasso Exp $
-
---- tools/clang/lib/Driver/Tools.cpp.orig	2009-11-25 12:21:45 +0200
-+++ tools/clang/lib/Driver/Tools.cpp	2009-11-25 12:22:09 +0200
-@@ -2326,7 +2326,7 @@ void dragonfly::Link::ConstructJob(Compi
- 
- 
-     if (Args.hasArg(options::OPT_pthread))
--      CmdArgs.push_back("-lthread_xu");
-+      CmdArgs.push_back("-lpthread");
- 
-     if (!Args.hasArg(options::OPT_nolibc)) {
-       CmdArgs.push_back("-lc");
diff --git a/lang/clang/patches/patch-ac b/lang/clang/patches/patch-ac
index 5c4255d1b5a..b9eee23d0b1 100644
--- a/lang/clang/patches/patch-ac
+++ b/lang/clang/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/11/16 23:24:37 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2010/04/27 15:12:09 drochner Exp $
 
---- Makefile.rules.orig	2009-09-30 15:03:21.000000000 +0200
+--- Makefile.rules.orig	2010-04-25 19:18:33.000000000 +0000
 +++ Makefile.rules
-@@ -549,11 +549,11 @@ ifdef LOADABLE_MODULE
+@@ -589,11 +589,11 @@ ifdef LOADABLE_MODULE
    LD.Flags += -module
  endif
  
@@ -19,36 +19,36 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/11/16 23:24:37 drochner Exp $
  
  ifdef TOOL_VERBOSE
    C.Flags += -v
-@@ -583,9 +583,9 @@ ifneq ($(HOST_OS),Darwin)
- ifneq ($(DARWIN_MAJVERS),4)
+@@ -624,9 +624,9 @@ ifneq ($(DARWIN_MAJVERS),4)
  ifdef TOOLNAME
- ifdef EXAMPLE_TOOL
--  LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(RDYNAMIC)
-+  LD.Flags += $(RDYNAMIC)
- else
--  LD.Flags += $(RPATH) -Wl,$(ToolDir) $(RDYNAMIC)
-+  LD.Flags += $(RDYNAMIC)
- endif
+   LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
+   ifdef EXAMPLE_TOOL
+-    LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(RDYNAMIC)
++    LD.Flags += $(RDYNAMIC)
+   else
+-    LD.Flags += $(RPATH) -Wl,$(ToolDir) $(RDYNAMIC)
++    LD.Flags += $(RDYNAMIC)
+   endif
  endif
  endif
-@@ -735,9 +735,6 @@ ObjectsBC := $(BaseNameSources:%=$(ObjDi
+@@ -780,9 +780,6 @@ ObjectsBC := $(BaseNameSources:%=$(ObjDi
  # in the file so they get built before dependencies
  #---------------------------------------------------------
  
--$(PROJ_bindir) $(PROJ_libdir) $(PROJ_includedir) $(PROJ_etcdir)::
+-$(DESTDIR)$(PROJ_bindir) $(DESTDIR)$(PROJ_libdir) $(DESTDIR)$(PROJ_includedir) $(DESTDIR)$(PROJ_etcdir)::
 -	$(Verb) $(MKDIR) $@
 -
  # To create other directories, as needed, and timestamp their creation
  %/.dir:
  	$(Verb) $(MKDIR) $* > /dev/null
-@@ -858,7 +855,9 @@ install-local::
+@@ -903,7 +900,9 @@ install-local::
  uninstall-local::
  	$(Echo) UnInstall circumvented with NO_INSTALL
  else
--install-local:: $(PROJ_etcdir) $(CONFIG_FILES)
+-install-local:: $(DESTDIR)$(PROJ_etcdir) $(CONFIG_FILES)
 +PROJ_etcdir=${PREFIX}/share/examples/llvm
 +install-local:: $(CONFIG_FILES)
 +	$(MKDIR) ${PROJ_etcdir}
- 	$(Echo) Installing Configuration Files To $(PROJ_etcdir)
+ 	$(Echo) Installing Configuration Files To $(DESTDIR)$(PROJ_etcdir)
  	$(Verb)for file in $(CONFIG_FILES); do \
            if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
diff --git a/lang/clang/patches/patch-ad b/lang/clang/patches/patch-ad
index 67f1586e224..1fe9badc731 100644
--- a/lang/clang/patches/patch-ad
+++ b/lang/clang/patches/patch-ad
@@ -1,18 +1,18 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/11/16 23:24:37 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2010/04/27 15:12:09 drochner Exp $
 
---- Makefile.config.in.orig	2007-07-03 23:04:11.000000000 +0000
+--- Makefile.config.in.orig	2010-03-19 14:56:04.000000000 +0000
 +++ Makefile.config.in
 @@ -79,11 +79,11 @@ LLVMMAKE := $(LLVM_SRC_ROOT)/make
- PROJ_bindir     := $(DESTDIR)$(PROJ_prefix)/bin
- PROJ_libdir     := $(DESTDIR)$(PROJ_prefix)/lib
- PROJ_datadir    := $(DESTDIR)$(PROJ_prefix)/share
--PROJ_docsdir    := $(DESTDIR)$(PROJ_prefix)/docs/llvm
-+PROJ_docsdir    := $(DESTDIR)$(PROJ_prefix)/share/doc/llvm
- PROJ_etcdir     := $(DESTDIR)$(PROJ_prefix)/etc/llvm
- PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
- PROJ_infodir    := $(DESTDIR)$(PROJ_prefix)/info
--PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/share/man
-+PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/man
+ PROJ_bindir     := $(PROJ_prefix)/bin
+ PROJ_libdir     := $(PROJ_prefix)/lib
+ PROJ_datadir    := $(PROJ_prefix)/share
+-PROJ_docsdir    := $(PROJ_prefix)/docs/llvm
++PROJ_docsdir    := $(PROJ_prefix)/share/doc/llvm
+ PROJ_etcdir     := $(PROJ_prefix)/etc/llvm
+ PROJ_includedir := $(PROJ_prefix)/include
+ PROJ_infodir    := $(PROJ_prefix)/info
+-PROJ_mandir     := $(PROJ_prefix)/share/man
++PROJ_mandir     := $(PROJ_prefix)/man
  
  # Determine if we're on a unix type operating system
  LLVM_ON_UNIX:=@LLVM_ON_UNIX@
diff --git a/lang/clang/patches/patch-ae b/lang/clang/patches/patch-ae
index 11c73542e8f..39ae264b7d5 100644
--- a/lang/clang/patches/patch-ae
+++ b/lang/clang/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/11/16 23:24:37 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2010/04/27 15:12:09 drochner Exp $
 
---- lib/System/Unix/Path.inc.orig	2009-08-05 22:16:55.000000000 +0200
+--- lib/System/Unix/Path.inc.orig	2009-12-09 15:56:52.000000000 +0100
 +++ lib/System/Unix/Path.inc
-@@ -279,7 +279,7 @@ Path::GetCurrentDirectory() {
+@@ -283,7 +283,7 @@ Path::GetCurrentDirectory() {
    return Path(pathname);
  }
  
@@ -11,12 +11,12 @@ $NetBSD: patch-ae,v 1.1.1.1 2009/11/16 23:24:37 drochner Exp $
  static int
  test_dir(char buf[PATH_MAX], char ret[PATH_MAX],
      const char *dir, const char *bin)
-@@ -336,7 +336,7 @@ getprogpath(char ret[PATH_MAX], const ch
- /// GetMainExecutable - Return the path to the main executable, given the
- /// value of argv[0] from program startup.
- Path Path::GetMainExecutable(const char *argv0, void *MainAddr) {
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
+@@ -351,7 +351,7 @@ Path Path::GetMainExecutable(const char 
+     if (realpath(exe_path, link_path))
+       return Path(std::string(link_path));
+   }
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
    char exe_path[PATH_MAX];
  
    if (getprogpath(exe_path, argv0) != NULL)