From owner-svn-ports-head@FreeBSD.ORG  Thu Jan  8 03:55:01 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 58A8FB8E;
 Thu,  8 Jan 2015 03:55:01 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 44641EFE;
 Thu,  8 Jan 2015 03:55:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t083t1OJ006584;
 Thu, 8 Jan 2015 03:55:01 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t083t1cj006582;
 Thu, 8 Jan 2015 03:55:01 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201501080355.t083t1cj006582@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 8 Jan 2015 03:55:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r376511 - head/Mk/Scripts
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.18-1
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: Thu, 08 Jan 2015 03:55:01 -0000

Author: bdrewery
Date: Thu Jan  8 03:55:00 2015
New Revision: 376511
URL: https://svnweb.freebsd.org/changeset/ports/376511
QAT: https://qat.redports.org/buildarchive/r376511/

Log:
  - Rework check on $makeplist in parse_plist(). The variable was/is always 0 as
    the makeplist code does not use parse_plist(). Rename the param to
    'parse_comments' to be more clear on what it is for. This is kept for
    upcoming refactoring.
  
  With hat:	portmgr

Modified:
  head/Mk/Scripts/check-stagedir.sh

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Thu Jan  8 03:37:20 2015	(r376510)
+++ head/Mk/Scripts/check-stagedir.sh	Thu Jan  8 03:55:00 2015	(r376511)
@@ -18,7 +18,9 @@ export LC_ALL=C
 #    Use file descriptors 1 and 3 so that the while loop can write
 #    files to the pipe and dirs to a separate file.
 parse_plist() {
-	local cwd cwd_save commented_cwd comment line newcwd
+	local cwd cwd_save commented_cwd comment line newcwd parse_comments
+
+	parse_comments="${1:-1}"
 
 	echo "===> Parsing plist"
 	cwd=${PREFIX}
@@ -30,7 +32,7 @@ parse_plist() {
 		# a @comment to deactive files. XXX: It would be better to
 		# make all ports use @ignore instead of @comment.
 		comment=
-		if [ ${makeplist} -eq 0 -a -z "${line%%@comment *}" ]; then
+		if [ ${parse_comments} -eq 1 -a -z "${line%%@comment *}" ]; then
 			line="${line##*@comment }"
 			# Remove @comment so it can be parsed as a file,
 			# but later prepend it again to create a list of