From owner-svn-ports-all@freebsd.org Tue Mar 20 21:08:48 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3472FF4A5C2; Tue, 20 Mar 2018 21:08:48 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D57B987EF1; Tue, 20 Mar 2018 21:08:47 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CB19421E20; Tue, 20 Mar 2018 21:08:47 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2KL8lYj056455; Tue, 20 Mar 2018 21:08:47 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2KL8lIi056453; Tue, 20 Mar 2018 21:08:47 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201803202108.w2KL8lIi056453@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 20 Mar 2018 21:08:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r465109 - in branches/2018Q1/Mk: . Scripts X-SVN-Group: ports-branches X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in branches/2018Q1/Mk: . Scripts X-SVN-Commit-Revision: 465109 X-SVN-Commit-Repository: ports 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.25 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: Tue, 20 Mar 2018 21:08:48 -0000 Author: bdrewery Date: Tue Mar 20 21:08:47 2018 New Revision: 465109 URL: https://svnweb.freebsd.org/changeset/ports/465109 Log: MFH: r459882 Allow passing -DDEPENDS_SHOW_FLAVOR to list flavors for dependency lists. Submitted by: se (based on D13535) With hat: portmgr Approved by: portmgr (implicit) Modified: branches/2018Q1/Mk/Scripts/depends-list.sh branches/2018Q1/Mk/bsd.port.mk Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/Mk/Scripts/depends-list.sh ============================================================================== --- branches/2018Q1/Mk/Scripts/depends-list.sh Tue Mar 20 19:23:32 2018 (r465108) +++ branches/2018Q1/Mk/Scripts/depends-list.sh Tue Mar 20 21:08:47 2018 (r465109) @@ -6,11 +6,15 @@ set -e . ${dp_SCRIPTSDIR}/functions.sh +flavors=0 recursive=0 missing=0 requires_wrkdir=0 -while getopts "mrw" FLAG; do +while getopts "fmrw" FLAG; do case "${FLAG}" in + f) + flavors=1 + ;; m) missing=1 recursive=1 @@ -71,14 +75,19 @@ check_dep() { d=${d%@*} ;; esac + if [ ${flavors} -eq 1 -a -n "${FLAVOR:-}" ]; then + port_display="${d}@${FLAVOR}" + else + port_display="${d}" + fi case " ${checked} " in *\ ${d}\ *) continue ;; # Already checked esac checked="${checked} ${d}" # Check if the dependency actually exists or skip otherwise. - if [ ! -d ${d} ]; then - echo "${dp_PKGNAME}: \"${d}\" non-existent -- dependency list incomplete" >&2 + if [ ! -d "${d}" ]; then + echo "${dp_PKGNAME}: \"${port_display}\" non-existent -- dependency list incomplete" >&2 continue fi @@ -104,7 +113,7 @@ check_dep() { if [ ${requires_wrkdir} -eq 1 ] && ! [ -d "${wrkdir}" ]; then show_dep=0 fi - [ ${show_dep} -eq 1 ] && echo ${d} + [ ${show_dep} -eq 1 ] && echo "${port_display}" if [ ${recursive} -eq 1 -o ${requires_wrkdir} -eq 1 -a ${show_dep} -eq 1 ]; then check_dep $@ fi Modified: branches/2018Q1/Mk/bsd.port.mk ============================================================================== --- branches/2018Q1/Mk/bsd.port.mk Tue Mar 20 19:23:32 2018 (r465108) +++ branches/2018Q1/Mk/bsd.port.mk Tue Mar 20 21:08:47 2018 (r465109) @@ -4075,7 +4075,8 @@ DEPENDS-LIST= \ dp_PKGNAME="${PKGNAME}" \ dp_PKG_INFO="${PKG_INFO}" \ dp_SCRIPTSDIR="${SCRIPTSDIR}" \ - ${SH} ${SCRIPTSDIR}/depends-list.sh + ${SH} ${SCRIPTSDIR}/depends-list.sh \ + ${DEPENDS_SHOW_FLAVOR:D-f} ALL-DEPENDS-LIST= ${DEPENDS-LIST} -r ${_UNIFIED_DEPENDS:Q} ALL-DEPENDS-FLAVORS-LIST= ${DEPENDS-LIST} -f -r ${_UNIFIED_DEPENDS:Q}