Index: lang/rust/Makefile =================================================================== --- lang/rust/Makefile +++ lang/rust/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.32.0 +PORTVERSION?= 1.33.0 PORTREVISION?= 0 CATEGORIES= lang -MASTER_SITES= http://static.rust-lang.org/dist/:src \ +MASTER_SITES= http://dev-static.rust-lang.org/dist/:src \ LOCAL/dumbbell/rust:rust_bootstrap \ LOCAL/tobik/rust:rust_bootstrap \ https://static.rust-lang.org/dist/:rust_bootstrap \ @@ -42,9 +42,9 @@ CONFLICTS_INSTALL?= rust-nightly # See WRKSRC/src/stage0.txt for this date and version values. -BOOTSTRAPS_DATE?= 2018-12-20 +BOOTSTRAPS_DATE?= 2019-01-17 -RUST_BOOTSTRAP_VERSION?= 1.31.1 +RUST_BOOTSTRAP_VERSION?= 1.32.0 RUST_BOOTSTRAP_VERSION_aarch64?= 1.32.0 RUST_BOOTSTRAP_VERSION_armv6?= 1.32.0 RUST_BOOTSTRAP_VERSION_armv7?= 1.32.0 @@ -52,7 +52,7 @@ RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz -CARGO_BOOTSTRAP_VERSION?= 0.32.0 +CARGO_BOOTSTRAP_VERSION?= 0.33.0 CARGO_BOOTSTRAP_VERSION_aarch64?= 0.33.0 CARGO_BOOTSTRAP_VERSION_armv6?= 0.33.0 CARGO_BOOTSTRAP_VERSION_armv7?= 0.33.0 Index: lang/rust/distinfo =================================================================== --- lang/rust/distinfo +++ lang/rust/distinfo @@ -1,18 +1,18 @@ -TIMESTAMP = 1547636591 -SHA256 (rust/rustc-1.32.0-src.tar.xz) = d617a7dc39daaafa8256320991005fc376c8ef2080593918301b24466d0067af -SIZE (rust/rustc-1.32.0-src.tar.xz) = 99602696 -SHA256 (rust/2018-12-20/rustc-1.31.1-x86_64-unknown-freebsd.tar.gz) = fb38ad94976c273c0fb95d0b5ba2d1ce90684e58fa06fafc9f8050ba00559f50 -SIZE (rust/2018-12-20/rustc-1.31.1-x86_64-unknown-freebsd.tar.gz) = 69931606 -SHA256 (rust/2018-12-20/rust-std-1.31.1-x86_64-unknown-freebsd.tar.gz) = 89e551403f70eed976ac1dd91c3effc9434ef450da4c347d24a141529f83a101 -SIZE (rust/2018-12-20/rust-std-1.31.1-x86_64-unknown-freebsd.tar.gz) = 69337097 -SHA256 (rust/2018-12-20/cargo-0.32.0-x86_64-unknown-freebsd.tar.gz) = 2cc09d55f6c6dcca58d43815c4968d2349813b12e12a23eff1b8fa30548eba8f -SIZE (rust/2018-12-20/cargo-0.32.0-x86_64-unknown-freebsd.tar.gz) = 6813542 -SHA256 (rust/2018-12-20/rustc-1.31.1-i686-unknown-freebsd.tar.gz) = a68848c513b2eaf3fb15e6798ee3a1cd352d0b75d3f103e104a72d8290651e8b -SIZE (rust/2018-12-20/rustc-1.31.1-i686-unknown-freebsd.tar.gz) = 70696299 -SHA256 (rust/2018-12-20/rust-std-1.31.1-i686-unknown-freebsd.tar.gz) = 87d7e4aa9bfc50a111ac6c47360c831857b83ed61a07bc368a505f4d0183ea8f -SIZE (rust/2018-12-20/rust-std-1.31.1-i686-unknown-freebsd.tar.gz) = 69465005 -SHA256 (rust/2018-12-20/cargo-0.32.0-i686-unknown-freebsd.tar.gz) = 32db6c8124e5cfeffb58576bbdbe9a8ec1317a31588d393a2be822e87efc55ab -SIZE (rust/2018-12-20/cargo-0.32.0-i686-unknown-freebsd.tar.gz) = 6510783 +TIMESTAMP = 1551091754 +SHA256 (rust/rustc-1.33.0-src.tar.xz) = c4a200c27b47276ea294f9de4afc2932d0720638a486b93e6bf924f90eb354c1 +SIZE (rust/rustc-1.33.0-src.tar.xz) = 100626716 +SHA256 (rust/2019-01-17/rustc-1.32.0-x86_64-unknown-freebsd.tar.gz) = a14a0e288be8ce894a85810151a2eb70fc86afa36e4a5fae4e903c744b888687 +SIZE (rust/2019-01-17/rustc-1.32.0-x86_64-unknown-freebsd.tar.gz) = 70385575 +SHA256 (rust/2019-01-17/rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = d50f674379791a93764d383153ed6533cea165ede7f233df4e17563bfdab273c +SIZE (rust/2019-01-17/rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = 67069445 +SHA256 (rust/2019-01-17/cargo-0.33.0-x86_64-unknown-freebsd.tar.gz) = e780264949c8e597191f38d4930cad8074890a7a48c04cf10e6864ff0eb4bc8a +SIZE (rust/2019-01-17/cargo-0.33.0-x86_64-unknown-freebsd.tar.gz) = 6253970 +SHA256 (rust/2019-01-17/rustc-1.32.0-i686-unknown-freebsd.tar.gz) = 7bea209a99b8a3c05a80e55fef293d73a68fa57d58120ed5cd11adc9d6b7ed5c +SIZE (rust/2019-01-17/rustc-1.32.0-i686-unknown-freebsd.tar.gz) = 71140698 +SHA256 (rust/2019-01-17/rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = 1189726665509f2a5e44fcdbbe70f691e8ffc748404966c9b73abf62b4f9cb82 +SIZE (rust/2019-01-17/rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = 67402728 +SHA256 (rust/2019-01-17/cargo-0.33.0-i686-unknown-freebsd.tar.gz) = cba7cf145100c4e74da1fca20ad272999ec2b55817f26723c3dfc9fd4abd196d +SIZE (rust/2019-01-17/cargo-0.33.0-i686-unknown-freebsd.tar.gz) = 6017543 SHA256 (rust/2018-12-20/cargo-0.33.0-aarch64-unknown-freebsd.tar.gz) = a13c3f8c17beb6d19f54ac705d87b6dbb9cd09cd945d0ffbaed1a77e8ac38128 SHA256 (rust/2018-12-20/cargo-0.33.0-armv6-unknown-freebsd.tar.gz) = 62158d26a9dbc17cfd92882cb48b6ee7a06432b9f18d1f78b90b6973d63be12c SHA256 (rust/2018-12-20/cargo-0.33.0-armv7-unknown-freebsd.tar.gz) = bfb8986a11034cac7329037a2f24c07bcd62ba2d91838f6c28955b2ee639e361 Index: lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs =================================================================== --- lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs +++ /dev/null @@ -1,7 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/dragonfly/mod.rs.orig 2018-06-19 04:36:14 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/dragonfly/mod.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type clock_t = u64; - pub type ino_t = u64; - pub type lwpid_t = i32; Index: lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs =================================================================== --- lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs +++ /dev/null @@ -1,7 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs.orig 2018-06-19 04:36:14 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs -@@ -1,3 +1,4 @@ -+pub type c_char = u8; - pub type c_long = i64; - pub type c_ulong = u64; - pub type time_t = i64; Index: lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_arm.rs =================================================================== --- lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_arm.rs +++ /dev/null @@ -1,40 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/arm.rs.orig 2019-02-15 13:41:07 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/arm.rs -@@ -0,0 +1,37 @@ -+pub type c_char = u8; -+pub type c_long = i32; -+pub type c_ulong = u32; -+pub type time_t = i64; -+pub type suseconds_t = i32; -+ -+s! { -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_atime_pad: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_mtime_pad: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ pub st_ctime_pad: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: ::uint32_t, -+ pub st_lspare: ::int32_t, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ pub st_birthtime_pad: ::c_long, -+ } -+} -+ -+pub const MAP_32BIT: ::c_int = 0x00080000; Index: lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_mod.rs =================================================================== --- lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_mod.rs +++ /dev/null @@ -1,15 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2019-01-16 09:30:47 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs -@@ -1068,6 +1068,12 @@ cfg_if! { - } else if #[cfg(target_arch = "aarch64")] { - mod aarch64; - pub use self::aarch64::*; -+ } else if #[cfg(target_arch = "arm")] { -+ mod arm; -+ pub use self::arm::*; -+ } else if #[cfg(target_arch = "powerpc64")] { -+ mod powerpc64; -+ pub use self::powerpc64::*; - } else { - // Unknown target_arch - } Index: lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_powerpc64.rs =================================================================== --- lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_powerpc64.rs +++ /dev/null @@ -1,34 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs.orig 2019-02-15 13:41:07 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs -@@ -0,0 +1,31 @@ -+pub type c_char = u8; -+pub type c_long = i64; -+pub type c_ulong = u64; -+pub type time_t = i64; -+pub type suseconds_t = i64; -+ -+s! { -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: ::uint32_t, -+ pub st_lspare: ::int32_t, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ } -+} Index: lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86.rs =================================================================== --- lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86.rs +++ /dev/null @@ -1,7 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86.rs.orig 2018-06-19 04:36:14 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type c_long = i32; - pub type c_ulong = u32; - pub type time_t = i32; Index: lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs =================================================================== --- lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs +++ /dev/null @@ -1,7 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2018-06-19 04:36:14 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type c_long = i64; - pub type c_ulong = u64; - pub type time_t = i64; Index: lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_mod.rs =================================================================== --- lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_mod.rs +++ /dev/null @@ -1,17 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/mod.rs.orig 2019-01-16 09:30:47 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/mod.rs -@@ -1,4 +1,3 @@ --pub type c_char = i8; - pub type dev_t = u32; - pub type mode_t = u16; - pub type pthread_attr_t = *mut ::c_void; -@@ -83,8 +82,7 @@ s! { - } - - pub struct stack_t { -- // In FreeBSD 11 and later, ss_sp is actually a void* -- pub ss_sp: *mut ::c_char, -+ pub ss_sp: *mut ::c_void, - pub ss_size: ::size_t, - pub ss_flags: ::c_int, - } Index: lang/rust/files/patch-src_libstd_build.rs =================================================================== --- lang/rust/files/patch-src_libstd_build.rs +++ /dev/null @@ -1,22 +0,0 @@ ---- src/libstd/build.rs.orig 2019-01-16 09:30:27 UTC -+++ src/libstd/build.rs -@@ -92,13 +92,18 @@ fn build_libbacktrace(target: &str) -> Result<(), ()> - .out_dir(&native.out_dir) - .warnings(false) - .file("../libbacktrace/alloc.c") -- .file("../libbacktrace/backtrace.c") - .file("../libbacktrace/dwarf.c") - .file("../libbacktrace/fileline.c") - .file("../libbacktrace/posix.c") - .file("../libbacktrace/read.c") - .file("../libbacktrace/sort.c") - .file("../libbacktrace/state.c"); -+ -+ if target.contains("freebsd") { -+ build.file("../libbacktrace/nounwind.c"); -+ } else { -+ build.file("../libbacktrace/backtrace.c"); -+ } - - let any_debug = env::var("RUSTC_DEBUGINFO").unwrap_or_default() == "true" || - env::var("RUSTC_DEBUGINFO_LINES").unwrap_or_default() == "true"; Index: lang/rust/files/patch-src_libstd_os_raw_mod.rs =================================================================== --- lang/rust/files/patch-src_libstd_os_raw_mod.rs +++ /dev/null @@ -1,24 +0,0 @@ ---- src/libstd/os/raw/mod.rs.orig 2019-01-16 09:30:27 UTC -+++ src/libstd/os/raw/mod.rs -@@ -27,6 +27,10 @@ - all(target_os = "android", any(target_arch = "aarch64", - target_arch = "arm")), - all(target_os = "l4re", target_arch = "x86_64"), -+ all(target_os = "freebsd", any(target_arch = "aarch64", -+ target_arch = "arm", -+ target_arch = "powerpc", -+ target_arch = "powerpc64")), - all(target_os = "netbsd", any(target_arch = "aarch64", - target_arch = "arm", - target_arch = "powerpc")), -@@ -42,6 +46,10 @@ - all(target_os = "android", any(target_arch = "aarch64", - target_arch = "arm")), - all(target_os = "l4re", target_arch = "x86_64"), -+ all(target_os = "freebsd", any(target_arch = "aarch64", -+ target_arch = "arm", -+ target_arch = "powerpc", -+ target_arch = "powerpc64")), - all(target_os = "netbsd", any(target_arch = "aarch64", - target_arch = "arm", - target_arch = "powerpc")), Index: lang/rust/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c =================================================================== --- lang/rust/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c +++ lang/rust/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c @@ -1,7 +1,7 @@ This file is in the public domain. ---- src/libbacktrace/fileline.c.orig 2019-01-16 09:30:44 UTC -+++ src/libbacktrace/fileline.c +--- vendor/backtrace-sys/src/libbacktrace/fileline.c.orig 2019-01-16 09:30:44 UTC ++++ vendor/backtrace-sys/src/libbacktrace/fileline.c @@ -39,8 +39,39 @@ POSSIBILITY OF SUCH DAMAGE. */ #include #include Index: lang/rust/files/patch-vendor_compiler__builtins_build.rs =================================================================== --- lang/rust/files/patch-vendor_compiler__builtins_build.rs +++ lang/rust/files/patch-vendor_compiler__builtins_build.rs @@ -1,5 +1,5 @@ ---- src/libcompiler_builtins/build.rs.orig 2019-01-16 09:30:44 UTC -+++ src/libcompiler_builtins/build.rs +--- vendor/compiler_builtins/build.rs.orig 2019-01-16 09:30:44 UTC ++++ vendor/compiler_builtins/build.rs @@ -308,6 +308,10 @@ mod c { ], ); Index: lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs =================================================================== --- lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs +++ lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs @@ -1,12 +1,12 @@ --- vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2019-01-16 11:06:08 UTC +++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs -@@ -1154,6 +1154,12 @@ cfg_if! { +@@ -1068,6 +1068,12 @@ cfg_if! { } else if #[cfg(target_arch = "aarch64")] { mod aarch64; pub use self::aarch64::*; + } else if #[cfg(target_arch = "arm")] { -+ mod arm; -+ pub use self::arm::*; ++ mod arm; ++ pub use self::arm::*; + } else if #[cfg(target_arch = "powerpc64")] { + mod powerpc64; + pub use self::powerpc64::*; Index: lang/rust/files/patch-vendor_openssl-sys_build_main.rs =================================================================== --- lang/rust/files/patch-vendor_openssl-sys_build_main.rs +++ /dev/null @@ -1,66 +0,0 @@ -https://github.com/sfackler/rust-openssl/commit/9fd7584a8416 -https://github.com/sfackler/rust-openssl/commit/e75793e8962d - ---- vendor/openssl-sys/build/main.rs.orig 2018-12-05 01:24:32 UTC -+++ vendor/openssl-sys/build/main.rs -@@ -1,9 +1,9 @@ - extern crate cc; -+#[cfg(feature = "vendored")] -+extern crate openssl_src; - extern crate pkg_config; - #[cfg(target_env = "msvc")] - extern crate vcpkg; --#[cfg(feature = "vendored")] --extern crate openssl_src; - - use std::collections::HashSet; - use std::env; -@@ -103,20 +103,23 @@ fn main() { - - #[cfg(feature = "vendored")] - mod imp { -- use std::path::PathBuf; -- use openssl_src; -+ use openssl_src; -+ use std::path::PathBuf; - -- pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) { -- let artifacts = openssl_src::Build::new().build(); -- (artifacts.lib_dir().to_path_buf(), artifacts.include_dir().to_path_buf()) -- } -+ pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) { -+ let artifacts = openssl_src::Build::new().build(); -+ ( -+ artifacts.lib_dir().to_path_buf(), -+ artifacts.include_dir().to_path_buf(), -+ ) -+ } - } - - #[cfg(not(feature = "vendored"))] - mod imp { - use pkg_config; -- use std::path::{Path, PathBuf}; - use std::ffi::OsString; -+ use std::path::{Path, PathBuf}; - use std::process::{self, Command}; - - use super::env; -@@ -500,6 +503,8 @@ See rust-openssl README for more information: - (7, _) => ('7', 'x'), - (8, 0) => ('8', '0'), - (8, 1) => ('8', '1'), -+ (8, _) => ('8', 'x'), -+ (9, 0) => ('9', '0'), - _ => version_error(), - }; - -@@ -540,7 +545,7 @@ fn version_error() -> ! { - " - - This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 --through 2.8.1, but a different version of OpenSSL was found. The build is now aborting -+through 2.9.0, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - "