From owner-svn-ports-head@FreeBSD.ORG  Mon Sep 23 11:45:21 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BB642A6A;
 Mon, 23 Sep 2013 11:45:21 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A93752580;
 Mon, 23 Sep 2013 11:45:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NBjL95056118;
 Mon, 23 Sep 2013 11:45:21 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8NBjLZo056117;
 Mon, 23 Sep 2013 11:45:21 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201309231145.r8NBjLZo056117@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 23 Sep 2013 11:45:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r327983 - head/Mk
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Sep 2013 11:45:21 -0000

Author: bapt
Date: Mon Sep 23 11:45:21 2013
New Revision: 327983
URL: http://svnweb.freebsd.org/changeset/ports/327983

Log:
  Use macro when possible
  
  Reported by:	ak

Modified:
  head/Mk/bsd.stage.mk

Modified: head/Mk/bsd.stage.mk
==============================================================================
--- head/Mk/bsd.stage.mk	Mon Sep 23 11:31:33 2013	(r327982)
+++ head/Mk/bsd.stage.mk	Mon Sep 23 11:45:21 2013	(r327983)
@@ -82,12 +82,12 @@ makeplist: stage
 			[ -z "$${a}" ] && break ; \
 			${ECHO_CMD} $${a} >> ${WRKDIR}/.mtree ; \
 		done
-	@${FIND} ${STAGEDIR} -type f -o -type l | sort | ${SED} -e "s,${STAGEDIR},,g" \
+	@${FIND} ${STAGEDIR} -type f -o -type l | ${SORT} | ${SED} -e "s,${STAGEDIR},,g" \
 		-e "s,${DOCSDIR},%%PORTDOCS%%%%DOCSDIR%%,g" \
 		-e "s,${EXAMPLESDIR},%%PORTEXAMPLES%%%%EXAMPLESDIR%%,g" \
 		-e "s,${DATADIR},%%DATADIR%%,g" \
-		-e "s,${PREFIX}/,,g" | grep -v "^share/licenses" || ${TRUE}
-	@${FIND} ${STAGEDIR} -type d | sed -e "s,${STAGEDIR},,g" \
+		-e "s,${PREFIX}/,,g" | ${GREP} -v "^share/licenses" || ${TRUE}
+	@${FIND} ${STAGEDIR} -type d | ${SED} -e "s,${STAGEDIR},,g" \
 		| while read line; do \
 		${GREP} -qw "^$${line}$$" ${WRKDIR}/.mtree || { \
 			[ -n "$${line}" ] && ${ECHO_CMD} "@dirrmtry $${line}"; \
@@ -96,5 +96,5 @@ makeplist: stage
 		-e "s,\(.*\)${DOCSDIR},%%PORTDOCS%%\1%%DOCSDIR%%,g" \
 		-e "s,\(.*\)${EXAMPLESDIR},%%PORTEXAMPLES%%\1%%EXAMPLESDIR%%,g" \
 		-e "s,${DATADIR},%%DATADIR%%,g" \
-		-e "s,${PREFIX}/,,g" | grep -v "^@dirrmtry share/licenses" || ${TRUE}
+		-e "s,${PREFIX}/,,g" | ${GREP} -v "^@dirrmtry share/licenses" || ${TRUE}
 .endif