From owner-svn-src-stable@FreeBSD.ORG  Sun Oct 21 09:31:49 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7CCA5F72;
 Sun, 21 Oct 2012 09:31:49 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 5DAD28FC0C;
 Sun, 21 Oct 2012 09:31:49 +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 q9L9VnMD038035;
 Sun, 21 Oct 2012 09:31:49 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9L9Vn50038033;
 Sun, 21 Oct 2012 09:31:49 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201210210931.q9L9Vn50038033@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Sun, 21 Oct 2012 09:31:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r241799 - stable/9/share/mk
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Oct 2012 09:31:49 -0000

Author: brooks
Date: Sun Oct 21 09:31:48 2012
New Revision: 241799
URL: http://svn.freebsd.org/changeset/base/241799

Log:
  MFC r228120:
  
  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).
  
  PR:		misc/172873

Modified:
  stable/9/share/mk/bsd.own.mk
Directory Properties:
  stable/9/share/mk/   (props changed)

Modified: stable/9/share/mk/bsd.own.mk
==============================================================================
--- stable/9/share/mk/bsd.own.mk	Sun Oct 21 08:46:15 2012	(r241798)
+++ stable/9/share/mk/bsd.own.mk	Sun Oct 21 09:31:48 2012	(r241799)
@@ -208,6 +208,13 @@ COMPRESS_EXT?=	.gz
     MAN \
     PROFILE
 .if defined(NO_${var})
+.if defined(WITH_${var})
+.warning unsetting WITH_${var}
+.undef WITH_${var}
+.if defined(WITH_${var})
+.error wtf
+.endif
+.endif
 WITHOUT_${var}=
 .endif
 .endfor