From owner-svn-ports-head@FreeBSD.ORG  Sun May  4 03:09:59 2014
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 ESMTPS id 7ADD6E4E;
 Sun,  4 May 2014 03:09:59 +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 67B31147E;
 Sun,  4 May 2014 03:09:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4439xT7030195;
 Sun, 4 May 2014 03:09:59 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4439x4g030194;
 Sun, 4 May 2014 03:09:59 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201405040309.s4439x4g030194@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 4 May 2014 03:09:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r352937 - 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.17
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: Sun, 04 May 2014 03:09:59 -0000

Author: bdrewery
Date: Sun May  4 03:09:58 2014
New Revision: 352937
URL: http://svnweb.freebsd.org/changeset/ports/352937
QAT: https://qat.redports.org/buildarchive/r352937/

Log:
  - Ignore MTREE owned PREFIX and PREFIX/info removal for now.
    The removal of PREFIX/info may be a bug in bsd.port.mk and needs
    more testing.
  
  With hat:	portmgr
  Reported by:	gerald

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

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Sun May  4 03:08:38 2014	(r352936)
+++ head/Mk/Scripts/check-stagedir.sh	Sun May  4 03:09:58 2014	(r352937)
@@ -320,8 +320,18 @@ check_invalid_directories_mtree() {
 	    | sort_dfs | sed "${sed_dirs}" \
 	    >>${WRKDIR}/.invalid-plist-mtree || :
 	if [ -s "${WRKDIR}/.invalid-plist-mtree" ]; then
-		ret=1
 		while read line; do
+			# Skip removal of PREFIX and PREFIX/info from
+			# bsd.port.mk for now. The removal of info may
+			# be a bug; it's part of BSD.local.dist.
+			# See ports/74691
+			if [ "${PREFIX}" != "${LOCALBASE}" ]; then
+				case "${line}" in
+					"@dirrmtry info") continue ;;
+					"@unexec rmdir \"${PREFIX}\" >/dev/null 2>&1 || :") continue ;;
+				esac
+			fi
+			ret=1
 			echo "Error: Owned by MTREE: ${line}" >&2
 		done < ${WRKDIR}/.invalid-plist-mtree
 	fi