From owner-svn-src-all@FreeBSD.ORG  Tue Nov 29 08:20:23 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F303106566B;
	Tue, 29 Nov 2011 08:20:23 +0000 (UTC)
	(envelope-from fjoe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F0438FC19;
	Tue, 29 Nov 2011 08:20:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAT8KN58030983;
	Tue, 29 Nov 2011 08:20:23 GMT (envelope-from fjoe@svn.freebsd.org)
Received: (from fjoe@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAT8KNRS030981;
	Tue, 29 Nov 2011 08:20:23 GMT (envelope-from fjoe@svn.freebsd.org)
Message-Id: <201111290820.pAT8KNRS030981@svn.freebsd.org>
From: Max Khon <fjoe@FreeBSD.org>
Date: Tue, 29 Nov 2011 08:20:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228120 - head/share/mk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Nov 2011 08:20:23 -0000

Author: fjoe
Date: Tue Nov 29 08:20:23 2011
New Revision: 228120
URL: http://svn.freebsd.org/changeset/base/228120

Log:
  Allow NO_FOO to override WITH_FOO that could be specified in /etc/src.conf.
  
  This is required to override knobs (e.g. WITH_PROFILE) during buildworld
  stages in Makefile.inc1 (otherwise the build is stopped due to both WITH_FOO
  and WITHOUT_FOO defined).

Modified:
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Tue Nov 29 08:16:14 2011	(r228119)
+++ head/share/mk/bsd.own.mk	Tue Nov 29 08:20:23 2011	(r228120)
@@ -207,6 +207,9 @@ COMPRESS_EXT?=	.gz
     MAN \
     PROFILE
 .if defined(NO_${var})
+.if defined(WITH_${var})
+.undef WITH_${var}
+.endif
 WITHOUT_${var}=
 .endif
 .endfor