git: d9a427479501 - main - Update/fix Makefile.depend for userland

From: Simon J. Gerraty <sjg_at_FreeBSD.org>
Date: Wed, 19 Apr 2023 00:15:46 UTC
The branch main has been updated by sjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=d9a42747950146bf03cda7f6e25d219253f8a57a

commit d9a42747950146bf03cda7f6e25d219253f8a57a
Author:     Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2023-04-19 00:14:23 +0000
Commit:     Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2023-04-19 00:14:23 +0000

    Update/fix Makefile.depend for userland
---
 bin/cat/Makefile.depend                            |  5 ++-
 bin/chflags/Makefile.depend                        |  1 -
 bin/chio/Makefile.depend                           |  1 -
 bin/chmod/Makefile.depend                          |  1 -
 bin/cp/Makefile.depend                             |  1 -
 bin/csh/Makefile.depend                            |  4 +--
 bin/date/Makefile.depend                           |  1 -
 bin/dd/Makefile.depend                             |  3 +-
 bin/df/Makefile.depend                             |  3 +-
 bin/domainname/Makefile.depend                     |  1 -
 bin/echo/Makefile.depend                           |  2 +-
 bin/ed/Makefile.depend                             |  2 --
 bin/expr/Makefile.depend                           |  1 -
 bin/getfacl/Makefile.depend                        |  1 -
 bin/hostname/Makefile.depend                       |  1 -
 bin/kenv/Makefile.depend                           |  1 -
 bin/kill/Makefile.depend                           |  1 -
 bin/ln/Makefile.depend                             |  1 -
 bin/ls/Makefile.depend                             |  1 +
 bin/mkdir/Makefile.depend                          |  1 -
 bin/mv/Makefile.depend                             |  1 -
 bin/pax/Makefile.depend                            |  1 -
 bin/pkill/Makefile.depend                          |  2 --
 bin/ps/Makefile.depend                             |  5 +--
 bin/pwait/Makefile.depend                          |  1 -
 bin/pwd/Makefile.depend                            |  1 -
 bin/realpath/Makefile.depend                       |  1 -
 bin/rm/Makefile.depend                             |  1 -
 bin/rmail/Makefile.depend                          |  1 -
 bin/rmdir/Makefile.depend                          |  1 -
 bin/setfacl/Makefile.depend                        |  1 -
 bin/sh/Makefile.depend                             |  4 +--
 bin/sleep/Makefile.depend                          |  2 +-
 bin/stty/Makefile.depend                           |  1 -
 bin/sync/Makefile.depend                           |  1 -
 bin/test/Makefile.depend                           |  1 -
 bin/uuidgen/Makefile.depend                        |  4 ++-
 cddl/lib/libavl/Makefile.depend                    |  2 ++
 cddl/lib/libctf/Makefile.depend                    |  1 +
 cddl/lib/libdtrace/Makefile.depend                 |  3 +-
 cddl/lib/libicp/Makefile.depend                    |  0
 cddl/lib/libicp_rescue/Makefile.depend             |  0
 cddl/lib/libnvpair/Makefile.depend                 |  2 +-
 cddl/lib/libspl/Makefile.depend                    |  0
 cddl/lib/libtpool/Makefile.depend                  |  0
 cddl/lib/libuutil/Makefile.depend                  |  2 ++
 cddl/lib/libzfs/Makefile.depend                    |  2 ++
 cddl/lib/libzfs_core/Makefile.depend               |  3 +-
 cddl/lib/libzfsbootenv/Makefile.depend             |  0
 cddl/lib/libzpool/Makefile.depend                  |  3 +-
 cddl/lib/libzutil/Makefile.depend                  |  0
 cddl/sbin/zfs/Makefile.depend                      | 11 +++----
 cddl/sbin/zpool/Makefile.depend                    | 10 ++----
 cddl/usr.bin/ctfconvert/Makefile.depend            |  3 +-
 cddl/usr.bin/ctfdump/Makefile.depend               |  1 -
 cddl/usr.bin/ctfmerge/Makefile.depend              |  2 +-
 cddl/usr.bin/zinject/Makefile.depend               |  9 ++----
 cddl/usr.bin/ztest/Makefile.depend                 |  9 ++----
 cddl/usr.sbin/dtrace/Makefile.depend               |  8 +----
 cddl/usr.sbin/lockstat/Makefile.depend             |  8 -----
 cddl/usr.sbin/plockstat/Makefile.depend            |  8 -----
 cddl/usr.sbin/zdb/Makefile.depend                  | 13 ++------
 cddl/usr.sbin/zfsd/Makefile.depend                 |  7 +---
 cddl/usr.sbin/zhack/Makefile.depend                | 15 ++-------
 gnu/lib/libdialog/Makefile.depend                  |  3 +-
 gnu/usr.bin/dialog/Makefile.depend                 |  4 +--
 gnu/usr.bin/diff3/Makefile.depend                  |  1 -
 include/Makefile.depend                            |  1 +
 kerberos5/lib/libgssapi_ntlm/Makefile.depend       |  1 -
 kerberos5/lib/libgssapi_spnego/Makefile.depend     |  1 -
 kerberos5/lib/libheimipcs/Makefile.depend          |  1 -
 kerberos5/lib/libkadm5srv/Makefile.depend          |  1 -
 kerberos5/libexec/digest-service/Makefile.depend   |  6 ----
 kerberos5/libexec/hprop/Makefile.depend            |  6 ----
 kerberos5/libexec/hpropd/Makefile.depend           |  6 ----
 kerberos5/libexec/ipropd-master/Makefile.depend    | 10 ------
 kerberos5/libexec/ipropd-slave/Makefile.depend     | 10 ------
 kerberos5/libexec/kadmind/Makefile.depend          |  6 ----
 kerberos5/libexec/kcm/Makefile.depend              |  8 -----
 kerberos5/libexec/kdc/Makefile.depend              |  5 ---
 kerberos5/libexec/kdigest/Makefile.depend          |  9 ------
 kerberos5/libexec/kfd/Makefile.depend              |  9 ------
 kerberos5/libexec/kimpersonate/Makefile.depend     |  8 -----
 kerberos5/libexec/kpasswdd/Makefile.depend         |  9 ------
 kerberos5/tools/asn1_compile/Makefile.depend       |  1 -
 kerberos5/tools/make-roken/Makefile.depend         |  1 -
 kerberos5/tools/slc/Makefile.depend                |  1 -
 kerberos5/usr.bin/hxtool/Makefile.depend           |  5 ---
 kerberos5/usr.bin/kadmin/Makefile.depend           |  7 ----
 kerberos5/usr.bin/kcc/Makefile.depend              |  9 ------
 kerberos5/usr.bin/kdestroy/Makefile.depend         |  8 -----
 kerberos5/usr.bin/kf/Makefile.depend               |  9 ------
 kerberos5/usr.bin/kgetcred/Makefile.depend         |  8 -----
 kerberos5/usr.bin/kinit/Makefile.depend            |  8 -----
 kerberos5/usr.bin/kpasswd/Makefile.depend          |  9 ------
 kerberos5/usr.bin/ksu/Makefile.depend              |  7 ----
 kerberos5/usr.bin/string2key/Makefile.depend       |  5 ---
 kerberos5/usr.bin/verify_krb5_conf/Makefile.depend |  5 ---
 kerberos5/usr.sbin/iprop-log/Makefile.depend       | 11 -------
 kerberos5/usr.sbin/kstash/Makefile.depend          |  6 ----
 kerberos5/usr.sbin/ktutil/Makefile.depend          |  9 ------
 lib/atf/libatf-c++/Makefile.depend                 |  1 -
 lib/geom/cache/Makefile.depend                     |  2 --
 lib/geom/concat/Makefile.depend                    |  2 --
 lib/geom/eli/Makefile.depend                       |  2 --
 lib/geom/journal/Makefile.depend                   |  2 --
 lib/geom/label/Makefile.depend                     |  2 --
 lib/geom/mirror/Makefile.depend                    |  2 --
 lib/geom/mountver/Makefile.depend                  |  2 --
 lib/geom/multipath/Makefile.depend                 |  2 --
 lib/geom/nop/Makefile.depend                       |  2 --
 lib/geom/part/Makefile.depend                      |  2 --
 lib/geom/raid/Makefile.depend                      |  2 --
 lib/geom/raid3/Makefile.depend                     |  2 --
 lib/geom/shsec/Makefile.depend                     |  2 --
 lib/geom/stripe/Makefile.depend                    |  2 --
 lib/geom/virstor/Makefile.depend                   |  2 --
 lib/lib9p/Makefile.depend                          |  0
 lib/libalias/modules/dummy/Makefile.depend         |  1 -
 lib/libalias/modules/ftp/Makefile.depend           |  1 -
 lib/libalias/modules/irc/Makefile.depend           |  1 -
 lib/libalias/modules/nbt/Makefile.depend           |  1 -
 lib/libalias/modules/pptp/Makefile.depend          |  1 -
 lib/libalias/modules/skinny/Makefile.depend        |  1 -
 lib/libalias/modules/smedia/Makefile.depend        |  1 -
 lib/libauditd/Makefile.depend                      |  1 -
 lib/libbe/Makefile.depend                          |  4 +--
 lib/libbsddialog/Makefile.depend                   |  0
 lib/libcasper/services/Makefile.depend             |  0
 .../services/cap_dns/tests/Makefile.depend         | 10 ------
 .../services/cap_grp/tests/Makefile.depend         |  9 ------
 lib/libcasper/services/cap_net/Makefile.depend     |  0
 lib/libcasper/services/cap_netdb/Makefile.depend   |  0
 .../services/cap_pwd/tests/Makefile.depend         |  9 ------
 .../services/cap_sysctl/tests/Makefile.depend      |  9 ------
 lib/libdl/Makefile.depend                          |  1 -
 lib/libdpv/Makefile.depend                         |  3 +-
 lib/libdwarf/Makefile.depend                       |  1 +
 lib/libedit/Makefile.depend                        |  2 +-
 lib/libexpat/Makefile.depend                       |  1 +
 lib/libiconv_modules/BIG5/Makefile.depend          |  1 -
 lib/libiconv_modules/DECHanyu/Makefile.depend      |  1 -
 lib/libiconv_modules/EUC/Makefile.depend           |  1 -
 lib/libiconv_modules/EUCTW/Makefile.depend         |  1 -
 lib/libiconv_modules/GBK2K/Makefile.depend         |  1 -
 lib/libiconv_modules/HZ/Makefile.depend            |  1 -
 lib/libiconv_modules/ISO2022/Makefile.depend       |  1 -
 lib/libiconv_modules/JOHAB/Makefile.depend         |  1 -
 lib/libiconv_modules/MSKanji/Makefile.depend       |  1 -
 lib/libiconv_modules/UES/Makefile.depend           |  1 -
 lib/libiconv_modules/UTF1632/Makefile.depend       |  1 -
 lib/libiconv_modules/UTF7/Makefile.depend          |  1 -
 lib/libiconv_modules/UTF8/Makefile.depend          |  1 -
 lib/libiconv_modules/VIQR/Makefile.depend          |  1 -
 lib/libiconv_modules/ZW/Makefile.depend            |  1 -
 lib/libiconv_modules/iconv_none/Makefile.depend    |  1 -
 lib/libiconv_modules/iconv_std/Makefile.depend     |  1 -
 lib/libiconv_modules/mapper_646/Makefile.depend    |  1 -
 lib/libiconv_modules/mapper_none/Makefile.depend   |  1 -
 .../mapper_parallel/Makefile.depend                |  1 -
 lib/libiconv_modules/mapper_serial/Makefile.depend |  1 -
 lib/libiconv_modules/mapper_std/Makefile.depend    |  1 -
 lib/libiconv_modules/mapper_zone/Makefile.depend   |  1 -
 lib/libifconfig/Makefile.depend                    |  1 +
 lib/libiscsiutil/Makefile.depend                   |  0
 lib/libkiconv/Makefile.depend                      |  1 -
 lib/liblzma/Makefile.depend                        |  1 +
 lib/libmilter/Makefile.depend                      |  1 +
 lib/libmixer/Makefile.depend                       |  0
 lib/libpam/modules/pam_chroot/Makefile.depend      |  1 -
 lib/libpam/modules/pam_deny/Makefile.depend        |  1 -
 lib/libpam/modules/pam_echo/Makefile.depend        |  1 -
 lib/libpam/modules/pam_exec/Makefile.depend        |  1 -
 lib/libpam/modules/pam_ftpusers/Makefile.depend    |  1 -
 lib/libpam/modules/pam_group/Makefile.depend       |  1 -
 lib/libpam/modules/pam_guest/Makefile.depend       |  1 -
 lib/libpam/modules/pam_krb5/Makefile.depend        |  1 -
 lib/libpam/modules/pam_ksu/Makefile.depend         |  1 -
 lib/libpam/modules/pam_lastlog/Makefile.depend     |  1 -
 .../modules/pam_login_access/Makefile.depend       |  1 -
 lib/libpam/modules/pam_nologin/Makefile.depend     |  1 -
 lib/libpam/modules/pam_passwdqc/Makefile.depend    |  1 -
 lib/libpam/modules/pam_permit/Makefile.depend      |  1 -
 lib/libpam/modules/pam_radius/Makefile.depend      |  1 -
 lib/libpam/modules/pam_rhosts/Makefile.depend      |  1 -
 lib/libpam/modules/pam_rootok/Makefile.depend      |  1 -
 lib/libpam/modules/pam_securetty/Makefile.depend   |  1 -
 lib/libpam/modules/pam_self/Makefile.depend        |  1 -
 lib/libpam/modules/pam_ssh/Makefile.depend         |  1 -
 lib/libpam/modules/pam_tacplus/Makefile.depend     |  1 -
 lib/libpathconv/Makefile.depend                    |  1 -
 lib/libpfctl/Makefile.depend                       |  0
 lib/libpjdlog/Makefile.depend                      |  1 -
 lib/libpmc/Makefile.depend                         |  1 +
 lib/libproc/Makefile.depend                        |  1 +
 lib/libprocstat/zfs/Makefile.depend                |  3 --
 lib/libregex/Makefile.depend                       |  0
 lib/librpcsec_gss/Makefile.depend                  |  1 -
 lib/librt/Makefile.depend                          |  1 -
 lib/libsmb/Makefile.depend                         |  1 -
 lib/libsmutil/Makefile.depend.options              |  0
 lib/libssp/Makefile.depend                         |  0
 lib/libstats/Makefile.depend                       |  0
 lib/libstdbuf/Makefile.depend                      |  1 -
 lib/libsysdecode/Makefile.depend                   | 37 ++++++++++++----------
 lib/libthr/Makefile.depend                         |  1 +
 lib/libunbound/Makefile.depend                     |  1 -
 lib/libvmmapi/Makefile.depend                      |  2 ++
 lib/libxo/Makefile.depend                          |  9 ++----
 lib/libxo/encoder/csv/Makefile.depend              |  0
 lib/libxo/libxo/Makefile.depend                    |  0
 lib/ncurses/form/Makefile.depend                   |  3 +-
 lib/ncurses/menu/Makefile.depend                   |  3 +-
 lib/ncurses/ncurses/Makefile.depend                |  3 +-
 lib/ncurses/panel/Makefile.depend                  |  3 +-
 lib/ncurses/tinfo/Makefile.depend                  |  3 +-
 libexec/atf/atf-check/Makefile.depend              |  1 -
 libexec/atf/atf-sh/Makefile.depend                 |  1 -
 libexec/atrun/Makefile.depend                      |  1 -
 libexec/bootpd/Makefile.depend                     |  1 -
 libexec/bootpd/bootpgw/Makefile.depend             |  1 -
 libexec/bootpd/tools/bootpef/Makefile.depend       |  1 -
 libexec/bootpd/tools/bootptest/Makefile.depend     |  1 -
 libexec/comsat/Makefile.depend                     |  1 -
 libexec/dma/dma-mbox-create/Makefile.depend        |  3 +-
 libexec/dma/dmagent/Makefile.depend                |  1 -
 libexec/fingerd/Makefile.depend                    |  1 -
 libexec/ftpd/Makefile.depend                       |  1 -
 libexec/getty/Makefile.depend                      |  1 -
 libexec/mail.local/Makefile.depend                 |  1 -
 libexec/mknetid/Makefile.depend                    |  1 -
 libexec/pppoed/Makefile.depend                     |  1 -
 libexec/rbootd/Makefile.depend                     |  1 -
 libexec/revnetgroup/Makefile.depend                |  1 -
 libexec/rpc.rquotad/Makefile.depend                |  1 -
 libexec/rpc.rstatd/Makefile.depend                 |  2 --
 libexec/rpc.rusersd/Makefile.depend                |  1 -
 libexec/rpc.rwalld/Makefile.depend                 |  1 -
 libexec/rpc.sprayd/Makefile.depend                 |  1 -
 libexec/rtld-elf/Makefile.depend                   |  1 +
 libexec/smrsh/Makefile.depend                      |  1 -
 libexec/talkd/Makefile.depend                      |  1 -
 libexec/tcpd/Makefile.depend                       |  1 -
 libexec/tftp-proxy/Makefile.depend                 |  3 +-
 libexec/ulog-helper/Makefile.depend                |  2 --
 libexec/ypxfr/Makefile.depend                      |  1 -
 rescue/rescue/Makefile.depend                      | 29 +++++++++--------
 sbin/adjkerntz/Makefile.depend                     |  1 -
 sbin/bsdlabel/Makefile.depend                      |  3 --
 sbin/camcontrol/Makefile.depend                    |  1 -
 sbin/ccdconfig/Makefile.depend                     |  3 --
 sbin/clri/Makefile.depend                          |  2 +-
 sbin/comcontrol/Makefile.depend                    |  1 -
 sbin/conscontrol/Makefile.depend                   |  1 -
 sbin/ddb/Makefile.depend                           |  2 --
 sbin/decryptcore/Makefile.depend                   |  4 +--
 sbin/devd/Makefile.depend                          |  3 +-
 sbin/devfs/Makefile.depend                         |  1 -
 sbin/dhclient/Makefile.depend                      |  1 -
 sbin/dmesg/Makefile.depend                         |  2 --
 sbin/dump/Makefile.depend                          |  2 +-
 sbin/dumpfs/Makefile.depend                        |  1 -
 sbin/dumpon/Makefile.depend                        |  1 -
 sbin/etherswitchcfg/Makefile.depend                |  1 -
 sbin/fdisk/Makefile.depend                         |  3 --
 sbin/ffsinfo/Makefile.depend                       |  1 -
 sbin/fsck/Makefile.depend                          |  1 -
 sbin/fsck_ffs/Makefile.depend                      |  1 -
 sbin/fsck_msdosfs/Makefile.depend                  |  2 +-
 sbin/fsdb/Makefile.depend                          |  2 --
 sbin/fsirand/Makefile.depend                       |  2 +-
 sbin/gbde/Makefile.depend                          |  3 --
 sbin/ggate/ggatec/Makefile.depend                  |  3 --
 sbin/ggate/ggated/Makefile.depend                  |  1 -
 sbin/ggate/ggatel/Makefile.depend                  |  3 --
 sbin/growfs/Makefile.depend                        |  1 -
 sbin/gvinum/Makefile.depend                        |  6 +---
 sbin/hastctl/Makefile.depend                       |  2 +-
 sbin/hastd/Makefile.depend                         |  4 +--
 sbin/ifconfig/Makefile.depend                      |  5 +--
 sbin/init/Makefile.depend                          |  1 -
 sbin/ipf/ipf/Makefile.depend                       |  2 --
 sbin/ipf/ipfs/Makefile.depend                      |  2 --
 sbin/ipf/ipfstat/Makefile.depend                   |  5 ++-
 sbin/ipf/ipmon/Makefile.depend                     |  2 --
 sbin/ipf/ipnat/Makefile.depend                     |  2 --
 sbin/ipf/ippool/Makefile.depend                    |  2 --
 sbin/ipfw/Makefile.depend                          |  2 +-
 sbin/kldconfig/Makefile.depend                     |  1 -
 sbin/kldload/Makefile.depend                       |  1 -
 sbin/kldstat/Makefile.depend                       |  1 -
 sbin/kldunload/Makefile.depend                     |  1 -
 sbin/ldconfig/Makefile.depend                      |  1 -
 sbin/md5/Makefile.depend                           |  2 +-
 sbin/mdconfig/Makefile.depend                      |  3 --
 sbin/mdmfs/Makefile.depend                         |  1 -
 sbin/mknod/Makefile.depend                         |  1 -
 sbin/mksnap_ffs/Makefile.depend                    |  1 -
 sbin/mount/Makefile.depend                         |  2 +-
 sbin/mount_cd9660/Makefile.depend                  |  1 -
 sbin/mount_fusefs/Makefile.depend                  |  1 -
 sbin/mount_msdosfs/Makefile.depend                 |  1 -
 sbin/mount_nfs/Makefile.depend                     |  1 -
 sbin/mount_nullfs/Makefile.depend                  |  1 -
 sbin/mount_udf/Makefile.depend                     |  1 -
 sbin/mount_unionfs/Makefile.depend                 |  1 -
 sbin/natd/Makefile.depend                          |  1 -
 sbin/newfs/Makefile.depend                         |  1 -
 sbin/newfs_msdos/Makefile.depend                   |  1 -
 sbin/nfsiod/Makefile.depend                        |  1 -
 sbin/nos-tun/Makefile.depend                       |  1 -
 sbin/nvmecontrol/Makefile.depend                   |  2 +-
 sbin/pfctl/Makefile.depend                         |  3 +-
 sbin/pflogd/Makefile.depend                        |  2 +-
 sbin/ping/Makefile.depend                          |  2 +-
 sbin/quotacheck/Makefile.depend                    |  2 +-
 sbin/rcorder/Makefile.depend                       |  1 -
 sbin/reboot/Makefile.depend                        |  1 -
 sbin/recoverdisk/Makefile.depend                   |  2 +-
 sbin/restore/Makefile.depend                       |  1 -
 sbin/route/Makefile.depend                         |  1 -
 sbin/routed/Makefile.depend                        |  1 -
 sbin/routed/rtquery/Makefile.depend                |  1 -
 sbin/savecore/Makefile.depend                      |  5 ++-
 sbin/setkey/Makefile.depend                        |  3 --
 sbin/shutdown/Makefile.depend                      |  1 -
 sbin/swapon/Makefile.depend                        |  1 -
 sbin/sysctl/Makefile.depend                        |  1 -
 sbin/tunefs/Makefile.depend                        |  1 -
 sbin/umount/Makefile.depend                        |  1 -
 sbin/zfsbootcfg/Makefile.depend                    | 16 +---------
 secure/libexec/sftp-server/Makefile.depend         |  4 ---
 secure/libexec/ssh-keysign/Makefile.depend         |  4 ---
 secure/libexec/ssh-pkcs11-helper/Makefile.depend   |  4 ---
 secure/usr.bin/openssl/Makefile.depend             |  2 +-
 secure/usr.bin/scp/Makefile.depend                 |  4 ---
 secure/usr.bin/sftp/Makefile.depend                |  5 ---
 secure/usr.bin/ssh-add/Makefile.depend             |  4 ---
 secure/usr.bin/ssh-agent/Makefile.depend           |  4 ---
 secure/usr.bin/ssh-keygen/Makefile.depend          |  4 ---
 secure/usr.bin/ssh-keyscan/Makefile.depend         |  4 ---
 secure/usr.bin/ssh/Makefile.depend                 |  6 ----
 secure/usr.sbin/sshd/Makefile.depend               |  6 ----
 share/examples/Makefile.depend                     |  1 -
 share/i18n/csmapper/APPLE/Makefile.depend          |  1 -
 share/i18n/csmapper/AST/Makefile.depend            |  1 -
 share/i18n/csmapper/BIG5/Makefile.depend           |  1 -
 share/i18n/csmapper/CNS/Makefile.depend            |  1 -
 share/i18n/csmapper/CP/Makefile.depend             |  1 -
 share/i18n/csmapper/EBCDIC/Makefile.depend         |  1 -
 share/i18n/csmapper/GB/Makefile.depend             |  1 -
 share/i18n/csmapper/GEORGIAN/Makefile.depend       |  1 -
 share/i18n/csmapper/ISO-8859/Makefile.depend       |  1 -
 share/i18n/csmapper/JIS/Makefile.depend            |  1 -
 share/i18n/csmapper/KAZAKH/Makefile.depend         |  1 -
 share/i18n/csmapper/KOI/Makefile.depend            |  1 -
 share/i18n/csmapper/KS/Makefile.depend             |  1 -
 share/i18n/csmapper/MISC/Makefile.depend           |  1 -
 share/i18n/csmapper/Makefile.depend                |  1 -
 share/i18n/csmapper/TCVN/Makefile.depend           |  1 -
 share/i18n/esdb/APPLE/Makefile.depend              |  1 -
 share/i18n/esdb/AST/Makefile.depend                |  1 -
 share/i18n/esdb/BIG5/Makefile.depend               |  1 -
 share/i18n/esdb/CP/Makefile.depend                 |  1 -
 share/i18n/esdb/DEC/Makefile.depend                |  1 -
 share/i18n/esdb/EBCDIC/Makefile.depend             |  1 -
 share/i18n/esdb/EUC/Makefile.depend                |  1 -
 share/i18n/esdb/GB/Makefile.depend                 |  1 -
 share/i18n/esdb/GEORGIAN/Makefile.depend           |  1 -
 share/i18n/esdb/ISO-2022/Makefile.depend           |  1 -
 share/i18n/esdb/ISO-8859/Makefile.depend           |  1 -
 share/i18n/esdb/ISO646/Makefile.depend             |  1 -
 share/i18n/esdb/KAZAKH/Makefile.depend             |  1 -
 share/i18n/esdb/KOI/Makefile.depend                |  1 -
 share/i18n/esdb/MISC/Makefile.depend               |  1 -
 share/i18n/esdb/Makefile.depend                    |  1 -
 share/i18n/esdb/TCVN/Makefile.depend               |  1 -
 share/i18n/esdb/UTF/Makefile.depend                |  1 -
 share/syscons/scrnmaps/Makefile.depend             |  6 +---
 share/zoneinfo/Makefile.depend                     |  1 +
 stand/efi/boot1/Makefile.depend                    |  4 ---
 stand/efi/loader_4th/Makefile.depend               |  0
 stand/ficl32/Makefile.depend                       |  2 +-
 stand/i386/libi386/Makefile.depend                 |  4 +--
 stand/i386/loader/Makefile.depend                  |  8 ++---
 stand/i386/pxeldr/Makefile.depend                  |  6 ++--
 stand/i386/pxeldr/Makefile.depend.options          |  0
 stand/libsa32/Makefile.depend                      |  1 -
 stand/userboot/test/Makefile.depend                |  1 -
 stand/userboot/userboot/Makefile.depend            |  3 --
 targets/pseudo/userland/lib/Makefile.depend        | 22 ++++++++++---
 targets/pseudo/userland/misc/Makefile.depend       |  9 +++++-
 usr.bin/apply/Makefile.depend                      |  1 -
 usr.bin/ar/Makefile.depend                         |  7 ----
 usr.bin/asa/Makefile.depend                        |  1 -
 usr.bin/at/Makefile.depend                         |  1 -
 usr.bin/awk/Makefile.depend                        |  2 +-
 usr.bin/awk/tests/Makefile.depend                  |  0
 usr.bin/awk/tests/bugs-fixed/Makefile.depend       |  0
 usr.bin/awk/tests/netbsd/Makefile.depend           |  0
 usr.bin/banner/Makefile.depend                     |  1 -
 usr.bin/basename/Makefile.depend                   |  2 +-
 usr.bin/bc/Makefile.depend                         |  2 --
 usr.bin/biff/Makefile.depend                       |  1 -
 usr.bin/bintrans/Makefile.depend                   |  1 -
 usr.bin/bluetooth/bthost/Makefile.depend           |  1 -
 usr.bin/bluetooth/btsockstat/Makefile.depend       |  2 --
 usr.bin/bluetooth/rfcomm_sppd/Makefile.depend      |  1 -
 usr.bin/brandelf/Makefile.depend                   |  1 -
 usr.bin/bsdcat/Makefile.depend                     |  7 ----
 usr.bin/bsdiff/bsdiff/Makefile.depend              |  1 -
 usr.bin/bsdiff/bspatch/Makefile.depend             |  1 -
 usr.bin/bzip2/Makefile.depend                      |  1 -
 usr.bin/bzip2recover/Makefile.depend               |  1 -
 usr.bin/c89/Makefile.depend                        |  1 -
 usr.bin/c99/Makefile.depend                        |  1 -
 usr.bin/calendar/Makefile.depend                   |  2 +-
 usr.bin/cap_mkdb/Makefile.depend                   |  1 -
 usr.bin/chat/Makefile.depend                       |  1 -
 usr.bin/chkey/Makefile.depend                      |  1 -
 usr.bin/cksum/Makefile.depend                      |  1 -
 usr.bin/cmp/Makefile.depend                        |  3 +-
 usr.bin/col/Makefile.depend                        |  2 +-
 usr.bin/colrm/Makefile.depend                      |  1 -
 usr.bin/column/Makefile.depend                     |  1 -
 usr.bin/comm/Makefile.depend                       |  1 -
 usr.bin/compile_et/Makefile.depend                 |  2 --
 usr.bin/compress/Makefile.depend                   |  1 -
 usr.bin/cpio/Makefile.depend                       |  7 ----
 usr.bin/cpuset/Makefile.depend                     |  2 +-
 usr.bin/csplit/Makefile.depend                     |  1 -
 usr.bin/ctags/Makefile.depend                      |  1 -
 usr.bin/ctlstat/Makefile.depend                    |  3 +-
 usr.bin/cut/Makefile.depend                        |  1 -
 usr.bin/dc/Makefile.depend                         |  3 +-
 usr.bin/dirname/Makefile.depend                    |  2 +-
 usr.bin/dpv/Makefile.depend                        |  4 +--
 usr.bin/drill/Makefile.depend                      |  2 --
 usr.bin/dtc/Makefile.depend                        |  1 -
 usr.bin/du/Makefile.depend                         |  1 -
 usr.bin/ee/Makefile.depend                         |  4 +--
 usr.bin/elfdump/Makefile.depend                    |  2 +-
 usr.bin/enigma/Makefile.depend                     |  1 -
 usr.bin/env/Makefile.depend                        |  2 +-
 usr.bin/expand/Makefile.depend                     |  1 -
 usr.bin/false/Makefile.depend                      |  1 -
 usr.bin/fetch/Makefile.depend                      |  3 --
 usr.bin/file/Makefile.depend                       |  2 --
 usr.bin/file2c/Makefile.depend                     |  1 -
 usr.bin/find/Makefile.depend                       |  1 -
 usr.bin/finger/Makefile.depend                     |  1 -
 usr.bin/fmt/Makefile.depend                        |  1 -
 usr.bin/fold/Makefile.depend                       |  1 -
 usr.bin/from/Makefile.depend                       |  1 -
 usr.bin/fstat/Makefile.depend                      |  5 +--
 usr.bin/fsync/Makefile.depend                      |  1 -
 usr.bin/ftp/Makefile.depend                        |  3 +-
 usr.bin/gcore/Makefile.depend                      |  1 -
 usr.bin/gencat/Makefile.depend                     |  1 -
 usr.bin/getaddrinfo/Makefile.depend                |  2 +-
 usr.bin/getconf/Makefile.depend                    |  1 -
 usr.bin/getent/Makefile.depend                     |  1 -
 usr.bin/getopt/Makefile.depend                     |  2 +-
 usr.bin/gprof/Makefile.depend                      |  1 -
 usr.bin/grep/Makefile.depend                       |  1 +
 usr.bin/gzip/Makefile.depend                       |  1 -
 usr.bin/head/Makefile.depend                       |  2 +-
 usr.bin/hexdump/Makefile.depend                    |  2 +-
 usr.bin/host/Makefile.depend                       |  2 --
 usr.bin/iconv/Makefile.depend                      |  2 +-
 usr.bin/id/Makefile.depend                         |  1 -
 usr.bin/ident/Makefile.depend                      |  3 +-
 usr.bin/indent/Makefile.depend                     |  3 +-
 usr.bin/ipcrm/Makefile.depend                      |  2 --
 usr.bin/ipcs/Makefile.depend                       |  2 --
 usr.bin/iscsictl/Makefile.depend                   |  3 +-
 usr.bin/join/Makefile.depend                       |  1 -
 usr.bin/jot/Makefile.depend                        |  2 +-
 usr.bin/kdump/Makefile.depend                      |  1 -
 usr.bin/keylogin/Makefile.depend                   |  1 -
 usr.bin/keylogout/Makefile.depend                  |  1 -
 usr.bin/killall/Makefile.depend                    |  1 -
 usr.bin/ktrace/Makefile.depend                     |  1 -
 usr.bin/ktrdump/Makefile.depend                    |  3 +-
 usr.bin/lam/Makefile.depend                        |  2 +-
 usr.bin/last/Makefile.depend                       |  3 +-
 usr.bin/lastcomm/Makefile.depend                   |  1 -
 usr.bin/ldd/Makefile.depend                        |  2 +-
 usr.bin/leave/Makefile.depend                      |  1 -
 usr.bin/less/Makefile.depend                       |  3 +-
 usr.bin/lessecho/Makefile.depend                   |  1 -
 usr.bin/lesskey/Makefile.depend                    |  1 -
 usr.bin/lex/lib/Makefile.depend                    |  1 +
 usr.bin/limits/Makefile.depend                     |  1 -
 usr.bin/locale/Makefile.depend                     |  2 +-
 usr.bin/localedef/Makefile.depend                  |  1 -
 usr.bin/locate/bigram/Makefile.depend              |  2 +-
 usr.bin/locate/code/Makefile.depend                |  1 -
 usr.bin/locate/locate/Makefile.depend              |  1 -
 usr.bin/lock/Makefile.depend                       |  3 +-
 usr.bin/lockf/Makefile.depend                      |  1 -
 usr.bin/logger/Makefile.depend                     |  4 ++-
 usr.bin/logins/Makefile.depend                     |  1 -
 usr.bin/logname/Makefile.depend                    |  2 +-
 usr.bin/look/Makefile.depend                       |  1 -
 usr.bin/lsvfs/Makefile.depend                      |  1 -
 usr.bin/lzmainfo/Makefile.depend                   |  2 --
 usr.bin/m4/Makefile.depend                         |  3 --
 usr.bin/mail/Makefile.depend                       |  1 -
 usr.bin/mandoc/Makefile.depend                     |  1 -
 usr.bin/mesg/Makefile.depend                       |  1 -
 usr.bin/ministat/Makefile.depend                   |  2 +-
 usr.bin/mkcsmapper/Makefile.depend                 |  1 -
 usr.bin/mkesdb/Makefile.depend                     |  1 -
 usr.bin/mkfifo/Makefile.depend                     |  1 -
 usr.bin/mkimg/Makefile.depend                      |  1 -
 usr.bin/mkstr/Makefile.depend                      |  1 -
 usr.bin/mktemp/Makefile.depend                     |  1 -
 usr.bin/mkuzip/Makefile.depend                     |  2 +-
 usr.bin/msgs/Makefile.depend                       |  3 +-
 usr.bin/mt/Makefile.depend                         |  2 --
 usr.bin/nc/Makefile.depend                         |  3 +-
 usr.bin/ncal/Makefile.depend                       |  3 +-
 usr.bin/netstat/Makefile.depend                    |  4 +--
 usr.bin/newgrp/Makefile.depend                     |  1 -
 usr.bin/newkey/Makefile.depend                     |  1 -
 usr.bin/nfsstat/Makefile.depend                    |  3 +-
 usr.bin/nice/Makefile.depend                       |  1 -
 usr.bin/nl/Makefile.depend                         |  1 -
 usr.bin/nohup/Makefile.depend                      |  1 -
 usr.bin/passwd/Makefile.depend                     |  1 -
 usr.bin/paste/Makefile.depend                      |  1 -
 usr.bin/patch/Makefile.depend                      |  1 -
 usr.bin/pathchk/Makefile.depend                    |  1 -
 usr.bin/perror/Makefile.depend                     |  1 -
 usr.bin/pr/Makefile.depend                         |  1 -
 usr.bin/printenv/Makefile.depend                   |  2 +-
 usr.bin/printf/Makefile.depend                     |  1 -
 usr.bin/proccontrol/Makefile.depend                |  1 -
 usr.bin/procstat/Makefile.depend                   |  5 +--
 usr.bin/protect/Makefile.depend                    |  1 -
 usr.bin/quota/Makefile.depend                      |  1 -
 usr.bin/rctl/Makefile.depend                       |  1 -
 usr.bin/renice/Makefile.depend                     |  1 -
 usr.bin/resizewin/Makefile.depend                  |  1 -
 usr.bin/rev/Makefile.depend                        |  1 -
 usr.bin/revoke/Makefile.depend                     |  1 -
 usr.bin/rpcgen/Makefile.depend                     |  1 -
 usr.bin/rpcinfo/Makefile.depend                    |  1 -
 usr.bin/rs/Makefile.depend                         |  4 ++-
 usr.bin/rup/Makefile.depend                        |  1 -
 usr.bin/ruptime/Makefile.depend                    |  1 -
 usr.bin/rusers/Makefile.depend                     |  1 -
 usr.bin/rwall/Makefile.depend                      |  1 -
 usr.bin/rwho/Makefile.depend                       |  3 +-
 usr.bin/script/Makefile.depend                     |  1 -
 usr.bin/sdiff/Makefile.depend                      |  1 -
 usr.bin/sed/Makefile.depend                        |  1 -
 usr.bin/seq/Makefile.depend                        |  1 -
 usr.bin/showmount/Makefile.depend                  |  1 -
 usr.bin/smbutil/Makefile.depend                    |  2 --
 usr.bin/sockstat/Makefile.depend                   |  8 ++++-
 usr.bin/soelim/Makefile.depend                     |  1 -
 usr.bin/split/Makefile.depend                      |  1 -
 usr.bin/stat/Makefile.depend                       |  1 -
 usr.bin/stdbuf/Makefile.depend                     |  1 -
 usr.bin/systat/Makefile.depend                     |  7 ++--
 usr.bin/tabs/Makefile.depend                       |  3 +-
 usr.bin/tail/Makefile.depend                       |  2 +-
 usr.bin/talk/Makefile.depend                       |  4 +--
 usr.bin/tar/Makefile.depend                        |  7 ----
 usr.bin/tcopy/Makefile.depend                      |  1 -
 usr.bin/tee/Makefile.depend                        |  2 +-
 usr.bin/telnet/Makefile.depend                     |  5 +--
 usr.bin/tftp/Makefile.depend                       |  2 --
 usr.bin/time/Makefile.depend                       |  1 -
 usr.bin/tip/tip/Makefile.depend                    |  1 -
 usr.bin/top/Makefile.depend                        |  6 ++--
 usr.bin/touch/Makefile.depend                      |  1 -
 usr.bin/tr/Makefile.depend                         |  2 +-
 usr.bin/true/Makefile.depend                       |  1 -
 usr.bin/truncate/Makefile.depend                   |  1 -
 usr.bin/truss/Makefile.depend                      |  1 -
 usr.bin/tsort/Makefile.depend                      |  1 -
 usr.bin/tty/Makefile.depend                        |  1 -
 usr.bin/ul/Makefile.depend                         |  3 +-
 usr.bin/uname/Makefile.depend                      |  1 -
 usr.bin/unexpand/Makefile.depend                   |  1 -
 usr.bin/unifdef/Makefile.depend                    |  1 -
 usr.bin/uniq/Makefile.depend                       |  3 +-
 usr.bin/units/Makefile.depend                      |  4 +--
 usr.bin/unvis/Makefile.depend                      |  1 -
 usr.bin/unzip/Makefile.depend                      |  7 ----
 usr.bin/usbhidaction/Makefile.depend               |  1 -
 usr.bin/usbhidctl/Makefile.depend                  |  1 -
 usr.bin/users/Makefile.depend                      |  3 +-
 usr.bin/vacation/Makefile.depend                   |  1 -
 usr.bin/vgrind/Makefile.depend                     |  1 -
 usr.bin/vi/Makefile.depend                         |  4 +--
 usr.bin/vi/catalog/Makefile.depend                 |  5 +++
 usr.bin/vis/Makefile.depend                        |  1 -
 usr.bin/vmstat/Makefile.depend                     |  4 +--
 usr.bin/vtfontcvt/Makefile.depend                  |  1 -
 usr.bin/w/Makefile.depend                          |  4 +--
 usr.bin/wall/Makefile.depend                       |  1 -
 usr.bin/wc/Makefile.depend                         |  4 +--
 usr.bin/what/Makefile.depend                       |  1 -
 usr.bin/whereis/Makefile.depend                    |  1 -
 usr.bin/which/Makefile.depend                      |  1 -
 usr.bin/who/Makefile.depend                        |  1 -
 usr.bin/whois/Makefile.depend                      |  1 -
 usr.bin/write/Makefile.depend                      |  2 +-
 usr.bin/xargs/Makefile.depend                      |  1 -
 usr.bin/xinstall/Makefile.depend                   |  1 -
 usr.bin/xo/Makefile.depend                         |  3 +-
 usr.bin/xstr/Makefile.depend                       |  1 -
 usr.bin/xz/Makefile.depend                         |  2 --
 usr.bin/xzdec/Makefile.depend                      |  2 --
 usr.bin/yacc/Makefile.depend                       |  1 -
 usr.bin/yes/Makefile.depend                        |  2 +-
 usr.bin/ypcat/Makefile.depend                      |  1 -
 usr.bin/ypmatch/Makefile.depend                    |  1 -
 usr.bin/ypwhich/Makefile.depend                    |  1 -
 usr.bin/zstd/Makefile.depend                       |  2 --
 usr.sbin/ac/Makefile.depend                        |  1 -
 usr.sbin/accton/Makefile.depend                    |  1 -
 usr.sbin/acpi/acpiconf/Makefile.depend             |  1 -
 usr.sbin/acpi/acpidb/Makefile.depend               |  1 -
 usr.sbin/acpi/acpidump/Makefile.depend             |  1 -
 usr.sbin/acpi/iasl/Makefile.depend                 |  1 -
 usr.sbin/apm/Makefile.depend                       |  1 -
 usr.sbin/arp/Makefile.depend                       |  4 +--
 usr.sbin/audit/Makefile.depend                     |  1 -
 usr.sbin/auditd/Makefile.depend                    |  1 -
 usr.sbin/auditdistd/Makefile.depend                |  2 --
 usr.sbin/auditreduce/Makefile.depend               |  1 -
 usr.sbin/authpf/Makefile.depend                    |  3 +-
 usr.sbin/autofs/Makefile.depend                    |  1 -
 usr.sbin/bhyve/Makefile.depend                     |  5 +--
 usr.sbin/bhyvectl/Makefile.depend                  |  1 -
 usr.sbin/bhyveload/Makefile.depend                 |  2 --
 usr.sbin/binmiscctl/Makefile.depend                |  1 -
 usr.sbin/blacklistctl/Makefile.depend              |  2 --
 usr.sbin/blacklistd/Makefile.depend                |  2 --
 usr.sbin/bluetooth/ath3kfw/Makefile.depend         |  2 --
 usr.sbin/bluetooth/bcmfw/Makefile.depend           |  1 -
 usr.sbin/bluetooth/bthidcontrol/Makefile.depend    |  1 -
 usr.sbin/bluetooth/bthidd/Makefile.depend          |  1 -
 usr.sbin/bluetooth/btpand/Makefile.depend          |  1 -
 usr.sbin/bluetooth/hccontrol/Makefile.depend       |  1 -
 usr.sbin/bluetooth/hcsecd/Makefile.depend          |  1 -
 usr.sbin/bluetooth/iwmbtfw/Makefile.depend         |  0
 usr.sbin/bluetooth/l2control/Makefile.depend       |  1 -
 usr.sbin/bluetooth/l2ping/Makefile.depend          |  1 -
 usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend     |  1 -
 usr.sbin/bluetooth/sdpcontrol/Makefile.depend      |  1 -
 usr.sbin/bluetooth/sdpd/Makefile.depend            |  1 -
 usr.sbin/boot0cfg/Makefile.depend                  |  3 --
 usr.sbin/bootparamd/bootparamd/Makefile.depend     |  1 -
 usr.sbin/bootparamd/callbootd/Makefile.depend      |  1 -
 usr.sbin/bsdinstall/distextract/Makefile.depend    | 13 +-------
 usr.sbin/bsdinstall/distfetch/Makefile.depend      |  8 ++---
 usr.sbin/bsdinstall/partedit/Makefile.depend       |  8 ++---
 usr.sbin/bsnmpd/bsnmpd/Makefile.depend             |  2 --
 usr.sbin/bsnmpd/gensnmptree/Makefile.depend        |  1 -
 usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend  |  3 +-
 .../bsnmpd/modules/snmp_hostres/Makefile.depend    |  2 +-
 usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend  |  2 +-
 usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend    |  4 ++-
 .../bsnmpd/modules/snmp_target/Makefile.depend     |  2 +-
 usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend   |  2 +-
 usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend  |  2 +-
 usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend  |  2 +-
 usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend   |  2 --
 usr.sbin/btxld/Makefile.depend                     |  1 -
 usr.sbin/camdd/Makefile.depend                     |  2 --
 usr.sbin/cdcontrol/Makefile.depend                 |  2 --
 usr.sbin/chkgrp/Makefile.depend                    |  1 -
 usr.sbin/chown/Makefile.depend                     |  1 -
 usr.sbin/chroot/Makefile.depend                    |  1 -
 usr.sbin/ckdist/Makefile.depend                    |  1 -
 usr.sbin/clear_locks/Makefile.depend               |  1 -
 usr.sbin/config/Makefile.depend                    |  6 ++--
 usr.sbin/cpucontrol/Makefile.depend                |  1 -
 usr.sbin/cron/cron/Makefile.depend                 |  1 -
 usr.sbin/cron/crontab/Makefile.depend              |  1 -
 usr.sbin/crunch/crunchgen/Makefile.depend          |  1 -
 usr.sbin/crunch/crunchide/Makefile.depend          |  1 -
 usr.sbin/ctladm/Makefile.depend                    |  2 +-
 usr.sbin/ctld/Makefile.depend                      |  6 ++--
 usr.sbin/cxgbetool/Makefile.depend                 |  2 +-
 usr.sbin/daemon/Makefile.depend                    |  1 -
 usr.sbin/dconschat/Makefile.depend                 |  2 --
 usr.sbin/devctl/Makefile.depend                    |  1 -
 usr.sbin/devinfo/Makefile.depend                   |  2 +-
 usr.sbin/diskinfo/Makefile.depend                  |  1 -
 usr.sbin/dumpcis/Makefile.depend                   |  1 -
 usr.sbin/editmap/Makefile.depend                   |  1 -
 usr.sbin/edquota/Makefile.depend                   |  1 -
 usr.sbin/efidp/Makefile.depend                     |  2 +-
 usr.sbin/efivar/Makefile.depend                    |  2 +-
 usr.sbin/extattr/Makefile.depend                   |  1 -
 usr.sbin/extattrctl/Makefile.depend                |  1 -
 usr.sbin/fdcontrol/Makefile.depend                 |  1 -
 usr.sbin/fdformat/Makefile.depend                  |  1 -
 usr.sbin/fdread/Makefile.depend                    |  1 -
 usr.sbin/fdwrite/Makefile.depend                   |  1 -
 usr.sbin/fifolog/fifolog_create/Makefile.depend    |  1 -
 usr.sbin/fifolog/fifolog_reader/Makefile.depend    |  1 -
 usr.sbin/fifolog/fifolog_writer/Makefile.depend    |  1 -
 usr.sbin/flowctl/Makefile.depend                   |  1 -
 usr.sbin/fstyp/Makefile.depend                     | 10 +-----
 usr.sbin/ftp-proxy/Makefile.depend                 |  5 +--
 usr.sbin/fwcontrol/Makefile.depend                 |  1 -
 usr.sbin/getfmac/Makefile.depend                   |  1 -
 usr.sbin/getpmac/Makefile.depend                   |  1 -
 usr.sbin/gpioctl/Makefile.depend                   |  1 -
 usr.sbin/gssd/Makefile.depend                      |  4 ---
 usr.sbin/gstat/Makefile.depend                     |  7 ++--
 usr.sbin/hyperv/tools/kvp/Makefile.depend          |  1 -
 usr.sbin/hyperv/tools/vss/Makefile.depend          |  1 -
 usr.sbin/i2c/Makefile.depend                       |  1 -
 usr.sbin/ifmcstat/Makefile.depend                  |  1 -
 usr.sbin/iostat/Makefile.depend                    |  2 --
 usr.sbin/iovctl/Makefile.depend                    |  1 -
 usr.sbin/ip6addrctl/Makefile.depend                |  1 -
 usr.sbin/ipfwpcap/Makefile.depend                  |  2 +-
 usr.sbin/iscsid/Makefile.depend                    |  5 +--
 usr.sbin/jail/Makefile.depend                      |  3 --
 usr.sbin/jexec/Makefile.depend                     |  1 -
 usr.sbin/jls/Makefile.depend                       |  4 +--
 usr.sbin/kbdcontrol/Makefile.depend                |  2 --
 usr.sbin/kbdmap/Makefile.depend                    |  2 +-
 usr.sbin/keyserv/Makefile.depend                   |  1 -
 usr.sbin/kldxref/Makefile.depend                   |  1 -
 usr.sbin/lastlogin/Makefile.depend                 |  2 +-
 usr.sbin/lpr/chkprintcap/Makefile.depend           |  1 -
 usr.sbin/lpr/filters.ru/koi2855/Makefile.depend    |  1 -
 usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend    |  1 -
 usr.sbin/lpr/filters/Makefile.depend               |  1 -
 usr.sbin/lpr/lpc/Makefile.depend                   |  2 --
 usr.sbin/lpr/lpd/Makefile.depend                   |  1 -
 usr.sbin/lpr/lpq/Makefile.depend                   |  1 -
 usr.sbin/lpr/lpr/Makefile.depend                   |  1 -
 usr.sbin/lpr/lprm/Makefile.depend                  |  1 -
 usr.sbin/lpr/lptest/Makefile.depend                |  1 -
 usr.sbin/lpr/pac/Makefile.depend                   |  1 -
 usr.sbin/lptcontrol/Makefile.depend                |  1 -
 usr.sbin/mailstats/Makefile.depend                 |  1 -
 usr.sbin/mailwrapper/Makefile.depend               |  1 -
 usr.sbin/makemap/Makefile.depend                   |  1 -
 usr.sbin/memcontrol/Makefile.depend                |  1 -
 usr.sbin/mfiutil/Makefile.depend                   |  1 -
 usr.sbin/mixer/Makefile.depend                     |  2 +-
 usr.sbin/mld6query/Makefile.depend                 |  1 -
 usr.sbin/mlx5tool/Makefile.depend                  |  0
 usr.sbin/mlxcontrol/Makefile.depend                |  1 -
 usr.sbin/mount_smbfs/Makefile.depend               |  2 --
 usr.sbin/mountd/Makefile.depend                    |  1 -
 usr.sbin/moused/Makefile.depend                    |  1 -
 usr.sbin/mpsutil/Makefile.depend                   |  1 -
 usr.sbin/mptable/Makefile.depend                   |  1 -
 usr.sbin/mptutil/Makefile.depend                   |  2 --
 usr.sbin/mtest/Makefile.depend                     |  1 -
 usr.sbin/ndp/Makefile.depend                       |  2 +-
 usr.sbin/newsyslog/Makefile.depend                 |  2 +-
 usr.sbin/nfscbd/Makefile.depend                    |  1 -
 usr.sbin/nfsd/Makefile.depend                      |  1 -
 usr.sbin/nfsdumpstate/Makefile.depend              |  1 -
 usr.sbin/nfsrevoke/Makefile.depend                 |  1 -
 usr.sbin/nfsuserd/Makefile.depend                  |  2 +-
 usr.sbin/ngctl/Makefile.depend                     |  1 -
 usr.sbin/nghook/Makefile.depend                    |  1 -
 usr.sbin/nmtree/Makefile.depend                    |  1 -
 usr.sbin/nologin/Makefile.depend                   |  1 -
 usr.sbin/nscd/Makefile.depend                      |  1 -
 usr.sbin/ntp/libntp/Makefile.depend                |  1 +
 usr.sbin/ntp/ntpd/Makefile.depend                  |  1 +
 usr.sbin/ntp/ntpdate/Makefile.depend               |  1 +
 usr.sbin/ntp/ntpdc/Makefile.depend                 |  2 +-
 usr.sbin/ntp/ntpq/Makefile.depend                  |  2 +-
 usr.sbin/ntp/ntptime/Makefile.depend               |  1 -
 usr.sbin/pciconf/Makefile.depend                   |  1 -
 usr.sbin/pkg/Makefile.depend                       | 10 ++----
 usr.sbin/pmcannotate/Makefile.depend               |  1 -
 usr.sbin/pmccontrol/Makefile.depend                |  4 ++-
 usr.sbin/pmcstat/Makefile.depend                   |  6 ++--
 usr.sbin/pmcstudy/Makefile.depend                  |  1 -
 usr.sbin/portsnap/make_index/Makefile.depend       |  1 -
 usr.sbin/powerd/Makefile.depend                    |  1 -
 usr.sbin/ppp/Makefile.depend                       |  1 -
 usr.sbin/pppctl/Makefile.depend                    |  2 --
 usr.sbin/praliases/Makefile.depend                 |  1 -
 usr.sbin/praudit/Makefile.depend                   |  1 -
 .../prometheus_sysctl_exporter/Makefile.depend     |  1 -
 usr.sbin/pstat/Makefile.depend                     |  2 --
 usr.sbin/pw/Makefile.depend                        |  2 --
 usr.sbin/pwd_mkdb/Makefile.depend                  |  1 -
 usr.sbin/quot/Makefile.depend                      |  2 +-
 usr.sbin/quotaon/Makefile.depend                   |  1 -
 usr.sbin/rarpd/Makefile.depend                     |  1 -
 usr.sbin/repquota/Makefile.depend                  |  1 -
 usr.sbin/rip6query/Makefile.depend                 |  1 -
 usr.sbin/rmt/Makefile.depend                       |  1 -
 usr.sbin/route6d/Makefile.depend                   |  1 -
 usr.sbin/rpc.lockd/Makefile.depend                 |  1 -
 usr.sbin/rpc.statd/Makefile.depend                 |  1 -
 usr.sbin/rpc.umntall/Makefile.depend               |  1 -
 usr.sbin/rpc.yppasswdd/Makefile.depend             |  1 -
 usr.sbin/rpc.ypupdated/Makefile.depend             |  1 -
 usr.sbin/rpc.ypxfrd/Makefile.depend                |  1 -
 usr.sbin/rrenumd/Makefile.depend                   |  3 --
 usr.sbin/rtadvctl/Makefile.depend                  |  1 -
 usr.sbin/rtadvd/Makefile.depend                    |  1 -
 usr.sbin/rtprio/Makefile.depend                    |  1 -
 usr.sbin/rwhod/Makefile.depend                     |  3 +-
 usr.sbin/sa/Makefile.depend                        |  1 -
 usr.sbin/sendmail/Makefile.depend                  |  1 -
 usr.sbin/services_mkdb/Makefile.depend             |  1 -
 usr.sbin/sesutil/Makefile.depend                   |  4 +--
 usr.sbin/setfib/Makefile.depend                    |  1 -
 usr.sbin/setfmac/Makefile.depend                   |  1 -
 usr.sbin/setpmac/Makefile.depend                   |  1 -
 usr.sbin/smbmsg/Makefile.depend                    |  1 -
 usr.sbin/snapinfo/Makefile.depend                  |  1 -
 usr.sbin/spray/Makefile.depend                     |  1 -
 usr.sbin/syslogd/Makefile.depend                   |  1 -
 usr.sbin/tcpdchk/Makefile.depend                   |  1 -
 usr.sbin/tcpdmatch/Makefile.depend                 |  1 -
 usr.sbin/tcpdrop/Makefile.depend                   |  1 -
 usr.sbin/tcpdump/tcpdump/Makefile.depend           |  5 ---
 usr.sbin/traceroute/Makefile.depend                |  1 -
 usr.sbin/traceroute6/Makefile.depend               |  4 ++-
 usr.sbin/tzsetup/Makefile.depend                   |  2 +-
 usr.sbin/uathload/Makefile.depend                  |  1 -
 usr.sbin/uefisign/Makefile.depend                  |  3 +-
 usr.sbin/ugidfw/Makefile.depend                    |  1 -
 usr.sbin/uhsoctl/Makefile.depend                   |  1 -
 usr.sbin/unbound/anchor/Makefile.depend            |  1 -
 usr.sbin/unbound/checkconf/Makefile.depend         |  3 --
 usr.sbin/unbound/control/Makefile.depend           |  1 -
 usr.sbin/unbound/daemon/Makefile.depend            |  1 -
 usr.sbin/usbconfig/Makefile.depend                 |  2 --
 usr.sbin/usbdump/Makefile.depend                   |  1 -
 usr.sbin/utx/Makefile.depend                       |  1 -
 usr.sbin/vidcontrol/Makefile.depend                |  1 -
 usr.sbin/vipw/Makefile.depend                      |  1 -
 usr.sbin/wake/Makefile.depend                      |  1 -
 usr.sbin/watch/Makefile.depend                     |  3 +-
 usr.sbin/watchdogd/Makefile.depend                 |  1 -
 usr.sbin/wlandebug/Makefile.depend                 |  2 +-
 usr.sbin/wpa/Makefile.depend                       |  0
 usr.sbin/wpa/hostapd/Makefile.depend               | 13 +++++++-
 usr.sbin/wpa/hostapd_cli/Makefile.depend           |  5 ++-
 usr.sbin/wpa/src/ap/Makefile.depend                |  0
 usr.sbin/wpa/src/common/Makefile.depend            |  0
 usr.sbin/wpa/src/crypto/Makefile.depend            |  0
 usr.sbin/wpa/src/drivers/Makefile.depend           |  0
 usr.sbin/wpa/src/eap_common/Makefile.depend        |  0
 usr.sbin/wpa/src/eap_peer/Makefile.depend          |  0
 usr.sbin/wpa/src/eap_server/Makefile.depend        |  0
 usr.sbin/wpa/src/eapol_auth/Makefile.depend        |  0
 usr.sbin/wpa/src/eapol_supp/Makefile.depend        |  0
 usr.sbin/wpa/src/l2_packet/Makefile.depend         |  0
 usr.sbin/wpa/src/radius/Makefile.depend            |  0
 usr.sbin/wpa/src/rsn_supp/Makefile.depend          |  0
 usr.sbin/wpa/src/tls/Makefile.depend               |  0
 usr.sbin/wpa/src/utils/Makefile.depend             |  0
 usr.sbin/wpa/src/wps/Makefile.depend               |  0
 usr.sbin/wpa/wpa_cli/Makefile.depend               | 16 +++++++++-
 usr.sbin/wpa/wpa_passphrase/Makefile.depend        |  5 ++-
 usr.sbin/wpa/wpa_supplicant/Makefile.depend        | 13 +++++++-
 usr.sbin/yp_mkdb/Makefile.depend                   |  1 -
 usr.sbin/ypbind/Makefile.depend                    |  1 -
 usr.sbin/ypldap/Makefile.depend                    |  3 +-
 usr.sbin/yppoll/Makefile.depend                    |  1 -
 usr.sbin/yppush/Makefile.depend                    |  1 -
 usr.sbin/ypset/Makefile.depend                     |  1 -
 usr.sbin/zonectl/Makefile.depend                   |  1 -
 879 files changed, 409 insertions(+), 1444 deletions(-)

diff --git a/bin/cat/Makefile.depend b/bin/cat/Makefile.depend
index 6cfaab1c3644..7dfbe9638dcb 100644
--- a/bin/cat/Makefile.depend
+++ b/bin/cat/Makefile.depend
@@ -2,11 +2,14 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
+	lib/libcasper/libcasper \
+	lib/libcasper/services/cap_fileargs \
+	lib/libcasper/services/cap_net \
 	lib/libcompiler_rt \
 
 
diff --git a/bin/chflags/Makefile.depend b/bin/chflags/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/chflags/Makefile.depend
+++ b/bin/chflags/Makefile.depend
@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/bin/chio/Makefile.depend b/bin/chio/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/chio/Makefile.depend
+++ b/bin/chio/Makefile.depend
@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/bin/chmod/Makefile.depend b/bin/chmod/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/chmod/Makefile.depend
+++ b/bin/chmod/Makefile.depend
@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/bin/cp/Makefile.depend b/bin/cp/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/cp/Makefile.depend
+++ b/bin/cp/Makefile.depend
@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/bin/csh/Makefile.depend b/bin/csh/Makefile.depend
index 05f33d1d7799..f82118793993 100644
--- a/bin/csh/Makefile.depend
+++ b/bin/csh/Makefile.depend
@@ -2,7 +2,7 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
+	bin/csh.host \
 	include \
 	include/arpa \
 	include/xlocale \
@@ -10,7 +10,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libcrypt \
-	lib/ncurses/ncursesw \
+	lib/ncurses/tinfo \
 
 
 .include <dirdeps.mk>
diff --git a/bin/date/Makefile.depend b/bin/date/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/date/Makefile.depend
+++ b/bin/date/Makefile.depend
*** 13219 LINES SKIPPED ***