From owner-svn-ports-head@freebsd.org  Thu Apr  7 07:17:46 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5FD1B06840;
 Thu,  7 Apr 2016 07:17:46 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9E42B1B21;
 Thu,  7 Apr 2016 07:17:46 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u377Hj0B072051;
 Thu, 7 Apr 2016 07:17:45 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u377Hj9Y072050;
 Thu, 7 Apr 2016 07:17:45 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201604070717.u377Hj9Y072050@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 7 Apr 2016 07:17:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r412657 - head/lang/rust
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Apr 2016 07:17:47 -0000

Author: jbeich
Date: Thu Apr  7 07:17:45 2016
New Revision: 412657
URL: https://svnweb.freebsd.org/changeset/ports/412657

Log:
  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@mimar.rs>, pilot513@gmail.com
  Approved by:	riggs (maintainer)
  MFH:		2016Q2

Modified:
  head/lang/rust/Makefile   (contents, props changed)

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Thu Apr  7 03:59:58 2016	(r412656)
+++ head/lang/rust/Makefile	Thu Apr  7 07:17:45 2016	(r412657)
@@ -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.