From owner-svn-ports-all@FreeBSD.ORG  Fri Oct  4 16:43:14 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 939296C6;
 Fri,  4 Oct 2013 16:43:14 +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 80B7D287F;
 Fri,  4 Oct 2013 16:43:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r94GhEWp096131;
 Fri, 4 Oct 2013 16:43:14 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r94GhE8G096130;
 Fri, 4 Oct 2013 16:43:14 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201310041643.r94GhE8G096130@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 4 Oct 2013 16:43:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329337 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Oct 2013 16:43:14 -0000

Author: bapt
Date: Fri Oct  4 16:43:13 2013
New Revision: 329337
URL: http://svnweb.freebsd.org/changeset/ports/329337

Log:
  MTREE_FILE is not yet defined bsd.stage.mk is parsed let the shell script test it.

Modified:
  head/Mk/bsd.stage.mk

Modified: head/Mk/bsd.stage.mk
==============================================================================
--- head/Mk/bsd.stage.mk	Fri Oct  4 16:38:03 2013	(r329336)
+++ head/Mk/bsd.stage.mk	Fri Oct  4 16:43:13 2013	(r329337)
@@ -72,14 +72,11 @@ add-plist-info:
 
 .if !target(makeplist)
 makeplist: stage
-.if !empty(MTREE_FILE)
-	@{ ${ECHO_CMD} "#mtree"; ${CAT} ${MTREE_FILE}; } | ${TAR} tf - | \
+	@if [ -n "${MTREE_FILE}" ]; then \
+	{ ${ECHO_CMD} "#mtree"; ${CAT} ${MTREE_FILE}; } | ${TAR} tf - | \
 		awk '{ sub(/^\.$$/, "", $$1); \
-		if ($$1 == "") print "${PREFIX}"; else print "${PREFIX}/"$$1; }' \
-		> ${WRKDIR}/.mtree
-.else
-	@: > ${WRKDIR}/.mtree
-.endif
+		if ($$1 == "") print "${PREFIX}"; else print "${PREFIX}/"$$1; }' ; \
+	fi > ${WRKDIR}/.mtree
 	@a=${PREFIX}; \
 		while :; do \
 			a=$${a%/*} ; \
@@ -123,14 +120,11 @@ check-orphans: stage
 		*) ${ECHO_CMD} $$cwd/$$line ;; \
 		esac ; \
 	done < ${TMPPLIST} > ${WRKDIR}/.expanded-plist
-.if !empty(MTREE_FILE)
-	@{ ${ECHO_CMD} "#mtree"; ${CAT} ${MTREE_FILE}; } | ${TAR} tf - | \
+	@if [ -n "${MTREE_FILE}" ]; then \
+		{ ${ECHO_CMD} "#mtree"; ${CAT} ${MTREE_FILE}; } | ${TAR} tf - | \
 		awk '{ sub(/^\.$$/, "", $$1); \
-		if ($$1 == "") print "${PREFIX}"; else print "${PREFIX}/"$$1; }' \
-		> ${WRKDIR}/.mtree
-.else
-	@: > ${WRKDIR}/.mtree
-.endif
+		if ($$1 == "") print "${PREFIX}"; else print "${PREFIX}/"$$1; }' ; \
+	fi > ${WRKDIR}/.mtree
 	@a=${PREFIX}; \
 		while :; do \
 			a=$${a%/*} ; \