From owner-svn-ports-all@freebsd.org  Thu Jan  4 20:18:04 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 D218DEB3EDF;
 Thu,  4 Jan 2018 20:18:04 +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 9A53A7F292;
 Thu,  4 Jan 2018 20:18:04 +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 w04KI3CX057152;
 Thu, 4 Jan 2018 20:18:03 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w04KI3ae057151;
 Thu, 4 Jan 2018 20:18:03 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201801042018.w04KI3ae057151@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:18:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r458084 - branches/2018Q1/Mk
X-SVN-Group: ports-branches
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: branches/2018Q1/Mk
X-SVN-Commit-Revision: 458084
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:18:04 -0000

Author: bdrewery
Date: Thu Jan  4 20:18:03 2018
New Revision: 458084
URL: https://svnweb.freebsd.org/changeset/ports/458084

Log:
  MFH: r458083
  
  Disallow forced FLAVOR as make argument.
  
  This otherwise prevents properly setting FLAVOR to the default internally
  since it is in a separate namespace in bmake that is read-only.
  
  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:17:40 2018	(r458083)
+++ branches/2018Q1/Mk/bsd.port.mk	Thu Jan  4 20:18:03 2018	(r458084)
@@ -1061,6 +1061,11 @@ STAGEDIR?=	${WRKDIR}/stage
 NOTPHONY?=
 FLAVORS?=
 FLAVOR?=
+# Disallow forced FLAVOR as make argument since we cannot change it to the
+# proper default.
+.if empty(FLAVOR) && !empty(.MAKEOVERRIDES:MFLAVOR)
+.error FLAVOR may not be passed empty as a make argument.
+.endif
 # Store env FLAVOR for later
 .if !defined(_FLAVOR)
 _FLAVOR:=	${FLAVOR}