From owner-svn-ports-all@FreeBSD.ORG Sun Apr 27 08:02:11 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 41DD3B11; Sun, 27 Apr 2014 08:02:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2CDAE18CF; Sun, 27 Apr 2014 08:02:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3R82B4I018845; Sun, 27 Apr 2014 08:02:11 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3R82AXR018839; Sun, 27 Apr 2014 08:02:10 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201404270802.s3R82AXR018839@svn.freebsd.org> From: Steve Wills Date: Sun, 27 Apr 2014 08:02:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352402 - head/lang/rust 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.17 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: Sun, 27 Apr 2014 08:02:11 -0000 Author: swills Date: Sun Apr 27 08:02:10 2014 New Revision: 352402 URL: http://svnweb.freebsd.org/changeset/ports/352402 QAT: https://qat.redports.org/buildarchive/r352402/ Log: - Update to 0.10 - Remove deprecated rustpkg functionality - Stage improvements - Add 10.x and 11.x compability - Pet portlint PR: ports/188800 Submitted by: Bartek Rutkowski Approved by: Jyun-Yan You (maintainer) Modified: head/lang/rust/Makefile head/lang/rust/distinfo head/lang/rust/pkg-plist Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Sun Apr 27 07:44:22 2014 (r352401) +++ head/lang/rust/Makefile Sun Apr 27 08:02:10 2014 (r352402) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION= 0.9 +PORTVERSION= 0.10 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ http://static.rust-lang.org/stage0-snapshots/:boot @@ -11,7 +11,7 @@ DISTFILES= ${RUST_SOURCE}:src \ EXTRACT_ONLY= ${RUST_SOURCE} MAINTAINER= jyyou@cs.nctu.edu.tw -COMMENT= A language with a focus on memory safety and concurrency +COMMENT= Language with a focus on memory safety and concurrency LICENSE= APACHE20 \ MIT @@ -21,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE-APACHE \ RUST_SOURCE= ${DISTNAME}${EXTRACT_SUFX} RUST_BOOT= rust-stage0-${RUST_BOOT_SIG}.tar.bz2 -RUST_BOOT_SIG= 2014-01-05-a6d3e57-freebsd-x86_64-ac21ea9537da2aaee35b7f3d2698b651dc3e8bd9 +RUST_BOOT_SIG= 2014-03-28-b8601a3-freebsd-x86_64-c6b0651b2a90697754920ad381c13f9b7942ab47 RUST_TARGET= x86_64-unknown-freebsd ONLY_FOR_ARCHS= amd64 @@ -29,41 +29,33 @@ HAS_CONFIGURE= yes USE_LDCONFIG= yes USES= gmake perl5 USE_PERL5= build +USE_PYTHON= yes USE_PYTHON_BUILD= 2 -MAN1= rustc.1 \ - rustdoc.1 \ - rustpkg.1 - -OPTIONS_DEFINE= RUSTPKG \ - LLNEXTGEN - -RUSTPKG_DESC= Build with package manager +OPTIONS_DEFINE= LLNEXTGEN LLNEXTGEN_DESC= Build with grammar verification -OPTIONS_DEFAULT= RUSTPKG -OPTIONS_SUB= yes .include -.if ${OSVERSION} < 900044 || ${OSVERSION} >= 1000000 -BROKEN= Only compiles on FreeBSD 9 -.endif +LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo -CC= clang -CXX= clang++ -CONFIGURE_ARGS+= --disable-valgrind --disable-docs \ - --enable-clang -MAKE_ARGS+= CC=${CC} CXX=${CXX} ARCH=x86_64 +.if ${OSVERSION} < 900044 +BROKEN= Only compiles on FreeBSD 9,10 and 11 +.endif -.if ${PORT_OPTIONS:MRUSTPKG} -RUN_DEPENDS+= git:${PORTSDIR}/devel/git +.if ${OSVERSION} >= 1000000 +BUILD_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x .endif .if ${PORT_OPTIONS:MLLNEXTGEN} BUILD_DEPENDS+= LLnextgen:${PORTSDIR}/devel/llnextgen .endif -LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo +CC= clang +CXX= clang++ +CONFIGURE_ARGS+= --disable-valgrind --disable-docs \ + --enable-clang --mandir=${MANPREFIX}/man +MAKE_ARGS+= CC=${CC} CXX=${CXX} ARCH=x86_64 post-extract: ${MKDIR} ${WRKSRC}/${RUST_TARGET} && \ @@ -72,13 +64,10 @@ post-extract: ${MV} rust-stage0 stage0 post-patch: - ${REINPLACE_CMD} \ - -e '/get-snapshot.py $$(CFG_BUILD)/d' \ - ${WRKSRC}/mk/stage0.mk -.if empty(PORT_OPTIONS:MRUSTPKG) - ${REINPLACE_CMD} \ - -e '/$$(Q)$$(call INSTALL,$$(HB2),$$(PHB),rustpkg$$(X_$$(CFG_BUILD)))/d' \ - ${WRKSRC}/mk/install.mk -.endif + ${REINPLACE_CMD} -e '/get-snapshot.py $$(CFG_BUILD)/d' ${WRKSRC}/mk/stage0.mk + +post-install: + @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest + ${STRIP_CMD} `${GREP} -v -e '^@dirrm' -e '^man' -e 'rlib$$' ${PLIST} | ${SED} 's:^:${STAGEDIR}${PREFIX}/:g'` .include Modified: head/lang/rust/distinfo ============================================================================== --- head/lang/rust/distinfo Sun Apr 27 07:44:22 2014 (r352401) +++ head/lang/rust/distinfo Sun Apr 27 08:02:10 2014 (r352402) @@ -1,4 +1,4 @@ -SHA256 (rust-0.9.tar.gz) = c0911c3545b797a1ca16f3d76bf5ed234754b828efd1e22c182c7300ac7dd5d1 -SIZE (rust-0.9.tar.gz) = 17152912 -SHA256 (rust-stage0-2014-01-05-a6d3e57-freebsd-x86_64-ac21ea9537da2aaee35b7f3d2698b651dc3e8bd9.tar.bz2) = 1caf47fddfef62d97d6d31970a4193d60ef24cc0e5b9f23067970a6b18eb79de -SIZE (rust-stage0-2014-01-05-a6d3e57-freebsd-x86_64-ac21ea9537da2aaee35b7f3d2698b651dc3e8bd9.tar.bz2) = 12048052 +SHA256 (rust-0.10.tar.gz) = c72cfbbf03016804a81d7b68e8258ffaf018f8f5a25550ad64571ce6c2642cf9 +SIZE (rust-0.10.tar.gz) = 19538709 +SHA256 (rust-stage0-2014-03-28-b8601a3-freebsd-x86_64-c6b0651b2a90697754920ad381c13f9b7942ab47.tar.bz2) = ed4214b795e6de322b7aea23e2d97b2399893931218f7c07453ddabcf21a5add +SIZE (rust-stage0-2014-03-28-b8601a3-freebsd-x86_64-c6b0651b2a90697754920ad381c13f9b7942ab47.tar.bz2) = 11942997 Modified: head/lang/rust/pkg-plist ============================================================================== --- head/lang/rust/pkg-plist Sun Apr 27 07:44:22 2014 (r352401) +++ head/lang/rust/pkg-plist Sun Apr 27 08:02:10 2014 (r352402) @@ -1,29 +1,72 @@ bin/rustc bin/rustdoc -%%RUSTPKG%%bin/rustpkg -lib/libextra-fd30a1b1-0.9.so -lib/libgreen-83b1c0e5-0.9.so -lib/librustc-8b28e8d8-0.9.so -lib/librustdoc-f0f95988-0.9.so -lib/librustpkg-7b329bae-0.9.so -lib/librustuv-2ba3695a-0.9.so -lib/libstd-3e5aeb83-0.9.so -lib/libsyntax-9be99726-0.9.so -lib/rustlib/x86_64-unknown-freebsd/lib/libextra-fd30a1b1-0.9.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libextra-fd30a1b1-0.9.so -lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-83b1c0e5-0.9.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-83b1c0e5-0.9.so +lib/libtest-aca9f118-0.10.so +lib/libtime-58f63fc6-0.10.so +lib/libsync-12723c47-0.10.so +lib/librustc-068bdd27-0.10.so +lib/libflate-6e405485-0.10.so +lib/libcollections-d806bd21-0.10.so +lib/librustdoc-652a145d-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libuuid-e10dc465-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-3ec61d8e-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libarena-862d25bd-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libtest-aca9f118-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libfourcc-bdd8db56-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/librand-15245696-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libtime-58f63fc6-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libsync-12723c47-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libnative-72349f30-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/librustc-068bdd27-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libtest-aca9f118-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libflate-6e405485-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libnum-85d3e2cc-0.10.rlib lib/rustlib/x86_64-unknown-freebsd/lib/libmorestack.a -lib/rustlib/x86_64-unknown-freebsd/lib/libnative-cf55a53a-0.9.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libnative-cf55a53a-0.9.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc-8b28e8d8-0.9.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustdoc-f0f95988-0.9.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustpkg-7b329bae-0.9.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustuv-2ba3695a-0.9.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/librustuv-2ba3695a-0.9.so -lib/rustlib/x86_64-unknown-freebsd/lib/libstd-3e5aeb83-0.9.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libstd-3e5aeb83-0.9.so -lib/rustlib/x86_64-unknown-freebsd/lib/libsyntax-9be99726-0.9.so +lib/rustlib/x86_64-unknown-freebsd/lib/libcollections-d806bd21-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustdoc-652a145d-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/liburl-20851330-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustuv-59da37cb-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libtime-58f63fc6-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libsemver-91d9a1a0-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/librand-15245696-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libcollections-d806bd21-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-a730521c-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-3ec61d8e-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-ff6cea05-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libworkcache-ba12ef35-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libuuid-e10dc465-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/liblog-11894fa1-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libflate-6e405485-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libglob-e345fe87-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libsync-12723c47-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libstd-8b97b62e-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libcompiler-rt.a +lib/rustlib/x86_64-unknown-freebsd/lib/libterm-016974a5-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/liblog-11894fa1-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-a730521c-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-ff6cea05-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libworkcache-ba12ef35-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libstd-8b97b62e-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/liburl-20851330-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libhexfloat-ef02b0da-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libsemver-91d9a1a0-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libnative-72349f30-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustuv-59da37cb-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libglob-e345fe87-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libterm-016974a5-0.10.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libarena-862d25bd-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libnum-85d3e2cc-0.10.so +lib/rustlib/x86_64-unknown-freebsd/lib/libsyntax-8ef99071-0.10.so +lib/librand-15245696-0.10.so +lib/libgetopts-a730521c-0.10.so +lib/libserialize-3ec61d8e-0.10.so +lib/libstd-8b97b62e-0.10.so +lib/libterm-016974a5-0.10.so +lib/liblog-11894fa1-0.10.so +lib/libnative-72349f30-0.10.so +lib/libarena-862d25bd-0.10.so +lib/libsyntax-8ef99071-0.10.so +man/man1/rustdoc.1.gz +man/man1/rustc.1.gz @dirrm lib/rustlib/x86_64-unknown-freebsd/lib @dirrm lib/rustlib/x86_64-unknown-freebsd @dirrm lib/rustlib