From owner-svn-ports-head@freebsd.org  Fri Oct  9 18:00:46 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2DF639D1869;
 Fri,  9 Oct 2015 18:00:46 +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 mx1.freebsd.org (Postfix) with ESMTPS id D363D1144;
 Fri,  9 Oct 2015 18:00:45 +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 t99I0iFj049421;
 Fri, 9 Oct 2015 18:00:44 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t99I0iRY049419;
 Fri, 9 Oct 2015 18:00:44 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201510091800.t99I0iRY049419@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 9 Oct 2015 18:00:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r398927 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Oct 2015 18:00:46 -0000

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}" \