Index: user/ngie/detangle-rc/etc/rc.d/Makefile
===================================================================
--- user/ngie/detangle-rc/etc/rc.d/Makefile	(revision 299100)
+++ user/ngie/detangle-rc/etc/rc.d/Makefile	(revision 299101)
@@ -1,343 +1,319 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 FILESGROUPS=	FILES
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}
 
 FILES=	DAEMON \
 	FILESYSTEMS \
 	LOGIN \
 	NETWORKING \
 	SERVERS \
 	abi \
 	addswap \
 	adjkerntz \
 	archdep \
 	auditd \
 	auditdistd \
 	bgfsck \
 	${_bluetooth} \
 	bridge \
 	${_bthidd} \
 	cleanvar \
 	cleartmp \
 	cron \
 	ctld \
 	ddb \
 	defaultroute \
 	devd \
 	devfs \
 	dhclient \
 	dmesg \
 	dumpon \
 	fsck \
 	gbde \
 	geli \
 	geli2 \
 	gptboot \
 	growfs \
 	gssd \
 	${_hcsecd} \
 	hostid \
 	hostid_save \
 	hostname \
 	iovctl \
 	ipfilter \
 	ipfs \
 	ipfw \
 	ipmon \
 	ipnat \
 	ipsec \
 	${_kadmind} \
 	${_kdc} \
 	${_kfd} \
 	kld \
 	kldxref \
 	${_kpasswdd} \
 	ldconfig \
 	local \
 	localpkg \
 	lockd \
 	mixer \
 	motd \
 	mountcritlocal \
 	mountcritremote \
 	mountlate \
 	mdconfig \
 	mdconfig2 \
 	mountd \
 	msgs \
 	natd \
 	netif \
 	netoptions \
 	netwait \
 	newsyslog \
 	nfsclient \
 	nfscbd \
 	nfsd \
 	nfsuserd \
 	nisdomain \
 	${_nscd} \
 	nsswitch \
 	ntpdate \
 	${_opensm} \
 	pf \
 	pflog \
 	pfsync \
 	ppp \
 	pppoed \
 	pwcheck \
 	quota \
 	random \
 	rarpd \
 	rctl \
 	resolv \
 	rfcomm_pppd_server \
 	root \
 	routing \
 	rpcbind \
 	savecore \
 	sdpd \
 	securelevel \
 	serial \
 	sppp \
 	statd \
 	static_arp \
 	static_ndp \
 	stf \
 	swap \
 	swaplate \
 	sysctl \
 	syslogd \
 	tmp \
 	${_ubthidhci} \
 	ugidfw \
 	${_utx} \
 	var \
 	watchdogd \
 	ypbind \
 	yppasswdd \
 	ypserv \
 	ypset \
 	ypupdated \
 	ypxfrd \
 
 .if ${MK_ACCT} != "no"
 FILESGROUPS+=	ACCT
 ACCT+=		accounting
-.endif
-ACCTDIR=	/etc/rc.d
-ACCTMODE=	${BINMODE}
 ACCTPACKAGE=	acct
+.endif
 
 .if ${MK_ACPI} != "no"
 FILESGROUPS+=	ACPI
 ACPI=		power_profile
-.endif
-ACPIDIR=	/etc/rc.d
-ACPIMODE=	${BINMODE}
 ACPIPACKAGE=	acpi
+.endif
 
 .if ${MK_ACPI} != "no" || ${MK_APM} != "no"
 FILES+=		powerd
 .endif
 
 .if ${MK_AMD} != "no"
 FILESGROUPS+=	AMD
 AMD+=		amd
-.endif
-AMDDIR=		/etc/rc.d
-AMDMODE=	${BINMODE}
 AMDPACKAGE=	amd
+.endif
 
 .if ${MK_APM} != "no"
 FILESGROUPS+=	APM
 APM+=		apm
 APM+=		apmd
-.endif
-APMDIR=		/etc/rc.d
-APMMODE=	${BINMODE}
 APMPACKAGE=	apm
+.endif
 
 .if ${MK_ATM} != "no"
 FILESGROUPS+=	ATM
 ATM+=		atm1
 ATM+=		atm2
 ATM+=		atm3
-.endif
-ATMDIR=		/etc/rc.d
-ATMMODE=	${BINMODE}
 ATMPACKAGE=	atm
+.endif
 
 .if ${MK_AUTOFS} != "no"
 FILES+=		automount
 FILES+=		automountd
 FILES+=		autounmountd
 .endif
 
 .if ${MK_BLUETOOTH} != "no"
 _bluetooth=	bluetooth
 _bthidd=	bthidd
 _hcsecd=	hcsecd
 _ubthidhci=	ubthidhci
 .endif
 
 .if ${MK_BOOTPARAMD} != "no"
 FILES+=		bootparams
 .endif
 
 .if ${MK_BSNMP} != "no"
 FILESGROUPS+=	BSNMP
 BSNMP+=		bsnmpd
-.endif
-BSNMPDIR=	/etc/rc.d
-BSNMPMODE=	${BINMODE}
 BSNMPPACKAGE=	bsnmp
+.endif
 
 .if ${MK_CCD} != "no"
 FILES+=		ccd
 .endif
 
 .if ${MK_FTP} != "no"
 FILES+=		ftpd
 .endif
 
 .if ${MK_HAST} != "no"
 FILESGROUPS+=	HAST
 HAST=		hastd
-.endif
-HASTDIR=	/etc/rc.d
-HASTMODE=	${BINMODE}
 HASTPACKAGE=	hast
+.endif
 
 .if ${MK_INET6} != "no"
 FILES+=		ip6addrctl
 FILES+=		route6d
 FILES+=		rtadvd
 FILES+=		rtsold
 .endif
 
 .if ${MK_INETD} != "no"
 FILES+=		inetd
 .endif
 
 .if ${MK_ISCSI} != "no"
 FILES+=		iscsictl
 FILES+=		iscsid
 .endif
 
 .if ${MK_JAIL} != "no"
 FILESGROUPS+=	JAIL
 JAIL+=		jail
-.endif
-JAILDIR=	/etc/rc.d
-JAILMODE=	${BINMODE}
 JAILPACKAGE=	jail
+.endif
 
 .if ${MK_LEGACY_CONSOLE} != "no"
 FILES+=		moused
 FILES+=		syscons
 .endif
 
 .if ${MK_LPR} != "no"
 FILES+=		lpd
 .endif
 
 .if ${MK_KERBEROS} != "no"
 FILES+=		ipropd_master
 FILES+=		ipropd_slave
 _kadmind=	kadmind
 _kdc=		kdc
 _kfd=		kfd
 _kpasswdd=	kpasswdd
 .endif
 
 .if ${MK_MAIL} != "no"
 FILES+=		othermta
 .endif
 
 .if ${MK_NS_CACHING} != "no"
 _nscd=		nscd
 .endif
 
 .if ${MK_NTP} != "no"
 FILES+=		ntpd
 .endif
 
 .if ${MK_OFED} != "no"
 _opensm=	opensm
 .endif
 
 .if ${MK_OPENSSL} != "no"
 FILES+=		keyserv
 .endif
 
 .if ${MK_OPENSSH} != "no"
 FILESGROUPS+=	SSH
 SSH=		sshd
-.endif
-SSHDIR=		/etc/rc.d
-SSHMODE=	${BINMODE}
 SSHPACKAGE=	ssh
+.endif
 
 .if ${MK_PF} != "no"
 FILES+=		ftp-proxy
 .endif
 
 .if ${MK_RCMDS} != "no"
 FILESGROUPS+=	RCMDS
 RCMDS+=		rwho
-.endif
-RCMDSDIR=	/etc/rc.d
-RCMDSMODE=	${BINMODE}
 RCMDSPACKAGE=	rcmds
+.endif
 
 .if ${MK_ROUTED} != "no"
 FILES+=		routed
 .endif
 
 .if ${MK_SENDMAIL} != "no"
 FILESGROUPS+=	SMRCD
 SMRCD=		sendmail
-.endif
-SMRCDDIR=	/etc/rc.d
-SMRCDMODE=	${BINMODE}
 SMRCDPACKAGE=	sendmail
+.endif
 
 .if ${MK_TIMED} != "no"
 FILES+=		timed
 .endif
 
 .if ${MK_UNBOUND} != "no"
 FILESGROUPS+=	UNBOUND
 UNBOUND+=	local_unbound
-.endif
-UNBOUNDDIR=	/etc/rc.d
-UNBOUNDMODE=	${BINMODE}
 UNBOUNDPACKAGE=	unbound
+.endif
 
 .if ${MK_UTMPX} != "no"
 _utx=		utx
 .endif
 
 .if ${MK_VI} != "no"
 FILESGROUPS+=	VI
 VI+=		virecover
-.endif
-VIDIR=		/etc/rc.d
-VIMODE=		${BINMODE}
 VIPACKAGE=	vi
+.endif
 
 .if ${MK_WIRELESS} != "no"
 FILES+=		hostapd
 FILES+=		wpa_supplicant
 .endif
 
 .if ${MK_ZFS} != "no"
-FILES+=		zfs
-FILES+=		zvol
+FILESGROUPS+=	ZFS
+ZFS+=		zfs
+ZFS+=		zvol
+ZFSPACKAGE=	zfs
 .endif
 
 .include <bsd.prog.mk>