svn commit: r459882 - in head/Mk: . Scripts

[Bryan Drewery]

Author: bdrewery
Date: Wed Jan 24 18:54:57 2018
New Revision: 459882
URL: https://svnweb.freebsd.org/changeset/ports/459882

Log:
  Allow passing -DDEPENDS_SHOW_FLAVOR to list flavors for dependency lists.
  
  Submitted by:	se (based on D13535)
  With hat:	portmgr

Modified:
  head/Mk/Scripts/depends-list.sh
  head/Mk/bsd.port.mk

Modified: head/Mk/Scripts/depends-list.sh
==============================================================================
--- head/Mk/Scripts/depends-list.sh	Wed Jan 24 18:47:10 2018	(r459881)
+++ head/Mk/Scripts/depends-list.sh	Wed Jan 24 18:54:57 2018	(r459882)
@@ -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: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Jan 24 18:47:10 2018	(r459881)
+++ head/Mk/bsd.port.mk	Wed Jan 24 18:54:57 2018	(r459882)
@@ -4026,7 +4026,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}
 MISSING-DEPENDS-LIST=		${DEPENDS-LIST} -m ${_UNIFIED_DEPENDS:Q}