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

[Bryan Drewery]

Author: bdrewery
Date: Fri Oct  9 18:00:44 2015
New Revision: 398927
URL: https://svnweb.freebsd.org/changeset/ports/398927

Log:
  Unify depends-list.sh and all-depends-list.sh into one script, depends-list.sh.
  
  With hat:	portmgr

Deleted:
  head/Mk/Scripts/all-depends-list.sh
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	Fri Oct  9 17:31:32 2015	(r398926)
+++ head/Mk/Scripts/depends-list.sh	Fri Oct  9 18:00:44 2015	(r398927)
@@ -6,7 +6,21 @@ set -e
 
 . ${dp_SCRIPTSDIR}/functions.sh
 
+recursive=0
+while getopts "r" FLAG; do
+	case "${FLAG}" in
+		r)
+			recursive=1
+			;;
+		*)
+			echo "Unknown flag" >&2
+			exit 1
+			;;
+	esac
+done
+
 validate_env dp_ALLDEPENDS dp_PORTSDIR dp_PKGNAME
+[ ${recursive} -eq 1 ] && validate_env dp_MAKE
 
 set -u
 
@@ -31,6 +45,9 @@ check_dep() {
 			continue
 		fi
 		echo ${d}
+		if [ ${recursive} -eq 1 ]; then
+			check_dep $(${dp_MAKE} -C ${d} -V_UNIFIED_DEPENDS)
+		fi
 	done
 }
 

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Oct  9 17:31:32 2015	(r398926)
+++ head/Mk/bsd.port.mk	Fri Oct  9 18:00:44 2015	(r398927)
@@ -4369,7 +4369,7 @@ ALL-DEPENDS-LIST= \
 			dp_MAKE="${MAKE}" \
 			dp_PKGNAME="${PKGNAME}" \
 			dp_SCRIPTSDIR="${SCRIPTSDIR}" \
-			${SH} ${SCRIPTSDIR}/all-depends-list.sh
+			${SH} ${SCRIPTSDIR}/depends-list.sh -r
 
 CLEAN-DEPENDS-LIST= \
 	${SETENV} dp_ALLDEPENDS="${_UNIFIED_DEPENDS}" \