Index: /usr/src/tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- /usr/src/tools/build/mk/OptionalObsoleteFiles.inc	(revision 340240)
+++ /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
@@ -436,6 +438,7 @@
 .endif
 
 .if ${MK_BLACKLIST} == no
+OLD_FILES+=etc/blacklistd.conf
 OLD_FILES+=etc/rc.d/blacklistd
 OLD_FILES+=usr/include/blacklist.h
 OLD_FILES+=usr/lib/libblacklist.a
@@ -1151,6 +1154,7 @@
 OLD_FILES+=etc/casper/system.pwd
 OLD_FILES+=etc/casper/system.random
 OLD_FILES+=etc/casper/system.sysctl
+OLD_DIRS+=etc/casper
 OLD_FILES+=etc/rc.d/casperd
 OLD_LIBS+=lib/libcapsicum.so.0
 OLD_LIBS+=lib/libcasper.so.0
@@ -1313,6 +1317,7 @@
 OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs
 OLD_FILES+=etc/periodic/daily/800.scrub-zfs
+OLD_DIRS+=etc/zfs
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=lib/libzfs.so.3
 OLD_LIBS+=lib/libzfs_core.so.2
@@ -2277,6 +2282,7 @@
 
 .if ${MK_DMAGENT} == no
 OLD_FILES+=etc/dma/dma.conf
+OLD_DIRS+=etc/dma
 OLD_FILES+=usr/libexec/dma
 OLD_FILES+=usr/libexec/dma-mbox-create
 OLD_FILES+=usr/share/man/man8/dma.8.gz
@@ -3068,6 +3074,10 @@
 .endif
 
 .if ${MK_GSSAPI} == no
+OLD_FILES+=etc/gss/mech
+OLD_FILES+=etc/gss/qop
+OLD_DIRS+=etc/gss
+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 +3280,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
@@ -3305,6 +3318,7 @@
 .endif
 
 .if ${MK_INETD} == no
+OLD_FILES+=etc/inetd.conf
 OLD_FILES+=etc/rc.d/inetd
 OLD_FILES+=usr/sbin/inetd
 OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz
@@ -3314,6 +3328,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 +3415,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 +4472,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
@@ -6017,6 +6039,7 @@
 OLD_FILES+=etc/mail.rc
 OLD_FILES+=etc/mail/aliases
 OLD_FILES+=etc/mail/mailer.conf
+OLD_DIRS+=etc/mail
 OLD_FILES+=etc/periodic/daily/130.clean-msgs
 OLD_FILES+=usr/bin/Mail
 OLD_FILES+=usr/bin/biff
@@ -6457,6 +6480,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
@@ -6714,7 +6738,11 @@
 .endif
 
 .if ${MK_NTP} == no
+OLD_DIRS+=etc/ntp
 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
@@ -6807,6 +6835,7 @@
 OLD_FILES+=etc/ssh/moduli
 OLD_FILES+=etc/ssh/ssh_config
 OLD_FILES+=etc/ssh/sshd_config
+OLD_DIRS+=etc/ssh
 OLD_FILES+=usr/bin/scp
 OLD_FILES+=usr/bin/sftp
 OLD_FILES+=usr/bin/slogin
@@ -6949,6 +6978,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 +7118,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 +7234,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 +9278,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