From owner-svn-src-head@FreeBSD.ORG  Thu May  8 02:24:31 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 14C2C86C;
 Thu,  8 May 2014 02:24:31 +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 0235BC41;
 Thu,  8 May 2014 02:24:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s482OUXd026370;
 Thu, 8 May 2014 02:24:30 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s482OU5w026368;
 Thu, 8 May 2014 02:24:30 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201405080224.s482OU5w026368@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 8 May 2014 02:24:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265628 - 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.18
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: Thu, 08 May 2014 02:24:31 -0000

Author: imp
Date: Thu May  8 02:24:30 2014
New Revision: 265628
URL: http://svnweb.freebsd.org/changeset/base/265628

Log:
  Put bsd.own.mk back in the list, and take src.opts.mk out.
  Fix a silly typo.

Modified:
  head/share/mk/Makefile
  head/share/mk/bsd.mkopt.mk

Modified: head/share/mk/Makefile
==============================================================================
--- head/share/mk/Makefile	Thu May  8 02:18:36 2014	(r265627)
+++ head/share/mk/Makefile	Thu May  8 02:24:30 2014	(r265628)
@@ -26,7 +26,7 @@ FILES=	\
 	bsd.nls.mk \
 	bsd.obj.mk \
 	bsd.opts.mk \
-	src.opts.mk \
+	bsd.own.mk \
 	bsd.port.mk \
 	bsd.port.options.mk \
 	bsd.port.post.mk \

Modified: head/share/mk/bsd.mkopt.mk
==============================================================================
--- head/share/mk/bsd.mkopt.mk	Thu May  8 02:18:36 2014	(r265627)
+++ head/share/mk/bsd.mkopt.mk	Thu May  8 02:24:30 2014	(r265628)
@@ -42,7 +42,7 @@ MK_${var}:=	yes
 #
 .for var in ${__DEFAULT_NO_OPTIONS}
 .if !defined(MK_${var})
-.if defined(WITH_${var} && !defined(WITHOUT_${var}) # WITHOUT aways wins
+.if defined(WITH_${var}) && !defined(WITHOUT_${var}) # WITHOUT aways wins
 MK_${var}:=	yes
 .else
 MK_${var}:=	no