From owner-svn-src-stable@FreeBSD.ORG  Thu Feb  5 10:06:45 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 98458B6D;
 Thu,  5 Feb 2015 10:06:45 +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 835956F;
 Thu,  5 Feb 2015 10:06:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15A6j82028096;
 Thu, 5 Feb 2015 10:06:45 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15A6jp0028094;
 Thu, 5 Feb 2015 10:06:45 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201502051006.t15A6jp0028094@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: Thu, 5 Feb 2015 10:06:45 +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: r278243 - in stable/9: etc/defaults tools/build/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.18-1
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: Thu, 05 Feb 2015 10:06:45 -0000

Author: ngie
Date: Thu Feb  5 10:06:44 2015
New Revision: 278243
URL: https://svnweb.freebsd.org/changeset/base/278243

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

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

Modified: stable/9/etc/defaults/Makefile
==============================================================================
--- stable/9/etc/defaults/Makefile	Thu Feb  5 09:59:18 2015	(r278242)
+++ stable/9/etc/defaults/Makefile	Thu Feb  5 10:06:44 2015	(r278243)
@@ -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/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Thu Feb  5 09:59:18 2015	(r278242)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Thu Feb  5 10:06:44 2015	(r278243)
@@ -344,6 +344,8 @@ OLD_DIRS+=var/named/etc/namedb/dynamic
 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