Upgrade LLVM and Clang to r116582 and bump the overall version to 2.9

since 2.8 has shipped.

Split out the clang portion of devel/llvm-devel into lang/clang-devel.

4 files changed, 71 insertions, 52 deletions

diff --git a/lang/Makefile b/lang/Makefile
index 19d2f65fef53..9055e51e42b1 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -30,6 +30,7 @@
     SUBDIR += cim
     SUBDIR += cint
     SUBDIR += clang
+    SUBDIR += clang-devel
     SUBDIR += clips
     SUBDIR += clisp
     SUBDIR += clojure
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 8c7bcf22c614..714ad322cfdd 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	clang
-PORTVERSION=	2.8
-PORTREVISION=	2
-CATEGORIES=	devel lang
-MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
-EXTRACT_SUFX=	.tgz
+PORTVERSION=	2.9.r${SVN_REV}
+CATEGORIES=	lang devel
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	brooks
+PKGNAMESUFFIX=	-devel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${LLVM_SOURCE}
 EXTRACT_ONLY=	${LLVM_SOURCE}
@@ -18,7 +18,7 @@ EXTRACT_ONLY=	${LLVM_SOURCE}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and (alpha-quality) C++ compiler
 
-CONFLICTS=	clang-devel-2.[0-9]* llvm-devel-2.[0-9]*
+CONFLICTS=	clang-2.[0-9]* llvm-2.[0-9]*
 
 CLANG_NAME=	clang-${PORTVERSION}
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
@@ -29,8 +29,8 @@ WRKSRC=		${WRKDIR}/${LLVM_NAME}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
 INSTALL_WRKSRC=	${WRKSRC}/tools/clang
 
-BUILD_DEPENDS+=	llvm>=${PORTVERSION}:${PORTSDIR}/devel/llvm
-RUN_DEPENDS+=	llvm>=${PORTVERSION}:${PORTSDIR}/devel/llvm
+BUILD_DEPENDS+=	llvm-devel>=${PORTVERSION}:${PORTSDIR}/devel/llvm-devel
+RUN_DEPENDS+=	llvm-devel>=${PORTVERSION}:${PORTSDIR}/devel/llvm-devel
 .if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
@@ -39,6 +39,7 @@ BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 .endif
 
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_GCC=	4.2+
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
@@ -66,10 +67,26 @@ MAN1=		clang.1
 
 .include <bsd.port.pre.mk>
 
+.include "${.CURDIR}/../../devel/llvm-devel/Makefile.svn_rev"
+
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
 
+.if defined(BOOTSTRAP) || defined(SVN_FETCH)
+FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
+
+do-fetch:
+	${MKDIR} ${WRKDIR}
+	svn export -r ${SVN_REV} \
+	    http://llvm.org/svn/llvm-project/cfe/trunk ${WRKDIR}/${CLANG_NAME}
+	cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
+.if ${USER} == brooks
+	scp ${DISTDIR}/${DISTNAME}.tar.bz2 \
+	    freefall.freebsd.org:public_distfiles/
+.endif
+.endif
+
 post-extract:
 	cd ${WRKSRC}/tools && \
 	    tar xf ${DISTDIR}/${CLANG_SOURCE} && \
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index cc5227dab937..bcf24873dc50 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (clang-2.8.tgz) = 10e14c901fc3728eecbd5b829e011b59
-SHA256 (clang-2.8.tgz) = ed83481553e6a39a8a2953e89630d881d87833506f096a90f18d93ec2bdee0c1
-SIZE (clang-2.8.tgz) = 5666777
-MD5 (llvm-2.8.tgz) = 220d361b4d17051ff4bb21c64abe05ba
-SHA256 (llvm-2.8.tgz) = 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
-SIZE (llvm-2.8.tgz) = 9112527
+MD5 (clang-2.9.r116582.tar.bz2) = f4dc890fc18a86ff6043bcd5233ff66c
+SHA256 (clang-2.9.r116582.tar.bz2) = 94c76107ff56d3797c44c82c858d32c6c237e06b5ba70f164f5fbf29b419c6d1
+SIZE (clang-2.9.r116582.tar.bz2) = 4767581
+MD5 (llvm-2.9.r116582.tar.bz2) = 3ad4886e027b77cf5ea438e54d99aa2e
+SHA256 (llvm-2.9.r116582.tar.bz2) = ad5e66fcb06d5d7ce0ca77bf7a72a77e6d6bde44cf26fa5a4573decec3246c12
+SIZE (llvm-2.9.r116582.tar.bz2) = 7023799
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index dfc49ae6dd9e..94c977a2b1e3 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -32,6 +32,7 @@ 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
@@ -44,10 +45,10 @@ include/clang/AST/PrettyPrinter.h
 include/clang/AST/RecordLayout.h
 include/clang/AST/RecursiveASTVisitor.h
 include/clang/AST/Redeclarable.h
-include/clang/AST/Release/AttrImpl.inc.tmp
-include/clang/AST/Release/Attrs.inc.tmp
-include/clang/AST/Release/DeclNodes.inc.tmp
-include/clang/AST/Release/StmtNodes.inc.tmp
+include/clang/AST/Release+Asserts/AttrImpl.inc.tmp
+include/clang/AST/Release+Asserts/Attrs.inc.tmp
+include/clang/AST/Release+Asserts/DeclNodes.inc.tmp
+include/clang/AST/Release+Asserts/StmtNodes.inc.tmp
 include/clang/AST/Stmt.h
 include/clang/AST/StmtCXX.h
 include/clang/AST/StmtGraphTraits.h
@@ -113,18 +114,18 @@ include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
 include/clang/Basic/PartialDiagnostic.h
 include/clang/Basic/PrettyStackTrace.h
-include/clang/Basic/Release/AttrList.inc.tmp
-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/Release/Version.inc.tmp
-include/clang/Basic/Release/arm_neon.inc.tmp
+include/clang/Basic/Release+Asserts/AttrList.inc.tmp
+include/clang/Basic/Release+Asserts/DiagnosticASTKinds.inc.tmp
+include/clang/Basic/Release+Asserts/DiagnosticAnalysisKinds.inc.tmp
+include/clang/Basic/Release+Asserts/DiagnosticCommonKinds.inc.tmp
+include/clang/Basic/Release+Asserts/DiagnosticDriverKinds.inc.tmp
+include/clang/Basic/Release+Asserts/DiagnosticFrontendKinds.inc.tmp
+include/clang/Basic/Release+Asserts/DiagnosticGroups.inc.tmp
+include/clang/Basic/Release+Asserts/DiagnosticLexKinds.inc.tmp
+include/clang/Basic/Release+Asserts/DiagnosticParseKinds.inc.tmp
+include/clang/Basic/Release+Asserts/DiagnosticSemaKinds.inc.tmp
+include/clang/Basic/Release+Asserts/Version.inc.tmp
+include/clang/Basic/Release+Asserts/arm_neon.inc.tmp
 include/clang/Basic/SourceLocation.h
 include/clang/Basic/SourceManager.h
 include/clang/Basic/SourceManagerInternals.h
@@ -197,9 +198,9 @@ include/clang/Driver/Option.h
 include/clang/Driver/Options.h
 include/clang/Driver/Options.inc
 include/clang/Driver/Phases.h
-include/clang/Driver/Release/CC1AsOptions.inc.tmp
-include/clang/Driver/Release/CC1Options.inc.tmp
-include/clang/Driver/Release/Options.inc.tmp
+include/clang/Driver/Release+Asserts/CC1AsOptions.inc.tmp
+include/clang/Driver/Release+Asserts/CC1Options.inc.tmp
+include/clang/Driver/Release+Asserts/Options.inc.tmp
 include/clang/Driver/Tool.h
 include/clang/Driver/ToolChain.h
 include/clang/Driver/Types.def
@@ -313,19 +314,19 @@ include/clang/Serialization/ASTReader.h
 include/clang/Serialization/ASTWriter.h
 include/clang/Serialization/AttrPCHRead.inc
 include/clang/Serialization/AttrPCHWrite.inc
-include/clang/Serialization/Release/AttrPCHRead.inc.tmp
-include/clang/Serialization/Release/AttrPCHWrite.inc.tmp
-lib/clang/2.8/include/arm_neon.h
-lib/clang/2.8/include/emmintrin.h
-lib/clang/2.8/include/immintrin.h
-lib/clang/2.8/include/mm_malloc.h
-lib/clang/2.8/include/mmintrin.h
-lib/clang/2.8/include/nmmintrin.h
-lib/clang/2.8/include/pmmintrin.h
-lib/clang/2.8/include/smmintrin.h
-lib/clang/2.8/include/tmmintrin.h
-lib/clang/2.8/include/wmmintrin.h
-lib/clang/2.8/include/xmmintrin.h
+include/clang/Serialization/Release+Asserts/AttrPCHRead.inc.tmp
+include/clang/Serialization/Release+Asserts/AttrPCHWrite.inc.tmp
+lib/clang/2.9/include/arm_neon.h
+lib/clang/2.9/include/emmintrin.h
+lib/clang/2.9/include/immintrin.h
+lib/clang/2.9/include/mm_malloc.h
+lib/clang/2.9/include/mmintrin.h
+lib/clang/2.9/include/nmmintrin.h
+lib/clang/2.9/include/pmmintrin.h
+lib/clang/2.9/include/smmintrin.h
+lib/clang/2.9/include/tmmintrin.h
+lib/clang/2.9/include/wmmintrin.h
+lib/clang/2.9/include/xmmintrin.h
 lib/libclang.a
 lib/libclang.so
 lib/libclangAST.a
@@ -364,10 +365,10 @@ lib/libclangSerialization.a
 %%PYTHON_SITELIBDIR%%/Resources/bugcatcher.ico
 %%PYTHON_SITELIBDIR%%/ScanView.py
 %%PYTHON_SITELIBDIR%%/startfile.py
-@dirrm lib/clang/2.8/include
-@dirrm lib/clang/2.8
+@dirrm lib/clang/2.9/include
+@dirrm lib/clang/2.9
 @dirrm lib/clang
-@dirrm include/clang/Serialization/Release
+@dirrm include/clang/Serialization/Release+Asserts
 @dirrm include/clang/Serialization
 @dirrm include/clang/Sema
 @dirrm include/clang/Rewrite
@@ -376,7 +377,7 @@ lib/libclangSerialization.a
 @dirrm include/clang/Index
 @dirrm include/clang/FrontendTool
 @dirrm include/clang/Frontend
-@dirrm include/clang/Driver/Release
+@dirrm include/clang/Driver/Release+Asserts
 @dirrm include/clang/Driver
 @dirrm include/clang/CodeGen
 @dirrm include/clang/Checker/PathSensitive
@@ -384,14 +385,14 @@ lib/libclangSerialization.a
 @dirrm include/clang/Checker/Checkers
 @dirrm include/clang/Checker/BugReporter
 @dirrm include/clang/Checker
-@dirrm include/clang/Basic/Release
+@dirrm include/clang/Basic/Release+Asserts
 @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/Release
+@dirrm include/clang/AST/Release+Asserts
 @dirrm include/clang/AST
 @dirrm include/clang-c
 @dirrm include/clang