Upgrade Clang and LLVM 3.3 ports to the release version.

4 files changed, 26 insertions, 18 deletions

diff --git a/lang/clang33/Makefile b/lang/clang33/Makefile
index 84569f32220b..b99ff6485278 100644
--- a/lang/clang33/Makefile
+++ b/lang/clang33/Makefile
@@ -1,21 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	clang
-DISTVERSION=	3.3rc3
-PORTREVISION=	2
+DISTVERSION=	3.3
 CATEGORIES=	lang devel
-MASTER_SITES=	http://llvm.org/pre-releases/3.3/rc3/
-DISTNAME=	cfe-source-${DISTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
+DISTNAME=	${CLANG_NAME}
+DISTFILES=	${CLANG_SOURCE} \
 		${LLVM_SOURCE}
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler
 
-CLANG_NAME=	cfe.src
-CLANG_SOURCE=	${DISTNAME}${EXTRACT_SUFX}
-LLVM_NAME=	llvm.src
-LLVM_SOURCE=	llvm-source-${DISTVERSION}${EXTRACT_SUFX}
+CLANG_NAME=	cfe-${PORTVERSION}.src
+CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
+LLVM_NAME=	llvm-${PORTVERSION}.src
+LLVM_SOURCE=	${LLVM_NAME}${EXTRACT_SUFX}
 
 WRKSRC=		${WRKDIR}/${LLVM_NAME}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
@@ -24,7 +23,7 @@ INSTALL_WRKSRC=	${WRKSRC}/tools/clang
 BUILD_DEPENDS+=	llc${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
 RUN_DEPENDS+=	llc${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
 
-LLVM_SUFFIX=	33
+LLVM_SUFFIX=	${PORTVERSION:S/.//g}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
diff --git a/lang/clang33/distinfo b/lang/clang33/distinfo
index 51ca1b46e127..bca04e73140a 100644
--- a/lang/clang33/distinfo
+++ b/lang/clang33/distinfo
@@ -1,4 +1,4 @@
-SHA256 (cfe-source-3.3rc3.tar.gz) = db2b5bdaa3a21632cd0c8fbf59c9cbe0c4688bcb444677bd75c5c8f62f372c6f
-SIZE (cfe-source-3.3rc3.tar.gz) = 9423822
-SHA256 (llvm-source-3.3rc3.tar.gz) = 22202303fc2ff667bd2ed1777f46985aed87a266efcc5d438451c25ec50e743b
-SIZE (llvm-source-3.3rc3.tar.gz) = 13644242
+SHA256 (cfe-3.3.src.tar.gz) = b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996
+SIZE (cfe-3.3.src.tar.gz) = 9425539
+SHA256 (llvm-3.3.src.tar.gz) = 68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578
+SIZE (llvm-3.3.src.tar.gz) = 13602421
diff --git a/lang/clang33/files/patch-tools_clang_docs_Makefile b/lang/clang33/files/patch-tools_clang_docs_Makefile
new file mode 100644
index 000000000000..e11bb5957797
--- /dev/null
+++ b/lang/clang33/files/patch-tools_clang_docs_Makefile
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- tools/clang/docs/Makefile.orig
++++ tools/clang/docs/Makefile
+@@ -8,7 +8,6 @@
+ ##===----------------------------------------------------------------------===##
+ 
+ CLANG_LEVEL := ..
+-DIRS       := tools
+ 
+ ifdef BUILD_FOR_WEBSITE
+ PROJ_OBJ_DIR = .
diff --git a/lang/clang33/pkg-plist b/lang/clang33/pkg-plist
index c22f9b542428..24ad14e2a41f 100644
--- a/lang/clang33/pkg-plist
+++ b/lang/clang33/pkg-plist
@@ -463,11 +463,8 @@ llvm33/lib/libclangStaticAnalyzerCheckers.a
 llvm33/lib/libclangStaticAnalyzerCore.a
 llvm33/lib/libclangStaticAnalyzerFrontend.a
 llvm33/lib/libclangTooling.a
-%%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
-%%PORTDOCS%%%%DOCSDIR%%/html/LibASTMatchersReference.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/ps/clang.ps
 @dirrm llvm33/lib/clang/3.3/include
 @dirrm llvm33/lib/clang/3.3
@@ -506,7 +503,6 @@ llvm33/lib/libclangTooling.a
 @dirrm llvm33/include/clang-c
 @dirrm llvm33/include/clang
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/clang
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%