From owner-svn-ports-all@FreeBSD.ORG Fri Oct 3 18:22:47 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 D97FBD4F; Fri, 3 Oct 2014 18:22:47 +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 C55FB2DB; Fri, 3 Oct 2014 18:22:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s93IMlI0013557; Fri, 3 Oct 2014 18:22:47 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s93IMlqp013555; Fri, 3 Oct 2014 18:22:47 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410031822.s93IMlqp013555@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:22:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369925 - in 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:22:48 -0000 Author: bdrewery Date: Fri Oct 3 18:22:46 2014 New Revision: 369925 URL: https://svnweb.freebsd.org/changeset/ports/369925 QAT: https://qat.redports.org/buildarchive/r369925/ Log: check-plist no longer needs to check for directories owned by dependencies. pkg-1.3.8's auto directory handling makes this a non-issue. We should add a new check to warn of possibly needing @dir for empty dirs though. With hat: portmgr Modified: head/Mk/Scripts/check-stagedir.sh head/Mk/bsd.port.mk Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Fri Oct 3 18:14:18 2014 (r369924) +++ head/Mk/Scripts/check-stagedir.sh Fri Oct 3 18:22:46 2014 (r369925) @@ -189,30 +189,6 @@ parse_mtree() { } >${WRKDIR}/.mtree } -pkg_get_recursive_deps() { - echo "$@" - PKG_CHECKED="${PKG_CHECKED} $@" - for depends in $(${PKG_QUERY} '%do' $@ | sort -u); do - [ -z "${depends}" ] && return - case " ${PKG_CHECKED} " in - *\ ${depends}\ *) continue ;; - esac - pkg_get_recursive_deps "${depends}" - done -} - -### GATHER DIRS OWNED BY RUN-DEPENDS. WHY ARE WE SCREAMING? -lookup_dependency_dirs() { - : >${WRKDIR}/.run-depends-dirs - if [ -n "${PACKAGE_DEPENDS}" ]; then - echo "${PACKAGE_DEPENDS}" | while read pkg; do \ - PKG_CHECKED= pkg_get_recursive_deps "${pkg}"; \ - done | sort -u | xargs ${PKG_QUERY} "%D" | \ - sed -e 's,/$,,' | sort -u \ - >>${WRKDIR}/.run-depends-dirs - fi -} - # Sort a directory list by the order of the dfs-sorted file (from find -ds) sort_dfs() { while read dir; do @@ -268,7 +244,7 @@ generate_plist() { ### HANDLE DIRS cat ${WRKDIR}/.plist-dirs-unsorted ${WRKDIR}/.mtree \ - ${WRKDIR}/.run-depends-dirs | sort -u >${WRKDIR}/.traced-dirs + | sort -u >${WRKDIR}/.traced-dirs find -sd ${STAGEDIR} -type d | sed -e "s,^${STAGEDIR},,;/^$/d" \ >${WRKDIR}/.staged-dirs-dfs sort ${WRKDIR}/.staged-dirs-dfs >${WRKDIR}/.staged-dirs-sorted @@ -324,27 +300,6 @@ check_orphans_from_plist() { 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() { - local ret=0 - echo "===> Checking for directories handled by dependencies" - cat ${WRKDIR}/.run-depends-dirs | sort -u >${WRKDIR}/.restricted-dirs - : >${WRKDIR}/.invalid-plist-dependencies - comm -12 ${WRKDIR}/.plist-dirs-sorted-no-comments \ - ${WRKDIR}/.restricted-dirs \ - | sort_dfs | sed "${sed_dirs}" \ - >>${WRKDIR}/.invalid-plist-dependencies || : - if [ -s "${WRKDIR}/.invalid-plist-dependencies" ]; then - # ret=1 - while read line; do - echo "Warning: Possibly owned by dependency: ${line}" \ - >&2 - done < ${WRKDIR}/.invalid-plist-dependencies - fi - return ${ret} -} - # Check for items in plist not in STAGEDIR (pkg lstat(2) errors) check_missing_plist_items() { local ret=0 @@ -393,7 +348,7 @@ esac # validate environment envfault= for i in STAGEDIR PREFIX LOCALBASE WRKDIR WRKSRC MTREE_FILE GNOME_MTREE_FILE \ - TMPPLIST PLIST_SUB_SED SCRIPTSDIR PACKAGE_DEPENDS PKG_QUERY \ + TMPPLIST PLIST_SUB_SED SCRIPTSDIR \ PORT_OPTIONS NO_PREFIX_RMDIR do if ! ( eval ": \${${i}?}" ) 2>/dev/null ; then @@ -419,9 +374,6 @@ fi parse_mtree -lookup_dependency_dirs -unset PACKAGE_DEPENDS PKG_QUERY - setup_plist_seds generate_plist @@ -437,7 +389,6 @@ check_orphans_from_plist || ret=1 sort -u ${WRKDIR}/.plist-dirs-unsorted-no-comments \ >${WRKDIR}/.plist-dirs-sorted-no-comments -check_invalid_directories_from_dependencies || ret=1 check_missing_plist_items || ret=1 if [ ${ret} -ne 0 ]; then Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Oct 3 18:14:18 2014 (r369924) +++ head/Mk/bsd.port.mk Fri Oct 3 18:22:46 2014 (r369925) @@ -1805,9 +1805,6 @@ MAKE_ENV+= ${DESTDIRNAME}=${STAGEDIR} MAKE_ARGS+= ${DESTDIRNAME}=${STAGEDIR} .endif -CO_ENV+= PACKAGE_DEPENDS="${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,}" \ - PKG_QUERY="${PKG_QUERY}" - .if defined(NO_PREFIX_RMDIR) CO_ENV+= NO_PREFIX_RMDIR=1 .else