# Makefile                                               |    9 +---
# distinfo                                               |   36 +++++++----------
# files/patch-src_librustc__back_target_freebsd__base.rs |    7 +--
# 3 files changed, 22 insertions(+), 30 deletions(-)
# svn status
M       lang/rust/Makefile
M       lang/rust/distinfo
D       lang/rust/files/extra-patch-abi
M       lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs

Index: lang/rust/Makefile
===================================================================
--- lang/rust/Makefile	(revision 466235)
+++ lang/rust/Makefile	(working copy)
@@ -3,5 +3,5 @@
 
 PORTNAME=	rust
-PORTVERSION?=	1.24.1
+PORTVERSION?=	1.25.0
 PORTREVISION?=
 CATEGORIES=	lang
@@ -45,11 +45,11 @@ CONFLICTS_INSTALL?=	rust-nightly
 
 # See WRKSRC/src/stage0.txt for this date and version values.
-BOOTSTRAPS_DATE?=		2018-01-04
+BOOTSTRAPS_DATE?=		2018-02-15
 
-RUST_BOOTSTRAP_VERSION?=	1.23.0
+RUST_BOOTSTRAP_VERSION?=	1.24.0
 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.24.0
+CARGO_BOOTSTRAP_VERSION?=	0.25.0
 CARGO_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz
 
@@ -97,5 +97,4 @@ PLIST_FILES=		lib/rustlib/components \
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 && !defined(NIGHTLY_DATE)
 NEED_ABI_PATCH=		1
-EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-abi
 .else
 NEED_ABI_PATCH=		0
Index: lang/rust/distinfo
===================================================================
--- lang/rust/distinfo	(revision 466235)
+++ lang/rust/distinfo	(working copy)
@@ -1,21 +1,15 @@
-TIMESTAMP = 1520331200
-SHA256 (rust/rustc-1.24.1-src.tar.xz) = 85d5d032a59ff91ae01e2b0b65607e763de8dc2729e4b3d28a69023bdd8f5718
-SIZE (rust/rustc-1.24.1-src.tar.xz) = 42171464
-SHA256 (rust/2018-01-04/rustc-1.23.0-aarch64-unknown-freebsd.tar.gz) = 44ae0e7615c19209fb74dc18dd15668af228bb2135bd74a3d4bd8917af6ec889
-SIZE (rust/2018-01-04/rustc-1.23.0-aarch64-unknown-freebsd.tar.gz) = 56833352
-SHA256 (rust/2018-01-04/rust-std-1.23.0-aarch64-unknown-freebsd.tar.gz) = 248cd23557285c7e43ca5ba69d8c71c810ed95affbd723d21d5ce87058bf66f1
-SIZE (rust/2018-01-04/rust-std-1.23.0-aarch64-unknown-freebsd.tar.gz) = 71207727
-SHA256 (rust/2018-01-04/cargo-0.24.0-aarch64-unknown-freebsd.tar.gz) = b028d83da266259adf81ae00b8263a08bfb0ae1bcdbb79abca2fd565fe550669
-SIZE (rust/2018-01-04/cargo-0.24.0-aarch64-unknown-freebsd.tar.gz) = 3895466
-SHA256 (rust/2018-01-04/rustc-1.23.0-i686-unknown-freebsd.tar.gz) = 47211ab3d9232d08a626f666da1d83f8d713de6010b7c9e1b28565c5c0edf544
-SIZE (rust/2018-01-04/rustc-1.23.0-i686-unknown-freebsd.tar.gz) = 49240849
-SHA256 (rust/2018-01-04/rust-std-1.23.0-i686-unknown-freebsd.tar.gz) = 5c220445e20467b71a76bdffeff87d57e17e99860ee8c0e745509147ea283393
-SIZE (rust/2018-01-04/rust-std-1.23.0-i686-unknown-freebsd.tar.gz) = 67245886
-SHA256 (rust/2018-01-04/cargo-0.24.0-i686-unknown-freebsd.tar.gz) = c15a71df418533e1c1bb4a879b10c819e0f0b5bc831c148ffafe69a60dbd8ccc
-SIZE (rust/2018-01-04/cargo-0.24.0-i686-unknown-freebsd.tar.gz) = 5854910
-SHA256 (rust/2018-01-04/rustc-1.23.0-x86_64-unknown-freebsd.tar.gz) = 49576fd518c3bf7b3b665e666d16a8c4875577514cc1864e498d3b0a50cff500
-SIZE (rust/2018-01-04/rustc-1.23.0-x86_64-unknown-freebsd.tar.gz) = 48148869
-SHA256 (rust/2018-01-04/rust-std-1.23.0-x86_64-unknown-freebsd.tar.gz) = 6a7b58f6beb9b5dfad44ee286be552cc96117be3fdce0f2a0ed2904b0ce23186
-SIZE (rust/2018-01-04/rust-std-1.23.0-x86_64-unknown-freebsd.tar.gz) = 66669825
-SHA256 (rust/2018-01-04/cargo-0.24.0-x86_64-unknown-freebsd.tar.gz) = 89878efa237bc0121f3702cd286796c4ce8b0829e671408fe0ea99bf28ce2d4c
-SIZE (rust/2018-01-04/cargo-0.24.0-x86_64-unknown-freebsd.tar.gz) = 5912767
+TIMESTAMP = 1522577690
+SHA256 (rust/rustc-1.25.0-src.tar.xz) = 14fcb82d5959df758aaf422539359300917217fa8420e34bd596e3fb6ed2de87
+SIZE (rust/rustc-1.25.0-src.tar.xz) = 56108536
+SHA256 (rust/2018-02-15/rustc-1.24.0-i686-unknown-freebsd.tar.gz) = f775a54ee18263a12fe9039d98af19c36a7b4e513f54cbd247a32e6b008d40cd
+SIZE (rust/2018-02-15/rustc-1.24.0-i686-unknown-freebsd.tar.gz) = 63788470
+SHA256 (rust/2018-02-15/rust-std-1.24.0-i686-unknown-freebsd.tar.gz) = 41d21402bd5b29c292c4db4a06b07396271e10824006794138e6f9b581f9f319
+SIZE (rust/2018-02-15/rust-std-1.24.0-i686-unknown-freebsd.tar.gz) = 81013253
+SHA256 (rust/2018-02-15/cargo-0.25.0-i686-unknown-freebsd.tar.gz) = c0ebc42bc19933220d56238920dcade0750eb64462d55830403e0e7167f09316
+SIZE (rust/2018-02-15/cargo-0.25.0-i686-unknown-freebsd.tar.gz) = 5455389
+SHA256 (rust/2018-02-15/rustc-1.24.0-x86_64-unknown-freebsd.tar.gz) = 2a0110adc137bf241962eb4000bdba8cbf3713e09087edaba499bb917dce9b8e
+SIZE (rust/2018-02-15/rustc-1.24.0-x86_64-unknown-freebsd.tar.gz) = 62428675
+SHA256 (rust/2018-02-15/rust-std-1.24.0-x86_64-unknown-freebsd.tar.gz) = 99d0ca487e292f76e425074ae77f4e12fe1f67d3f90e0b0a8c4b8ed4e87bc163
+SIZE (rust/2018-02-15/rust-std-1.24.0-x86_64-unknown-freebsd.tar.gz) = 80387975
+SHA256 (rust/2018-02-15/cargo-0.25.0-x86_64-unknown-freebsd.tar.gz) = 9b914574fbdbd4190718ce681041af3ac161aab2bcd5b3b6d52ccb954660c5d3
+SIZE (rust/2018-02-15/cargo-0.25.0-x86_64-unknown-freebsd.tar.gz) = 5604586
Index: lang/rust/files/extra-patch-abi (deleted)
===================================================================
Index: lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs
===================================================================
--- lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs	(revision 466235)
+++ lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs	(working copy)
@@ -1,13 +1,12 @@
 Return struct like OpenBSD, see src/librustc_trans/cabi_x86.rs
 
---- src/librustc_back/target/freebsd_base.rs.orig	2017-11-22 21:33:00 UTC
+--- src/librustc_back/target/freebsd_base.rs.orig	2018-03-25 14:26:14 UTC
 +++ src/librustc_back/target/freebsd_base.rs
-@@ -31,6 +31,8 @@ pub fn opts() -> TargetOptions {
+@@ -31,6 +31,7 @@ pub fn opts() -> TargetOptions {
          target_family: Some("unix".to_string()),
          linker_is_gnu: true,
          has_rpath: true,
 +        is_like_openbsd: true,
-+        eliminate_frame_pointer: false,
          pre_link_args: args,
          position_independent_executables: true,
-         relro_level: RelroLevel::Full,
+         eliminate_frame_pointer: false, // FIXME 43575