Index: /usr/src/tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- /usr/src/tools/build/mk/OptionalObsoleteFiles.inc	(revision 340206)
+++ /usr/src/tools/build/mk/OptionalObsoleteFiles.inc	(working copy)
@@ -163,6 +163,8 @@
 .endif
 
 .if ${MK_AUDIT} == no
+OLD_FILES+=etc/rc.d/auditd
+OLD_FILES+=etc/rc.d/auditdistd
 OLD_FILES+=usr/sbin/audit
 OLD_FILES+=usr/sbin/auditd
 OLD_FILES+=usr/sbin/auditdistd
@@ -3068,6 +3070,7 @@
 .endif
 
 .if ${MK_GSSAPI} == no
+OLD_FILES+=etc/rc.d/gssd
 OLD_FILES+=usr/include/gssapi/gssapi.h
 OLD_DIRS+=usr/include/gssapi
 OLD_FILES+=usr/include/gssapi.h
@@ -3270,6 +3273,9 @@
 .endif
 
 .if ${MK_INET6} == no
+OLD_FILES+=etc/rc.d/route6d
+OLD_FILES+=etc/rc.d/rtadvd
+OLD_FILES+=etc/rc.d/rtsold
 OLD_FILES+=sbin/ping6
 OLD_FILES+=sbin/rtsol
 OLD_FILES+=usr/sbin/ip6addrctl
@@ -3314,6 +3320,10 @@
 .if ${MK_IPFILTER} == no
 OLD_FILES+=etc/periodic/security/510.ipfdenied
 OLD_FILES+=etc/periodic/security/610.ipf6denied
+OLD_FILES+=etc/rc.d/ipfilter
+OLD_FILES+=etc/rc.d/ipfs
+OLD_FILES+=etc/rc.d/ipmon
+OLD_FILES+=etc/rc.d/ipnat
 OLD_FILES+=rescue/ipf
 OLD_FILES+=sbin/ipf
 OLD_FILES+=sbin/ipfs
@@ -3397,6 +3407,9 @@
 .if ${MK_IPFW} == no
 OLD_FILES+=etc/periodic/security/500.ipfwdenied
 OLD_FILES+=etc/periodic/security/550.ipfwlimit
+OLD_FILES+=etc/rc.d/ipfw
+OLD_FILES+=etc/rc.d/ipfw_netflow
+OLD_FILES+=etc/rc.d/natd
 OLD_FILES+=sbin/ipfw
 OLD_FILES+=sbin/natd
 OLD_FILES+=usr/sbin/ipfwpcap
@@ -4451,6 +4464,7 @@
 .endif
 
 .if ${MK_LEGACY_CONSOLE} == no
+OLD_FILES+=etc/rc.d/moused
 OLD_FILES+=usr/sbin/kbdcontrol
 OLD_FILES+=usr/sbin/kbdmap
 OLD_FILES+=usr/sbin/moused
@@ -6457,6 +6471,7 @@
 .endif
 
 .if ${MK_NETGRAPH} == no
+OLD_FILES+=etc/rc.d/pppoed
 OLD_FILES+=usr/include/netgraph.h
 OLD_FILES+=usr/lib/libnetgraph.a
 OLD_FILES+=usr/lib/libnetgraph.so
@@ -6715,6 +6730,9 @@
 
 .if ${MK_NTP} == no
 OLD_FILES+=etc/ntp.conf
+OLD_FILES+=etc/rc.d/ntpd
+OLD_FILES+=etc/rc.d/ntpdate
+OLD_FILES+=etc/periodic/daily/480.leapfile-ntpd
 OLD_FILES+=etc/periodic/daily/480.status-ntpd
 OLD_FILES+=usr/bin/ntpq
 OLD_FILES+=usr/sbin/ntp-keygen
@@ -6949,6 +6967,9 @@
 OLD_FILES+=etc/periodic/security/520.pfdenied
 OLD_FILES+=etc/pf.os
 OLD_FILES+=etc/rc.d/ftp-proxy
+OLD_FILES+=etc/rc.d/pf
+OLD_FILES+=etc/rc.d/pflog
+OLD_FILES+=etc/rc.d/pfsync
 OLD_FILES+=sbin/pfctl
 OLD_FILES+=sbin/pflogd
 OLD_FILES+=usr/include/netpfil/pf/pf.h
@@ -7086,6 +7107,7 @@
 
 .if ${MK_PPP} == no
 OLD_FILES+=etc/ppp/ppp.conf
+OLD_FILES+=etc/rc.d/ppp
 OLD_DIRS+=etc/ppp
 OLD_FILES+=usr/sbin/ppp
 OLD_FILES+=usr/sbin/pppctl
@@ -7201,6 +7223,7 @@
 .endif
 
 .if ${MK_QUOTAS} == no
+OLD_FILES+=etc/rc.d/quota
 OLD_FILES+=sbin/quotacheck
 OLD_FILES+=usr/bin/quota
 OLD_FILES+=usr/sbin/edquota
@@ -9244,6 +9267,7 @@
 
 .if ${MK_UTMPX} == no
 OLD_FILES+=etc/periodic/monthly/200.accounting
+OLD_FILES+=etc/rc.d/utx
 OLD_FILES+=usr/bin/last
 OLD_FILES+=usr/bin/users
 OLD_FILES+=usr/bin/who