From owner-svn-ports-all@FreeBSD.ORG Fri Oct 3 18:14:19 2014 Return-Path: Delivered-To: svn-ports-all@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 3EE57B9D; Fri, 3 Oct 2014 18:14:19 +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 112E51C6; Fri, 3 Oct 2014 18:14:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s93IEIDL008984; Fri, 3 Oct 2014 18:14:18 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s93IEIon008983; Fri, 3 Oct 2014 18:14:18 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410031814.s93IEIon008983@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 3 Oct 2014 18:14:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369924 - 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Oct 2014 18:14:19 -0000 Author: bdrewery Date: Fri Oct 3 18:14:18 2014 New Revision: 369924 URL: https://svnweb.freebsd.org/changeset/ports/369924 QAT: https://qat.redports.org/buildarchive/r369924/ Log: Garbage collect dependency mtree check removed in r368803 Modified: head/Mk/Scripts/check-stagedir.sh Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Fri Oct 3 18:10:51 2014 (r369923) +++ head/Mk/Scripts/check-stagedir.sh Fri Oct 3 18:14:18 2014 (r369924) @@ -324,37 +324,6 @@ check_orphans_from_plist() { return ${ret} } -# Check for directories being removed that are handled by MTREE files. -check_invalid_directories_mtree() { - local ret=0 - # Anything listed in plist and in restricted-dirs is a failure. I.e., - # it's owned by a run-time dependency or one of the MTREEs. - echo "===> Checking for directories owned by MTREEs" - cat ${WRKDIR}/.mtree | sort -u >${WRKDIR}/.restricted-dirs - : >${WRKDIR}/.invalid-plist-mtree - comm -12 ${WRKDIR}/.plist-dirs-sorted-no-comments \ - ${WRKDIR}/.restricted-dirs \ - | sort_dfs | sed "${sed_dirs}" \ - >>${WRKDIR}/.invalid-plist-mtree || : - if [ -s "${WRKDIR}/.invalid-plist-mtree" ]; then - 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 ;; - "@dirrmtry ${PREFIX}") continue ;; - esac - fi - ret=1 - echo "Error: Owned by MTREE: ${line}" >&2 - done < ${WRKDIR}/.invalid-plist-mtree - fi - return ${ret} -} - # Check for directories in plist that dependencies already handle. # XXX: This goes away when pkg learns auto dir tracking check_invalid_directories_from_dependencies() {