Upgrade to release 3.4.2.

3 files changed, 47 insertions, 48 deletions

diff --git a/lang/clang34/Makefile b/lang/clang34/Makefile
index 0afca59afdca..a8fa4186cfd6 100644
--- a/lang/clang34/Makefile
+++ b/lang/clang34/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	clang
-DISTVERSION=	3.4
-PORTREVISION=	2
+DISTVERSION=	3.4.2
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
@@ -13,13 +12,13 @@ DISTFILES=	${CLANG_SOURCE} \
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler
 
-CLANG_NAME=	clang-${DISTVERSION}.src
+CLANG_NAME=	cfe-${DISTVERSION}.src
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
-CLANG_EXTRACT=	clang-${DISTVERSION}
+CLANG_EXTRACT=	cfe-${DISTVERSION}.src
 LLVM_NAME=	llvm-${DISTVERSION}.src
 LLVM_SOURCE=	${LLVM_NAME}${EXTRACT_SUFX}
-LLVM_EXTRACT=	llvm-${DISTVERSION}
-LIBNAME=	libLLVM-${DISTVERSION:C/rc[0-9]//}.so
+LLVM_EXTRACT=	llvm-${DISTVERSION}.src
+LIBNAME=	libLLVM-${DISTVERSION:C/([0-9]\.[0-9]).*/\1/:C/rc[0-9]//}.so
 
 WRKSRC=		${WRKDIR}/${LLVM_EXTRACT}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
@@ -28,7 +27,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=	${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}
diff --git a/lang/clang34/distinfo b/lang/clang34/distinfo
index 9dae51c285b7..2908d4ad2a00 100644
--- a/lang/clang34/distinfo
+++ b/lang/clang34/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.4.src.tar.gz) = 22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b
-SIZE (clang-3.4.src.tar.gz) = 10619607
-SHA256 (llvm-3.4.src.tar.gz) = 25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628
-SIZE (llvm-3.4.src.tar.gz) = 15920544
+SHA256 (cfe-3.4.2.src.tar.gz) = 5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10
+SIZE (cfe-3.4.2.src.tar.gz) = 10612313
+SHA256 (llvm-3.4.2.src.tar.gz) = 17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7
+SIZE (llvm-3.4.2.src.tar.gz) = 15938155
diff --git a/lang/clang34/pkg-plist b/lang/clang34/pkg-plist
index ce16629fbe8c..7fdb8c9a852f 100644
--- a/lang/clang34/pkg-plist
+++ b/lang/clang34/pkg-plist
@@ -428,41 +428,41 @@ llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/RefactoringCallbacks.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/ReplacementsYaml.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Tooling.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/__wmmintrin_aes.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/__wmmintrin_pclmul.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/altivec.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/ammintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/arm_neon.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/avx2intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/avxintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/bmi2intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/bmiintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/cpuid.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/emmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/f16cintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/fma4intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/fmaintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/immintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/lzcntintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/mm3dnow.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/mm_malloc.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/mmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/module.map
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/nmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/pmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/popcntintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/prfchwintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/rdseedintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/rtmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/shaintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/smmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/tbmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/tmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/unwind.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/wmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/x86intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/xmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include/xopintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/__wmmintrin_aes.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/__wmmintrin_pclmul.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/altivec.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/ammintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/arm_neon.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/avx2intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/avxintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/bmi2intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/bmiintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/cpuid.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/emmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/f16cintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/fma4intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/fmaintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/immintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/lzcntintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/mm3dnow.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/mm_malloc.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/mmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/module.map
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/nmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/pmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/popcntintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/prfchwintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/rdseedintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/rtmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/shaintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/smmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/tbmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/tmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/unwind.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/wmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/x86intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/xmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include/xopintrin.h
 llvm%%LLVM_SUFFIX%%/lib/libclang.a
 llvm%%LLVM_SUFFIX%%/lib/libclang.so
 llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
@@ -493,8 +493,8 @@ man/man1/scan-build%%LLVM_SUFFIX%%.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
 %%PORTDOCS%%%%DOCSDIR%%/ps/clang.ps
-@dirrm llvm%%LLVM_SUFFIX%%/lib/clang/3.4/include
-@dirrm llvm%%LLVM_SUFFIX%%/lib/clang/3.4
+@dirrm llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include
+@dirrm llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2
 @dirrm llvm%%LLVM_SUFFIX%%/lib/clang
 @dirrm llvm%%LLVM_SUFFIX%%/include/clang/Tooling
 @dirrm llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend