Index: lang/rust/Makefile =================================================================== --- lang/rust/Makefile +++ lang/rust/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION= 1.1.0 +PORTVERSION= 1.2.0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ http://static.rust-lang.org/stage0-snapshots/:bootstrap @@ -32,7 +32,10 @@ RUST_SOURCE= ${DISTNAME}-src${EXTRACT_SUFX} RUST_BOOT= rust-stage0-${RUST_BOOT_SIG}.tar.bz2 -RUST_BOOT_SIG= 2015-04-27-857ef6e-freebsd-x86_64-18925db56f6298cc190d1f41615ab5871de1dda0 +RUST_BOOT_SIG= 2015-05-24-ba0e1cd-freebsd-x86_64-370db40613f5c08563ed7e38357826dd42d4e0f8 + +RUST_LIB_SFX= 62abc69f +PLIST_SUB= RUST_LIB_SFX=${RUST_LIB_SFX} USES= gmake python:2,build HAS_CONFIGURE= yes Index: lang/rust/distinfo =================================================================== --- lang/rust/distinfo +++ lang/rust/distinfo @@ -1,4 +1,4 @@ -SHA256 (rustc-1.1.0-src.tar.gz) = cb09f443b37ec1b81fe73c04eb413f9f656859cf7d00bc5088008cbc2a63fa8a -SIZE (rustc-1.1.0-src.tar.gz) = 22241376 -SHA256 (rust-stage0-2015-04-27-857ef6e-freebsd-x86_64-18925db56f6298cc190d1f41615ab5871de1dda0.tar.bz2) = c09d2f622217129b4c5a5ae0b889315606d993c22c3f6ee2ffc06e997940f113 -SIZE (rust-stage0-2015-04-27-857ef6e-freebsd-x86_64-18925db56f6298cc190d1f41615ab5871de1dda0.tar.bz2) = 12915343 +SHA256 (rustc-1.2.0-src.tar.gz) = ea6eb983daf2a073df57186a58f0d4ce0e85c711bec13c627a8c85d51b6a6d78 +SIZE (rustc-1.2.0-src.tar.gz) = 23863924 +SHA256 (rust-stage0-2015-05-24-ba0e1cd-freebsd-x86_64-370db40613f5c08563ed7e38357826dd42d4e0f8.tar.bz2) = 454530016c6a2f033de5fdfa6086a8caf78a597b99519f1b9a2ecbdd18b001eb +SIZE (rust-stage0-2015-05-24-ba0e1cd-freebsd-x86_64-370db40613f5c08563ed7e38357826dd42d4e0f8.tar.bz2) = 13137436 Index: lang/rust/files/patch-configure =================================================================== --- lang/rust/files/patch-configure +++ lang/rust/files/patch-configure @@ -1,24 +1,10 @@ ---- configure.orig 2015-05-13 20:03:52 UTC +--- configure.orig 2015-08-04 19:28:47 UTC +++ configure -@@ -678,7 +678,6 @@ putvar CFG_BOOTSTRAP_KEY +@@ -696,7 +696,6 @@ putvar CFG_BOOTSTRAP_KEY step_msg "looking for build programs" -probe_need CFG_CURLORWGET curl wget - probe_need CFG_PYTHON python2.7 python2.6 python2 python - - python_version=$($CFG_PYTHON -V 2>&1) -@@ -805,13 +804,6 @@ then - putvar CFG_LOCAL_RUST_ROOT + if [ -z "$CFG_PYTHON_PROVIDED" ]; then + probe_need CFG_PYTHON python2.7 python2.6 python2 python 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 --fi -- - # Force bitrig to build with clang; gcc doesn't like us there - if [ $CFG_OSTYPE = unknown-bitrig ] - then Index: lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs =================================================================== --- lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs +++ /dev/null @@ -1,12 +0,0 @@ ---- src/librustc_back/target/freebsd_base.rs.orig 2015-05-07 14:37:17 UTC -+++ src/librustc_back/target/freebsd_base.rs -@@ -19,9 +19,6 @@ pub fn opts() -> TargetOptions { - morestack: true, - has_rpath: true, - pre_link_args: vec!( -- "-L/usr/local/lib".to_string(), -- "-L/usr/local/lib/gcc46".to_string(), -- "-L/usr/local/lib/gcc44".to_string(), - ), - - .. Default::default() Index: lang/rust/pkg-plist =================================================================== --- lang/rust/pkg-plist +++ lang/rust/pkg-plist @@ -1,79 +1,80 @@ bin/rust-gdb bin/rustc bin/rustdoc -lib/libarena-7d23ff90.so -lib/libflate-7d23ff90.so -lib/libfmt_macros-7d23ff90.so -lib/libgetopts-7d23ff90.so -lib/libgraphviz-7d23ff90.so -lib/liblog-7d23ff90.so -lib/librbml-7d23ff90.so -lib/librustc-7d23ff90.so -lib/librustc_back-7d23ff90.so -lib/librustc_borrowck-7d23ff90.so -lib/librustc_driver-7d23ff90.so -lib/librustc_lint-7d23ff90.so -lib/librustc_llvm-7d23ff90.so -lib/librustc_privacy-7d23ff90.so -lib/librustc_resolve-7d23ff90.so -lib/librustc_trans-7d23ff90.so -lib/librustc_typeck-7d23ff90.so -lib/librustc_data_structures-7d23ff90.so -lib/librustdoc-7d23ff90.so -lib/libserialize-7d23ff90.so -lib/libstd-7d23ff90.so -lib/libsyntax-7d23ff90.so -lib/libterm-7d23ff90.so -lib/libtest-7d23ff90.so +lib/libarena-%%RUST_LIB_SFX%%.so +lib/libflate-%%RUST_LIB_SFX%%.so +lib/libfmt_macros-%%RUST_LIB_SFX%%.so +lib/libgetopts-%%RUST_LIB_SFX%%.so +lib/libgraphviz-%%RUST_LIB_SFX%%.so +lib/liblog-%%RUST_LIB_SFX%%.so +lib/librbml-%%RUST_LIB_SFX%%.so +lib/librustc-%%RUST_LIB_SFX%%.so +lib/librustc_back-%%RUST_LIB_SFX%%.so +lib/librustc_borrowck-%%RUST_LIB_SFX%%.so +lib/librustc_driver-%%RUST_LIB_SFX%%.so +lib/librustc_lint-%%RUST_LIB_SFX%%.so +lib/librustc_llvm-%%RUST_LIB_SFX%%.so +lib/librustc_privacy-%%RUST_LIB_SFX%%.so +lib/librustc_resolve-%%RUST_LIB_SFX%%.so +lib/librustc_trans-%%RUST_LIB_SFX%%.so +lib/librustc_typeck-%%RUST_LIB_SFX%%.so +lib/librustc_data_structures-%%RUST_LIB_SFX%%.so +lib/librustdoc-%%RUST_LIB_SFX%%.so +lib/libserialize-%%RUST_LIB_SFX%%.so +lib/libstd-%%RUST_LIB_SFX%%.so +lib/libsyntax-%%RUST_LIB_SFX%%.so +lib/libterm-%%RUST_LIB_SFX%%.so +lib/libtest-%%RUST_LIB_SFX%%.so lib/rustlib/components +lib/rustlib/etc/debugger_pretty_printers_common.py lib/rustlib/etc/gdb_load_rust_pretty_printers.py lib/rustlib/etc/gdb_rust_pretty_printing.py lib/rustlib/manifest-rustc lib/rustlib/rust-installer-version lib/rustlib/uninstall.sh -lib/rustlib/x86_64-unknown-freebsd/lib/liballoc-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libarena-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libarena-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/libcollections-7d23ff90.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/liballoc-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libarena-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libarena-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/libcollections-%%RUST_LIB_SFX%%.rlib lib/rustlib/x86_64-unknown-freebsd/lib/libcompiler-rt.a -lib/rustlib/x86_64-unknown-freebsd/lib/libcore-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libflate-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libflate-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/libfmt_macros-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/liblibc-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/liblog-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/liblog-7d23ff90.so +lib/rustlib/x86_64-unknown-freebsd/lib/libcore-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libflate-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libflate-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/libfmt_macros-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/liblibc-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/liblog-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/liblog-%%RUST_LIB_SFX%%.so lib/rustlib/x86_64-unknown-freebsd/lib/libmorestack.a -lib/rustlib/x86_64-unknown-freebsd/lib/librand-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/librbml-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/librbml-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_back-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_bitflags-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_borrowck-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_driver-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_lint-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_llvm-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_privacy-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_resolve-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_trans-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_typeck-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustdoc-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/libstd-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libstd-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/libsyntax-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/libterm-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libterm-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/libtest-7d23ff90.rlib -lib/rustlib/x86_64-unknown-freebsd/lib/libtest-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_data_structures-7d23ff90.so -lib/rustlib/x86_64-unknown-freebsd/lib/librustc_unicode-7d23ff90.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/librand-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/librbml-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/librbml-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_back-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_bitflags-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_borrowck-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_driver-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_lint-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_llvm-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_privacy-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_resolve-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_trans-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_typeck-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustdoc-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/libstd-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libstd-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/libsyntax-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/libterm-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libterm-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/libtest-%%RUST_LIB_SFX%%.rlib +lib/rustlib/x86_64-unknown-freebsd/lib/libtest-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_data_structures-%%RUST_LIB_SFX%%.so +lib/rustlib/x86_64-unknown-freebsd/lib/librustc_unicode-%%RUST_LIB_SFX%%.rlib man/man1/rustc.1.gz man/man1/rustdoc.1.gz @dir lib/rustlib/x86_64-unknown-freebsd/lib