5 files changed, 23 insertions, 23 deletions

diff --git a/devel/llvm35/Makefile b/devel/llvm35/Makefile
index 13f41250d69a..e756923e8a81 100644
--- a/devel/llvm35/Makefile
+++ b/devel/llvm35/Makefile
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	3.5rc1
+DISTVERSION=	3.5.0rc2
 CATEGORIES=	devel lang
-MASTER_SITES=	http://llvm.org/pre-releases/3.5/rc1/
-DISTNAME=	${PORTNAME}.src-${DISTVERSION}.src
-#http://llvm.org/pre-releases/3.5/rc1/llvm.src-3.5rc1.src.tar.gz
+MASTER_SITES=	http://llvm.org/pre-releases/3.5/rc2/
+#http://llvm.org/pre-releases/3.5/rc2/llvm-3.5.0rc2.src.tar.xz
+DISTNAME=	${PORTNAME}-${DISTVERSION}.src
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Low Level Virtual Machine
 
-LLVM_SUFFIX=	${PORTVERSION:S/.//g:C/r.//}
+LLVM_SUFFIX=	${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
@@ -19,7 +19,7 @@ UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
 WRKSRC=		${WRKDIR}/llvm.src
 
-USES=		compiler:c++11-lib execinfo gmake perl5
+USES=		compiler:c++11-lib execinfo gmake perl5 tar:xz
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
@@ -30,7 +30,7 @@ SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
 # Suggested tweaks from http://llvm.org/docs/Packaging.html
 CONFIGURE_ARGS+=	--enable-shared
 MAKE_ARGS+=		REQUIRES_RTTI=1
-LIBNAME=		libLLVM-3.5.0svn.so
+LIBNAME=		libLLVM-3.5.so
 
 CONFIGURE_ARGS+=	--enable-bindings=none
 CONFIGURE_ARGS+=	--enable-optimized
diff --git a/devel/llvm35/distinfo b/devel/llvm35/distinfo
index cf665f9ff77b..66d49199129f 100644
--- a/devel/llvm35/distinfo
+++ b/devel/llvm35/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvm.src-3.5rc1.src.tar.gz) = 841929809647700f7629f0d567af7a8b45fb82f11d25239c8602db0badf8adb8
-SIZE (llvm.src-3.5rc1.src.tar.gz) = 17623122
+SHA256 (llvm-3.5.0rc2.src.tar.xz) = 962130e3c1916e5a393675276af709d61a34d272c62d655baa9d966d0b87adde
+SIZE (llvm-3.5.0rc2.src.tar.xz) = 11770380
diff --git a/devel/llvm35/pkg-plist b/devel/llvm35/pkg-plist
index b79af043b513..8288755ac021 100644
--- a/devel/llvm35/pkg-plist
+++ b/devel/llvm35/pkg-plist
@@ -670,9 +670,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/VectorUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Vectorize.h
 llvm%%LLVM_SUFFIX%%/lib/BugpointPasses.so
 llvm%%LLVM_SUFFIX%%/lib/LLVMHello.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.5.0svn.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.5.0svn.so.0
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.5svn.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.5.0.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.5.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.5.so.0
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmParser.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64CodeGen.a
diff --git a/lang/clang35/Makefile b/lang/clang35/Makefile
index 933c1a864086..2857006346a7 100644
--- a/lang/clang35/Makefile
+++ b/lang/clang35/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	clang
-DISTVERSION=	3.5rc1
+DISTVERSION=	3.5.0rc2
 CATEGORIES=	lang devel
-MASTER_SITES=   http://llvm.org/pre-releases/3.5/rc1/
+MASTER_SITES=   http://llvm.org/pre-releases/3.5/rc2/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	${CLANG_NAME}
 DISTFILES=	${CLANG_SOURCE} \
@@ -12,13 +12,13 @@ DISTFILES=	${CLANG_SOURCE} \
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler
 
-CLANG_NAME=	cfe.src-${DISTVERSION}.src
+CLANG_NAME=	cfe-${DISTVERSION}.src
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
 CLANG_EXTRACT=	cfe.src
-LLVM_NAME=	llvm.src-${DISTVERSION}.src
+LLVM_NAME=	llvm-${DISTVERSION}.src
 LLVM_SOURCE=	${LLVM_NAME}${EXTRACT_SUFX}
 LLVM_EXTRACT=	llvm.src
-LIBNAME=	libLLVM-3.5svn.so
+LIBNAME=	libLLVM-3.5.so
 
 WRKSRC=		${WRKDIR}/${LLVM_EXTRACT}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
@@ -27,14 +27,14 @@ 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=	${PORTVERSION:S/.//g:C/r.*//}
+LLVM_SUFFIX=	${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
-USES=		compiler:c++11-lib gmake perl5
+USES=		compiler:c++11-lib gmake perl5 tar:xz
 USE_LDCONFIG=	yes
 USE_PYTHON_BUILD=	yes
 
diff --git a/lang/clang35/distinfo b/lang/clang35/distinfo
index 2f7db34587d3..4d254522d936 100644
--- a/lang/clang35/distinfo
+++ b/lang/clang35/distinfo
@@ -1,4 +1,4 @@
-SHA256 (cfe.src-3.5rc1.src.tar.gz) = 01d922b250f34df6c83beabbf07138178b3c7d04829a006cdf507c4040d79b9c
-SIZE (cfe.src-3.5rc1.src.tar.gz) = 11507469
-SHA256 (llvm.src-3.5rc1.src.tar.gz) = 841929809647700f7629f0d567af7a8b45fb82f11d25239c8602db0badf8adb8
-SIZE (llvm.src-3.5rc1.src.tar.gz) = 17623122
+SHA256 (cfe-3.5.0rc2.src.tar.xz) = a2202993744dfba25154b59c4e4c982d58f44b0c627109c418daab2606c828af
+SIZE (cfe-3.5.0rc2.src.tar.xz) = 8231116
+SHA256 (llvm-3.5.0rc2.src.tar.xz) = 962130e3c1916e5a393675276af709d61a34d272c62d655baa9d966d0b87adde
+SIZE (llvm-3.5.0rc2.src.tar.xz) = 11770380