svn commit: r278186 - in stable/10: etc/defaults tools/build/mk

[Garrett Cooper]

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