svn commit: r256230 - stable/9/etc/rc.d

[Glen Barber]

Author: gjb
Date: Wed Oct  9 19:34:11 2013
New Revision: 256230
URL: http://svnweb.freebsd.org/changeset/base/256230

Log:
  MFC r228541, r256022:
  
  r228541 (by pjd):
   - Put one file into one line. This makes keeping local changes and
     merging with FreeBSD easier for vendors.
   - For optional files use variables starting with underscore
  
  r256022:
   - Do not install bluetooth rc(8) scripts if MK_BLUETOOTH = no.

Modified:
  stable/9/etc/rc.d/Makefile
Directory Properties:
  stable/9/etc/rc.d/   (props changed)

Modified: stable/9/etc/rc.d/Makefile
==============================================================================
--- stable/9/etc/rc.d/Makefile	Wed Oct  9 19:30:13 2013	(r256229)
+++ stable/9/etc/rc.d/Makefile	Wed Oct  9 19:34:11 2013	(r256230)
@@ -2,64 +2,182 @@
 
 .include <bsd.own.mk>
 
-FILES=	DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS \
-	abi accounting addswap adjkerntz amd \
-	apm apmd archdep atm1 atm2 atm3 auditd auditdistd \
-	bgfsck bluetooth bootparams bridge bsnmpd bthidd \
-	ccd cleanvar cleartmp cron \
-	ddb defaultroute devd devfs dhclient \
-	dmesg dumpon \
+FILES=	DAEMON \
+	FILESYSTEMS \
+	LOGIN \
+	NETWORKING \
+	SERVERS \
+	abi \
+	accounting \
+	addswap \
+	adjkerntz \
+	amd \
+	apm \
+	apmd \
+	archdep \
+	atm1 \
+	atm2 \
+	atm3 \
+	auditd \
+	bgfsck \
+	${_bluetooth} \
+	bootparams \
+	bridge \
+	bsnmpd \
+	${_bthidd} \
+	ccd \
+	cleanvar \
+	cleartmp \
+	cron \
+	ddb \
+	defaultroute \
+	devd \
+	devfs \
+	dhclient \
+	dmesg \
+	dumpon \
 	encswap \
-	faith fsck ftp-proxy ftpd \
-	gbde geli geli2 gptboot gssd \
-	hastd hcsecd \
-	hostapd hostid hostid_save hostname \
-	inetd initrandom \
-	ip6addrctl ipfilter ipfs ipfw ipmon \
-	ipnat ipsec \
+	faith \
+	fsck \
+	ftp-proxy \
+	ftpd \
+	gbde \
+	geli \
+	geli2 \
+	gptboot \
+	gssd \
+	hastd \
+	${_hcsecd} \
+	hostapd \
+	hostid \
+	hostid_save \
+	hostname \
+	inetd \
+	initrandom \
+	ip6addrctl \
+	ipfilter \
+	ipfs \
+	ipfw \
+	ipmon \
+	ipnat \
+	ipsec \
+	${_ipxrouted} \
 	jail \
-	kadmind kerberos keyserv kld kldxref kpasswdd \
-	ldconfig local localpkg lockd lpd \
-	mixer motd mountcritlocal mountcritremote mountlate \
-	mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
-	named natd netif netoptions netwait \
-	newsyslog nfsclient nfscbd nfsd \
-	nfsuserd nisdomain nsswitch ntpd ntpdate \
+	kadmind \
+	kerberos \
+	keyserv \
+	kld \
+	kldxref \
+	kpasswdd \
+	ldconfig \
+	local \
+	localpkg \
+	lockd \
+	lpd \
+	mixer \
+	motd \
+	mountcritlocal \
+	mountcritremote \
+	mountlate \
+	mdconfig \
+	mdconfig2 \
+	mountd \
+	moused \
+	mroute6d \
+	mrouted \
+	msgs \
+	named \
+	natd \
+	netif \
+	netoptions \
+	netwait \
+	newsyslog \
+	nfsclient \
+	nfscbd \
+	nfsd \
+	nfsuserd \
+	nisdomain \
+	${_nscd} \
+	nsswitch \
+	ntpd \
+	ntpdate \
+	${_opensm} \
 	othermta \
-	pf pflog pfsync \
-	powerd power_profile ppp pppoed pwcheck \
+	pf \
+	pflog \
+	pfsync \
+	powerd \
+	power_profile \
+	ppp \
+	pppoed \
+	pwcheck \
 	quota \
-	random rarpd rctl resolv rfcomm_pppd_server root \
-	route6d routed routing rpcbind rtadvd rtsold rwho \
-	savecore sdpd securelevel sendmail \
-	serial sppp statd static_arp static_ndp stf swap1 \
-	syscons sysctl syslogd \
-	timed tmp \
+	random \
+	rarpd \
+	rctl \
+	resolv \
+	rfcomm_pppd_server \
+	root \
+	route6d \
+	routed \
+	routing \
+	rpcbind \
+	rtadvd \
+	rtsold \
+	rwho \
+	savecore \
+	sdpd \
+	securelevel \
+	sendmail \
+	serial \
+	sppp \
+	${_sshd} \
+	statd \
+	static_arp \
+	static_ndp \
+	stf \
+	swap1 \
+	syscons \
+	sysctl \
+	syslogd \
+	timed \
+	tmp \
+	${_ubthidhci} \
 	ugidfw \
-	var virecover \
-	watchdogd wpa_supplicant \
-	ypbind yppasswdd ypserv \
-	ypset ypupdated ypxfrd \
-	zfs zvol
+	var \
+	virecover \
+	watchdogd \
+	wpa_supplicant \
+	ypbind \
+	yppasswdd \
+	ypserv \
+	ypset \
+	ypupdated \
+	ypxfrd \
+	zfs \
+	zvol
 
 .if ${MK_IPX} != "no"
-FILES+=	ipxrouted
+_ipxrouted=	ipxrouted
 .endif
 
 .if ${MK_OFED} != "no"
-FILES+= opensm
+_opensm=	opensm
 .endif
 
 .if ${MK_OPENSSH} != "no"
-FILES+=	sshd
+_sshd=		sshd
 .endif
 
 .if ${MK_NS_CACHING} != "no"
-FILES+= nscd
+_nscd=		nscd
 .endif
 
 .if ${MK_BLUETOOTH} != "no"
-FILES+=	ubthidhci
+_bluetooth=	bluetooth
+_bthidd=	bthidd
+_hcsecd=	hcsecd
+_ubthidhci=	ubthidhci
 .endif
 
 FILESDIR=	/etc/rc.d