Upgrade to llvm/clang 3.5.1 release.

5 files changed, 48 insertions, 67 deletions

diff --git a/devel/llvm35/Makefile b/devel/llvm35/Makefile
index 4631786195a4..d9680174fa02 100644
--- a/devel/llvm35/Makefile
+++ b/devel/llvm35/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	3.5.0
-PORTREVISION=	1
+DISTVERSION=	3.5.1
 CATEGORIES=	devel lang
-MASTER_SITES=	http://llvm.org/releases/3.5.0/
+MASTER_SITES=	http://llvm.org/releases/3.5.1/
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
@@ -267,17 +266,6 @@ build-plist:
 	${FIND} ${STAGEDIR}${DOCSDIR} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
 	    ${SORT} >> ${PLIST}
-	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type d | \
-	    ${SED} -e 's|${STAGEDIR}${PREFIX}/||' | \
-	    ${SORT} -r | ${SED} -e 's|^|@dirrm |' \
-	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' >> ${PLIST}
-	echo "%%LIT%%@dirrm %%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%" >> \
-	    ${PLIST}
-	echo "%%LIT%%@dirrm %%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats" >> \
-	    ${PLIST}
-	${FIND} ${STAGEDIR}${DOCSDIR} -type d | \
-	    ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' | \
-	    ${SORT} -r >> ${PLIST}
 
 .if make(svn-patch)
 .if !defined(PATCH_REV)
diff --git a/devel/llvm35/distinfo b/devel/llvm35/distinfo
index 3770da8b9e38..8f2e769ac286 100644
--- a/devel/llvm35/distinfo
+++ b/devel/llvm35/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvm-3.5.0.src.tar.xz) = 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03
-SIZE (llvm-3.5.0.src.tar.xz) = 11735940
+SHA256 (llvm-3.5.1.src.tar.xz) = bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15
+SIZE (llvm-3.5.1.src.tar.xz) = 11869356
diff --git a/lang/clang35/Makefile b/lang/clang35/Makefile
index ce488a01bfc1..99262b52f7c8 100644
--- a/lang/clang35/Makefile
+++ b/lang/clang35/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	clang
-DISTVERSION=	3.5.0
-PORTREVISION=	3
+DISTVERSION=	3.5.1
 CATEGORIES=	lang devel
-MASTER_SITES=   http://llvm.org/releases/3.5.0/
+MASTER_SITES=   http://llvm.org/releases/3.5.1/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	${CLANG_NAME}
 DISTFILES=	${CLANG_SOURCE} \
@@ -181,19 +180,13 @@ build-plist:
 	(ls ${PLIST_FILE_LIST:S|^|${STAGEDIR}${LLVM_PREFIX}/|}; \
 	    ${FIND} ${PLIST_DIR_LIST:S|^|${STAGEDIR}${LLVM_PREFIX}/|} -type f) \
 	    | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
-	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' | ${SORT} >> ${PLIST}
+	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' \
+	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' | ${SORT} >> ${PLIST}
 	echo man/man1/clang%%LLVM_SUFFIX%%.1.gz >> ${PLIST}
 	echo man/man1/scan-build%%LLVM_SUFFIX%%.1.gz >> ${PLIST}
 	${FIND} ${STAGEDIR}${DOCSDIR} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
 	    ${SORT} >> ${PLIST}
-	${FIND} ${PLIST_DIR_LIST:S|^|${STAGEDIR}${LLVM_PREFIX}/|} -type d | \
-	    ${SED} -e 's|${STAGEDIR}${PREFIX}/|@dirrm |' \
-	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' | \
-	    ${SORT} -r >> ${PLIST}
-	${FIND} ${STAGEDIR}${DOCSDIR} -type d | ${SORT} -r | \
-	    ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' \
-	    >> ${PLIST}
 
 .if make(svn-patch)
 .if !defined(PATCH_REV)
diff --git a/lang/clang35/distinfo b/lang/clang35/distinfo
index 919c2bcf4b7d..c552701f5dc9 100644
--- a/lang/clang35/distinfo
+++ b/lang/clang35/distinfo
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.5.0.src.tar.xz) = fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b
-SIZE (cfe-3.5.0.src.tar.xz) = 8233432
-SHA256 (llvm-3.5.0.src.tar.xz) = 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03
-SIZE (llvm-3.5.0.src.tar.xz) = 11735940
+SHA256 (cfe-3.5.1.src.tar.xz) = 6773f3f9cf815631cc7e779ec134ddd228dc8e9a250e1ea3a910610c59eb8f5c
+SIZE (cfe-3.5.1.src.tar.xz) = 8268140
+SHA256 (llvm-3.5.1.src.tar.xz) = bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15
+SIZE (llvm-3.5.1.src.tar.xz) = 11869356
diff --git a/lang/clang35/pkg-plist b/lang/clang35/pkg-plist
index b84c5e6a66b0..4066e7ba1096 100644
--- a/lang/clang35/pkg-plist
+++ b/lang/clang35/pkg-plist
@@ -441,42 +441,42 @@ 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.5.0/include/__wmmintrin_aes.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/__wmmintrin_pclmul.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/altivec.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/ammintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/arm_neon.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/avx2intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/avxintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/bmi2intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/bmiintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/cpuid.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/emmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/f16cintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/fma4intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/fmaintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/ia32intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/immintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/lzcntintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/mm3dnow.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/mm_malloc.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/mmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/module.modulemap
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/nmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/pmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/popcntintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/prfchwintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/rdseedintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/rtmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/shaintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/smmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/tbmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/tmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/unwind.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/wmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/x86intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/xmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/3.5.0/include/xopintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/__wmmintrin_aes.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/__wmmintrin_pclmul.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/altivec.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/ammintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/arm_neon.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/avx2intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/avxintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/bmi2intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/bmiintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/cpuid.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/emmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/f16cintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/fma4intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/fmaintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/ia32intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/immintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/lzcntintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/mm3dnow.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/mm_malloc.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/mmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/module.modulemap
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/nmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/pmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/popcntintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/prfchwintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/rdseedintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/rtmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/shaintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/smmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/tbmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/tmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/unwind.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/wmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/x86intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/xmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/xopintrin.h
 llvm%%LLVM_SUFFIX%%/lib/libclang.a
 llvm%%LLVM_SUFFIX%%/lib/libclang.so
 llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a