From owner-svn-ports-all@freebsd.org  Mon Mar 19 21:40:32 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E093F4BD7C;
 Mon, 19 Mar 2018 21:40:32 +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 1EE65873BF;
 Mon, 19 Mar 2018 21:40:32 +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 1887D13E5A;
 Mon, 19 Mar 2018 21:40:32 +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 w2JLeVA1044656;
 Mon, 19 Mar 2018 21:40:31 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2JLeVFt044655;
 Mon, 19 Mar 2018 21:40:31 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201803192140.w2JLeVFt044655@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: Mon, 19 Mar 2018 21:40:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r465036 - branches/2018Q1/Mk
X-SVN-Group: ports-branches
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: branches/2018Q1/Mk
X-SVN-Commit-Revision: 465036
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 <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: Mon, 19 Mar 2018 21:40:32 -0000

Author: bdrewery
Date: Mon Mar 19 21:40:31 2018
New Revision: 465036
URL: https://svnweb.freebsd.org/changeset/ports/465036

Log:
  MFH: r465035
  
  Fix some recursive targets using the wrong FLAVOR.
  
  Reported by:	Andrzej Tobola <ato@iem.pw.edu.pl>, koobs
  Approved by:	portmgr (implicit)

Modified:
  branches/2018Q1/Mk/bsd.port.mk
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/Mk/bsd.port.mk
==============================================================================
--- branches/2018Q1/Mk/bsd.port.mk	Mon Mar 19 21:39:40 2018	(r465035)
+++ branches/2018Q1/Mk/bsd.port.mk	Mon Mar 19 21:40:31 2018	(r465036)
@@ -4052,6 +4052,7 @@ _FLAVOR_RECURSIVE_SH= \
 		${FALSE}; \
 	fi; \
 	for dir in $${recursive_dirs}; do \
+		unset flavor; \
 		case $${dir} in \
 			*@*) \
 				flavor=$${dir\#*@}; \
@@ -4238,6 +4239,7 @@ PACKAGE-DEPENDS-LIST?= \
 	fi; \
 	checked="${PARENT_CHECKED}"; \
 	for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \
+		unset flavor; \
 		case $${dir} in \
 		*@*) \
 			flavor=$${dir\#*@}; \