From owner-svn-src-all@FreeBSD.ORG  Thu Oct  3 15:19:17 2013
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 318BA290;
 Thu,  3 Oct 2013 15:19:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1DDE92B04;
 Thu,  3 Oct 2013 15:19:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r93FJGjA040134;
 Thu, 3 Oct 2013 15:19:16 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r93FJGZn040133;
 Thu, 3 Oct 2013 15:19:16 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201310031519.r93FJGZn040133@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 3 Oct 2013 15:19:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256022 - head/etc/rc.d
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.14
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: Thu, 03 Oct 2013 15:19:17 -0000

Author: gjb
Date: Thu Oct  3 15:19:16 2013
New Revision: 256022
URL: http://svnweb.freebsd.org/changeset/base/256022

Log:
  Do not install bluetooth rc(8) scripts if MK_BLUETOOTH = no.
  
  Approved by:	re (glebius)
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/etc/rc.d/Makefile

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Thu Oct  3 12:28:51 2013	(r256021)
+++ head/etc/rc.d/Makefile	Thu Oct  3 15:19:16 2013	(r256022)
@@ -21,11 +21,11 @@ FILES=	DAEMON \
 	auditd \
 	auditdistd \
 	bgfsck \
-	bluetooth \
+	${_bluetooth} \
 	bootparams \
 	bridge \
 	bsnmpd \
-	bthidd \
+	${_bthidd} \
 	ccd \
 	cleanvar \
 	cleartmp \
@@ -48,7 +48,7 @@ FILES=	DAEMON \
 	gptboot \
 	gssd \
 	hastd \
-	hcsecd \
+	${_hcsecd} \
 	hostapd \
 	hostid \
 	hostid_save \
@@ -182,6 +182,9 @@ _nscd=		nscd
 .endif
 
 .if ${MK_BLUETOOTH} != "no"
+_bluetooth=	bluetooth
+_bthidd=	bthidd
+_hcsecd=	hcsecd
 _ubthidhci=	ubthidhci
 .endif