svn commit: r487978 - head/lang/rust-nightly

[Tobias Kortkamp]

Author: tobik
Date: Fri Dec 21 10:37:45 2018
New Revision: 487978
URL: https://svnweb.freebsd.org/changeset/ports/487978

Log:
  lang/rust-nightly: Unbreak after r487977

Modified:
  head/lang/rust-nightly/Makefile

Modified: head/lang/rust-nightly/Makefile
==============================================================================
--- head/lang/rust-nightly/Makefile	Fri Dec 21 10:37:09 2018	(r487977)
+++ head/lang/rust-nightly/Makefile	Fri Dec 21 10:37:45 2018	(r487978)
@@ -22,32 +22,14 @@ 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
 
-# Same as lang/rust except for src/vendor/ -> vendor/
-CRATES_PATCHED_BY_FBSD10_FIX=	vendor/libssh2-sys \
-				vendor/lzma-sys
-
 post-patch:	nightly-post-patch
 nightly-post-patch:
 # Work around unused_unsafe errors in libcore with stage0
 	@${REINPLACE_CMD} '/RUSTC_DENY_WARNINGS/d' ${WRKSRC}/src/bootstrap/builder.rs
-
-# Same as lang/rust except for src/vendor/ -> vendor/
-pre-configure:
-	@for file in \
-		${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/configure \
-		${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \
-		mv "$$file" "$$file.dont-fix"; \
-	done
-
-# Same as lang/rust except for src/vendor/ -> vendor/
-post-configure:
-	@for file in \
-		${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/configure \
-		${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \
-		mv "$$file.dont-fix" "$$file"; \
-	done
 
 .include "${MASTERDIR}/Makefile"