From 811236773d81e40e3f8d3e3359528d441ffa411a Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 7 Apr 2016 07:17:45 +0000
Subject: [PATCH] lang/rust: unbreak non-poudriere build after r412305
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

gmake[1]: Leaving directory '/wrkdirs/usr/ports/lang/rust/work/rustc-1.7.0'
sed: /wrkdirs/usr/ports/lang/rust/work/stage/usr/local/lib/rustlib/manifest-rust-std-x86_64-unknown-: No such file or directory
*** Error code 1

PR:		208527
Pointy hat:	jbeich
Tested by:	Marko Cupać <marko.cupac@mimar.rs>, pilot513@gmail.com
Approved by:	riggs (maintainer)
MFH:		2016Q2
---
 lang/rust/Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index a30717756eee..b29468ea7877 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -125,13 +125,13 @@ post-patch:
 # new ones. Otherwise, the staging directory is polluted with unneeded
 # files.
 pre-install:
-.for f in manifest-rustc manifest-rust-std-${RUST_TARGET}
-	@if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/${f}; then \
+	@for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \
+	    if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \
 		${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \
-		< ${STAGEDIR}${PREFIX}/lib/rustlib/${f} \
+		< ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \
 		| ${XARGS} ${RM}; \
-	fi
-.endfor
+	    fi; \
+	done
 	@${RM} \
 		${STAGEDIR}${PREFIX}/lib/rustlib/components \
 		${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \
@@ -140,11 +140,11 @@ pre-install:
 		${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
 
 post-install:
-.for f in manifest-rustc manifest-rust-std-${RUST_TARGET}
-	@${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
-		${STAGEDIR}${PREFIX}/lib/rustlib/${f}
-	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/${f}.bak
-.endfor
+	@for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \
+		${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
+			${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \
+		${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \
+	done
 	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log
 # FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped,
 # but they contain non-object files which make strip(1) unhappy.