Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 348290) +++ head/lang/rust/Makefile (revision 348291) @@ -1,81 +1,84 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= rust -PORTVERSION= 0.8 +PORTVERSION= 0.9 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ http://static.rust-lang.org/stage0-snapshots/:boot DISTFILES= ${RUST_SOURCE}:src \ ${RUST_BOOT}:boot EXTRACT_ONLY= ${RUST_SOURCE} MAINTAINER= jyyou@cs.nctu.edu.tw COMMENT= A language with a focus on memory safety and concurrency +LICENSE= APACHE20 \ + MIT +LICENSE_COMB= dual +LICENSE_FILE= ${WRKSRC}/LICENSE-APACHE \ + ${WRKSRC}/LICENSE-MIT + RUST_SOURCE= ${DISTNAME}${EXTRACT_SUFX} RUST_BOOT= rust-stage0-${RUST_BOOT_SIG}.tar.bz2 -RUST_BOOT_SIG= 2013-09-23-348d844-freebsd-x86_64-8b99ec197e441f013c5ba0788f8bcfa689bfc75e +RUST_BOOT_SIG= 2014-01-05-a6d3e57-freebsd-x86_64-ac21ea9537da2aaee35b7f3d2698b651dc3e8bd9 RUST_TARGET= x86_64-unknown-freebsd ONLY_FOR_ARCHS= amd64 HAS_CONFIGURE= yes USE_LDCONFIG= yes USES= gmake perl5 USE_PERL5= build USE_PYTHON_BUILD= 2 -MAN1= rust.1 \ - rustc.1 \ +MAN1= rustc.1 \ rustdoc.1 \ - rusti.1 \ rustpkg.1 -OPTIONS_DEFINE= RUSTPKG +OPTIONS_DEFINE= RUSTPKG \ + LLNEXTGEN + RUSTPKG_DESC= Build with package manager +LLNEXTGEN_DESC= Build with grammar verification OPTIONS_DEFAULT= RUSTPKG +OPTIONS_SUB= yes -NO_STAGE= yes .include -.if ${OSVERSION} < 900044 -BROKEN= Only compiles on 9.0-RELEASE and later +.if ${OSVERSION} < 900044 || ${OSVERSION} >= 1000000 +BROKEN= Only compiles on FreeBSD 9 .endif -LIB_DEPENDS+= unwind:${PORTSDIR}/devel/libunwind CC= clang CXX= clang++ -CONFIGURE_ARGS+= --enable-clang +CONFIGURE_ARGS+= --disable-valgrind --disable-docs \ + --enable-clang +MAKE_ARGS+= CC=${CC} CXX=${CXX} ARCH=x86_64 .if ${PORT_OPTIONS:MRUSTPKG} RUN_DEPENDS+= git:${PORTSDIR}/devel/git -PLIST_SUB+= RUSTPKG="" -.else -PLIST_SUB+= RUSTPKG="@comment " .endif +.if ${PORT_OPTIONS:MLLNEXTGEN} +BUILD_DEPENDS+= LLnextgen:${PORTSDIR}/devel/llnextgen +.endif + LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo -MAKE_ARGS+= CC=${CC} CXX=${CXX} ARCH=x86_64 -CONFIGURE_ARGS+= --disable-valgrind --disable-docs - post-extract: ${MKDIR} ${WRKSRC}/${RUST_TARGET} && \ cd ${WRKSRC}/${RUST_TARGET} && \ ${TAR} -xf ${DISTDIR}/${RUST_BOOT} && \ ${MV} rust-stage0 stage0 post-patch: ${REINPLACE_CMD} \ - -e 's|$$(PREFIX_ROOT)/share/man|${MANPREFIX}/man|' \ - ${WRKSRC}/mk/install.mk - ${REINPLACE_CMD} \ - -e '/get-snapshot.py $$(CFG_BUILD_TRIPLE)/d' \ + -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_TRIPLE)))/d' \ + -e '/$$(Q)$$(call INSTALL,$$(HB2),$$(PHB),rustpkg$$(X_$$(CFG_BUILD)))/d' \ ${WRKSRC}/mk/install.mk .endif .include Index: head/lang/rust/distinfo =================================================================== --- head/lang/rust/distinfo (revision 348290) +++ head/lang/rust/distinfo (revision 348291) @@ -1,4 +1,4 @@ -SHA256 (rust-0.8.tar.gz) = 42f791ab1537357fe0f63d67ffe6bcb64ecf16b2bd3f1484ab589823f5914182 -SIZE (rust-0.8.tar.gz) = 16720822 -SHA256 (rust-stage0-2013-09-23-348d844-freebsd-x86_64-8b99ec197e441f013c5ba0788f8bcfa689bfc75e.tar.bz2) = 5e55044af98f5d7489cd2231736f48c18fa945639de75d1a0cf5565f17eabd01 -SIZE (rust-stage0-2013-09-23-348d844-freebsd-x86_64-8b99ec197e441f013c5ba0788f8bcfa689bfc75e.tar.bz2) = 21350020 +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 Index: head/lang/rust/files/patch-configure =================================================================== --- head/lang/rust/files/patch-configure (revision 348290) +++ head/lang/rust/files/patch-configure (revision 348291) @@ -1,26 +1,25 @@ ---- configure.orig 2013-09-27 13:30:39.473857288 +0800 -+++ configure 2013-09-27 13:30:56.427856617 +0800 -@@ -405,7 +405,6 @@ +--- configure.orig 2014-01-20 12:44:20.637789551 +0800 ++++ configure 2014-01-20 12:45:23.726260411 +0800 +@@ -424,7 +424,6 @@ step_msg "looking for build programs" probe_need CFG_PERL perl -probe_need CFG_CURLORWGET curl wget probe_need CFG_PYTHON python2.7 python2.6 python2 python python_version=$($CFG_PYTHON -V 2>&1) -@@ -520,15 +519,6 @@ +@@ -547,14 +546,6 @@ fi fi -# Force freebsd to build with clang; gcc doesn't like us there -if [ $CFG_OSTYPE = unknown-freebsd ] -then - step_msg "on FreeBSD, forcing use of clang" - CFG_ENABLE_CLANG=1 - putvar CFG_ENABLE_CLANG -fi -- - if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ] then err "either clang or gcc is required" Index: head/lang/rust/files/patch-mk_platform.mk =================================================================== --- head/lang/rust/files/patch-mk_platform.mk (revision 348290) +++ head/lang/rust/files/patch-mk_platform.mk (revision 348291) @@ -1,11 +1,11 @@ ---- mk/platform.mk.orig 2013-07-09 00:57:39.009593612 +0800 -+++ mk/platform.mk 2013-07-09 00:57:55.526200080 +0800 -@@ -375,7 +375,7 @@ - CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so +--- mk/platform.mk.orig 2014-01-20 12:47:42.902789736 +0800 ++++ mk/platform.mk 2014-01-20 12:47:53.647790608 +0800 +@@ -522,7 +522,7 @@ + CFG_STATIC_LIB_NAME_x86_64-unknown-freebsd=lib$(1).a CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so CFG_LIB_DSYM_GLOB_x86_64-unknown-freebsd=$(1)-*.dylib.dSYM -CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd := -Wall -Werror -g -fPIC -I/usr/local/include +CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd := -Wall -g -fPIC -I/usr/local/include CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd := -shared -fPIC -g -pthread -lrt CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list= CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-freebsd := -Wl,-whole-archive Index: head/lang/rust/pkg-plist =================================================================== --- head/lang/rust/pkg-plist (revision 348290) +++ head/lang/rust/pkg-plist (revision 348291) @@ -1,29 +1,29 @@ -bin/rust bin/rustc bin/rustdoc -bin/rusti %%RUSTPKG%%bin/rustpkg -lib/libextra-a7c050cfd46b2c9a-0.8.so -lib/librust-5828c92a27389871-0.8.so -lib/librustc-d3cb8c2ccd84a7a7-0.8.so -lib/librustdoc-a437806a76c5f37a-0.8.so -lib/librusti-53e0ef2ae196aaff-0.8.so -lib/librustllvm.so -lib/librustpkg-45c3eae3148fd21-0.8.so -lib/librustrt.so -lib/libstd-6c65cf4b443341b1-0.8.so -lib/libsyntax-64629f7f0c6a9bc-0.8.so -lib/rustc/x86_64-unknown-freebsd/lib/libextra-a7c050cfd46b2c9a-0.8.so -lib/rustc/x86_64-unknown-freebsd/lib/libmorestack.a -lib/rustc/x86_64-unknown-freebsd/lib/librust-5828c92a27389871-0.8.so -lib/rustc/x86_64-unknown-freebsd/lib/librustc-d3cb8c2ccd84a7a7-0.8.so -lib/rustc/x86_64-unknown-freebsd/lib/librustdoc-a437806a76c5f37a-0.8.so -lib/rustc/x86_64-unknown-freebsd/lib/librusti-53e0ef2ae196aaff-0.8.so -lib/rustc/x86_64-unknown-freebsd/lib/librustllvm.so -lib/rustc/x86_64-unknown-freebsd/lib/librustpkg-45c3eae3148fd21-0.8.so -lib/rustc/x86_64-unknown-freebsd/lib/librustrt.so -lib/rustc/x86_64-unknown-freebsd/lib/libstd-6c65cf4b443341b1-0.8.so -lib/rustc/x86_64-unknown-freebsd/lib/libsyntax-64629f7f0c6a9bc-0.8.so -@dirrm lib/rustc/x86_64-unknown-freebsd/lib -@dirrm lib/rustc/x86_64-unknown-freebsd -@dirrm lib/rustc +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/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 +@dirrm lib/rustlib/x86_64-unknown-freebsd/lib +@dirrm lib/rustlib/x86_64-unknown-freebsd +@dirrm lib/rustlib