5 files changed, 66 insertions, 16 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 62b837f..b27542a 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -14,8 +14,7 @@ SUBDIR+=sendmail
 SUBDIR+=tests
 .endif
 
-BIN1=	auto_master \
-	crontab \
+BIN1=	crontab \
 	devd.conf \
 	devfs.conf \
 	ddb.conf \
@@ -90,6 +89,10 @@ BIN1+= amd.map
 BIN1+= apmd.conf
 .endif
 
+.if ${MK_AUTOFS} != "no"
+BIN1+= auto_master
+.endif
+
 .if ${MK_BSNMP} != "no"
 BIN1+= snmpd.config
 .endif
@@ -229,7 +232,9 @@ distribution:
 		echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
 	) | ${METALOG.add}
 .endif
+.if ${MK_AUTOFS} != "no"
 	${_+_}cd ${.CURDIR}/autofs; ${MAKE} install
+.endif
 .if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile
index c6555e6..1f6ac5e 100644
--- a/etc/defaults/Makefile
+++ b/etc/defaults/Makefile
@@ -1,7 +1,13 @@
 # $FreeBSD$
 
-FILES=	bluetooth.device.conf devfs.rules periodic.conf rc.conf
+.include <src.opts.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>
diff --git a/etc/devd/Makefile b/etc/devd/Makefile
index 27dfb92..a0909af 100644
--- a/etc/devd/Makefile
+++ b/etc/devd/Makefile
@@ -2,12 +2,16 @@
 
 .include <src.opts.mk>
 
+FILES=
+
 .if ${MACHINE} == "powerpc"
 FILES+=	apple.conf
 .endif
 
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.if ${MK_ACPI} != "no"
 FILES+=	asus.conf
+.endif
 .if ${MK_HYPERV} != "no"
 FILES+=	hyperv.conf
 .endif
diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile
index 7369022..ac7db6c 100644
--- a/etc/pam.d/Makefile
+++ b/etc/pam.d/Makefile
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 NO_OBJ=
 
 FILES=	README \
-	atrun \
 	cron \
 	ftpd \
 	imap \
@@ -15,6 +16,10 @@ FILES=	README \
 	telnetd \
 	xdm
 
+.if ${MK_AT} != "no"
+FILES+=	atrun
+.endif
+
 FILESDIR=	/etc/pam.d
 FILESMODE=	644
 FILESMODE_README=	444
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 3cd0711..a19f73a 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -11,18 +11,12 @@ FILES=	DAEMON \
 	accounting \
 	addswap \
 	adjkerntz \
-	amd \
-	apm \
-	apmd \
 	archdep \
 	atm1 \
 	atm2 \
 	atm3 \
 	auditd \
 	auditdistd \
-	automount \
-	automountd \
-	autounmountd \
 	bgfsck \
 	${_bluetooth} \
 	bootparams \
@@ -48,7 +42,6 @@ FILES=	DAEMON \
 	gptboot \
 	growfs \
 	gssd \
-	hastd \
 	${_hcsecd} \
 	hostapd \
 	hostid \
@@ -61,10 +54,7 @@ FILES=	DAEMON \
 	ipfw \
 	ipmon \
 	ipnat \
-	ipropd_master \
-	ipropd_slave \
 	ipsec \
-	jail \
 	${_kadmind} \
 	${_kdc} \
 	${_kfd} \
@@ -75,7 +65,6 @@ FILES=	DAEMON \
 	local \
 	localpkg \
 	lockd \
-	lpd \
 	mixer \
 	motd \
 	mountcritlocal \
@@ -107,7 +96,6 @@ FILES=	DAEMON \
 	pflog \
 	pfsync \
 	powerd \
-	power_profile \
 	ppp \
 	pppoed \
 	pwcheck \
@@ -159,6 +147,29 @@ FILES=	DAEMON \
 	zfs \
 	zvol
 
+.if ${MK_ACCT} != "no"
+FILES+=		accounting
+.endif
+
+.if ${MK_ACPI} != "no"
+FILES+=		power_profile
+.endif
+
+.if ${MK_AMD} != "no"
+FILES+=		amd
+.endif
+
+.if ${MK_APM} != "no"
+FILES+=	apm
+FILES+=	apmd
+.endif
+
+.if ${MK_AUTOFS} != "no"
+FILES+=		automount
+FILES+=		automountd
+FILES+=		autounmountd
+.endif
+
 .if ${MK_BLUETOOTH} != "no"
 _bluetooth=	bluetooth
 _bthidd=	bthidd
@@ -178,16 +189,30 @@ _casperd=	casperd
 FILES+=		ccd
 .endif
 
+.if ${MK_HAST} != "no"
+FILES+=		hastd
+.endif
+
 .if ${MK_ISCSI} != "no"
 FILES+=		iscsictl
 FILES+=		iscsid
 .endif
 
+.if ${MK_JAIL} != "no"
+FILES+=	jail
+.endif
+
+.if ${MK_LPR} != "no"
+FILES+=		lpd
+.endif
+
 .if ${MK_NS_CACHING} != "no"
 _nscd=		nscd
 .endif
 
 .if ${MK_KERBEROS} != "no"
+FILES+=		ipropd_master
+FILES+=		ipropd_slave
 _kadmind=	kadmind
 _kdc=		kdc
 _kfd=		kfd
@@ -222,6 +247,11 @@ _unbound=	local_unbound
 _utx=		utx
 .endif
 
+.if ${MK_WIRELESS} != "no"
+FILES+=		hostapd
+FILES+=		wpa_supplicant
+.endif
+
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}