svn commit: r327983 - head/Mk

Baptiste Daroussin bapt at FreeBSD.org
Mon Sep 23 11:45:21 UTC 2013


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


More information about the svn-ports-all mailing list