From owner-svn-src-all@FreeBSD.ORG  Wed Feb  4 09:14:09 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 39BD776;
 Wed,  4 Feb 2015 09:14:09 +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 24BC52B6;
 Wed,  4 Feb 2015 09:14:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t149E9QN019790;
 Wed, 4 Feb 2015 09:14:09 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t149E8n9019788;
 Wed, 4 Feb 2015 09:14:08 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201502040914.t149E8n9019788@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 4 Feb 2015 09:14:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r278186 - in stable/10: etc/defaults tools/build/mk
X-SVN-Group: stable-10
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-1
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: Wed, 04 Feb 2015 09:14:09 -0000

Author: ngie
Date: Wed Feb  4 09:14:07 2015
New Revision: 278186
URL: https://svnweb.freebsd.org/changeset/base/278186

Log:
  MFC r277738:
  
  r277738:
  
    Honor MK_BLUETOOTH with etc/defaults/bluetooth.device.conf
  
    Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/etc/defaults/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/defaults/Makefile
==============================================================================
--- stable/10/etc/defaults/Makefile	Wed Feb  4 09:10:46 2015	(r278185)
+++ stable/10/etc/defaults/Makefile	Wed Feb  4 09:14:07 2015	(r278186)
@@ -1,7 +1,13 @@
 # $FreeBSD$
 
-FILES=	bluetooth.device.conf devfs.rules periodic.conf rc.conf
+.include <bsd.own.mk>
+
+FILES=	devfs.rules periodic.conf rc.conf
 NO_OBJ=
 FILESDIR= /etc/defaults
 
+.if ${MK_BLUETOOTH} != "no"
+FILES+=	bluetooth.device.conf
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb  4 09:10:46 2015	(r278185)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb  4 09:14:07 2015	(r278186)
@@ -143,6 +143,8 @@ OLD_FILES+=usr/share/man/man8/authpf-noi
 OLD_FILES+=etc/bluetooth/hcsecd.conf
 OLD_FILES+=etc/bluetooth/hosts
 OLD_FILES+=etc/bluetooth/protocols
+OLD_DIRS+=etc/bluetooth
+OLD_FILES+=etc/defaults/bluetooth.device.conf
 OLD_FILES+=usr/bin/bthost
 OLD_FILES+=usr/bin/btsockstat
 OLD_FILES+=usr/bin/rfcomm_sppd