From owner-svn-ports-all@freebsd.org  Tue Oct 18 15:27:26 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 E7F58C1768F;
 Tue, 18 Oct 2016 15:27:26 +0000 (UTC) (envelope-from mat@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 B856C641;
 Tue, 18 Oct 2016 15:27:26 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9IFRPue045248;
 Tue, 18 Oct 2016 15:27:25 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9IFRPSZ045247;
 Tue, 18 Oct 2016 15:27:25 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201610181527.u9IFRPSZ045247@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 18 Oct 2016 15:27:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r424170 - 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Oct 2016 15:27:27 -0000

Author: mat
Date: Tue Oct 18 15:27:25 2016
New Revision: 424170
URL: https://svnweb.freebsd.org/changeset/ports/424170

Log:
  Make make clean be recursive again.
  
  PR:		213188
  Submitted by:	tijl
  Exp-run by:	antoine
  Sponsored by:	Absolight

Modified:
  head/Mk/Scripts/depends-list.sh   (contents, props changed)

Modified: head/Mk/Scripts/depends-list.sh
==============================================================================
--- head/Mk/Scripts/depends-list.sh	Tue Oct 18 15:02:39 2016	(r424169)
+++ head/Mk/Scripts/depends-list.sh	Tue Oct 18 15:27:25 2016	(r424170)
@@ -21,6 +21,8 @@ while getopts "mrw" FLAG; do
 		w)
 			# Only list dependencies that have a WRKDIR.  Used for
 			# 'make clean-depends'.
+			# Without -r recurse when WRKDIR exists; with -r
+			# always recurse.
 			requires_wrkdir=1
 			;;
 		*)
@@ -80,13 +82,10 @@ check_dep() {
 
 		# Grab any needed vars from the port.
 
-		if [ ${requires_wrkdir} -eq 1 -a ${recursive} -eq 1 ]; then
+		if [ ${requires_wrkdir} -eq 1 ]; then
 			set -- $(${dp_MAKE} -C ${d} -VWRKDIR -V_UNIFIED_DEPENDS)
 			wrkdir="$1"
 			shift
-		elif [ ${requires_wrkdir} -eq 1 -a ${recursive} -eq 0 ]; then
-			set -- "$(${dp_MAKE} -C ${d} -VWRKDIR)"
-			wrkdir="$1"
 		elif [ ${recursive} -eq 1 ]; then
 			set -- $(${dp_MAKE} -C ${d} -V_UNIFIED_DEPENDS)
 		fi
@@ -97,7 +96,7 @@ check_dep() {
 			show_dep=0
 		fi
 		[ ${show_dep} -eq 1 ] && echo ${d}
-		if [ ${recursive} -eq 1 ]; then
+		if [ ${recursive} -eq 1 -o ${requires_wrkdir} -eq 1 -a ${show_dep} -eq 1 ]; then
 			check_dep $@
 		fi
 	done