Index: head/lang/rust-nightly/Makefile =================================================================== --- head/lang/rust-nightly/Makefile (revision 489122) +++ head/lang/rust-nightly/Makefile (revision 489123) @@ -1,36 +1,36 @@ # Created by: Jean-Sébastien Pédron # $FreeBSD$ PORTVERSION= 1.33.0.${NIGHTLY_DATE:C,-,,g} PKGNAMESUFFIX= -nightly DISTNAME= rustc-nightly-src MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo CONFLICTS_INSTALL= rust # Which source to pull: # https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2019-01-01 +NIGHTLY_DATE= 2019-01-03 NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/ # See WRKSRC/src/stage0.txt for this date BOOTSTRAPS_DATE= 2018-12-09 RUST_BOOTSTRAP_VERSION= beta CARGO_BOOTSTRAP_VERSION= beta CARGO_VENDOR_DIR= ${WRKSRC}/vendor # Other bootstraps aren't provided by upstream yet ONLY_FOR_ARCHS= amd64 i386 post-patch: nightly-post-patch nightly-post-patch: # Work around unused_unsafe errors in libcore with stage0 # https://github.com/rust-lang/rust/pull/57184 @${REINPLACE_CMD} '/RUSTC_DENY_WARNINGS/d' ${WRKSRC}/src/bootstrap/builder.rs .include "${MASTERDIR}/Makefile" Index: head/lang/rust-nightly/distinfo =================================================================== --- head/lang/rust-nightly/distinfo (revision 489122) +++ head/lang/rust-nightly/distinfo (revision 489123) @@ -1,15 +1,15 @@ -TIMESTAMP = 1546295983 -SHA256 (rust/2019-01-01/rustc-nightly-src.tar.xz) = 89a8829d474889e16bd8f716fe10847aba00f608c3d7e7a1e0058aa19108e3cf -SIZE (rust/2019-01-01/rustc-nightly-src.tar.xz) = 100412360 +TIMESTAMP = 1546448030 +SHA256 (rust/2019-01-03/rustc-nightly-src.tar.xz) = 5ff712be6e2a80a3aa945e9c6df28b074aee767120339de15ecd72cfbf0e46fa +SIZE (rust/2019-01-03/rustc-nightly-src.tar.xz) = 100414384 SHA256 (rust/2018-12-09/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 1c59a13cc385c9e06b80202651f8af9e9e22658e1863de85ce67ca12a0940a46 SIZE (rust/2018-12-09/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 70377440 SHA256 (rust/2018-12-09/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 12fa39ff525ddd64490e63be98b954c9ee66e0cf603143f49b04f1c5760f3885 SIZE (rust/2018-12-09/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 67038294 SHA256 (rust/2018-12-09/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 054d227205949638483fc13035c0657177ebe0e48da24b77f406c86b35aef0a0 SIZE (rust/2018-12-09/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 6256857 SHA256 (rust/2018-12-09/rustc-beta-i686-unknown-freebsd.tar.gz) = e01e810b8aa0e985d78918cc8934796b6c440e5bb87fd969c4ad074106492cea SIZE (rust/2018-12-09/rustc-beta-i686-unknown-freebsd.tar.gz) = 71112245 SHA256 (rust/2018-12-09/rust-std-beta-i686-unknown-freebsd.tar.gz) = 869efa046038c4bebec34cc04f1187fbae70dda9294effccce31510a3365b775 SIZE (rust/2018-12-09/rust-std-beta-i686-unknown-freebsd.tar.gz) = 67329498 SHA256 (rust/2018-12-09/cargo-beta-i686-unknown-freebsd.tar.gz) = dcf240699f5a00a97350a8cb47653da2633e33deb9ad4e85a979c81ab2e59072 SIZE (rust/2018-12-09/cargo-beta-i686-unknown-freebsd.tar.gz) = 6020090 Index: head/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c =================================================================== --- head/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c (revision 489122) +++ head/lang/rust-nightly/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c (revision 489123) @@ -1,42 +1,44 @@ +This file is in the public domain. + --- vendor/backtrace-sys/src/libbacktrace/fileline.c.orig 2017-06-06 00:42:59 UTC +++ vendor/backtrace-sys/src/libbacktrace/fileline.c @@ -38,8 +38,39 @@ POSSIBILITY OF SUCH DAMAGE. */ #include #include +#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) +#include +#include +#endif + #include "backtrace.h" #include "internal.h" + +#if !defined(HAVE_GETEXECNAME) && defined(KERN_PROC_PATHNAME) +/* Return pathname of executable or 0 on failure. */ +#define HAVE_GETEXECNAME +static char execname[PATH_MAX + 1]; +static const char * +getexecname(void) +{ + size_t path_len = sizeof(execname); + int mib[] = { + CTL_KERN, +#if defined(__NetBSD__) + KERN_PROC_ARGS, + -1, + KERN_PROC_PATHNAME, +#else + KERN_PROC, + KERN_PROC_PATHNAME, + -1, +#endif + }; + u_int miblen = sizeof(mib) / sizeof(mib[0]); + int rc = sysctl(mib, miblen, execname, &path_len, NULL, 0); + return rc ? NULL : execname; +} +#endif /* !HAVE_GETEXECNAME && KERN_PROC_PATHNAME */ #ifndef HAVE_GETEXECNAME #define getexecname() NULL