From owner-svn-ports-head@FreeBSD.ORG  Fri Nov 29 16:08:42 2013
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 300CE736;
 Fri, 29 Nov 2013 16:08:42 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1BF711EE7;
 Fri, 29 Nov 2013 16:08:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rATG8f79005733;
 Fri, 29 Nov 2013 16:08:41 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rATG8fM7005732;
 Fri, 29 Nov 2013 16:08:41 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201311291608.rATG8fM7005732@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Fri, 29 Nov 2013 16:08:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335192 - 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.16
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: Fri, 29 Nov 2013 16:08:42 -0000

Author: mat
Date: Fri Nov 29 16:08:41 2013
New Revision: 335192
URL: http://svnweb.freebsd.org/changeset/ports/335192

Log:
  Fixup makeplist for directories.
  
  Without, it'll generate :
  @dirrmtry %%PORTDOCS%%%%DOCSDIR%%
  With :
  %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
  
  PR:		ports/184287
  Submitted by:	mat
  Approved by:	bapt

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

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Fri Nov 29 16:06:07 2013	(r335191)
+++ head/Mk/Scripts/check-stagedir.sh	Fri Nov 29 16:08:41 2013	(r335192)
@@ -107,9 +107,9 @@ cat ${WRKDIR}/.plist-dirs-unsorted ${WRK
 find ${STAGEDIR} -type d | sed -e "s,^${STAGEDIR},,;/^$/d" | sort >${WRKDIR}/.staged-dirs
 comm -13 ${WRKDIR}/.traced-dirs ${WRKDIR}/.staged-dirs \
 	| sort -r | sed \
+	-e 's,^,@dirrmtry ,' \
 	-e "s,\(.*\)${DOCSDIR},%%PORTDOCS%%\1%%DOCSDIR%%,g" \
 	-e "s,\(.*\)${EXAMPLESDIR},%%PORTEXAMPLES%%\1%%EXAMPLESDIR%%,g" \
 	-e "s,${DATADIR},%%DATADIR%%,g" \
 	-e "s,${PREFIX}/,,g" \
-	-e 's,^,@dirrmtry ,' \
 	-e 's,@dirrmtry \(/.*\),@unexec rmdir >/dev/null 2>\&1 \1 || :,' | grep -v "^@dirrmtry share/licenses" || [ $? = 1 ]