From owner-svn-src-head@FreeBSD.ORG  Wed Apr  2 16:33:11 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7DD223A4;
 Wed,  2 Apr 2014 16:33:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 67DB68F6;
 Wed,  2 Apr 2014 16:33:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s32GXBof063409;
 Wed, 2 Apr 2014 16:33:11 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s32GXBTc063408;
 Wed, 2 Apr 2014 16:33:11 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201404021633.s32GXBTc063408@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 2 Apr 2014 16:33:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264045 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Apr 2014 16:33:11 -0000

Author: imp
Date: Wed Apr  2 16:33:10 2014
New Revision: 264045
URL: http://svnweb.freebsd.org/changeset/base/264045

Log:
  Move setting of the MK_xxx variables based on NO_xxx to avoid
  triggering the "you aren't allowed to set this" warning when building
  stand alone in directories whose Makefile sets NO_MAN, for example.

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

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Wed Apr  2 16:33:02 2014	(r264044)
+++ head/share/mk/bsd.own.mk	Wed Apr  2 16:33:10 2014	(r264045)
@@ -219,21 +219,6 @@ COMPRESS_EXT?=	.gz
 #
 
 #
-# Supported NO_* options (if defined, MK_* will be forced to "no",
-# regardless of user's setting).
-#
-.for var in \
-    CTF \
-    DEBUG_FILES \
-    INSTALLLIB \
-    MAN \
-    PROFILE
-.if defined(NO_${var})
-MK_${var}:=no
-.endif
-.endfor
-
-#
 # Older-style variables that enabled behaviour when set.
 #
 .if defined(YES_HESIOD)
@@ -466,6 +451,22 @@ MK_${var}:=	no
 .endfor
 .undef __DEFAULT_NO_OPTIONS
 
+
+#
+# Supported NO_* options (if defined, MK_* will be forced to "no",
+# regardless of user's setting).
+#
+.for var in \
+    CTF \
+    DEBUG_FILES \
+    INSTALLLIB \
+    MAN \
+    PROFILE
+.if defined(NO_${var})
+MK_${var}:=no
+.endif
+.endfor
+
 #
 # Force some options off if their dependencies are off.
 # Order is somewhat important.