From owner-svn-ports-all@FreeBSD.ORG Fri Jun 21 15:17:42 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A115276A; Fri, 21 Jun 2013 15:17:42 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 92F9F1622; Fri, 21 Jun 2013 15:17:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5LFHgDn025511; Fri, 21 Jun 2013 15:17:42 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5LFHfqg025498; Fri, 21 Jun 2013 15:17:41 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201306211517.r5LFHfqg025498@svn.freebsd.org> From: Brooks Davis Date: Fri, 21 Jun 2013 15:17:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321475 - in head: devel/llvm33 lang/clang33 lang/clang33/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jun 2013 15:17:42 -0000 Author: brooks Date: Fri Jun 21 15:17:40 2013 New Revision: 321475 URL: http://svnweb.freebsd.org/changeset/ports/321475 Log: Upgrade Clang and LLVM 3.3 ports to the release version. Added: head/lang/clang33/files/patch-tools_clang_docs_Makefile (contents, props changed) Modified: head/devel/llvm33/Makefile head/devel/llvm33/distinfo head/devel/llvm33/pkg-plist head/lang/clang33/Makefile head/lang/clang33/distinfo head/lang/clang33/pkg-plist Modified: head/devel/llvm33/Makefile ============================================================================== --- head/devel/llvm33/Makefile Fri Jun 21 15:14:00 2013 (r321474) +++ head/devel/llvm33/Makefile Fri Jun 21 15:17:40 2013 (r321475) @@ -1,23 +1,17 @@ # $FreeBSD$ PORTNAME= llvm -DISTVERSION= 3.3rc3 +PORTVERSION= 3.3 CATEGORIES= devel lang -MASTER_SITES= http://llvm.org/pre-releases/3.3/rc3/ -DISTNAME= llvm-source-${DISTVERSION} +MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ +DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= brooks@FreeBSD.org COMMENT= Low Level Virtual Machine LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo -.if defined(PACKAGE_BUILDING) -BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash -.endif -.if defined(MAINTAINER_MODE) -BUILD_DEPENDS+= f2c:${PORTSDIR}/lang/f2c -.endif -LLVM_SUFFIX= 33 +LLVM_SUFFIX= ${PORTVERSION:S/.//g} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} LATEST_LINK= ${PORTNAME}${LLVM_SUFFIX} @@ -30,8 +24,6 @@ USE_PERL5= yes USE_PYTHON_BUILD= yes MAKE_JOBS_SAFE= yes -WRKSRC= ${WRKDIR}/llvm.src - SUB_FILES= llvm-wrapper.sh SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" Modified: head/devel/llvm33/distinfo ============================================================================== --- head/devel/llvm33/distinfo Fri Jun 21 15:14:00 2013 (r321474) +++ head/devel/llvm33/distinfo Fri Jun 21 15:17:40 2013 (r321475) @@ -1,2 +1,2 @@ -SHA256 (llvm-source-3.3rc3.tar.gz) = 22202303fc2ff667bd2ed1777f46985aed87a266efcc5d438451c25ec50e743b -SIZE (llvm-source-3.3rc3.tar.gz) = 13644242 +SHA256 (llvm-3.3.src.tar.gz) = 68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578 +SIZE (llvm-3.3.src.tar.gz) = 13602421 Modified: head/devel/llvm33/pkg-plist ============================================================================== --- head/devel/llvm33/pkg-plist Fri Jun 21 15:14:00 2013 (r321474) +++ head/devel/llvm33/pkg-plist Fri Jun 21 15:17:40 2013 (r321475) @@ -603,8 +603,8 @@ llvm33/include/llvm/Transforms/Utils/Val llvm33/include/llvm/Transforms/Vectorize.h llvm33/lib/BugpointPasses.so llvm33/lib/LLVMHello.so -llvm33/lib/libLLVM-3.3.so -llvm33/lib/libLLVM-3.3.so.0 +llvm33/lib/libLLVM-%%PORTVERSION%%.so +llvm33/lib/libLLVM-%%PORTVERSION%%.so.0 llvm33/lib/libLLVMAArch64AsmParser.a llvm33/lib/libLLVMAArch64AsmPrinter.a llvm33/lib/libLLVMAArch64CodeGen.a Modified: head/lang/clang33/Makefile ============================================================================== --- head/lang/clang33/Makefile Fri Jun 21 15:14:00 2013 (r321474) +++ head/lang/clang33/Makefile Fri Jun 21 15:17:40 2013 (r321475) @@ -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} Modified: head/lang/clang33/distinfo ============================================================================== --- head/lang/clang33/distinfo Fri Jun 21 15:14:00 2013 (r321474) +++ head/lang/clang33/distinfo Fri Jun 21 15:17:40 2013 (r321475) @@ -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 Added: head/lang/clang33/files/patch-tools_clang_docs_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/clang33/files/patch-tools_clang_docs_Makefile Fri Jun 21 15:17:40 2013 (r321475) @@ -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 = . Modified: head/lang/clang33/pkg-plist ============================================================================== --- head/lang/clang33/pkg-plist Fri Jun 21 15:14:00 2013 (r321474) +++ head/lang/clang33/pkg-plist Fri Jun 21 15:17:40 2013 (r321475) @@ -463,11 +463,8 @@ llvm33/lib/libclangStaticAnalyzerChecker 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%%