svn commit: r412668 - branches/2016Q2/lang/rust

[Jan Beich]

Author: jbeich
Date: Thu Apr  7 14:43:41 2016
New Revision: 412668
URL: https://svnweb.freebsd.org/changeset/ports/412668

Log:
  MFH: r412657
  
  lang/rust: unbreak non-poudriere build after r412305
  
  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 at mimar.rs>, pilot513 at gmail.com
  Approved by:	riggs (maintainer)
  Approved by:	ports-secteam (feld)

Modified:
  branches/2016Q2/lang/rust/Makefile
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/lang/rust/Makefile
==============================================================================
--- branches/2016Q2/lang/rust/Makefile	Thu Apr  7 14:39:14 2016	(r412667)
+++ branches/2016Q2/lang/rust/Makefile	Thu Apr  7 14:43:41 2016	(r412668)
@@ -124,13 +124,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 \
@@ -139,11 +139,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
 	@${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/bin/rustc \