From owner-svn-src-all@freebsd.org  Fri May  6 09:18:10 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id ADE69B2EE90;
 Fri,  6 May 2016 09:18:10 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 7FFA514B4;
 Fri,  6 May 2016 09:18:10 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u469I9kI091132;
 Fri, 6 May 2016 09:18:09 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u469I9MF091130;
 Fri, 6 May 2016 09:18:09 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605060918.u469I9MF091130@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 6 May 2016 09:18:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299169 - in head: etc/rc.d tools/build/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.22
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 May 2016 09:18:10 -0000

Author: ngie
Date: Fri May  6 09:18:09 2016
New Revision: 299169
URL: https://svnweb.freebsd.org/changeset/base/299169

Log:
  Only install etc/rc.d/{rfcomm_pppd_server,sdpd} if MK_BLUETOOTH != no
  
  These are bluetooth specific services
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Fri May  6 09:00:57 2016	(r299168)
+++ head/etc/rc.d/Makefile	Fri May  6 09:18:09 2016	(r299169)
@@ -98,7 +98,6 @@ FILES=	DAEMON \
 	rarpd \
 	rctl \
 	resolv \
-	rfcomm_pppd_server \
 	root \
 	route6d \
 	routing \
@@ -106,7 +105,6 @@ FILES=	DAEMON \
 	rtadvd \
 	rtsold \
 	savecore \
-	sdpd \
 	securelevel \
 	serial \
 	sppp \
@@ -180,6 +178,8 @@ FILES+=		autounmountd
 _bluetooth=	bluetooth
 _bthidd=	bthidd
 _hcsecd=	hcsecd
+FILES+=		rfcomm_pppd_server
+FILES+=		sdpd
 _ubthidhci=	ubthidhci
 .endif
 

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri May  6 09:00:57 2016	(r299168)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri May  6 09:18:09 2016	(r299169)
@@ -410,6 +410,8 @@ OLD_DIRS+=etc/bluetooth
 OLD_FILES+=etc/rc.d/bluetooth
 OLD_FILES+=etc/rc.d/bthidd
 OLD_FILES+=etc/rc.d/hcsecd
+OLD_FILES+=etc/rc.d/rfcomm_pppd_server
+OLD_FILES+=etc/rc.d/sdpd
 OLD_FILES+=etc/rc.d/ubthidhci
 OLD_FILES+=usr/bin/bthost
 OLD_FILES+=usr/bin/btsockstat