From owner-svn-src-all@FreeBSD.ORG  Fri May  9 04:49:48 2014
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: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 A93C8722;
 Fri,  9 May 2014 04:49:48 +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 96FC61EC;
 Fri,  9 May 2014 04:49:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s494nmSm015781;
 Fri, 9 May 2014 04:49:48 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s494nm9j015779;
 Fri, 9 May 2014 04:49:48 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201405090449.s494nm9j015779@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 9 May 2014 04:49:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265738 - 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-all@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Fri, 09 May 2014 04:49:48 -0000

Author: imp
Date: Fri May  9 04:49:48 2014
New Revision: 265738
URL: http://svnweb.freebsd.org/changeset/base/265738

Log:
  We have to include bsd.opts.mk (included in bsd.own.mk) after
  /etc/src.conf so that options set there will affect the options
  defined in bsd.opts.mk. Fix a few comments while I'm here.

Modified:
  head/share/mk/src.opts.mk

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Fri May  9 04:49:43 2014	(r265737)
+++ head/share/mk/src.opts.mk	Fri May  9 04:49:48 2014	(r265738)
@@ -30,17 +30,15 @@
 .if !target(__<src.opts.mk>__)
 __<src.opts.mk>__:
 
-# Compat -- needed still?
-.include <bsd.own.mk>
-
-# Allow user to configure things, but in the future this will move
-# elsehwere...
-
+# Allow user to configure things that only effect src tree builds.
 SRCCONF?=	/etc/src.conf
 .if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf"
 .include "${SRCCONF}"
 .endif
 
+# Must be included after src.conf
+.include <bsd.own.mk>
+
 #
 # Define MK_* variables (which are either "yes" or "no") for users
 # to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the