META MODE: Update dependencies with 'the-lot' and add missing directories.

This is not properly respecting WITHOUT or ARCH dependencies in target/.
Doing so requires a massive effort to rework targets/ to do so.  A
better approach will be to either include the SUBDIR Makefiles directly
and map to DIRDEPS or just dynamically lookup the SUBDIR.  These lose
the benefit of having a userland/lib, userland/libexec, etc, though and
results in a massive package.  The current implementation of targets/ is
very unmaintainable.

Currently rescue/rescue and sys/modules are still not connected.

Sponsored by:	EMC / Isilon Storage Division

7 files changed, 239 insertions, 39 deletions

diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend
index 546e146..a31f646 100644
--- a/targets/pseudo/userland/Makefile.depend
+++ b/targets/pseudo/userland/Makefile.depend
@@ -146,6 +146,7 @@ DIRDEPS+= \
 	sbin/resolvconf \
 	sbin/restore \
 	sbin/route \
+	sbin/routed \
 	sbin/routed/rtquery \
 	sbin/rtsol \
 	sbin/savecore \
@@ -209,6 +210,8 @@ DIRDEPS+= \
 	usr.bin/dc \
 	usr.bin/dig \
 	usr.bin/dirname \
+	usr.bin/dpv \
+	usr.bin/drill \
 	usr.bin/du \
 	usr.bin/ee \
 	usr.bin/elf2aout \
@@ -239,10 +242,13 @@ DIRDEPS+= \
 	usr.bin/head \
 	usr.bin/hexdump \
 	usr.bin/host \
+	usr.bin/iconv \
 	usr.bin/id \
+	usr.bin/ident \
 	usr.bin/indent \
 	usr.bin/ipcrm \
 	usr.bin/ipcs \
+	usr.bin/iscsictl \
 	usr.bin/join \
 	usr.bin/jot \
 	usr.bin/kdump \
@@ -254,6 +260,7 @@ DIRDEPS+= \
 	usr.bin/lam \
 	usr.bin/last \
 	usr.bin/lastcomm \
+	usr.bin/lex \
 	usr.bin/ldd \
 	usr.bin/leave \
 	usr.bin/less \
@@ -282,8 +289,11 @@ DIRDEPS+= \
 	usr.bin/mesg \
 	usr.bin/minigzip \
 	usr.bin/ministat \
+	usr.bin/mkcsmapper \
 	usr.bin/mkdep \
+	usr.bin/mkesdb \
 	usr.bin/mkfifo \
+	usr.bin/mkimg \
 	usr.bin/mklocale \
 	usr.bin/mkstr \
 	usr.bin/mktemp \
@@ -309,12 +319,14 @@ DIRDEPS+= \
 	usr.bin/pagesize \
 	usr.bin/passwd \
 	usr.bin/paste \
+	usr.bin/patch \
 	usr.bin/pathchk \
 	usr.bin/perror \
 	usr.bin/pr \
 	usr.bin/printenv \
 	usr.bin/printf \
 	usr.bin/procstat \
+	usr.bin/protect \
 	usr.bin/quota \
 	usr.bin/rctl \
 	usr.bin/renice \
@@ -332,16 +344,30 @@ DIRDEPS+= \
 	usr.bin/rwho \
 	usr.bin/script \
 	usr.bin/sed \
+	usr.bin/send-pr \
 	usr.bin/seq \
 	usr.bin/shar \
 	usr.bin/showmount \
+	usr.bin/smbutil \
 	usr.bin/sockstat \
+	usr.bin/soelim \
 	usr.bin/sort \
 	usr.bin/split \
 	usr.bin/ssh-copy-id \
 	usr.bin/stat \
 	usr.bin/stdbuf \
 	usr.bin/su \
+	usr.bin/svn/svn \
+	usr.bin/svn/svnadmin \
+	usr.bin/svn/svnbench \
+	usr.bin/svn/svndumpfilter \
+	usr.bin/svn/svnfsfs \
+	usr.bin/svn/svnlook \
+	usr.bin/svn/svnmucc \
+	usr.bin/svn/svnrdump \
+	usr.bin/svn/svnserve \
+	usr.bin/svn/svnsync \
+	usr.bin/svn/svnversion \
 	usr.bin/systat \
 	usr.bin/tabs \
 	usr.bin/tail \
@@ -380,6 +406,7 @@ DIRDEPS+= \
 	usr.bin/vacation \
 	usr.bin/vgrind \
 	usr.bin/vi \
+	usr.bin/vi/catalog \
 	usr.bin/vis \
 	usr.bin/vmstat \
 	usr.bin/vtfontcvt \
@@ -396,8 +423,9 @@ DIRDEPS+= \
 	usr.bin/xinstall \
 	usr.bin/xlint/lint1 \
 	usr.bin/xlint/lint2 \
-	usr.bin/xlint/xlint \
 	usr.bin/xlint/llib \
+	usr.bin/xlint/xlint \
+	usr.bin/xo \
 	usr.bin/xstr \
 	usr.bin/xz \
 	usr.bin/xzdec \
@@ -410,14 +438,14 @@ DIRDEPS+= \
 	usr.sbin/ac \
 	usr.sbin/accton \
 	usr.sbin/adduser \
-	usr.sbin/amd/include \
-	usr.sbin/amd/libamu \
 	usr.sbin/amd/amd \
 	usr.sbin/amd/amq \
 	usr.sbin/amd/doc \
 	usr.sbin/amd/fixmount \
 	usr.sbin/amd/fsinfo \
 	usr.sbin/amd/hlfsd \
+	usr.sbin/amd/include \
+	usr.sbin/amd/libamu \
 	usr.sbin/amd/mk-amd-map \
 	usr.sbin/amd/pawd \
 	usr.sbin/amd/scripts \
@@ -428,9 +456,11 @@ DIRDEPS+= \
 	usr.sbin/arpaname \
 	usr.sbin/audit \
 	usr.sbin/auditd \
+	usr.sbin/auditdistd \
 	usr.sbin/auditreduce \
 	usr.sbin/authpf \
-	usr.sbin/bhyve \
+	usr.sbin/autofs \
+	usr.sbin/binmiscctl \
 	usr.sbin/bluetooth/ath3kfw \
 	usr.sbin/bluetooth/bcmfw \
 	usr.sbin/bluetooth/bt3cfw \
@@ -447,25 +477,65 @@ DIRDEPS+= \
 	usr.sbin/bluetooth/sdpd \
 	usr.sbin/bootparamd/bootparamd \
 	usr.sbin/bootparamd/callbootd \
+	usr.sbin/bsdconfig \
+	usr.sbin/bsdconfig/console \
+	usr.sbin/bsdconfig/console/include \
+	usr.sbin/bsdconfig/diskmgmt \
+	usr.sbin/bsdconfig/diskmgmt/include \
+	usr.sbin/bsdconfig/docsinstall \
+	usr.sbin/bsdconfig/docsinstall/include \
+	usr.sbin/bsdconfig/dot \
+	usr.sbin/bsdconfig/dot/include \
+	usr.sbin/bsdconfig/examples \
+	usr.sbin/bsdconfig/include \
+	usr.sbin/bsdconfig/includes \
+	usr.sbin/bsdconfig/includes/include \
+	usr.sbin/bsdconfig/mouse \
+	usr.sbin/bsdconfig/mouse/include \
+	usr.sbin/bsdconfig/networking \
+	usr.sbin/bsdconfig/networking/include \
+	usr.sbin/bsdconfig/networking/share \
+	usr.sbin/bsdconfig/packages \
+	usr.sbin/bsdconfig/packages/include \
+	usr.sbin/bsdconfig/password \
+	usr.sbin/bsdconfig/password/include \
+	usr.sbin/bsdconfig/password/share \
+	usr.sbin/bsdconfig/security \
+	usr.sbin/bsdconfig/security/include \
+	usr.sbin/bsdconfig/share \
+	usr.sbin/bsdconfig/share/media \
+	usr.sbin/bsdconfig/share/packages \
+	usr.sbin/bsdconfig/startup \
+	usr.sbin/bsdconfig/startup/include \
+	usr.sbin/bsdconfig/startup/share \
+	usr.sbin/bsdconfig/timezone \
+	usr.sbin/bsdconfig/timezone/include \
+	usr.sbin/bsdconfig/timezone/share \
+	usr.sbin/bsdconfig/ttys \
+	usr.sbin/bsdconfig/ttys/include \
+	usr.sbin/bsdconfig/usermgmt \
+	usr.sbin/bsdconfig/usermgmt/include \
+	usr.sbin/bsdconfig/usermgmt/share \
 	usr.sbin/bsdinstall/distextract \
 	usr.sbin/bsdinstall/distfetch \
 	usr.sbin/bsdinstall/partedit \
 	usr.sbin/bsdinstall/scripts \
-	usr.sbin/bsnmpd/gensnmptree \
 	usr.sbin/bsnmpd/bsnmpd \
+	usr.sbin/bsnmpd/gensnmptree \
 	usr.sbin/bsnmpd/modules/snmp_atm \
 	usr.sbin/bsnmpd/modules/snmp_bridge \
+	usr.sbin/bsnmpd/modules/snmp_hast \
 	usr.sbin/bsnmpd/modules/snmp_hostres \
 	usr.sbin/bsnmpd/modules/snmp_lm75 \
 	usr.sbin/bsnmpd/modules/snmp_mibII \
+	usr.sbin/bsnmpd/modules/snmp_netgraph \
 	usr.sbin/bsnmpd/modules/snmp_pf \
 	usr.sbin/bsnmpd/modules/snmp_target \
 	usr.sbin/bsnmpd/modules/snmp_usm \
 	usr.sbin/bsnmpd/modules/snmp_vacm \
 	usr.sbin/bsnmpd/modules/snmp_wlan \
-	usr.sbin/bsnmpd/modules/snmp_netgraph \
-	usr.sbin/bsnmpd/tools/libbsnmptools \
 	usr.sbin/bsnmpd/tools/bsnmptools \
+	usr.sbin/bsnmpd/tools/libbsnmptools \
 	usr.sbin/burncd \
 	usr.sbin/cdcontrol \
 	usr.sbin/chkgrp \
@@ -475,19 +545,21 @@ DIRDEPS+= \
 	usr.sbin/clear_locks \
 	usr.sbin/config \
 	usr.sbin/crashinfo \
-	usr.sbin/cron/lib \
 	usr.sbin/cron/cron \
 	usr.sbin/cron/crontab \
+	usr.sbin/cron/lib \
 	usr.sbin/crunch/crunchgen \
 	usr.sbin/crunch/crunchide \
 	usr.sbin/ctladm \
+	usr.sbin/ctld \
 	usr.sbin/ctm/ctm \
+	usr.sbin/ctm/ctm_dequeue \
 	usr.sbin/ctm/ctm_rmail \
 	usr.sbin/ctm/ctm_smail \
-	usr.sbin/ctm/ctm_dequeue \
 	usr.sbin/daemon \
 	usr.sbin/dconschat \
 	usr.sbin/ddns-confgen \
+	usr.sbin/devctl \
 	usr.sbin/devinfo \
 	usr.sbin/digictl \
 	usr.sbin/diskinfo \
@@ -507,13 +579,15 @@ DIRDEPS+= \
 	usr.sbin/fdformat \
 	usr.sbin/fdread \
 	usr.sbin/fdwrite \
-	usr.sbin/fifolog/lib \
 	usr.sbin/fifolog/fifolog_create \
-	usr.sbin/fifolog/fifolog_writer \
 	usr.sbin/fifolog/fifolog_reader \
+	usr.sbin/fifolog/fifolog_writer \
+	usr.sbin/fifolog/lib \
 	usr.sbin/flowctl \
 	usr.sbin/fmtree \
 	usr.sbin/freebsd-update \
+	usr.sbin/fstyp \
+	usr.sbin/ftp-proxy \
 	usr.sbin/fwcontrol \
 	usr.sbin/genrandom \
 	usr.sbin/getfmac \
@@ -525,9 +599,11 @@ DIRDEPS+= \
 	usr.sbin/ifmcstat \
 	usr.sbin/inetd \
 	usr.sbin/iostat \
+	usr.sbin/iovctl \
 	usr.sbin/ip6addrctl \
 	usr.sbin/ipfwpcap \
 	usr.sbin/isc-hmac-fixup \
+	usr.sbin/iscsid \
 	usr.sbin/isfctl \
 	usr.sbin/jail \
 	usr.sbin/jexec \
@@ -538,8 +614,11 @@ DIRDEPS+= \
 	usr.sbin/kldxref \
 	usr.sbin/lastlogin \
 	usr.sbin/lmcconfig \
-	usr.sbin/lpr/common_source \
 	usr.sbin/lpr/chkprintcap \
+	usr.sbin/lpr/common_source \
+	usr.sbin/lpr/filters \
+	usr.sbin/lpr/filters.ru/koi2855 \
+	usr.sbin/lpr/filters.ru/koi2alt \
 	usr.sbin/lpr/lp \
 	usr.sbin/lpr/lpc \
 	usr.sbin/lpr/lpd \
@@ -548,21 +627,18 @@ DIRDEPS+= \
 	usr.sbin/lpr/lprm \
 	usr.sbin/lpr/lptest \
 	usr.sbin/lpr/pac \
-	usr.sbin/lpr/filters \
-	usr.sbin/lpr/filters.ru/koi2alt \
-	usr.sbin/lpr/filters.ru/koi2855 \
 	usr.sbin/mailstats \
 	usr.sbin/mailwrapper \
 	usr.sbin/makefs \
 	usr.sbin/makemap \
 	usr.sbin/manctl \
-	usr.sbin/manctl \
 	usr.sbin/memcontrol \
 	usr.sbin/mergemaster \
 	usr.sbin/mfiutil \
 	usr.sbin/mixer \
 	usr.sbin/mld6query \
 	usr.sbin/mlxcontrol \
+	usr.sbin/mount_smbfs \
 	usr.sbin/mountd \
 	usr.sbin/moused \
 	usr.sbin/mpsutil \
@@ -585,17 +661,24 @@ DIRDEPS+= \
 	usr.sbin/nologin \
 	usr.sbin/nscd \
 	usr.sbin/nsec3hash \
-	usr.sbin/ntp/libopts \
+	usr.sbin/ntp/doc \
+	usr.sbin/ntp/doc/drivers/icons \
+	usr.sbin/ntp/doc/drivers/scripts \
+	usr.sbin/ntp/doc/drivers \
+	usr.sbin/ntp/doc/hints \
+	usr.sbin/ntp/doc/icons \
+	usr.sbin/ntp/doc/pic \
+	usr.sbin/ntp/doc/scripts \
 	usr.sbin/ntp/libntp \
+	usr.sbin/ntp/libopts \
 	usr.sbin/ntp/libparse \
+	usr.sbin/ntp/ntp-keygen \
 	usr.sbin/ntp/ntpd \
+	usr.sbin/ntp/ntpdate \
 	usr.sbin/ntp/ntpdc \
 	usr.sbin/ntp/ntpq \
-	usr.sbin/ntp/ntpdate \
 	usr.sbin/ntp/ntptime \
-	usr.sbin/ntp/ntp-keygen \
 	usr.sbin/ntp/sntp \
-	usr.sbin/ntp/doc \
 	usr.sbin/pc-sysinstall/backend \
 	usr.sbin/pc-sysinstall/backend-partmanager \
 	usr.sbin/pc-sysinstall/backend-query \
@@ -606,19 +689,19 @@ DIRDEPS+= \
 	usr.sbin/pciconf \
 	usr.sbin/periodic \
 	usr.sbin/pkg \
-	usr.sbin/pkg_install/lib \
 	usr.sbin/pkg_install/add \
 	usr.sbin/pkg_install/create \
 	usr.sbin/pkg_install/delete \
 	usr.sbin/pkg_install/info \
+	usr.sbin/pkg_install/lib \
 	usr.sbin/pkg_install/updating \
 	usr.sbin/pkg_install/version \
 	usr.sbin/pmcannotate \
 	usr.sbin/pmccontrol \
 	usr.sbin/pmcstat \
-	usr.sbin/portsnap/portsnap \
 	usr.sbin/portsnap/make_index \
 	usr.sbin/portsnap/phttpget \
+	usr.sbin/portsnap/portsnap \
 	usr.sbin/powerd \
 	usr.sbin/ppp \
 	usr.sbin/pppctl \
@@ -662,6 +745,7 @@ DIRDEPS+= \
 	usr.sbin/snapinfo \
 	usr.sbin/spray \
 	usr.sbin/syslogd \
+	usr.sbin/sysrc \
 	usr.sbin/tcpdchk \
 	usr.sbin/tcpdmatch \
 	usr.sbin/tcpdrop \
@@ -673,37 +757,46 @@ DIRDEPS+= \
 	usr.sbin/trpt \
 	usr.sbin/tzsetup \
 	usr.sbin/uathload \
+	usr.sbin/uefisign \
 	usr.sbin/ugidfw \
 	usr.sbin/uhsoctl \
+	usr.sbin/unbound/anchor \
+	usr.sbin/unbound/checkconf \
+	usr.sbin/unbound/control \
+	usr.sbin/unbound/daemon \
+	usr.sbin/unbound/local-setup \
 	usr.sbin/usbconfig \
 	usr.sbin/usbdump \
 	usr.sbin/utx \
 	usr.sbin/vidcontrol \
+	usr.sbin/vigr \
 	usr.sbin/vipw \
 	usr.sbin/wake \
 	usr.sbin/watch \
 	usr.sbin/watchdogd \
 	usr.sbin/wlandebug \
-	usr.sbin/wpa/wpa_supplicant \
-	usr.sbin/wpa/wpa_cli \
-	usr.sbin/wpa/wpa_passphrase \
 	usr.sbin/wpa/hostapd \
 	usr.sbin/wpa/hostapd_cli \
 	usr.sbin/wpa/ndis_events \
+	usr.sbin/wpa/wpa_cli \
+	usr.sbin/wpa/wpa_passphrase \
+	usr.sbin/wpa/wpa_supplicant \
 	usr.sbin/yp_mkdb \
 	usr.sbin/ypbind \
 	usr.sbin/yppoll \
 	usr.sbin/yppush \
 	usr.sbin/ypserv \
 	usr.sbin/ypset \
-	usr.sbin/zic/zic \
 	usr.sbin/zic/zdump \
+	usr.sbin/zic/zic \
 	${DEP_RELDIR}/cddl \
 	${DEP_RELDIR}/games \
 	${DEP_RELDIR}/gnu \
 	${DEP_RELDIR}/include \
 	${DEP_RELDIR}/kerberos5 \
+	${DEP_RELDIR}/lib \
 	${DEP_RELDIR}/libexec \
+	${DEP_RELDIR}/misc \
 	${DEP_RELDIR}/secure \
 	${DEP_RELDIR}/share \
 
@@ -717,9 +810,13 @@ DIRDEPS.amd64= \
 	usr.sbin/acpi/iasl \
 	usr.sbin/apm \
 	usr.sbin/asf \
+	usr.sbin/bhyve \
+	usr.sbin/bhyvectl \
+	usr.sbin/bhyveload \
 	usr.sbin/boot0cfg \
 	usr.sbin/btxld \
 	usr.sbin/cpucontrol \
+	usr.sbin/hyperv/tools \
 	usr.sbin/kgmon \
 	usr.sbin/lptcontrol \
 	usr.sbin/mptable \
@@ -745,6 +842,7 @@ DIRDEPS.i386= \
 	usr.sbin/asf \
 	usr.sbin/btxld \
 	usr.sbin/cpucontrol \
+	usr.sbin/hyperv/tools \
 	usr.sbin/kgmon \
 	usr.sbin/kgzip \
 	usr.sbin/lptcontrol \
@@ -759,6 +857,10 @@ DIRDEPS.i386= \
 	usr.sbin/boot0cfg \
 	usr.sbin/wlconfig
 
+DIRDEPS.arm64= \
+	usr.sbin/acpi \
+	usr.sbin/ofwdump
+
 DIRDEPS.mips= \
 	sbin/bsdlabel \
 	sbin/fdisk
@@ -779,6 +881,14 @@ DIRDEPS.powerpc= \
 	usr.sbin/nvram \
 	usr.sbin/ofwdump
 
+.if ${MK_GPL_DTC} != "yes"
+DIRDEPS+= usr.bin/dtc
+.endif
+
+.if ${MK_CASPER} == "yes"
+DIRDEPS+= sbin/casperd
+.endif
+
 DIRDEPS+= ${DIRDEPS.${MACHINE}:U}
 
 
diff --git a/targets/pseudo/userland/gnu/Makefile.depend b/targets/pseudo/userland/gnu/Makefile.depend
index 3a90fb0..2ef018f 100644
--- a/targets/pseudo/userland/gnu/Makefile.depend
+++ b/targets/pseudo/userland/gnu/Makefile.depend
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+.if !defined(MK_GPL_DTC)
+.include "${SRCTOP}/share/mk/src.opts.mk"
+.endif
+
 # This file is not autogenerated - take care!
 
 DIRDEPS = \
@@ -11,6 +15,7 @@ DIRDEPS = \
 	gnu/lib/libreadline/history/doc \
 	gnu/lib/libreadline/readline/doc \
 	gnu/lib/libregex/doc \
+	gnu/lib/libssp \
 	gnu/lib/libssp/libssp_nonshared \
 	gnu/lib/libstdc++ \
 	gnu/lib/libsupc++ \
@@ -26,6 +31,7 @@ DIRDEPS = \
 	gnu/usr.bin/binutils/objdump \
 	gnu/usr.bin/binutils/ranlib \
 	gnu/usr.bin/dialog \
+	gnu/usr.bin/diff \
 	gnu/usr.bin/diff/doc \
 	gnu/usr.bin/diff3 \
 	gnu/usr.bin/gdb/doc \
@@ -34,7 +40,9 @@ DIRDEPS = \
 	gnu/usr.bin/gdb/gdbtui \
 	gnu/usr.bin/gdb/kgdb \
 	gnu/usr.bin/gdb/libgdb \
+	gnu/usr.bin/gperf \
 	gnu/usr.bin/gperf/doc \
+	gnu/usr.bin/grep \
 	gnu/usr.bin/grep/doc \
 	gnu/usr.bin/groff/contrib/mm \
 	gnu/usr.bin/groff/doc \
@@ -104,5 +112,8 @@ DIRDEPS = \
 	gnu/usr.bin/texinfo/makeinfo \
 	gnu/usr.bin/texinfo/texindex \
 
+.if ${MK_GPL_DTC} != "no"
+DIRDEPS+= gnu/usr.bin/dtc
+.endif
 
 .include <dirdeps.mk>
diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend
index 74e6a6e..2cbde23 100644
--- a/targets/pseudo/userland/lib/Makefile.depend
+++ b/targets/pseudo/userland/lib/Makefile.depend
@@ -2,10 +2,15 @@
 
 # This file is not autogenerated - take care!
 
+.if !defined(MK_CLANG)
+.include <src.opts.mk>
+.endif
+
 DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/atf/libatf-c \
 	lib/atf/libatf-c++ \
+	lib/lib80211 \
 	lib/libalias/libalias \
 	lib/libalias/modules/cuseeme \
 	lib/libalias/modules/dummy \
@@ -20,6 +25,7 @@ DIRDEPS = \
 	lib/libbegemot \
 	lib/libblocksruntime \
 	lib/libbluetooth \
+	lib/libbsdstat \
 	lib/libbsm \
 	lib/libbsnmp/libbsnmp \
 	lib/libbz2 \
@@ -27,17 +33,20 @@ DIRDEPS = \
 	lib/libc++ \
 	lib/libcalendar \
 	lib/libcam \
+	lib/libcasper \
 	lib/libcom_err/doc \
 	lib/libcompat \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libcuse \
 	lib/libcxxrt \
+	lib/libdevctl \
 	lib/libdevinfo \
 	lib/libdevstat \
 	lib/libdwarf \
 	lib/libedit/edit/readline \
 	lib/libelf \
+	lib/libevent \
 	lib/libexecinfo \
 	lib/libexpat \
 	lib/libfetch \
@@ -81,6 +90,7 @@ DIRDEPS = \
 	lib/libmp \
 	lib/libnetgraph \
 	lib/libngatm \
+	lib/libnv \
 	lib/libopie \
 	lib/libpam/libpam \
 	lib/libpam/modules/pam_chroot \
@@ -108,6 +118,7 @@ DIRDEPS = \
 	lib/libpam/modules/pam_tacplus \
 	lib/libpam/modules/pam_unix \
 	lib/libpcap \
+	lib/libpjdlog \
 	lib/libpmc \
 	lib/libproc \
 	lib/libprocstat \
@@ -153,5 +164,20 @@ DIRDEPS = \
 	lib/ncurses/panel \
 	lib/ncurses/panelw \
 
+.if ${MK_CLANG} != "no" && \
+    (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
+    (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb") || \
+    (${MACHINE_CPUARCH} == "i386"))
+DIRDEPS+= \
+	lib/libclang_rt/asan-preinit \
+	lib/libclang_rt/asan \
+	lib/libclang_rt/asan_cxx \
+	lib/libclang_rt/include \
+	lib/libclang_rt/profile \
+	lib/libclang_rt/safestack \
+	lib/libclang_rt/ubsan_standalone \
+	lib/libclang_rt/ubsan_standalone_cxx \
+
+.endif
 
 .include <dirdeps.mk>
diff --git a/targets/pseudo/userland/libexec/Makefile.depend b/targets/pseudo/userland/libexec/Makefile.depend
index f870b6a..427268c 100644
--- a/targets/pseudo/userland/libexec/Makefile.depend
+++ b/targets/pseudo/userland/libexec/Makefile.depend
@@ -6,13 +6,20 @@ DIRDEPS = \
 	libexec/atf/atf-check \
 	libexec/atf/atf-sh \
 	libexec/atrun \
+	libexec/bootpd \
 	libexec/bootpd/bootpgw \
 	libexec/bootpd/tools/bootpef \
 	libexec/bootpd/tools/bootptest \
+	libexec/casper/dns \
+	libexec/casper/grp \
+	libexec/casper/pwd \
+	libexec/casper/random \
+	libexec/casper/sysctl \
 	libexec/comsat \
 	libexec/fingerd \
 	libexec/ftpd \
 	libexec/getty \
+	libexec/hyperv \
 	libexec/mail.local \
 	libexec/mknetid \
 	libexec/pppoed \
diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend
index 15065fa..3dc5064 100644
--- a/targets/pseudo/userland/misc/Makefile.depend
+++ b/targets/pseudo/userland/misc/Makefile.depend
@@ -2,47 +2,84 @@
 
 # This file is not autogenerated - take care!
 
+.if !defined(MK_FORTH)
+.include <src.opts.mk>
+.endif
+
+_sys_boot_efi= sys/boot/efi/loader sys/boot/efi/boot1
+.if ${MK_FDT} != "no"
+_sys_boot_fdt= sys/boot/fdt sys/boot/efi/fdt
+.endif
+.if ${MK_ZFS} != "no"
+_sys_boot_zfs= sys/boot/zfs
+.endif
+
 DIRDEPS = \
+	etc \
+	etc/newsyslog.conf.d \
+	etc/sendmail \
 	rescue/librescue \
 	rescue/rescue \
-	sys/boot/ficl \
-	etc/sendmail \
 
+.if ${MK_BOOT} != "no"
+DIRDEPS+= sys/boot/common
 
+.if ${MK_FORTH} != "no"
+DIRDEPS+= \
+	sys/boot/ficl \
+	sys/boot/forth \
+
+.endif
 
 DIRDEPS.x86sys= \
-	sys/boot/i386/mbr \
-	sys/boot/i386/pmbr \
+	sys/boot/efi/libefi \
 	sys/boot/i386/boot0 \
 	sys/boot/i386/boot0sio \
+	sys/boot/i386/boot2 \
 	sys/boot/i386/btx/btx \
 	sys/boot/i386/btx/btxldr \
 	sys/boot/i386/btx/lib \
-	sys/boot/i386/boot2 \
 	sys/boot/i386/cdboot \
 	sys/boot/i386/gptboot \
-	sys/boot/i386/libi386 \
 	sys/boot/i386/libfirewire \
+	sys/boot/i386/libi386 \
 	sys/boot/i386/loader \
+	sys/boot/i386/mbr \
+	sys/boot/i386/pmbr \
 	sys/boot/i386/pxeldr \
-	sys/boot/i386/zfsboot \
+	sys/boot/libstand32 \
+	${_sys_boot_zfs} \
+
+.if ${MK_ZFS} != "no"
+DIRDEPS.x86sys+= \
 	sys/boot/i386/gptzfsboot \
+	sys/boot/i386/zfsboot \
 	sys/boot/i386/zfsloader \
 
+.endif
 
 DIRDEPS.amd64= \
 	${DIRDEPS.x86sys} \
-	sys/boot/efi/libefi \
-	sys/boot/zfs \
+	${_sys_boot_efi} \
+	sys/boot/ficl32 \
 	sys/boot/userboot/ficl \
 	sys/boot/userboot/libstand \
 	sys/boot/userboot/test \
 	sys/boot/userboot/userboot \
 
-DIRDEPS.arm= sys/boot/fdt sys/boot/uboot
-DIRDEPS.i386= ${DIRDEPS.x86sys} sys/boot/efi/libefi sys/boot/zfs
-DIRDEPS.powerpc= sys/boot/fdt sys/boot/ofw sys/boot/uboot
-DIRDEPS.sparc64= sys/boot/ofw sys/boot/zfs
+.if ${MK_ZFS} != "no"
+DIRDEPS.amd64+= \
+	sys/boot/userboot/zfs \
+
+.endif
+
+DIRDEPS.arm= ${_sys_boot_fdt} ${_sys_boot_efi}
+DIRDEPS.arm64= ${_sys_boot_fdt} ${_sys_boot_efi}
+DIRDEPS.i386= ${DIRDEPS.x86sys} sys/boot/efi/libefi
+DIRDEPS.powerpc= ${_sys_boot_fdt} sys/boot/libstand32 sys/boot/ofw sys/boot/uboot
+DIRDEPS.pc98= sys/boot/libstand32
+DIRDEPS.sparc64= sys/boot/ofw ${_sys_boot_zfs}
+.endif
 
 DIRDEPS+= ${DIRDEPS.${MACHINE}:U}
 
diff --git a/targets/pseudo/userland/secure/Makefile.depend b/targets/pseudo/userland/secure/Makefile.depend
index 22532a9..b00e889 100644
--- a/targets/pseudo/userland/secure/Makefile.depend
+++ b/targets/pseudo/userland/secure/Makefile.depend
@@ -7,6 +7,7 @@ DIRDEPS = \
 	secure/lib/libcrypto/engines/lib4758cca \
 	secure/lib/libcrypto/engines/libaep \
 	secure/lib/libcrypto/engines/libatalla \
+	secure/lib/libcrypto/engines/libcapi \
 	secure/lib/libcrypto/engines/libchil \
 	secure/lib/libcrypto/engines/libcswift \
 	secure/lib/libcrypto/engines/libgost \
diff --git a/targets/pseudo/userland/share/Makefile.depend b/targets/pseudo/userland/share/Makefile.depend
index 9f13ae0..4e7c9e1 100644
--- a/targets/pseudo/userland/share/Makefile.depend
+++ b/targets/pseudo/userland/share/Makefile.depend
@@ -83,10 +83,13 @@ DIRDEPS = \
 	share/doc/usd/22.trofftut \
 	share/doc/usd/contents \
 	share/doc/usd/title \
+	share/dtrace \
 	share/dtrace/toolkit \
 	share/examples/atf \
 	share/examples/ipfilter \
 	share/examples/pf \
+	share/examples/smbfs \
+	share/examples/smbfs/print \
 	share/i18n/csmapper \
 	share/i18n/csmapper/APPLE \
 	share/i18n/csmapper/AST \
@@ -123,6 +126,8 @@ DIRDEPS = \
 	share/i18n/esdb/TCVN \
 	share/i18n/esdb/UTF \
 	share/info \
+	share/keys/pkg/trusted \
+	share/locale-links \
 	share/man/man1 \
 	share/man/man3 \
 	share/man/man4 \
@@ -133,6 +138,7 @@ DIRDEPS = \
 	share/man/man9 \
 	share/me \
 	share/misc \
+	share/mk \
 	share/mklocale \
 	share/monetdef \
 	share/msgdef \
@@ -146,6 +152,8 @@ DIRDEPS = \
 	share/tabset \
 	share/termcap \
 	share/timedef \
+	share/vt/fonts \
+	share/vt/keymaps \
 	share/xml/atf \
 	share/xsl/atf \
 	share/zoneinfo \