From owner-svn-ports-all@freebsd.org  Thu Jan  4 20:06:49 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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DDA00EB2FDF;
 Thu,  4 Jan 2018 20:06:49 +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 A861C7D718;
 Thu,  4 Jan 2018 20:06:49 +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 w04K6mEU049642;
 Thu, 4 Jan 2018 20:06:48 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w04K6mXj049641;
 Thu, 4 Jan 2018 20:06:48 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201801042006.w04K6mXj049641@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: Thu, 4 Jan 2018 20:06:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r458059 - branches/2018Q1/Mk
X-SVN-Group: ports-branches
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: branches/2018Q1/Mk
X-SVN-Commit-Revision: 458059
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: Thu, 04 Jan 2018 20:06:50 -0000

Author: bdrewery
Date: Thu Jan  4 20:06:48 2018
New Revision: 458059
URL: https://svnweb.freebsd.org/changeset/ports/458059

Log:
  MFH: r458058
  
  Follow-up r458048: Properly trim FLAVOR from .MAKEOVERRIDES.
  
  The code I removed was wrong but it still achieved the proper effect of
  removing FLAVOR from .MAKEOVERRIDES.  This is still needed and now is
  done properly without truncating away all of the other valuable variables.
  
  Pointyhat to:	bdrewery
  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	Thu Jan  4 20:06:21 2018	(r458058)
+++ branches/2018Q1/Mk/bsd.port.mk	Thu Jan  4 20:06:48 2018	(r458059)
@@ -1081,6 +1081,9 @@ _PORTS_DIRECTORIES+=	${PKG_DBDIR} ${PREFIX} ${WRKDIR} 
 
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
+# Do not leak flavors to childs make
+.MAKEOVERRIDES:=	${.MAKEOVERRIDES:NFLAVOR}
+
 .if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
 _DID_FLAVORS_HELPERS=	yes
 _FLAVOR_HELPERS_OVERRIDE=	DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX