aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2023-04-19 00:14:23 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2023-04-19 00:14:23 +0000
commitd9a42747950146bf03cda7f6e25d219253f8a57a (patch)
treeb3d4ddc8633a01c23358d90ba7ba1f1d0cc4f1ce
parent617a11eab6337693eae9d160453adf1943ab6a37 (diff)
downloadsrc-d9a42747950146bf03cda7f6e25d219253f8a57a.tar.gz
src-d9a42747950146bf03cda7f6e25d219253f8a57a.zip
-rw-r--r--bin/cat/Makefile.depend5
-rw-r--r--bin/chflags/Makefile.depend1
-rw-r--r--bin/chio/Makefile.depend1
-rw-r--r--bin/chmod/Makefile.depend1
-rw-r--r--bin/cp/Makefile.depend1
-rw-r--r--bin/csh/Makefile.depend4
-rw-r--r--bin/date/Makefile.depend1
-rw-r--r--bin/dd/Makefile.depend3
-rw-r--r--bin/df/Makefile.depend3
-rw-r--r--bin/domainname/Makefile.depend1
-rw-r--r--bin/echo/Makefile.depend2
-rw-r--r--bin/ed/Makefile.depend2
-rw-r--r--bin/expr/Makefile.depend1
-rw-r--r--bin/getfacl/Makefile.depend1
-rw-r--r--bin/hostname/Makefile.depend1
-rw-r--r--bin/kenv/Makefile.depend1
-rw-r--r--bin/kill/Makefile.depend1
-rw-r--r--bin/ln/Makefile.depend1
-rw-r--r--bin/ls/Makefile.depend1
-rw-r--r--bin/mkdir/Makefile.depend1
-rw-r--r--bin/mv/Makefile.depend1
-rw-r--r--bin/pax/Makefile.depend1
-rw-r--r--bin/pkill/Makefile.depend2
-rw-r--r--bin/ps/Makefile.depend5
-rw-r--r--bin/pwait/Makefile.depend1
-rw-r--r--bin/pwd/Makefile.depend1
-rw-r--r--bin/realpath/Makefile.depend1
-rw-r--r--bin/rm/Makefile.depend1
-rw-r--r--bin/rmail/Makefile.depend1
-rw-r--r--bin/rmdir/Makefile.depend1
-rw-r--r--bin/setfacl/Makefile.depend1
-rw-r--r--bin/sh/Makefile.depend4
-rw-r--r--bin/sleep/Makefile.depend2
-rw-r--r--bin/stty/Makefile.depend1
-rw-r--r--bin/sync/Makefile.depend1
-rw-r--r--bin/test/Makefile.depend1
-rw-r--r--bin/uuidgen/Makefile.depend4
-rw-r--r--cddl/lib/libavl/Makefile.depend2
-rw-r--r--cddl/lib/libctf/Makefile.depend1
-rw-r--r--cddl/lib/libdtrace/Makefile.depend3
-rw-r--r--cddl/lib/libicp/Makefile.depend0
-rw-r--r--cddl/lib/libicp_rescue/Makefile.depend0
-rw-r--r--cddl/lib/libnvpair/Makefile.depend2
-rw-r--r--cddl/lib/libspl/Makefile.depend0
-rw-r--r--cddl/lib/libtpool/Makefile.depend0
-rw-r--r--cddl/lib/libuutil/Makefile.depend2
-rw-r--r--cddl/lib/libzfs/Makefile.depend2
-rw-r--r--cddl/lib/libzfs_core/Makefile.depend3
-rw-r--r--cddl/lib/libzfsbootenv/Makefile.depend0
-rw-r--r--cddl/lib/libzpool/Makefile.depend3
-rw-r--r--cddl/lib/libzutil/Makefile.depend0
-rw-r--r--cddl/sbin/zfs/Makefile.depend11
-rw-r--r--cddl/sbin/zpool/Makefile.depend10
-rw-r--r--cddl/usr.bin/ctfconvert/Makefile.depend3
-rw-r--r--cddl/usr.bin/ctfdump/Makefile.depend1
-rw-r--r--cddl/usr.bin/ctfmerge/Makefile.depend2
-rw-r--r--cddl/usr.bin/zinject/Makefile.depend9
-rw-r--r--cddl/usr.bin/ztest/Makefile.depend9
-rw-r--r--cddl/usr.sbin/dtrace/Makefile.depend8
-rw-r--r--cddl/usr.sbin/lockstat/Makefile.depend8
-rw-r--r--cddl/usr.sbin/plockstat/Makefile.depend8
-rw-r--r--cddl/usr.sbin/zdb/Makefile.depend13
-rw-r--r--cddl/usr.sbin/zfsd/Makefile.depend7
-rw-r--r--cddl/usr.sbin/zhack/Makefile.depend15
-rw-r--r--gnu/lib/libdialog/Makefile.depend3
-rw-r--r--gnu/usr.bin/dialog/Makefile.depend4
-rw-r--r--gnu/usr.bin/diff3/Makefile.depend1
-rw-r--r--include/Makefile.depend1
-rw-r--r--kerberos5/lib/libgssapi_ntlm/Makefile.depend1
-rw-r--r--kerberos5/lib/libgssapi_spnego/Makefile.depend1
-rw-r--r--kerberos5/lib/libheimipcs/Makefile.depend1
-rw-r--r--kerberos5/lib/libkadm5srv/Makefile.depend1
-rw-r--r--kerberos5/libexec/digest-service/Makefile.depend6
-rw-r--r--kerberos5/libexec/hprop/Makefile.depend6
-rw-r--r--kerberos5/libexec/hpropd/Makefile.depend6
-rw-r--r--kerberos5/libexec/ipropd-master/Makefile.depend10
-rw-r--r--kerberos5/libexec/ipropd-slave/Makefile.depend10
-rw-r--r--kerberos5/libexec/kadmind/Makefile.depend6
-rw-r--r--kerberos5/libexec/kcm/Makefile.depend8
-rw-r--r--kerberos5/libexec/kdc/Makefile.depend5
-rw-r--r--kerberos5/libexec/kdigest/Makefile.depend9
-rw-r--r--kerberos5/libexec/kfd/Makefile.depend9
-rw-r--r--kerberos5/libexec/kimpersonate/Makefile.depend8
-rw-r--r--kerberos5/libexec/kpasswdd/Makefile.depend9
-rw-r--r--kerberos5/tools/asn1_compile/Makefile.depend1
-rw-r--r--kerberos5/tools/make-roken/Makefile.depend1
-rw-r--r--kerberos5/tools/slc/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/hxtool/Makefile.depend5
-rw-r--r--kerberos5/usr.bin/kadmin/Makefile.depend7
-rw-r--r--kerberos5/usr.bin/kcc/Makefile.depend9
-rw-r--r--kerberos5/usr.bin/kdestroy/Makefile.depend8
-rw-r--r--kerberos5/usr.bin/kf/Makefile.depend9
-rw-r--r--kerberos5/usr.bin/kgetcred/Makefile.depend8
-rw-r--r--kerberos5/usr.bin/kinit/Makefile.depend8
-rw-r--r--kerberos5/usr.bin/kpasswd/Makefile.depend9
-rw-r--r--kerberos5/usr.bin/ksu/Makefile.depend7
-rw-r--r--kerberos5/usr.bin/string2key/Makefile.depend5
-rw-r--r--kerberos5/usr.bin/verify_krb5_conf/Makefile.depend5
-rw-r--r--kerberos5/usr.sbin/iprop-log/Makefile.depend11
-rw-r--r--kerberos5/usr.sbin/kstash/Makefile.depend6
-rw-r--r--kerberos5/usr.sbin/ktutil/Makefile.depend9
-rw-r--r--lib/atf/libatf-c++/Makefile.depend1
-rw-r--r--lib/geom/cache/Makefile.depend2
-rw-r--r--lib/geom/concat/Makefile.depend2
-rw-r--r--lib/geom/eli/Makefile.depend2
-rw-r--r--lib/geom/journal/Makefile.depend2
-rw-r--r--lib/geom/label/Makefile.depend2
-rw-r--r--lib/geom/mirror/Makefile.depend2
-rw-r--r--lib/geom/mountver/Makefile.depend2
-rw-r--r--lib/geom/multipath/Makefile.depend2
-rw-r--r--lib/geom/nop/Makefile.depend2
-rw-r--r--lib/geom/part/Makefile.depend2
-rw-r--r--lib/geom/raid/Makefile.depend2
-rw-r--r--lib/geom/raid3/Makefile.depend2
-rw-r--r--lib/geom/shsec/Makefile.depend2
-rw-r--r--lib/geom/stripe/Makefile.depend2
-rw-r--r--lib/geom/virstor/Makefile.depend2
-rw-r--r--lib/lib9p/Makefile.depend0
-rw-r--r--lib/libalias/modules/dummy/Makefile.depend1
-rw-r--r--lib/libalias/modules/ftp/Makefile.depend1
-rw-r--r--lib/libalias/modules/irc/Makefile.depend1
-rw-r--r--lib/libalias/modules/nbt/Makefile.depend1
-rw-r--r--lib/libalias/modules/pptp/Makefile.depend1
-rw-r--r--lib/libalias/modules/skinny/Makefile.depend1
-rw-r--r--lib/libalias/modules/smedia/Makefile.depend1
-rw-r--r--lib/libauditd/Makefile.depend1
-rw-r--r--lib/libbe/Makefile.depend4
-rw-r--r--lib/libbsddialog/Makefile.depend0
-rw-r--r--lib/libcasper/services/Makefile.depend0
-rw-r--r--lib/libcasper/services/cap_dns/tests/Makefile.depend10
-rw-r--r--lib/libcasper/services/cap_grp/tests/Makefile.depend9
-rw-r--r--lib/libcasper/services/cap_net/Makefile.depend0
-rw-r--r--lib/libcasper/services/cap_netdb/Makefile.depend0
-rw-r--r--lib/libcasper/services/cap_pwd/tests/Makefile.depend9
-rw-r--r--lib/libcasper/services/cap_sysctl/tests/Makefile.depend9
-rw-r--r--lib/libdl/Makefile.depend1
-rw-r--r--lib/libdpv/Makefile.depend3
-rw-r--r--lib/libdwarf/Makefile.depend1
-rw-r--r--lib/libedit/Makefile.depend2
-rw-r--r--lib/libexpat/Makefile.depend1
-rw-r--r--lib/libiconv_modules/BIG5/Makefile.depend1
-rw-r--r--lib/libiconv_modules/DECHanyu/Makefile.depend1
-rw-r--r--lib/libiconv_modules/EUC/Makefile.depend1
-rw-r--r--lib/libiconv_modules/EUCTW/Makefile.depend1
-rw-r--r--lib/libiconv_modules/GBK2K/Makefile.depend1
-rw-r--r--lib/libiconv_modules/HZ/Makefile.depend1
-rw-r--r--lib/libiconv_modules/ISO2022/Makefile.depend1
-rw-r--r--lib/libiconv_modules/JOHAB/Makefile.depend1
-rw-r--r--lib/libiconv_modules/MSKanji/Makefile.depend1
-rw-r--r--lib/libiconv_modules/UES/Makefile.depend1
-rw-r--r--lib/libiconv_modules/UTF1632/Makefile.depend1
-rw-r--r--lib/libiconv_modules/UTF7/Makefile.depend1
-rw-r--r--lib/libiconv_modules/UTF8/Makefile.depend1
-rw-r--r--lib/libiconv_modules/VIQR/Makefile.depend1
-rw-r--r--lib/libiconv_modules/ZW/Makefile.depend1
-rw-r--r--lib/libiconv_modules/iconv_none/Makefile.depend1
-rw-r--r--lib/libiconv_modules/iconv_std/Makefile.depend1
-rw-r--r--lib/libiconv_modules/mapper_646/Makefile.depend1
-rw-r--r--lib/libiconv_modules/mapper_none/Makefile.depend1
-rw-r--r--lib/libiconv_modules/mapper_parallel/Makefile.depend1
-rw-r--r--lib/libiconv_modules/mapper_serial/Makefile.depend1
-rw-r--r--lib/libiconv_modules/mapper_std/Makefile.depend1
-rw-r--r--lib/libiconv_modules/mapper_zone/Makefile.depend1
-rw-r--r--lib/libifconfig/Makefile.depend1
-rw-r--r--lib/libiscsiutil/Makefile.depend0
-rw-r--r--lib/libkiconv/Makefile.depend1
-rw-r--r--lib/liblzma/Makefile.depend1
-rw-r--r--lib/libmilter/Makefile.depend1
-rw-r--r--lib/libmixer/Makefile.depend0
-rw-r--r--lib/libpam/modules/pam_chroot/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_deny/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_echo/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_exec/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_ftpusers/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_group/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_guest/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_krb5/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_ksu/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_lastlog/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_login_access/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_nologin/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_passwdqc/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_permit/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_radius/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_rhosts/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_rootok/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_securetty/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_self/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_ssh/Makefile.depend1
-rw-r--r--lib/libpam/modules/pam_tacplus/Makefile.depend1
-rw-r--r--lib/libpathconv/Makefile.depend1
-rw-r--r--lib/libpfctl/Makefile.depend0
-rw-r--r--lib/libpjdlog/Makefile.depend1
-rw-r--r--lib/libpmc/Makefile.depend1
-rw-r--r--lib/libproc/Makefile.depend1
-rw-r--r--lib/libprocstat/zfs/Makefile.depend3
-rw-r--r--lib/libregex/Makefile.depend0
-rw-r--r--lib/librpcsec_gss/Makefile.depend1
-rw-r--r--lib/librt/Makefile.depend1
-rw-r--r--lib/libsmb/Makefile.depend1
-rw-r--r--lib/libsmutil/Makefile.depend.options0
-rw-r--r--lib/libssp/Makefile.depend0
-rw-r--r--lib/libstats/Makefile.depend0
-rw-r--r--lib/libstdbuf/Makefile.depend1
-rw-r--r--lib/libsysdecode/Makefile.depend37
-rw-r--r--lib/libthr/Makefile.depend1
-rw-r--r--lib/libunbound/Makefile.depend1
-rw-r--r--lib/libvmmapi/Makefile.depend2
-rw-r--r--lib/libxo/Makefile.depend9
-rw-r--r--lib/libxo/encoder/csv/Makefile.depend0
-rw-r--r--lib/libxo/libxo/Makefile.depend0
-rw-r--r--lib/ncurses/form/Makefile.depend3
-rw-r--r--lib/ncurses/menu/Makefile.depend3
-rw-r--r--lib/ncurses/ncurses/Makefile.depend3
-rw-r--r--lib/ncurses/panel/Makefile.depend3
-rw-r--r--lib/ncurses/tinfo/Makefile.depend3
-rw-r--r--libexec/atf/atf-check/Makefile.depend1
-rw-r--r--libexec/atf/atf-sh/Makefile.depend1
-rw-r--r--libexec/atrun/Makefile.depend1
-rw-r--r--libexec/bootpd/Makefile.depend1
-rw-r--r--libexec/bootpd/bootpgw/Makefile.depend1
-rw-r--r--libexec/bootpd/tools/bootpef/Makefile.depend1
-rw-r--r--libexec/bootpd/tools/bootptest/Makefile.depend1
-rw-r--r--libexec/comsat/Makefile.depend1
-rw-r--r--libexec/dma/dma-mbox-create/Makefile.depend3
-rw-r--r--libexec/dma/dmagent/Makefile.depend1
-rw-r--r--libexec/fingerd/Makefile.depend1
-rw-r--r--libexec/ftpd/Makefile.depend1
-rw-r--r--libexec/getty/Makefile.depend1
-rw-r--r--libexec/mail.local/Makefile.depend1
-rw-r--r--libexec/mknetid/Makefile.depend1
-rw-r--r--libexec/pppoed/Makefile.depend1
-rw-r--r--libexec/rbootd/Makefile.depend1
-rw-r--r--libexec/revnetgroup/Makefile.depend1
-rw-r--r--libexec/rpc.rquotad/Makefile.depend1
-rw-r--r--libexec/rpc.rstatd/Makefile.depend2
-rw-r--r--libexec/rpc.rusersd/Makefile.depend1
-rw-r--r--libexec/rpc.rwalld/Makefile.depend1
-rw-r--r--libexec/rpc.sprayd/Makefile.depend1
-rw-r--r--libexec/rtld-elf/Makefile.depend1
-rw-r--r--libexec/smrsh/Makefile.depend1
-rw-r--r--libexec/talkd/Makefile.depend1
-rw-r--r--libexec/tcpd/Makefile.depend1
-rw-r--r--libexec/tftp-proxy/Makefile.depend3
-rw-r--r--libexec/ulog-helper/Makefile.depend2
-rw-r--r--libexec/ypxfr/Makefile.depend1
-rw-r--r--rescue/rescue/Makefile.depend29
-rw-r--r--sbin/adjkerntz/Makefile.depend1
-rw-r--r--sbin/bsdlabel/Makefile.depend3
-rw-r--r--sbin/camcontrol/Makefile.depend1
-rw-r--r--sbin/ccdconfig/Makefile.depend3
-rw-r--r--sbin/clri/Makefile.depend2
-rw-r--r--sbin/comcontrol/Makefile.depend1
-rw-r--r--sbin/conscontrol/Makefile.depend1
-rw-r--r--sbin/ddb/Makefile.depend2
-rw-r--r--sbin/decryptcore/Makefile.depend4
-rw-r--r--sbin/devd/Makefile.depend3
-rw-r--r--sbin/devfs/Makefile.depend1
-rw-r--r--sbin/dhclient/Makefile.depend1
-rw-r--r--sbin/dmesg/Makefile.depend2
-rw-r--r--sbin/dump/Makefile.depend2
-rw-r--r--sbin/dumpfs/Makefile.depend1
-rw-r--r--sbin/dumpon/Makefile.depend1
-rw-r--r--sbin/etherswitchcfg/Makefile.depend1
-rw-r--r--sbin/fdisk/Makefile.depend3
-rw-r--r--sbin/ffsinfo/Makefile.depend1
-rw-r--r--sbin/fsck/Makefile.depend1
-rw-r--r--sbin/fsck_ffs/Makefile.depend1
-rw-r--r--sbin/fsck_msdosfs/Makefile.depend2
-rw-r--r--sbin/fsdb/Makefile.depend2
-rw-r--r--sbin/fsirand/Makefile.depend2
-rw-r--r--sbin/gbde/Makefile.depend3
-rw-r--r--sbin/ggate/ggatec/Makefile.depend3
-rw-r--r--sbin/ggate/ggated/Makefile.depend1
-rw-r--r--sbin/ggate/ggatel/Makefile.depend3
-rw-r--r--sbin/growfs/Makefile.depend1
-rw-r--r--sbin/gvinum/Makefile.depend6
-rw-r--r--sbin/hastctl/Makefile.depend2
-rw-r--r--sbin/hastd/Makefile.depend4
-rw-r--r--sbin/ifconfig/Makefile.depend5
-rw-r--r--sbin/init/Makefile.depend1
-rw-r--r--sbin/ipf/ipf/Makefile.depend2
-rw-r--r--sbin/ipf/ipfs/Makefile.depend2
-rw-r--r--sbin/ipf/ipfstat/Makefile.depend5
-rw-r--r--sbin/ipf/ipmon/Makefile.depend2
-rw-r--r--sbin/ipf/ipnat/Makefile.depend2
-rw-r--r--sbin/ipf/ippool/Makefile.depend2
-rw-r--r--sbin/ipfw/Makefile.depend2
-rw-r--r--sbin/kldconfig/Makefile.depend1
-rw-r--r--sbin/kldload/Makefile.depend1
-rw-r--r--sbin/kldstat/Makefile.depend1
-rw-r--r--sbin/kldunload/Makefile.depend1
-rw-r--r--sbin/ldconfig/Makefile.depend1
-rw-r--r--sbin/md5/Makefile.depend2
-rw-r--r--sbin/mdconfig/Makefile.depend3
-rw-r--r--sbin/mdmfs/Makefile.depend1
-rw-r--r--sbin/mknod/Makefile.depend1
-rw-r--r--sbin/mksnap_ffs/Makefile.depend1
-rw-r--r--sbin/mount/Makefile.depend2
-rw-r--r--sbin/mount_cd9660/Makefile.depend1
-rw-r--r--sbin/mount_fusefs/Makefile.depend1
-rw-r--r--sbin/mount_msdosfs/Makefile.depend1
-rw-r--r--sbin/mount_nfs/Makefile.depend1
-rw-r--r--sbin/mount_nullfs/Makefile.depend1
-rw-r--r--sbin/mount_udf/Makefile.depend1
-rw-r--r--sbin/mount_unionfs/Makefile.depend1
-rw-r--r--sbin/natd/Makefile.depend1
-rw-r--r--sbin/newfs/Makefile.depend1
-rw-r--r--sbin/newfs_msdos/Makefile.depend1
-rw-r--r--sbin/nfsiod/Makefile.depend1
-rw-r--r--sbin/nos-tun/Makefile.depend1
-rw-r--r--sbin/nvmecontrol/Makefile.depend2
-rw-r--r--sbin/pfctl/Makefile.depend3
-rw-r--r--sbin/pflogd/Makefile.depend2
-rw-r--r--sbin/ping/Makefile.depend2
-rw-r--r--sbin/quotacheck/Makefile.depend2
-rw-r--r--sbin/rcorder/Makefile.depend1
-rw-r--r--sbin/reboot/Makefile.depend1
-rw-r--r--sbin/recoverdisk/Makefile.depend2
-rw-r--r--sbin/restore/Makefile.depend1
-rw-r--r--sbin/route/Makefile.depend1
-rw-r--r--sbin/routed/Makefile.depend1
-rw-r--r--sbin/routed/rtquery/Makefile.depend1
-rw-r--r--sbin/savecore/Makefile.depend5
-rw-r--r--sbin/setkey/Makefile.depend3
-rw-r--r--sbin/shutdown/Makefile.depend1
-rw-r--r--sbin/swapon/Makefile.depend1
-rw-r--r--sbin/sysctl/Makefile.depend1
-rw-r--r--sbin/tunefs/Makefile.depend1
-rw-r--r--sbin/umount/Makefile.depend1
-rw-r--r--sbin/zfsbootcfg/Makefile.depend16
-rw-r--r--secure/libexec/sftp-server/Makefile.depend4
-rw-r--r--secure/libexec/ssh-keysign/Makefile.depend4
-rw-r--r--secure/libexec/ssh-pkcs11-helper/Makefile.depend4
-rw-r--r--secure/usr.bin/openssl/Makefile.depend2
-rw-r--r--secure/usr.bin/scp/Makefile.depend4
-rw-r--r--secure/usr.bin/sftp/Makefile.depend5
-rw-r--r--secure/usr.bin/ssh-add/Makefile.depend4
-rw-r--r--secure/usr.bin/ssh-agent/Makefile.depend4
-rw-r--r--secure/usr.bin/ssh-keygen/Makefile.depend4
-rw-r--r--secure/usr.bin/ssh-keyscan/Makefile.depend4
-rw-r--r--secure/usr.bin/ssh/Makefile.depend6
-rw-r--r--secure/usr.sbin/sshd/Makefile.depend6
-rw-r--r--share/examples/Makefile.depend1
-rw-r--r--share/i18n/csmapper/APPLE/Makefile.depend1
-rw-r--r--share/i18n/csmapper/AST/Makefile.depend1
-rw-r--r--share/i18n/csmapper/BIG5/Makefile.depend1
-rw-r--r--share/i18n/csmapper/CNS/Makefile.depend1
-rw-r--r--share/i18n/csmapper/CP/Makefile.depend1
-rw-r--r--share/i18n/csmapper/EBCDIC/Makefile.depend1
-rw-r--r--share/i18n/csmapper/GB/Makefile.depend1
-rw-r--r--share/i18n/csmapper/GEORGIAN/Makefile.depend1
-rw-r--r--share/i18n/csmapper/ISO-8859/Makefile.depend1
-rw-r--r--share/i18n/csmapper/JIS/Makefile.depend1
-rw-r--r--share/i18n/csmapper/KAZAKH/Makefile.depend1
-rw-r--r--share/i18n/csmapper/KOI/Makefile.depend1
-rw-r--r--share/i18n/csmapper/KS/Makefile.depend1
-rw-r--r--share/i18n/csmapper/MISC/Makefile.depend1
-rw-r--r--share/i18n/csmapper/Makefile.depend1
-rw-r--r--share/i18n/csmapper/TCVN/Makefile.depend1
-rw-r--r--share/i18n/esdb/APPLE/Makefile.depend1
-rw-r--r--share/i18n/esdb/AST/Makefile.depend1
-rw-r--r--share/i18n/esdb/BIG5/Makefile.depend1
-rw-r--r--share/i18n/esdb/CP/Makefile.depend1
-rw-r--r--share/i18n/esdb/DEC/Makefile.depend1
-rw-r--r--share/i18n/esdb/EBCDIC/Makefile.depend1
-rw-r--r--share/i18n/esdb/EUC/Makefile.depend1
-rw-r--r--share/i18n/esdb/GB/Makefile.depend1
-rw-r--r--share/i18n/esdb/GEORGIAN/Makefile.depend1
-rw-r--r--share/i18n/esdb/ISO-2022/Makefile.depend1
-rw-r--r--share/i18n/esdb/ISO-8859/Makefile.depend1
-rw-r--r--share/i18n/esdb/ISO646/Makefile.depend1
-rw-r--r--share/i18n/esdb/KAZAKH/Makefile.depend1
-rw-r--r--share/i18n/esdb/KOI/Makefile.depend1
-rw-r--r--share/i18n/esdb/MISC/Makefile.depend1
-rw-r--r--share/i18n/esdb/Makefile.depend1
-rw-r--r--share/i18n/esdb/TCVN/Makefile.depend1
-rw-r--r--share/i18n/esdb/UTF/Makefile.depend1
-rw-r--r--share/syscons/scrnmaps/Makefile.depend6
-rw-r--r--share/zoneinfo/Makefile.depend1
-rw-r--r--stand/efi/boot1/Makefile.depend4
-rw-r--r--stand/efi/loader_4th/Makefile.depend0
-rw-r--r--stand/ficl32/Makefile.depend2
-rw-r--r--stand/i386/libi386/Makefile.depend4
-rw-r--r--stand/i386/loader/Makefile.depend8
-rw-r--r--stand/i386/pxeldr/Makefile.depend6
-rw-r--r--stand/i386/pxeldr/Makefile.depend.options0
-rw-r--r--stand/libsa32/Makefile.depend1
-rw-r--r--stand/userboot/test/Makefile.depend1
-rw-r--r--stand/userboot/userboot/Makefile.depend3
-rw-r--r--targets/pseudo/userland/lib/Makefile.depend22
-rw-r--r--targets/pseudo/userland/misc/Makefile.depend9
-rw-r--r--usr.bin/apply/Makefile.depend1
-rw-r--r--usr.bin/ar/Makefile.depend7
-rw-r--r--usr.bin/asa/Makefile.depend1
-rw-r--r--usr.bin/at/Makefile.depend1
-rw-r--r--usr.bin/awk/Makefile.depend2
-rw-r--r--usr.bin/awk/tests/Makefile.depend0
-rw-r--r--usr.bin/awk/tests/bugs-fixed/Makefile.depend0
-rw-r--r--usr.bin/awk/tests/netbsd/Makefile.depend0
-rw-r--r--usr.bin/banner/Makefile.depend1
-rw-r--r--usr.bin/basename/Makefile.depend2
-rw-r--r--usr.bin/bc/Makefile.depend2
-rw-r--r--usr.bin/biff/Makefile.depend1
-rw-r--r--usr.bin/bintrans/Makefile.depend1
-rw-r--r--usr.bin/bluetooth/bthost/Makefile.depend1
-rw-r--r--usr.bin/bluetooth/btsockstat/Makefile.depend2
-rw-r--r--usr.bin/bluetooth/rfcomm_sppd/Makefile.depend1
-rw-r--r--usr.bin/brandelf/Makefile.depend1
-rw-r--r--usr.bin/bsdcat/Makefile.depend7
-rw-r--r--usr.bin/bsdiff/bsdiff/Makefile.depend1
-rw-r--r--usr.bin/bsdiff/bspatch/Makefile.depend1
-rw-r--r--usr.bin/bzip2/Makefile.depend1
-rw-r--r--usr.bin/bzip2recover/Makefile.depend1
-rw-r--r--usr.bin/c89/Makefile.depend1
-rw-r--r--usr.bin/c99/Makefile.depend1
-rw-r--r--usr.bin/calendar/Makefile.depend2
-rw-r--r--usr.bin/cap_mkdb/Makefile.depend1
-rw-r--r--usr.bin/chat/Makefile.depend1
-rw-r--r--usr.bin/chkey/Makefile.depend1
-rw-r--r--usr.bin/cksum/Makefile.depend1
-rw-r--r--usr.bin/cmp/Makefile.depend3
-rw-r--r--usr.bin/col/Makefile.depend2
-rw-r--r--usr.bin/colrm/Makefile.depend1
-rw-r--r--usr.bin/column/Makefile.depend1
-rw-r--r--usr.bin/comm/Makefile.depend1
-rw-r--r--usr.bin/compile_et/Makefile.depend2
-rw-r--r--usr.bin/compress/Makefile.depend1
-rw-r--r--usr.bin/cpio/Makefile.depend7
-rw-r--r--usr.bin/cpuset/Makefile.depend2
-rw-r--r--usr.bin/csplit/Makefile.depend1
-rw-r--r--usr.bin/ctags/Makefile.depend1
-rw-r--r--usr.bin/ctlstat/Makefile.depend3
-rw-r--r--usr.bin/cut/Makefile.depend1
-rw-r--r--usr.bin/dc/Makefile.depend3
-rw-r--r--usr.bin/dirname/Makefile.depend2
-rw-r--r--usr.bin/dpv/Makefile.depend4
-rw-r--r--usr.bin/drill/Makefile.depend2
-rw-r--r--usr.bin/dtc/Makefile.depend1
-rw-r--r--usr.bin/du/Makefile.depend1
-rw-r--r--usr.bin/ee/Makefile.depend4
-rw-r--r--usr.bin/elfdump/Makefile.depend2
-rw-r--r--usr.bin/enigma/Makefile.depend1
-rw-r--r--usr.bin/env/Makefile.depend2
-rw-r--r--usr.bin/expand/Makefile.depend1
-rw-r--r--usr.bin/false/Makefile.depend1
-rw-r--r--usr.bin/fetch/Makefile.depend3
-rw-r--r--usr.bin/file/Makefile.depend2
-rw-r--r--usr.bin/file2c/Makefile.depend1
-rw-r--r--usr.bin/find/Makefile.depend1
-rw-r--r--usr.bin/finger/Makefile.depend1
-rw-r--r--usr.bin/fmt/Makefile.depend1
-rw-r--r--usr.bin/fold/Makefile.depend1
-rw-r--r--usr.bin/from/Makefile.depend1
-rw-r--r--usr.bin/fstat/Makefile.depend5
-rw-r--r--usr.bin/fsync/Makefile.depend1
-rw-r--r--usr.bin/ftp/Makefile.depend3
-rw-r--r--usr.bin/gcore/Makefile.depend1
-rw-r--r--usr.bin/gencat/Makefile.depend1
-rw-r--r--usr.bin/getaddrinfo/Makefile.depend2
-rw-r--r--usr.bin/getconf/Makefile.depend1
-rw-r--r--usr.bin/getent/Makefile.depend1
-rw-r--r--usr.bin/getopt/Makefile.depend2
-rw-r--r--usr.bin/gprof/Makefile.depend1
-rw-r--r--usr.bin/grep/Makefile.depend1
-rw-r--r--usr.bin/gzip/Makefile.depend1
-rw-r--r--usr.bin/head/Makefile.depend2
-rw-r--r--usr.bin/hexdump/Makefile.depend2
-rw-r--r--usr.bin/host/Makefile.depend2
-rw-r--r--usr.bin/iconv/Makefile.depend2
-rw-r--r--usr.bin/id/Makefile.depend1
-rw-r--r--usr.bin/ident/Makefile.depend3
-rw-r--r--usr.bin/indent/Makefile.depend3
-rw-r--r--usr.bin/ipcrm/Makefile.depend2
-rw-r--r--usr.bin/ipcs/Makefile.depend2
-rw-r--r--usr.bin/iscsictl/Makefile.depend3
-rw-r--r--usr.bin/join/Makefile.depend1
-rw-r--r--usr.bin/jot/Makefile.depend2
-rw-r--r--usr.bin/kdump/Makefile.depend1
-rw-r--r--usr.bin/keylogin/Makefile.depend1
-rw-r--r--usr.bin/keylogout/Makefile.depend1
-rw-r--r--usr.bin/killall/Makefile.depend1
-rw-r--r--usr.bin/ktrace/Makefile.depend1
-rw-r--r--usr.bin/ktrdump/Makefile.depend3
-rw-r--r--usr.bin/lam/Makefile.depend2
-rw-r--r--usr.bin/last/Makefile.depend3
-rw-r--r--usr.bin/lastcomm/Makefile.depend1
-rw-r--r--usr.bin/ldd/Makefile.depend2
-rw-r--r--usr.bin/leave/Makefile.depend1
-rw-r--r--usr.bin/less/Makefile.depend3
-rw-r--r--usr.bin/lessecho/Makefile.depend1
-rw-r--r--usr.bin/lesskey/Makefile.depend1
-rw-r--r--usr.bin/lex/lib/Makefile.depend1
-rw-r--r--usr.bin/limits/Makefile.depend1
-rw-r--r--usr.bin/locale/Makefile.depend2
-rw-r--r--usr.bin/localedef/Makefile.depend1
-rw-r--r--usr.bin/locate/bigram/Makefile.depend2
-rw-r--r--usr.bin/locate/code/Makefile.depend1
-rw-r--r--usr.bin/locate/locate/Makefile.depend1
-rw-r--r--usr.bin/lock/Makefile.depend3
-rw-r--r--usr.bin/lockf/Makefile.depend1
-rw-r--r--usr.bin/logger/Makefile.depend4
-rw-r--r--usr.bin/logins/Makefile.depend1
-rw-r--r--usr.bin/logname/Makefile.depend2
-rw-r--r--usr.bin/look/Makefile.depend1
-rw-r--r--usr.bin/lsvfs/Makefile.depend1
-rw-r--r--usr.bin/lzmainfo/Makefile.depend2
-rw-r--r--usr.bin/m4/Makefile.depend3
-rw-r--r--usr.bin/mail/Makefile.depend1
-rw-r--r--usr.bin/mandoc/Makefile.depend1
-rw-r--r--usr.bin/mesg/Makefile.depend1
-rw-r--r--usr.bin/ministat/Makefile.depend2
-rw-r--r--usr.bin/mkcsmapper/Makefile.depend1
-rw-r--r--usr.bin/mkesdb/Makefile.depend1
-rw-r--r--usr.bin/mkfifo/Makefile.depend1
-rw-r--r--usr.bin/mkimg/Makefile.depend1
-rw-r--r--usr.bin/mkstr/Makefile.depend1
-rw-r--r--usr.bin/mktemp/Makefile.depend1
-rw-r--r--usr.bin/mkuzip/Makefile.depend2
-rw-r--r--usr.bin/msgs/Makefile.depend3
-rw-r--r--usr.bin/mt/Makefile.depend2
-rw-r--r--usr.bin/nc/Makefile.depend3
-rw-r--r--usr.bin/ncal/Makefile.depend3
-rw-r--r--usr.bin/netstat/Makefile.depend4
-rw-r--r--usr.bin/newgrp/Makefile.depend1
-rw-r--r--usr.bin/newkey/Makefile.depend1
-rw-r--r--usr.bin/nfsstat/Makefile.depend3
-rw-r--r--usr.bin/nice/Makefile.depend1
-rw-r--r--usr.bin/nl/Makefile.depend1
-rw-r--r--usr.bin/nohup/Makefile.depend1
-rw-r--r--usr.bin/passwd/Makefile.depend1
-rw-r--r--usr.bin/paste/Makefile.depend1
-rw-r--r--usr.bin/patch/Makefile.depend1
-rw-r--r--usr.bin/pathchk/Makefile.depend1
-rw-r--r--usr.bin/perror/Makefile.depend1
-rw-r--r--usr.bin/pr/Makefile.depend1
-rw-r--r--usr.bin/printenv/Makefile.depend2
-rw-r--r--usr.bin/printf/Makefile.depend1
-rw-r--r--usr.bin/proccontrol/Makefile.depend1
-rw-r--r--usr.bin/procstat/Makefile.depend5
-rw-r--r--usr.bin/protect/Makefile.depend1
-rw-r--r--usr.bin/quota/Makefile.depend1
-rw-r--r--usr.bin/rctl/Makefile.depend1
-rw-r--r--usr.bin/renice/Makefile.depend1
-rw-r--r--usr.bin/resizewin/Makefile.depend1
-rw-r--r--usr.bin/rev/Makefile.depend1
-rw-r--r--usr.bin/revoke/Makefile.depend1
-rw-r--r--usr.bin/rpcgen/Makefile.depend1
-rw-r--r--usr.bin/rpcinfo/Makefile.depend1
-rw-r--r--usr.bin/rs/Makefile.depend4
-rw-r--r--usr.bin/rup/Makefile.depend1
-rw-r--r--usr.bin/ruptime/Makefile.depend1
-rw-r--r--usr.bin/rusers/Makefile.depend1
-rw-r--r--usr.bin/rwall/Makefile.depend1
-rw-r--r--usr.bin/rwho/Makefile.depend3
-rw-r--r--usr.bin/script/Makefile.depend1
-rw-r--r--usr.bin/sdiff/Makefile.depend1
-rw-r--r--usr.bin/sed/Makefile.depend1
-rw-r--r--usr.bin/seq/Makefile.depend1
-rw-r--r--usr.bin/showmount/Makefile.depend1
-rw-r--r--usr.bin/smbutil/Makefile.depend2
-rw-r--r--usr.bin/sockstat/Makefile.depend8
-rw-r--r--usr.bin/soelim/Makefile.depend1
-rw-r--r--usr.bin/split/Makefile.depend1
-rw-r--r--usr.bin/stat/Makefile.depend1
-rw-r--r--usr.bin/stdbuf/Makefile.depend1
-rw-r--r--usr.bin/systat/Makefile.depend7
-rw-r--r--usr.bin/tabs/Makefile.depend3
-rw-r--r--usr.bin/tail/Makefile.depend2
-rw-r--r--usr.bin/talk/Makefile.depend4
-rw-r--r--usr.bin/tar/Makefile.depend7
-rw-r--r--usr.bin/tcopy/Makefile.depend1
-rw-r--r--usr.bin/tee/Makefile.depend2
-rw-r--r--usr.bin/telnet/Makefile.depend5
-rw-r--r--usr.bin/tftp/Makefile.depend2
-rw-r--r--usr.bin/time/Makefile.depend1
-rw-r--r--usr.bin/tip/tip/Makefile.depend1
-rw-r--r--usr.bin/top/Makefile.depend6
-rw-r--r--usr.bin/touch/Makefile.depend1
-rw-r--r--usr.bin/tr/Makefile.depend2
-rw-r--r--usr.bin/true/Makefile.depend1
-rw-r--r--usr.bin/truncate/Makefile.depend1
-rw-r--r--usr.bin/truss/Makefile.depend1
-rw-r--r--usr.bin/tsort/Makefile.depend1
-rw-r--r--usr.bin/tty/Makefile.depend1
-rw-r--r--usr.bin/ul/Makefile.depend3
-rw-r--r--usr.bin/uname/Makefile.depend1
-rw-r--r--usr.bin/unexpand/Makefile.depend1
-rw-r--r--usr.bin/unifdef/Makefile.depend1
-rw-r--r--usr.bin/uniq/Makefile.depend3
-rw-r--r--usr.bin/units/Makefile.depend4
-rw-r--r--usr.bin/unvis/Makefile.depend1
-rw-r--r--usr.bin/unzip/Makefile.depend7
-rw-r--r--usr.bin/usbhidaction/Makefile.depend1
-rw-r--r--usr.bin/usbhidctl/Makefile.depend1
-rw-r--r--usr.bin/users/Makefile.depend3
-rw-r--r--usr.bin/vacation/Makefile.depend1
-rw-r--r--usr.bin/vgrind/Makefile.depend1
-rw-r--r--usr.bin/vi/Makefile.depend4
-rw-r--r--usr.bin/vi/catalog/Makefile.depend5
-rw-r--r--usr.bin/vis/Makefile.depend1
-rw-r--r--usr.bin/vmstat/Makefile.depend4
-rw-r--r--usr.bin/vtfontcvt/Makefile.depend1
-rw-r--r--usr.bin/w/Makefile.depend4
-rw-r--r--usr.bin/wall/Makefile.depend1
-rw-r--r--usr.bin/wc/Makefile.depend4
-rw-r--r--usr.bin/what/Makefile.depend1
-rw-r--r--usr.bin/whereis/Makefile.depend1
-rw-r--r--usr.bin/which/Makefile.depend1
-rw-r--r--usr.bin/who/Makefile.depend1
-rw-r--r--usr.bin/whois/Makefile.depend1
-rw-r--r--usr.bin/write/Makefile.depend2
-rw-r--r--usr.bin/xargs/Makefile.depend1
-rw-r--r--usr.bin/xinstall/Makefile.depend1
-rw-r--r--usr.bin/xo/Makefile.depend3
-rw-r--r--usr.bin/xstr/Makefile.depend1
-rw-r--r--usr.bin/xz/Makefile.depend2
-rw-r--r--usr.bin/xzdec/Makefile.depend2
-rw-r--r--usr.bin/yacc/Makefile.depend1
-rw-r--r--usr.bin/yes/Makefile.depend2
-rw-r--r--usr.bin/ypcat/Makefile.depend1
-rw-r--r--usr.bin/ypmatch/Makefile.depend1
-rw-r--r--usr.bin/ypwhich/Makefile.depend1
-rw-r--r--usr.bin/zstd/Makefile.depend2
-rw-r--r--usr.sbin/ac/Makefile.depend1
-rw-r--r--usr.sbin/accton/Makefile.depend1
-rw-r--r--usr.sbin/acpi/acpiconf/Makefile.depend1
-rw-r--r--usr.sbin/acpi/acpidb/Makefile.depend1
-rw-r--r--usr.sbin/acpi/acpidump/Makefile.depend1
-rw-r--r--usr.sbin/acpi/iasl/Makefile.depend1
-rw-r--r--usr.sbin/apm/Makefile.depend1
-rw-r--r--usr.sbin/arp/Makefile.depend4
-rw-r--r--usr.sbin/audit/Makefile.depend1
-rw-r--r--usr.sbin/auditd/Makefile.depend1
-rw-r--r--usr.sbin/auditdistd/Makefile.depend2
-rw-r--r--usr.sbin/auditreduce/Makefile.depend1
-rw-r--r--usr.sbin/authpf/Makefile.depend3
-rw-r--r--usr.sbin/autofs/Makefile.depend1
-rw-r--r--usr.sbin/bhyve/Makefile.depend5
-rw-r--r--usr.sbin/bhyvectl/Makefile.depend1
-rw-r--r--usr.sbin/bhyveload/Makefile.depend2
-rw-r--r--usr.sbin/binmiscctl/Makefile.depend1
-rw-r--r--usr.sbin/blacklistctl/Makefile.depend2
-rw-r--r--usr.sbin/blacklistd/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/ath3kfw/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/bcmfw/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bthidd/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/btpand/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/hccontrol/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/hcsecd/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/iwmbtfw/Makefile.depend0
-rw-r--r--usr.sbin/bluetooth/l2control/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/l2ping/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/sdpd/Makefile.depend1
-rw-r--r--usr.sbin/boot0cfg/Makefile.depend3
-rw-r--r--usr.sbin/bootparamd/bootparamd/Makefile.depend1
-rw-r--r--usr.sbin/bootparamd/callbootd/Makefile.depend1
-rw-r--r--usr.sbin/bsdinstall/distextract/Makefile.depend13
-rw-r--r--usr.sbin/bsdinstall/distfetch/Makefile.depend8
-rw-r--r--usr.sbin/bsdinstall/partedit/Makefile.depend8
-rw-r--r--usr.sbin/bsnmpd/bsnmpd/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/gensnmptree/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend3
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend4
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend2
-rw-r--r--usr.sbin/btxld/Makefile.depend1
-rw-r--r--usr.sbin/camdd/Makefile.depend2
-rw-r--r--usr.sbin/cdcontrol/Makefile.depend2
-rw-r--r--usr.sbin/chkgrp/Makefile.depend1
-rw-r--r--usr.sbin/chown/Makefile.depend1
-rw-r--r--usr.sbin/chroot/Makefile.depend1
-rw-r--r--usr.sbin/ckdist/Makefile.depend1
-rw-r--r--usr.sbin/clear_locks/Makefile.depend1
-rw-r--r--usr.sbin/config/Makefile.depend6
-rw-r--r--usr.sbin/cpucontrol/Makefile.depend1
-rw-r--r--usr.sbin/cron/cron/Makefile.depend1
-rw-r--r--usr.sbin/cron/crontab/Makefile.depend1
-rw-r--r--usr.sbin/crunch/crunchgen/Makefile.depend1
-rw-r--r--usr.sbin/crunch/crunchide/Makefile.depend1
-rw-r--r--usr.sbin/ctladm/Makefile.depend2
-rw-r--r--usr.sbin/ctld/Makefile.depend6
-rw-r--r--usr.sbin/cxgbetool/Makefile.depend2
-rw-r--r--usr.sbin/daemon/Makefile.depend1
-rw-r--r--usr.sbin/dconschat/Makefile.depend2
-rw-r--r--usr.sbin/devctl/Makefile.depend1
-rw-r--r--usr.sbin/devinfo/Makefile.depend2
-rw-r--r--usr.sbin/diskinfo/Makefile.depend1
-rw-r--r--usr.sbin/dumpcis/Makefile.depend1
-rw-r--r--usr.sbin/editmap/Makefile.depend1
-rw-r--r--usr.sbin/edquota/Makefile.depend1
-rw-r--r--usr.sbin/efidp/Makefile.depend2
-rw-r--r--usr.sbin/efivar/Makefile.depend2
-rw-r--r--usr.sbin/extattr/Makefile.depend1
-rw-r--r--usr.sbin/extattrctl/Makefile.depend1
-rw-r--r--usr.sbin/fdcontrol/Makefile.depend1
-rw-r--r--usr.sbin/fdformat/Makefile.depend1
-rw-r--r--usr.sbin/fdread/Makefile.depend1
-rw-r--r--usr.sbin/fdwrite/Makefile.depend1
-rw-r--r--usr.sbin/fifolog/fifolog_create/Makefile.depend1
-rw-r--r--usr.sbin/fifolog/fifolog_reader/Makefile.depend1
-rw-r--r--usr.sbin/fifolog/fifolog_writer/Makefile.depend1
-rw-r--r--usr.sbin/flowctl/Makefile.depend1
-rw-r--r--usr.sbin/fstyp/Makefile.depend10
-rw-r--r--usr.sbin/ftp-proxy/Makefile.depend5
-rw-r--r--usr.sbin/fwcontrol/Makefile.depend1
-rw-r--r--usr.sbin/getfmac/Makefile.depend1
-rw-r--r--usr.sbin/getpmac/Makefile.depend1
-rw-r--r--usr.sbin/gpioctl/Makefile.depend1
-rw-r--r--usr.sbin/gssd/Makefile.depend4
-rw-r--r--usr.sbin/gstat/Makefile.depend7
-rw-r--r--usr.sbin/hyperv/tools/kvp/Makefile.depend1
-rw-r--r--usr.sbin/hyperv/tools/vss/Makefile.depend1
-rw-r--r--usr.sbin/i2c/Makefile.depend1
-rw-r--r--usr.sbin/ifmcstat/Makefile.depend1
-rw-r--r--usr.sbin/iostat/Makefile.depend2
-rw-r--r--usr.sbin/iovctl/Makefile.depend1
-rw-r--r--usr.sbin/ip6addrctl/Makefile.depend1
-rw-r--r--usr.sbin/ipfwpcap/Makefile.depend2
-rw-r--r--usr.sbin/iscsid/Makefile.depend5
-rw-r--r--usr.sbin/jail/Makefile.depend3
-rw-r--r--usr.sbin/jexec/Makefile.depend1
-rw-r--r--usr.sbin/jls/Makefile.depend4
-rw-r--r--usr.sbin/kbdcontrol/Makefile.depend2
-rw-r--r--usr.sbin/kbdmap/Makefile.depend2
-rw-r--r--usr.sbin/keyserv/Makefile.depend1
-rw-r--r--usr.sbin/kldxref/Makefile.depend1
-rw-r--r--usr.sbin/lastlogin/Makefile.depend2
-rw-r--r--usr.sbin/lpr/chkprintcap/Makefile.depend1
-rw-r--r--usr.sbin/lpr/filters.ru/koi2855/Makefile.depend1
-rw-r--r--usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend1
-rw-r--r--usr.sbin/lpr/filters/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lpc/Makefile.depend2
-rw-r--r--usr.sbin/lpr/lpd/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lpq/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lpr/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lprm/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lptest/Makefile.depend1
-rw-r--r--usr.sbin/lpr/pac/Makefile.depend1
-rw-r--r--usr.sbin/lptcontrol/Makefile.depend1
-rw-r--r--usr.sbin/mailstats/Makefile.depend1
-rw-r--r--usr.sbin/mailwrapper/Makefile.depend1
-rw-r--r--usr.sbin/makemap/Makefile.depend1
-rw-r--r--usr.sbin/memcontrol/Makefile.depend1
-rw-r--r--usr.sbin/mfiutil/Makefile.depend1
-rw-r--r--usr.sbin/mixer/Makefile.depend2
-rw-r--r--usr.sbin/mld6query/Makefile.depend1
-rw-r--r--usr.sbin/mlx5tool/Makefile.depend0
-rw-r--r--usr.sbin/mlxcontrol/Makefile.depend1
-rw-r--r--usr.sbin/mount_smbfs/Makefile.depend2
-rw-r--r--usr.sbin/mountd/Makefile.depend1
-rw-r--r--usr.sbin/moused/Makefile.depend1
-rw-r--r--usr.sbin/mpsutil/Makefile.depend1
-rw-r--r--usr.sbin/mptable/Makefile.depend1
-rw-r--r--usr.sbin/mptutil/Makefile.depend2
-rw-r--r--usr.sbin/mtest/Makefile.depend1
-rw-r--r--usr.sbin/ndp/Makefile.depend2
-rw-r--r--usr.sbin/newsyslog/Makefile.depend2
-rw-r--r--usr.sbin/nfscbd/Makefile.depend1
-rw-r--r--usr.sbin/nfsd/Makefile.depend1
-rw-r--r--usr.sbin/nfsdumpstate/Makefile.depend1
-rw-r--r--usr.sbin/nfsrevoke/Makefile.depend1
-rw-r--r--usr.sbin/nfsuserd/Makefile.depend2
-rw-r--r--usr.sbin/ngctl/Makefile.depend1
-rw-r--r--usr.sbin/nghook/Makefile.depend1
-rw-r--r--usr.sbin/nmtree/Makefile.depend1
-rw-r--r--usr.sbin/nologin/Makefile.depend1
-rw-r--r--usr.sbin/nscd/Makefile.depend1
-rw-r--r--usr.sbin/ntp/libntp/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntpd/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntpdate/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntpdc/Makefile.depend2
-rw-r--r--usr.sbin/ntp/ntpq/Makefile.depend2
-rw-r--r--usr.sbin/ntp/ntptime/Makefile.depend1
-rw-r--r--usr.sbin/pciconf/Makefile.depend1
-rw-r--r--usr.sbin/pkg/Makefile.depend10
-rw-r--r--usr.sbin/pmcannotate/Makefile.depend1
-rw-r--r--usr.sbin/pmccontrol/Makefile.depend4
-rw-r--r--usr.sbin/pmcstat/Makefile.depend6
-rw-r--r--usr.sbin/pmcstudy/Makefile.depend1
-rw-r--r--usr.sbin/portsnap/make_index/Makefile.depend1
-rw-r--r--usr.sbin/powerd/Makefile.depend1
-rw-r--r--usr.sbin/ppp/Makefile.depend1
-rw-r--r--usr.sbin/pppctl/Makefile.depend2
-rw-r--r--usr.sbin/praliases/Makefile.depend1
-rw-r--r--usr.sbin/praudit/Makefile.depend1
-rw-r--r--usr.sbin/prometheus_sysctl_exporter/Makefile.depend1
-rw-r--r--usr.sbin/pstat/Makefile.depend2
-rw-r--r--usr.sbin/pw/Makefile.depend2
-rw-r--r--usr.sbin/pwd_mkdb/Makefile.depend1
-rw-r--r--usr.sbin/quot/Makefile.depend2
-rw-r--r--usr.sbin/quotaon/Makefile.depend1
-rw-r--r--usr.sbin/rarpd/Makefile.depend1
-rw-r--r--usr.sbin/repquota/Makefile.depend1
-rw-r--r--usr.sbin/rip6query/Makefile.depend1
-rw-r--r--usr.sbin/rmt/Makefile.depend1
-rw-r--r--usr.sbin/route6d/Makefile.depend1
-rw-r--r--usr.sbin/rpc.lockd/Makefile.depend1
-rw-r--r--usr.sbin/rpc.statd/Makefile.depend1
-rw-r--r--usr.sbin/rpc.umntall/Makefile.depend1
-rw-r--r--usr.sbin/rpc.yppasswdd/Makefile.depend1
-rw-r--r--usr.sbin/rpc.ypupdated/Makefile.depend1
-rw-r--r--usr.sbin/rpc.ypxfrd/Makefile.depend1
-rw-r--r--usr.sbin/rrenumd/Makefile.depend3
-rw-r--r--usr.sbin/rtadvctl/Makefile.depend1
-rw-r--r--usr.sbin/rtadvd/Makefile.depend1
-rw-r--r--usr.sbin/rtprio/Makefile.depend1
-rw-r--r--usr.sbin/rwhod/Makefile.depend3
-rw-r--r--usr.sbin/sa/Makefile.depend1
-rw-r--r--usr.sbin/sendmail/Makefile.depend1
-rw-r--r--usr.sbin/services_mkdb/Makefile.depend1
-rw-r--r--usr.sbin/sesutil/Makefile.depend4
-rw-r--r--usr.sbin/setfib/Makefile.depend1
-rw-r--r--usr.sbin/setfmac/Makefile.depend1
-rw-r--r--usr.sbin/setpmac/Makefile.depend1
-rw-r--r--usr.sbin/smbmsg/Makefile.depend1
-rw-r--r--usr.sbin/snapinfo/Makefile.depend1
-rw-r--r--usr.sbin/spray/Makefile.depend1
-rw-r--r--usr.sbin/syslogd/Makefile.depend1
-rw-r--r--usr.sbin/tcpdchk/Makefile.depend1
-rw-r--r--usr.sbin/tcpdmatch/Makefile.depend1
-rw-r--r--usr.sbin/tcpdrop/Makefile.depend1
-rw-r--r--usr.sbin/tcpdump/tcpdump/Makefile.depend5
-rw-r--r--usr.sbin/traceroute/Makefile.depend1
-rw-r--r--usr.sbin/traceroute6/Makefile.depend4
-rw-r--r--usr.sbin/tzsetup/Makefile.depend2
-rw-r--r--usr.sbin/uathload/Makefile.depend1
-rw-r--r--usr.sbin/uefisign/Makefile.depend3
-rw-r--r--usr.sbin/ugidfw/Makefile.depend1
-rw-r--r--usr.sbin/uhsoctl/Makefile.depend1
-rw-r--r--usr.sbin/unbound/anchor/Makefile.depend1
-rw-r--r--usr.sbin/unbound/checkconf/Makefile.depend3
-rw-r--r--usr.sbin/unbound/control/Makefile.depend1
-rw-r--r--usr.sbin/unbound/daemon/Makefile.depend1
-rw-r--r--usr.sbin/usbconfig/Makefile.depend2
-rw-r--r--usr.sbin/usbdump/Makefile.depend1
-rw-r--r--usr.sbin/utx/Makefile.depend1
-rw-r--r--usr.sbin/vidcontrol/Makefile.depend1
-rw-r--r--usr.sbin/vipw/Makefile.depend1
-rw-r--r--usr.sbin/wake/Makefile.depend1
-rw-r--r--usr.sbin/watch/Makefile.depend3
-rw-r--r--usr.sbin/watchdogd/Makefile.depend1
-rw-r--r--usr.sbin/wlandebug/Makefile.depend2
-rw-r--r--usr.sbin/wpa/Makefile.depend0
-rw-r--r--usr.sbin/wpa/hostapd/Makefile.depend13
-rw-r--r--usr.sbin/wpa/hostapd_cli/Makefile.depend5
-rw-r--r--usr.sbin/wpa/src/ap/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/common/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/crypto/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/drivers/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/eap_common/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/eap_peer/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/eap_server/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/eapol_auth/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/eapol_supp/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/l2_packet/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/radius/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/rsn_supp/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/tls/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/utils/Makefile.depend0
-rw-r--r--usr.sbin/wpa/src/wps/Makefile.depend0
-rw-r--r--usr.sbin/wpa/wpa_cli/Makefile.depend16
-rw-r--r--usr.sbin/wpa/wpa_passphrase/Makefile.depend5
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Makefile.depend13
-rw-r--r--usr.sbin/yp_mkdb/Makefile.depend1
-rw-r--r--usr.sbin/ypbind/Makefile.depend1
-rw-r--r--usr.sbin/ypldap/Makefile.depend3
-rw-r--r--usr.sbin/yppoll/Makefile.depend1
-rw-r--r--usr.sbin/yppush/Makefile.depend1
-rw-r--r--usr.sbin/ypset/Makefile.depend1
-rw-r--r--usr.sbin/zonectl/Makefile.depend1
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
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/dd/Makefile.depend b/bin/dd/Makefile.depend
index 1adfc08a54d6..890f8a10aec4 100644
--- a/bin/dd/Makefile.depend
+++ b/bin/dd/Makefile.depend
@@ -2,13 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
+ lib/libutil \
.include <dirdeps.mk>
diff --git a/bin/df/Makefile.depend b/bin/df/Makefile.depend
index 5770a091f2a6..45a29f192e40 100644
--- a/bin/df/Makefile.depend
+++ b/bin/df/Makefile.depend
@@ -2,14 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/bin/domainname/Makefile.depend b/bin/domainname/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/domainname/Makefile.depend
+++ b/bin/domainname/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/echo/Makefile.depend b/bin/echo/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/bin/echo/Makefile.depend
+++ b/bin/echo/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/bin/ed/Makefile.depend b/bin/ed/Makefile.depend
index cdd96948933d..8d409f5263ac 100644
--- a/bin/ed/Makefile.depend
+++ b/bin/ed/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/bin/expr/Makefile.depend b/bin/expr/Makefile.depend
index d084433f911c..1648dc46a813 100644
--- a/bin/expr/Makefile.depend
+++ b/bin/expr/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/getfacl/Makefile.depend b/bin/getfacl/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/getfacl/Makefile.depend
+++ b/bin/getfacl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/hostname/Makefile.depend b/bin/hostname/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/hostname/Makefile.depend
+++ b/bin/hostname/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/kenv/Makefile.depend b/bin/kenv/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/kenv/Makefile.depend
+++ b/bin/kenv/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/kill/Makefile.depend b/bin/kill/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/kill/Makefile.depend
+++ b/bin/kill/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/ln/Makefile.depend b/bin/ln/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/ln/Makefile.depend
+++ b/bin/ln/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/ls/Makefile.depend b/bin/ls/Makefile.depend
index bcfa88f57adf..aaa4088eac17 100644
--- a/bin/ls/Makefile.depend
+++ b/bin/ls/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libutil \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/bin/mkdir/Makefile.depend b/bin/mkdir/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/mkdir/Makefile.depend
+++ b/bin/mkdir/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/mv/Makefile.depend b/bin/mv/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/mv/Makefile.depend
+++ b/bin/mv/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/pax/Makefile.depend b/bin/pax/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/pax/Makefile.depend
+++ b/bin/pax/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/pkill/Makefile.depend b/bin/pkill/Makefile.depend
index 6f5a5f79bf30..5003f3884a16 100644
--- a/bin/pkill/Makefile.depend
+++ b/bin/pkill/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libjail \
lib/libkvm \
diff --git a/bin/ps/Makefile.depend b/bin/ps/Makefile.depend
index eefffb37d491..4635b191213c 100644
--- a/bin/ps/Makefile.depend
+++ b/bin/ps/Makefile.depend
@@ -2,17 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libjail \
lib/libkvm \
- lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
lib/msun \
diff --git a/bin/pwait/Makefile.depend b/bin/pwait/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/pwait/Makefile.depend
+++ b/bin/pwait/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/pwd/Makefile.depend b/bin/pwd/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/pwd/Makefile.depend
+++ b/bin/pwd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/realpath/Makefile.depend b/bin/realpath/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/bin/realpath/Makefile.depend
+++ b/bin/realpath/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/bin/rm/Makefile.depend b/bin/rm/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/rm/Makefile.depend
+++ b/bin/rm/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/rmail/Makefile.depend b/bin/rmail/Makefile.depend
index e07330e48118..8aa382deb920 100644
--- a/bin/rmail/Makefile.depend
+++ b/bin/rmail/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/rmdir/Makefile.depend b/bin/rmdir/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/rmdir/Makefile.depend
+++ b/bin/rmdir/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/setfacl/Makefile.depend b/bin/setfacl/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/setfacl/Makefile.depend
+++ b/bin/setfacl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/sh/Makefile.depend b/bin/sh/Makefile.depend
index 0e0490b10835..a6c30ac3cc83 100644
--- a/bin/sh/Makefile.depend
+++ b/bin/sh/Makefile.depend
@@ -2,14 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
+ bin/sh.host \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libedit \
- lib/ncurses/ncursesw \
+ usr.bin/awk.host \
.include <dirdeps.mk>
diff --git a/bin/sleep/Makefile.depend b/bin/sleep/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/bin/sleep/Makefile.depend
+++ b/bin/sleep/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/bin/stty/Makefile.depend b/bin/stty/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/stty/Makefile.depend
+++ b/bin/stty/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/sync/Makefile.depend b/bin/sync/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/bin/sync/Makefile.depend
+++ b/bin/sync/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/bin/test/Makefile.depend b/bin/test/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/bin/test/Makefile.depend
+++ b/bin/test/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/bin/uuidgen/Makefile.depend b/bin/uuidgen/Makefile.depend
index cae7e645ef6a..8941ee6d8ae2 100644
--- a/bin/uuidgen/Makefile.depend
+++ b/bin/uuidgen/Makefile.depend
@@ -2,10 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
+ include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/cddl/lib/libavl/Makefile.depend b/cddl/lib/libavl/Makefile.depend
index 1c1a9bee1d67..0feb362c733b 100644
--- a/cddl/lib/libavl/Makefile.depend
+++ b/cddl/lib/libavl/Makefile.depend
@@ -2,7 +2,9 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ cddl/lib/libspl \
include \
+ include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
diff --git a/cddl/lib/libctf/Makefile.depend b/cddl/lib/libctf/Makefile.depend
index ec3b871042c4..01d86b615f97 100644
--- a/cddl/lib/libctf/Makefile.depend
+++ b/cddl/lib/libctf/Makefile.depend
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ cddl/lib/libspl \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/cddl/lib/libdtrace/Makefile.depend b/cddl/lib/libdtrace/Makefile.depend
index 68a8d3e9c520..4a5f5610ca67 100644
--- a/cddl/lib/libdtrace/Makefile.depend
+++ b/cddl/lib/libdtrace/Makefile.depend
@@ -2,8 +2,8 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ bin/sh.host \
cddl/lib/libctf \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -14,6 +14,7 @@ DIRDEPS = \
lib/libproc \
lib/librtld_db \
lib/libthr \
+ usr.bin/awk.host \
usr.bin/yacc.host \
diff --git a/cddl/lib/libicp/Makefile.depend b/cddl/lib/libicp/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cddl/lib/libicp/Makefile.depend
diff --git a/cddl/lib/libicp_rescue/Makefile.depend b/cddl/lib/libicp_rescue/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cddl/lib/libicp_rescue/Makefile.depend
diff --git a/cddl/lib/libnvpair/Makefile.depend b/cddl/lib/libnvpair/Makefile.depend
index 5f1a802404d8..0feb362c733b 100644
--- a/cddl/lib/libnvpair/Makefile.depend
+++ b/cddl/lib/libnvpair/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ cddl/lib/libspl \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/msun \
.include <dirdeps.mk>
diff --git a/cddl/lib/libspl/Makefile.depend b/cddl/lib/libspl/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cddl/lib/libspl/Makefile.depend
diff --git a/cddl/lib/libtpool/Makefile.depend b/cddl/lib/libtpool/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cddl/lib/libtpool/Makefile.depend
diff --git a/cddl/lib/libuutil/Makefile.depend b/cddl/lib/libuutil/Makefile.depend
index 8d409f5263ac..c217f64ad2a5 100644
--- a/cddl/lib/libuutil/Makefile.depend
+++ b/cddl/lib/libuutil/Makefile.depend
@@ -2,6 +2,8 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ cddl/lib/libavl \
+ cddl/lib/libspl \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/cddl/lib/libzfs/Makefile.depend b/cddl/lib/libzfs/Makefile.depend
index 54a7c43b42aa..633190c348d3 100644
--- a/cddl/lib/libzfs/Makefile.depend
+++ b/cddl/lib/libzfs/Makefile.depend
@@ -7,6 +7,7 @@ DIRDEPS = \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs_core \
+ cddl/lib/libzutil \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -19,6 +20,7 @@ DIRDEPS = \
lib/libutil \
lib/libz \
lib/msun \
+ secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/cddl/lib/libzfs_core/Makefile.depend b/cddl/lib/libzfs_core/Makefile.depend
index 26e3937b68fd..b1df1aa40e99 100644
--- a/cddl/lib/libzfs_core/Makefile.depend
+++ b/cddl/lib/libzfs_core/Makefile.depend
@@ -3,12 +3,13 @@
DIRDEPS = \
cddl/lib/libnvpair \
+ cddl/lib/libspl \
+ cddl/lib/libzutil \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/msun \
.include <dirdeps.mk>
diff --git a/cddl/lib/libzfsbootenv/Makefile.depend b/cddl/lib/libzfsbootenv/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cddl/lib/libzfsbootenv/Makefile.depend
diff --git a/cddl/lib/libzpool/Makefile.depend b/cddl/lib/libzpool/Makefile.depend
index 06045f57b437..8d4910b753c9 100644
--- a/cddl/lib/libzpool/Makefile.depend
+++ b/cddl/lib/libzpool/Makefile.depend
@@ -5,8 +5,8 @@ DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libicp \
cddl/lib/libnvpair \
+ cddl/lib/libspl \
cddl/lib/libumem \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -15,7 +15,6 @@ DIRDEPS = \
lib/libmd \
lib/libthr \
lib/libz \
- lib/msun \
.include <dirdeps.mk>
diff --git a/cddl/lib/libzutil/Makefile.depend b/cddl/lib/libzutil/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/cddl/lib/libzutil/Makefile.depend
diff --git a/cddl/sbin/zfs/Makefile.depend b/cddl/sbin/zfs/Makefile.depend
index b22dd60b0ef8..7f3b49fe3ebf 100644
--- a/cddl/sbin/zfs/Makefile.depend
+++ b/cddl/sbin/zfs/Makefile.depend
@@ -4,25 +4,22 @@
DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libnvpair \
- cddl/lib/libumem \
+ cddl/lib/libspl \
+ cddl/lib/libtpool \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
- gnu/lib/csu \
+ cddl/lib/libzutil \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
lib/libjail \
- lib/libmd \
- lib/libsbuf \
lib/libthr \
- lib/libutil \
- lib/libz \
lib/msun \
+ secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/cddl/sbin/zpool/Makefile.depend b/cddl/sbin/zpool/Makefile.depend
index 53090da6e2fc..5bb7b36c57c3 100644
--- a/cddl/sbin/zpool/Makefile.depend
+++ b/cddl/sbin/zpool/Makefile.depend
@@ -4,23 +4,19 @@
DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libnvpair \
- cddl/lib/libumem \
+ cddl/lib/libspl \
+ cddl/lib/libtpool \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
- gnu/lib/csu \
+ cddl/lib/libzutil \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libmd \
- lib/libsbuf \
lib/libthr \
- lib/libutil \
- lib/libz \
lib/msun \
diff --git a/cddl/usr.bin/ctfconvert/Makefile.depend b/cddl/usr.bin/ctfconvert/Makefile.depend
index eb40124b7c90..1d5b7ede25f2 100644
--- a/cddl/usr.bin/ctfconvert/Makefile.depend
+++ b/cddl/usr.bin/ctfconvert/Makefile.depend
@@ -2,10 +2,9 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
+ cddl/lib/libspl \
include \
include/xlocale \
- cddl/lib/libspl \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
diff --git a/cddl/usr.bin/ctfdump/Makefile.depend b/cddl/usr.bin/ctfdump/Makefile.depend
index ceebc6a83a34..ec3b871042c4 100644
--- a/cddl/usr.bin/ctfdump/Makefile.depend
+++ b/cddl/usr.bin/ctfdump/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/cddl/usr.bin/ctfmerge/Makefile.depend b/cddl/usr.bin/ctfmerge/Makefile.depend
index 32a1985bd180..9336ff032f87 100644
--- a/cddl/usr.bin/ctfmerge/Makefile.depend
+++ b/cddl/usr.bin/ctfmerge/Makefile.depend
@@ -2,7 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
+ cddl/lib/libspl \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/cddl/usr.bin/zinject/Makefile.depend b/cddl/usr.bin/zinject/Makefile.depend
index dfb2563fa7d1..113e2f1abdb3 100644
--- a/cddl/usr.bin/zinject/Makefile.depend
+++ b/cddl/usr.bin/zinject/Makefile.depend
@@ -4,24 +4,19 @@
DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libnvpair \
+ cddl/lib/libspl \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzpool \
- gnu/lib/csu \
+ cddl/lib/libzutil \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libmd \
- lib/libsbuf \
- lib/libthr \
- lib/libutil \
- lib/libz \
lib/msun \
diff --git a/cddl/usr.bin/ztest/Makefile.depend b/cddl/usr.bin/ztest/Makefile.depend
index dfb2563fa7d1..339e692486c5 100644
--- a/cddl/usr.bin/ztest/Makefile.depend
+++ b/cddl/usr.bin/ztest/Makefile.depend
@@ -3,25 +3,22 @@
DIRDEPS = \
cddl/lib/libavl \
+ cddl/lib/libicp \
cddl/lib/libnvpair \
+ cddl/lib/libspl \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzpool \
- gnu/lib/csu \
+ cddl/lib/libzutil \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libmd \
- lib/libsbuf \
lib/libthr \
- lib/libutil \
- lib/libz \
lib/msun \
diff --git a/cddl/usr.sbin/dtrace/Makefile.depend b/cddl/usr.sbin/dtrace/Makefile.depend
index c37ef4acf01e..6c22581ec6d6 100644
--- a/cddl/usr.sbin/dtrace/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/Makefile.depend
@@ -4,21 +4,15 @@
DIRDEPS = \
cddl/lib/libctf \
cddl/lib/libdtrace \
- gnu/lib/csu \
+ cddl/lib/libspl \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcxxrt \
lib/libelf \
- lib/libkvm \
lib/libproc \
- lib/libprocstat \
lib/librtld_db \
- lib/libthr \
- lib/libutil \
- lib/libz \
.include <dirdeps.mk>
diff --git a/cddl/usr.sbin/lockstat/Makefile.depend b/cddl/usr.sbin/lockstat/Makefile.depend
index 04b96e83f1c7..f00356c66cfb 100644
--- a/cddl/usr.sbin/lockstat/Makefile.depend
+++ b/cddl/usr.sbin/lockstat/Makefile.depend
@@ -2,24 +2,16 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- cddl/lib/libctf \
cddl/lib/libdtrace \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcxxrt \
lib/libelf \
- lib/libkvm \
lib/libproc \
- lib/libprocstat \
lib/librt \
lib/librtld_db \
- lib/libthr \
- lib/libutil \
- lib/libz \
.include <dirdeps.mk>
diff --git a/cddl/usr.sbin/plockstat/Makefile.depend b/cddl/usr.sbin/plockstat/Makefile.depend
index c37ef4acf01e..d9f7b622d970 100644
--- a/cddl/usr.sbin/plockstat/Makefile.depend
+++ b/cddl/usr.sbin/plockstat/Makefile.depend
@@ -2,23 +2,15 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- cddl/lib/libctf \
cddl/lib/libdtrace \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcxxrt \
lib/libelf \
- lib/libkvm \
lib/libproc \
- lib/libprocstat \
lib/librtld_db \
- lib/libthr \
- lib/libutil \
- lib/libz \
.include <dirdeps.mk>
diff --git a/cddl/usr.sbin/zdb/Makefile.depend b/cddl/usr.sbin/zdb/Makefile.depend
index dfb2563fa7d1..5a5b713cabf1 100644
--- a/cddl/usr.sbin/zdb/Makefile.depend
+++ b/cddl/usr.sbin/zdb/Makefile.depend
@@ -4,25 +4,18 @@
DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libnvpair \
+ cddl/lib/libspl \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs \
- cddl/lib/libzfs_core \
cddl/lib/libzpool \
- gnu/lib/csu \
+ cddl/lib/libzutil \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
- lib/libgeom \
- lib/libmd \
- lib/libsbuf \
- lib/libthr \
- lib/libutil \
- lib/libz \
- lib/msun \
+ secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/cddl/usr.sbin/zfsd/Makefile.depend b/cddl/usr.sbin/zfsd/Makefile.depend
index 023a4456ec68..ad796b78a955 100644
--- a/cddl/usr.sbin/zfsd/Makefile.depend
+++ b/cddl/usr.sbin/zfsd/Makefile.depend
@@ -4,11 +4,9 @@
DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libnvpair \
- cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs \
- cddl/lib/libzfs_core \
- gnu/lib/csu \
+ cddl/lib/libzutil \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -19,11 +17,8 @@ DIRDEPS = \
lib/libdevdctl \
lib/libexpat \
lib/libgeom \
- lib/libmd \
lib/libsbuf \
- lib/libthr \
lib/libutil \
- lib/libz \
lib/msun \
diff --git a/cddl/usr.sbin/zhack/Makefile.depend b/cddl/usr.sbin/zhack/Makefile.depend
index dfb2563fa7d1..c62053ddfaed 100644
--- a/cddl/usr.sbin/zhack/Makefile.depend
+++ b/cddl/usr.sbin/zhack/Makefile.depend
@@ -2,27 +2,16 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- cddl/lib/libavl \
cddl/lib/libnvpair \
- cddl/lib/libumem \
- cddl/lib/libuutil \
+ cddl/lib/libspl \
cddl/lib/libzfs \
- cddl/lib/libzfs_core \
cddl/lib/libzpool \
- gnu/lib/csu \
+ cddl/lib/libzutil \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
- lib/libgeom \
- lib/libmd \
- lib/libsbuf \
- lib/libthr \
- lib/libutil \
- lib/libz \
- lib/msun \
.include <dirdeps.mk>
diff --git a/gnu/lib/libdialog/Makefile.depend b/gnu/lib/libdialog/Makefile.depend
index 39c1cfe86213..134de25a5728 100644
--- a/gnu/lib/libdialog/Makefile.depend
+++ b/gnu/lib/libdialog/Makefile.depend
@@ -8,7 +8,8 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/msun \
- lib/ncurses/ncursesw \
+ lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/gnu/usr.bin/dialog/Makefile.depend b/gnu/usr.bin/dialog/Makefile.depend
index 87a30b89d0f0..db17003a8c44 100644
--- a/gnu/usr.bin/dialog/Makefile.depend
+++ b/gnu/usr.bin/dialog/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
gnu/lib/libdialog \
include \
include/xlocale \
@@ -10,7 +9,8 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/msun \
- lib/ncurses/ncursesw \
+ lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/gnu/usr.bin/diff3/Makefile.depend b/gnu/usr.bin/diff3/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/gnu/usr.bin/diff3/Makefile.depend
+++ b/gnu/usr.bin/diff3/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/include/Makefile.depend b/include/Makefile.depend
index d7cfba0e4f6e..adab05ddf6e1 100644
--- a/include/Makefile.depend
+++ b/include/Makefile.depend
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ bin/sh.host \
usr.bin/xinstall.host \
diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile.depend b/kerberos5/lib/libgssapi_ntlm/Makefile.depend
index b860dd2f7b73..766ae850941b 100644
--- a/kerberos5/lib/libgssapi_ntlm/Makefile.depend
+++ b/kerberos5/lib/libgssapi_ntlm/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/kerberos5/lib/libgssapi_spnego/Makefile.depend b/kerberos5/lib/libgssapi_spnego/Makefile.depend
index ec85bb9e1e38..b3a4c9673868 100644
--- a/kerberos5/lib/libgssapi_spnego/Makefile.depend
+++ b/kerberos5/lib/libgssapi_spnego/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/kerberos5/lib/libheimipcs/Makefile.depend b/kerberos5/lib/libheimipcs/Makefile.depend
index 248469a4ba59..efd206a444b3 100644
--- a/kerberos5/lib/libheimipcs/Makefile.depend
+++ b/kerberos5/lib/libheimipcs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/kerberos5/lib/libkadm5srv/Makefile.depend b/kerberos5/lib/libkadm5srv/Makefile.depend
index 3a500695511e..0049fff39436 100644
--- a/kerberos5/lib/libkadm5srv/Makefile.depend
+++ b/kerberos5/lib/libkadm5srv/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/kerberos5/libexec/digest-service/Makefile.depend b/kerberos5/libexec/digest-service/Makefile.depend
index 791f5db44fe4..c97d37f0d177 100644
--- a/kerberos5/libexec/digest-service/Makefile.depend
+++ b/kerberos5/libexec/digest-service/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libheimipcs \
kerberos5/lib/libheimntlm \
kerberos5/lib/libhx509 \
@@ -20,11 +18,7 @@ DIRDEPS = \
kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libsqlite3 \
- lib/libthr \
lib/libutil \
secure/lib/libcrypto \
diff --git a/kerberos5/libexec/hprop/Makefile.depend b/kerberos5/libexec/hprop/Makefile.depend
index 10fc46724ede..afa8e5d0f382 100644
--- a/kerberos5/libexec/hprop/Makefile.depend
+++ b/kerberos5/libexec/hprop/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libheimntlm \
kerberos5/lib/libhx509 \
kerberos5/lib/libkadm5clnt \
@@ -19,11 +17,7 @@ DIRDEPS = \
kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libsqlite3 \
- lib/libthr \
lib/libutil \
secure/lib/libcrypto \
diff --git a/kerberos5/libexec/hpropd/Makefile.depend b/kerberos5/libexec/hpropd/Makefile.depend
index 96378f6083d8..00d3bc063c1e 100644
--- a/kerberos5/libexec/hpropd/Makefile.depend
+++ b/kerberos5/libexec/hpropd/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libheimntlm \
kerberos5/lib/libhx509 \
kerberos5/lib/libkrb5 \
@@ -18,11 +16,7 @@ DIRDEPS = \
kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libsqlite3 \
- lib/libthr \
lib/libutil \
secure/lib/libcrypto \
diff --git a/kerberos5/libexec/ipropd-master/Makefile.depend b/kerberos5/libexec/ipropd-master/Makefile.depend
index 20251e94ba97..e746221de273 100644
--- a/kerberos5/libexec/ipropd-master/Makefile.depend
+++ b/kerberos5/libexec/ipropd-master/Makefile.depend
@@ -2,28 +2,18 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkadm5srv \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libsqlite3 \
- lib/libthr \
- secure/lib/libcrypto \
usr.bin/compile_et.host \
diff --git a/kerberos5/libexec/ipropd-slave/Makefile.depend b/kerberos5/libexec/ipropd-slave/Makefile.depend
index 20251e94ba97..e746221de273 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile.depend
+++ b/kerberos5/libexec/ipropd-slave/Makefile.depend
@@ -2,28 +2,18 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkadm5srv \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libsqlite3 \
- lib/libthr \
- secure/lib/libcrypto \
usr.bin/compile_et.host \
diff --git a/kerberos5/libexec/kadmind/Makefile.depend b/kerberos5/libexec/kadmind/Makefile.depend
index 67d2d5518d4a..6412e82a0842 100644
--- a/kerberos5/libexec/kadmind/Makefile.depend
+++ b/kerberos5/libexec/kadmind/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/gssapi \
@@ -10,7 +9,6 @@ DIRDEPS = \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libhx509 \
kerberos5/lib/libkadm5clnt \
kerberos5/lib/libkadm5srv \
@@ -20,12 +18,8 @@ DIRDEPS = \
kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
lib/libgssapi \
- lib/libsqlite3 \
- lib/libthr \
lib/libutil \
secure/lib/libcrypto \
diff --git a/kerberos5/libexec/kcm/Makefile.depend b/kerberos5/libexec/kcm/Makefile.depend
index 7f7343269e7f..7d312944e9e3 100644
--- a/kerberos5/libexec/kcm/Makefile.depend
+++ b/kerberos5/libexec/kcm/Makefile.depend
@@ -2,26 +2,18 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libheimipcs \
kerberos5/lib/libheimntlm \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libthr \
lib/libutil \
secure/lib/libcrypto \
diff --git a/kerberos5/libexec/kdc/Makefile.depend b/kerberos5/libexec/kdc/Makefile.depend
index 6a08c2b63ee8..08f05c233e11 100644
--- a/kerberos5/libexec/kdc/Makefile.depend
+++ b/kerberos5/libexec/kdc/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libheimntlm \
kerberos5/lib/libhx509 \
kerberos5/lib/libkdc \
@@ -19,11 +17,8 @@ DIRDEPS = \
kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
lib/libcrypt \
- lib/libsqlite3 \
- lib/libthr \
lib/libutil \
secure/lib/libcrypto \
diff --git a/kerberos5/libexec/kdigest/Makefile.depend b/kerberos5/libexec/kdigest/Makefile.depend
index e71b2214c1a8..79dac2066fd3 100644
--- a/kerberos5/libexec/kdigest/Makefile.depend
+++ b/kerberos5/libexec/kdigest/Makefile.depend
@@ -2,30 +2,21 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libheimntlm \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkafs5 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libsl \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
lib/libedit \
- lib/libthr \
- lib/ncurses/ncursesw \
secure/lib/libcrypto \
diff --git a/kerberos5/libexec/kfd/Makefile.depend b/kerberos5/libexec/kfd/Makefile.depend
index b7626cdd7360..7b0f56964836 100644
--- a/kerberos5/libexec/kfd/Makefile.depend
+++ b/kerberos5/libexec/kfd/Makefile.depend
@@ -2,25 +2,16 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libthr \
- secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/kerberos5/libexec/kimpersonate/Makefile.depend b/kerberos5/libexec/kimpersonate/Makefile.depend
index a8187f718255..7865d4350af8 100644
--- a/kerberos5/libexec/kimpersonate/Makefile.depend
+++ b/kerberos5/libexec/kimpersonate/Makefile.depend
@@ -2,25 +2,17 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkafs5 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libthr \
secure/lib/libcrypto \
diff --git a/kerberos5/libexec/kpasswdd/Makefile.depend b/kerberos5/libexec/kpasswdd/Makefile.depend
index 8178becab2f3..4a1a37c16115 100644
--- a/kerberos5/libexec/kpasswdd/Makefile.depend
+++ b/kerberos5/libexec/kpasswdd/Makefile.depend
@@ -2,28 +2,19 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkadm5clnt \
kerberos5/lib/libkadm5srv \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libsqlite3 \
- lib/libthr \
lib/libutil \
secure/lib/libcrypto \
diff --git a/kerberos5/tools/asn1_compile/Makefile.depend b/kerberos5/tools/asn1_compile/Makefile.depend
index 7f8f93b61067..65d46280aaf9 100644
--- a/kerberos5/tools/asn1_compile/Makefile.depend
+++ b/kerberos5/tools/asn1_compile/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/kerberos5/tools/make-roken/Makefile.depend b/kerberos5/tools/make-roken/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/kerberos5/tools/make-roken/Makefile.depend
+++ b/kerberos5/tools/make-roken/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/kerberos5/tools/slc/Makefile.depend b/kerberos5/tools/slc/Makefile.depend
index 7f8f93b61067..65d46280aaf9 100644
--- a/kerberos5/tools/slc/Makefile.depend
+++ b/kerberos5/tools/slc/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/kerberos5/usr.bin/hxtool/Makefile.depend b/kerberos5/usr.bin/hxtool/Makefile.depend
index 637ecdc71538..808ca2abe122 100644
--- a/kerberos5/usr.bin/hxtool/Makefile.depend
+++ b/kerberos5/usr.bin/hxtool/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -11,15 +10,11 @@ DIRDEPS = \
kerberos5/lib/libroken \
kerberos5/lib/libsl \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
lib/libedit \
- lib/ncurses/ncursesw \
secure/lib/libcrypto \
diff --git a/kerberos5/usr.bin/kadmin/Makefile.depend b/kerberos5/usr.bin/kadmin/Makefile.depend
index fca25156e4c7..34a312d66c9e 100644
--- a/kerberos5/usr.bin/kadmin/Makefile.depend
+++ b/kerberos5/usr.bin/kadmin/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libhx509 \
kerberos5/lib/libkadm5clnt \
kerberos5/lib/libkadm5srv \
@@ -21,14 +19,9 @@ DIRDEPS = \
kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
lib/libedit \
- lib/libsqlite3 \
- lib/libthr \
lib/libutil \
- lib/ncurses/ncursesw \
secure/lib/libcrypto \
diff --git a/kerberos5/usr.bin/kcc/Makefile.depend b/kerberos5/usr.bin/kcc/Makefile.depend
index 3c69ae3e4423..89d327e0023b 100644
--- a/kerberos5/usr.bin/kcc/Makefile.depend
+++ b/kerberos5/usr.bin/kcc/Makefile.depend
@@ -2,29 +2,20 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkafs5 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libsl \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
lib/libedit \
- lib/libthr \
- lib/ncurses/ncursesw \
secure/lib/libcrypto \
diff --git a/kerberos5/usr.bin/kdestroy/Makefile.depend b/kerberos5/usr.bin/kdestroy/Makefile.depend
index a8187f718255..7865d4350af8 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile.depend
+++ b/kerberos5/usr.bin/kdestroy/Makefile.depend
@@ -2,25 +2,17 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkafs5 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libthr \
secure/lib/libcrypto \
diff --git a/kerberos5/usr.bin/kf/Makefile.depend b/kerberos5/usr.bin/kf/Makefile.depend
index b7626cdd7360..7b0f56964836 100644
--- a/kerberos5/usr.bin/kf/Makefile.depend
+++ b/kerberos5/usr.bin/kf/Makefile.depend
@@ -2,25 +2,16 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libthr \
- secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/kerberos5/usr.bin/kgetcred/Makefile.depend b/kerberos5/usr.bin/kgetcred/Makefile.depend
index a8187f718255..7865d4350af8 100644
--- a/kerberos5/usr.bin/kgetcred/Makefile.depend
+++ b/kerberos5/usr.bin/kgetcred/Makefile.depend
@@ -2,25 +2,17 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkafs5 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libthr \
secure/lib/libcrypto \
diff --git a/kerberos5/usr.bin/kinit/Makefile.depend b/kerberos5/usr.bin/kinit/Makefile.depend
index 951e30014510..2dbdacbb1ab2 100644
--- a/kerberos5/usr.bin/kinit/Makefile.depend
+++ b/kerberos5/usr.bin/kinit/Makefile.depend
@@ -2,26 +2,18 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libheimntlm \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkafs5 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libthr \
secure/lib/libcrypto \
diff --git a/kerberos5/usr.bin/kpasswd/Makefile.depend b/kerberos5/usr.bin/kpasswd/Makefile.depend
index 5c48dc0bead0..2e068e6bdfdd 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile.depend
+++ b/kerberos5/usr.bin/kpasswd/Makefile.depend
@@ -2,26 +2,17 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libsqlite3 \
- lib/libthr \
lib/libutil \
secure/lib/libcrypto \
diff --git a/kerberos5/usr.bin/ksu/Makefile.depend b/kerberos5/usr.bin/ksu/Makefile.depend
index a8187f718255..63122143de99 100644
--- a/kerberos5/usr.bin/ksu/Makefile.depend
+++ b/kerberos5/usr.bin/ksu/Makefile.depend
@@ -2,25 +2,18 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkafs5 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
lib/libcrypt \
- lib/libthr \
secure/lib/libcrypto \
diff --git a/kerberos5/usr.bin/string2key/Makefile.depend b/kerberos5/usr.bin/string2key/Makefile.depend
index b0b8237d6091..00d3bc063c1e 100644
--- a/kerberos5/usr.bin/string2key/Makefile.depend
+++ b/kerberos5/usr.bin/string2key/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libheimntlm \
kerberos5/lib/libhx509 \
kerberos5/lib/libkrb5 \
@@ -18,10 +16,7 @@ DIRDEPS = \
kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libthr \
lib/libutil \
secure/lib/libcrypto \
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend b/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
index b7626cdd7360..7b0d3624e3ad 100644
--- a/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libhx509 \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
@@ -16,10 +14,7 @@ DIRDEPS = \
kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libthr \
secure/lib/libcrypto \
diff --git a/kerberos5/usr.sbin/iprop-log/Makefile.depend b/kerberos5/usr.sbin/iprop-log/Makefile.depend
index d94b32b91ee0..1434eb923835 100644
--- a/kerberos5/usr.sbin/iprop-log/Makefile.depend
+++ b/kerberos5/usr.sbin/iprop-log/Makefile.depend
@@ -2,32 +2,21 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkadm5srv \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libsl \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
lib/libedit \
- lib/libsqlite3 \
- lib/libthr \
- lib/ncurses/ncursesw \
- secure/lib/libcrypto \
usr.bin/compile_et.host \
diff --git a/kerberos5/usr.sbin/kstash/Makefile.depend b/kerberos5/usr.sbin/kstash/Makefile.depend
index 96378f6083d8..00d3bc063c1e 100644
--- a/kerberos5/usr.sbin/kstash/Makefile.depend
+++ b/kerberos5/usr.sbin/kstash/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libhdb \
kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
kerberos5/lib/libheimntlm \
kerberos5/lib/libhx509 \
kerberos5/lib/libkrb5 \
@@ -18,11 +16,7 @@ DIRDEPS = \
kerberos5/lib/libwind \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libsqlite3 \
- lib/libthr \
lib/libutil \
secure/lib/libcrypto \
diff --git a/kerberos5/usr.sbin/ktutil/Makefile.depend b/kerberos5/usr.sbin/ktutil/Makefile.depend
index 3529856e8ce2..f0934b4c5dfb 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile.depend
+++ b/kerberos5/usr.sbin/ktutil/Makefile.depend
@@ -2,29 +2,20 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
kerberos5/lib/libasn1 \
- kerberos5/lib/libheimbase \
- kerberos5/lib/libheimipcc \
- kerberos5/lib/libhx509 \
kerberos5/lib/libkadm5clnt \
kerberos5/lib/libkrb5 \
kerberos5/lib/libroken \
kerberos5/lib/libsl \
kerberos5/lib/libvers \
- kerberos5/lib/libwind \
kerberos5/tools/slc.host \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
lib/libedit \
- lib/libthr \
- lib/ncurses/ncursesw \
secure/lib/libcrypto \
diff --git a/lib/atf/libatf-c++/Makefile.depend b/lib/atf/libatf-c++/Makefile.depend
index b0b52c8a3f36..48fb8c6fecfc 100644
--- a/lib/atf/libatf-c++/Makefile.depend
+++ b/lib/atf/libatf-c++/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/geom/cache/Makefile.depend b/lib/geom/cache/Makefile.depend
index fb5f86e931fb..bbea616cfc48 100644
--- a/lib/geom/cache/Makefile.depend
+++ b/lib/geom/cache/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libgeom \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/concat/Makefile.depend b/lib/geom/concat/Makefile.depend
index fb5f86e931fb..bbea616cfc48 100644
--- a/lib/geom/concat/Makefile.depend
+++ b/lib/geom/concat/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libgeom \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/eli/Makefile.depend b/lib/geom/eli/Makefile.depend
index 3378fcd11dbc..38ae4d80af2a 100644
--- a/lib/geom/eli/Makefile.depend
+++ b/lib/geom/eli/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libgeom \
lib/libmd \
- sbin/geom/core \
secure/lib/libcrypto \
diff --git a/lib/geom/journal/Makefile.depend b/lib/geom/journal/Makefile.depend
index 7c411851c451..244792ff9380 100644
--- a/lib/geom/journal/Makefile.depend
+++ b/lib/geom/journal/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -11,7 +10,6 @@ DIRDEPS = \
lib/libgeom \
lib/libmd \
lib/libufs \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/label/Makefile.depend b/lib/geom/label/Makefile.depend
index fb5f86e931fb..bbea616cfc48 100644
--- a/lib/geom/label/Makefile.depend
+++ b/lib/geom/label/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libgeom \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/mirror/Makefile.depend b/lib/geom/mirror/Makefile.depend
index 7902e1927044..01dd08c8bad3 100644
--- a/lib/geom/mirror/Makefile.depend
+++ b/lib/geom/mirror/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libgeom \
lib/libmd \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/mountver/Makefile.depend b/lib/geom/mountver/Makefile.depend
index fb5f86e931fb..bbea616cfc48 100644
--- a/lib/geom/mountver/Makefile.depend
+++ b/lib/geom/mountver/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libgeom \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/multipath/Makefile.depend b/lib/geom/multipath/Makefile.depend
index fb5f86e931fb..bbea616cfc48 100644
--- a/lib/geom/multipath/Makefile.depend
+++ b/lib/geom/multipath/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libgeom \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/nop/Makefile.depend b/lib/geom/nop/Makefile.depend
index fb5f86e931fb..bbea616cfc48 100644
--- a/lib/geom/nop/Makefile.depend
+++ b/lib/geom/nop/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libgeom \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/part/Makefile.depend b/lib/geom/part/Makefile.depend
index 29b9a504acf9..e94c737e4378 100644
--- a/lib/geom/part/Makefile.depend
+++ b/lib/geom/part/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libgeom \
lib/libutil \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/raid/Makefile.depend b/lib/geom/raid/Makefile.depend
index 7902e1927044..01dd08c8bad3 100644
--- a/lib/geom/raid/Makefile.depend
+++ b/lib/geom/raid/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libgeom \
lib/libmd \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/raid3/Makefile.depend b/lib/geom/raid3/Makefile.depend
index 7902e1927044..01dd08c8bad3 100644
--- a/lib/geom/raid3/Makefile.depend
+++ b/lib/geom/raid3/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libgeom \
lib/libmd \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/shsec/Makefile.depend b/lib/geom/shsec/Makefile.depend
index fb5f86e931fb..bbea616cfc48 100644
--- a/lib/geom/shsec/Makefile.depend
+++ b/lib/geom/shsec/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libgeom \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/stripe/Makefile.depend b/lib/geom/stripe/Makefile.depend
index fb5f86e931fb..bbea616cfc48 100644
--- a/lib/geom/stripe/Makefile.depend
+++ b/lib/geom/stripe/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libgeom \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/geom/virstor/Makefile.depend b/lib/geom/virstor/Makefile.depend
index fb5f86e931fb..bbea616cfc48 100644
--- a/lib/geom/virstor/Makefile.depend
+++ b/lib/geom/virstor/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libgeom \
- sbin/geom/core \
.include <dirdeps.mk>
diff --git a/lib/lib9p/Makefile.depend b/lib/lib9p/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/lib9p/Makefile.depend
diff --git a/lib/libalias/modules/dummy/Makefile.depend b/lib/libalias/modules/dummy/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libalias/modules/dummy/Makefile.depend
+++ b/lib/libalias/modules/dummy/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libalias/modules/ftp/Makefile.depend b/lib/libalias/modules/ftp/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libalias/modules/ftp/Makefile.depend
+++ b/lib/libalias/modules/ftp/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libalias/modules/irc/Makefile.depend b/lib/libalias/modules/irc/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libalias/modules/irc/Makefile.depend
+++ b/lib/libalias/modules/irc/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libalias/modules/nbt/Makefile.depend b/lib/libalias/modules/nbt/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libalias/modules/nbt/Makefile.depend
+++ b/lib/libalias/modules/nbt/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libalias/modules/pptp/Makefile.depend b/lib/libalias/modules/pptp/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libalias/modules/pptp/Makefile.depend
+++ b/lib/libalias/modules/pptp/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libalias/modules/skinny/Makefile.depend b/lib/libalias/modules/skinny/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libalias/modules/skinny/Makefile.depend
+++ b/lib/libalias/modules/skinny/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libalias/modules/smedia/Makefile.depend b/lib/libalias/modules/smedia/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libalias/modules/smedia/Makefile.depend
+++ b/lib/libalias/modules/smedia/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libauditd/Makefile.depend b/lib/libauditd/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libauditd/Makefile.depend
+++ b/lib/libauditd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libbe/Makefile.depend b/lib/libbe/Makefile.depend
index dba0e55ed69d..16203a75505f 100644
--- a/lib/libbe/Makefile.depend
+++ b/lib/libbe/Makefile.depend
@@ -3,14 +3,14 @@
DIRDEPS = \
cddl/lib/libnvpair \
+ cddl/lib/libspl \
cddl/lib/libzfs \
- cddl/lib/libzfs_core \
+ cddl/lib/libzfsbootenv \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/msun \
.include <dirdeps.mk>
diff --git a/lib/libbsddialog/Makefile.depend b/lib/libbsddialog/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libbsddialog/Makefile.depend
diff --git a/lib/libcasper/services/Makefile.depend b/lib/libcasper/services/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libcasper/services/Makefile.depend
diff --git a/lib/libcasper/services/cap_dns/tests/Makefile.depend b/lib/libcasper/services/cap_dns/tests/Makefile.depend
index ab0b691a1299..f80275d86ab1 100644
--- a/lib/libcasper/services/cap_dns/tests/Makefile.depend
+++ b/lib/libcasper/services/cap_dns/tests/Makefile.depend
@@ -2,16 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
- include \
- include/arpa \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcasper/libcasper \
- lib/libcasper/services/cap_dns \
- lib/libcompiler_rt \
- lib/libnv \
.include <dirdeps.mk>
diff --git a/lib/libcasper/services/cap_grp/tests/Makefile.depend b/lib/libcasper/services/cap_grp/tests/Makefile.depend
index 92889dfb4269..f80275d86ab1 100644
--- a/lib/libcasper/services/cap_grp/tests/Makefile.depend
+++ b/lib/libcasper/services/cap_grp/tests/Makefile.depend
@@ -2,15 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcasper/libcasper \
- lib/libcasper/services/cap_grp \
- lib/libcompiler_rt \
- lib/libnv \
.include <dirdeps.mk>
diff --git a/lib/libcasper/services/cap_net/Makefile.depend b/lib/libcasper/services/cap_net/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libcasper/services/cap_net/Makefile.depend
diff --git a/lib/libcasper/services/cap_netdb/Makefile.depend b/lib/libcasper/services/cap_netdb/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libcasper/services/cap_netdb/Makefile.depend
diff --git a/lib/libcasper/services/cap_pwd/tests/Makefile.depend b/lib/libcasper/services/cap_pwd/tests/Makefile.depend
index d7db2fe99621..f80275d86ab1 100644
--- a/lib/libcasper/services/cap_pwd/tests/Makefile.depend
+++ b/lib/libcasper/services/cap_pwd/tests/Makefile.depend
@@ -2,15 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcasper/libcasper \
- lib/libcasper/services/cap_pwd \
- lib/libcompiler_rt \
- lib/libnv \
.include <dirdeps.mk>
diff --git a/lib/libcasper/services/cap_sysctl/tests/Makefile.depend b/lib/libcasper/services/cap_sysctl/tests/Makefile.depend
index 81ebff999213..f80275d86ab1 100644
--- a/lib/libcasper/services/cap_sysctl/tests/Makefile.depend
+++ b/lib/libcasper/services/cap_sysctl/tests/Makefile.depend
@@ -2,15 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcasper/libcasper \
- lib/libcasper/services/cap_sysctl \
- lib/libcompiler_rt \
- lib/libnv \
.include <dirdeps.mk>
diff --git a/lib/libdl/Makefile.depend b/lib/libdl/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libdl/Makefile.depend
+++ b/lib/libdl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libdpv/Makefile.depend b/lib/libdpv/Makefile.depend
index d6bb4b3b65b9..a387db5761cc 100644
--- a/lib/libdpv/Makefile.depend
+++ b/lib/libdpv/Makefile.depend
@@ -11,7 +11,8 @@ DIRDEPS = \
lib/libfigpar \
lib/libutil \
lib/msun \
- lib/ncurses/ncursesw \
+ lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/lib/libdwarf/Makefile.depend b/lib/libdwarf/Makefile.depend
index 8039bc4a961c..ec3b871042c4 100644
--- a/lib/libdwarf/Makefile.depend
+++ b/lib/libdwarf/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libelf \
+ lib/libz \
.include <dirdeps.mk>
diff --git a/lib/libedit/Makefile.depend b/lib/libedit/Makefile.depend
index 3d9451023bec..ddb8d5a21ca9 100644
--- a/lib/libedit/Makefile.depend
+++ b/lib/libedit/Makefile.depend
@@ -7,7 +7,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/lib/libexpat/Makefile.depend b/lib/libexpat/Makefile.depend
index 8d409f5263ac..5f1a802404d8 100644
--- a/lib/libexpat/Makefile.depend
+++ b/lib/libexpat/Makefile.depend
@@ -7,6 +7,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/msun \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/BIG5/Makefile.depend b/lib/libiconv_modules/BIG5/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/BIG5/Makefile.depend
+++ b/lib/libiconv_modules/BIG5/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/DECHanyu/Makefile.depend b/lib/libiconv_modules/DECHanyu/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/DECHanyu/Makefile.depend
+++ b/lib/libiconv_modules/DECHanyu/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/EUC/Makefile.depend b/lib/libiconv_modules/EUC/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/EUC/Makefile.depend
+++ b/lib/libiconv_modules/EUC/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/EUCTW/Makefile.depend b/lib/libiconv_modules/EUCTW/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/EUCTW/Makefile.depend
+++ b/lib/libiconv_modules/EUCTW/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/GBK2K/Makefile.depend b/lib/libiconv_modules/GBK2K/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/GBK2K/Makefile.depend
+++ b/lib/libiconv_modules/GBK2K/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/HZ/Makefile.depend b/lib/libiconv_modules/HZ/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/HZ/Makefile.depend
+++ b/lib/libiconv_modules/HZ/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/ISO2022/Makefile.depend b/lib/libiconv_modules/ISO2022/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/ISO2022/Makefile.depend
+++ b/lib/libiconv_modules/ISO2022/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/JOHAB/Makefile.depend b/lib/libiconv_modules/JOHAB/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/JOHAB/Makefile.depend
+++ b/lib/libiconv_modules/JOHAB/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/MSKanji/Makefile.depend b/lib/libiconv_modules/MSKanji/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/MSKanji/Makefile.depend
+++ b/lib/libiconv_modules/MSKanji/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/UES/Makefile.depend b/lib/libiconv_modules/UES/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/UES/Makefile.depend
+++ b/lib/libiconv_modules/UES/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/UTF1632/Makefile.depend b/lib/libiconv_modules/UTF1632/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/UTF1632/Makefile.depend
+++ b/lib/libiconv_modules/UTF1632/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/UTF7/Makefile.depend b/lib/libiconv_modules/UTF7/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/UTF7/Makefile.depend
+++ b/lib/libiconv_modules/UTF7/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/UTF8/Makefile.depend b/lib/libiconv_modules/UTF8/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/UTF8/Makefile.depend
+++ b/lib/libiconv_modules/UTF8/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/VIQR/Makefile.depend b/lib/libiconv_modules/VIQR/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/VIQR/Makefile.depend
+++ b/lib/libiconv_modules/VIQR/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/ZW/Makefile.depend b/lib/libiconv_modules/ZW/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/ZW/Makefile.depend
+++ b/lib/libiconv_modules/ZW/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/iconv_none/Makefile.depend b/lib/libiconv_modules/iconv_none/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/iconv_none/Makefile.depend
+++ b/lib/libiconv_modules/iconv_none/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/iconv_std/Makefile.depend b/lib/libiconv_modules/iconv_std/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/iconv_std/Makefile.depend
+++ b/lib/libiconv_modules/iconv_std/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/mapper_646/Makefile.depend b/lib/libiconv_modules/mapper_646/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/mapper_646/Makefile.depend
+++ b/lib/libiconv_modules/mapper_646/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/mapper_none/Makefile.depend b/lib/libiconv_modules/mapper_none/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/mapper_none/Makefile.depend
+++ b/lib/libiconv_modules/mapper_none/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/mapper_parallel/Makefile.depend b/lib/libiconv_modules/mapper_parallel/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/mapper_parallel/Makefile.depend
+++ b/lib/libiconv_modules/mapper_parallel/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/mapper_serial/Makefile.depend b/lib/libiconv_modules/mapper_serial/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/mapper_serial/Makefile.depend
+++ b/lib/libiconv_modules/mapper_serial/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/mapper_std/Makefile.depend b/lib/libiconv_modules/mapper_std/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/mapper_std/Makefile.depend
+++ b/lib/libiconv_modules/mapper_std/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libiconv_modules/mapper_zone/Makefile.depend b/lib/libiconv_modules/mapper_zone/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libiconv_modules/mapper_zone/Makefile.depend
+++ b/lib/libiconv_modules/mapper_zone/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libifconfig/Makefile.depend b/lib/libifconfig/Makefile.depend
index 18be76b0cb6f..c210061155d2 100644
--- a/lib/libifconfig/Makefile.depend
+++ b/lib/libifconfig/Makefile.depend
@@ -4,6 +4,7 @@
DIRDEPS = \
include \
include/xlocale \
+ lib/msun \
.include <dirdeps.mk>
diff --git a/lib/libiscsiutil/Makefile.depend b/lib/libiscsiutil/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libiscsiutil/Makefile.depend
diff --git a/lib/libkiconv/Makefile.depend b/lib/libkiconv/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libkiconv/Makefile.depend
+++ b/lib/libkiconv/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/liblzma/Makefile.depend b/lib/liblzma/Makefile.depend
index 25b26ea326c8..865fbdf36996 100644
--- a/lib/liblzma/Makefile.depend
+++ b/lib/liblzma/Makefile.depend
@@ -7,6 +7,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libmd \
lib/libthr \
diff --git a/lib/libmilter/Makefile.depend b/lib/libmilter/Makefile.depend
index b9209eb15132..4f60daa4e965 100644
--- a/lib/libmilter/Makefile.depend
+++ b/lib/libmilter/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/lib/libmixer/Makefile.depend b/lib/libmixer/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libmixer/Makefile.depend
diff --git a/lib/libpam/modules/pam_chroot/Makefile.depend b/lib/libpam/modules/pam_chroot/Makefile.depend
index a3a7ac4e5850..85c2aebab760 100644
--- a/lib/libpam/modules/pam_chroot/Makefile.depend
+++ b/lib/libpam/modules/pam_chroot/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_deny/Makefile.depend b/lib/libpam/modules/pam_deny/Makefile.depend
index 5fb710255efc..0920d51ef8a6 100644
--- a/lib/libpam/modules/pam_deny/Makefile.depend
+++ b/lib/libpam/modules/pam_deny/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/lib/libpam/modules/pam_echo/Makefile.depend b/lib/libpam/modules/pam_echo/Makefile.depend
index a3a7ac4e5850..85c2aebab760 100644
--- a/lib/libpam/modules/pam_echo/Makefile.depend
+++ b/lib/libpam/modules/pam_echo/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_exec/Makefile.depend b/lib/libpam/modules/pam_exec/Makefile.depend
index a3a7ac4e5850..85c2aebab760 100644
--- a/lib/libpam/modules/pam_exec/Makefile.depend
+++ b/lib/libpam/modules/pam_exec/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_ftpusers/Makefile.depend b/lib/libpam/modules/pam_ftpusers/Makefile.depend
index a3a7ac4e5850..85c2aebab760 100644
--- a/lib/libpam/modules/pam_ftpusers/Makefile.depend
+++ b/lib/libpam/modules/pam_ftpusers/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_group/Makefile.depend b/lib/libpam/modules/pam_group/Makefile.depend
index a3a7ac4e5850..85c2aebab760 100644
--- a/lib/libpam/modules/pam_group/Makefile.depend
+++ b/lib/libpam/modules/pam_group/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_guest/Makefile.depend b/lib/libpam/modules/pam_guest/Makefile.depend
index a3a7ac4e5850..85c2aebab760 100644
--- a/lib/libpam/modules/pam_guest/Makefile.depend
+++ b/lib/libpam/modules/pam_guest/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_krb5/Makefile.depend b/lib/libpam/modules/pam_krb5/Makefile.depend
index f4ad591d36ba..db7e2ccb6b22 100644
--- a/lib/libpam/modules/pam_krb5/Makefile.depend
+++ b/lib/libpam/modules/pam_krb5/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
kerberos5/lib/libasn1 \
diff --git a/lib/libpam/modules/pam_ksu/Makefile.depend b/lib/libpam/modules/pam_ksu/Makefile.depend
index ad4fcd166520..ef4752d5e404 100644
--- a/lib/libpam/modules/pam_ksu/Makefile.depend
+++ b/lib/libpam/modules/pam_ksu/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
kerberos5/lib/libasn1 \
diff --git a/lib/libpam/modules/pam_lastlog/Makefile.depend b/lib/libpam/modules/pam_lastlog/Makefile.depend
index a3a7ac4e5850..85c2aebab760 100644
--- a/lib/libpam/modules/pam_lastlog/Makefile.depend
+++ b/lib/libpam/modules/pam_lastlog/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_login_access/Makefile.depend b/lib/libpam/modules/pam_login_access/Makefile.depend
index a3a7ac4e5850..85c2aebab760 100644
--- a/lib/libpam/modules/pam_login_access/Makefile.depend
+++ b/lib/libpam/modules/pam_login_access/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_nologin/Makefile.depend b/lib/libpam/modules/pam_nologin/Makefile.depend
index 0f5cf60ca00c..ffa3cc011ebf 100644
--- a/lib/libpam/modules/pam_nologin/Makefile.depend
+++ b/lib/libpam/modules/pam_nologin/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_passwdqc/Makefile.depend b/lib/libpam/modules/pam_passwdqc/Makefile.depend
index 3e2c57639cd5..f93ebbd55e53 100644
--- a/lib/libpam/modules/pam_passwdqc/Makefile.depend
+++ b/lib/libpam/modules/pam_passwdqc/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_permit/Makefile.depend b/lib/libpam/modules/pam_permit/Makefile.depend
index 5fb710255efc..0920d51ef8a6 100644
--- a/lib/libpam/modules/pam_permit/Makefile.depend
+++ b/lib/libpam/modules/pam_permit/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/lib/libpam/modules/pam_radius/Makefile.depend b/lib/libpam/modules/pam_radius/Makefile.depend
index 88b5297a79c5..0b7e782a7fc8 100644
--- a/lib/libpam/modules/pam_radius/Makefile.depend
+++ b/lib/libpam/modules/pam_radius/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_rhosts/Makefile.depend b/lib/libpam/modules/pam_rhosts/Makefile.depend
index a3a7ac4e5850..85c2aebab760 100644
--- a/lib/libpam/modules/pam_rhosts/Makefile.depend
+++ b/lib/libpam/modules/pam_rhosts/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_rootok/Makefile.depend b/lib/libpam/modules/pam_rootok/Makefile.depend
index 5fb710255efc..0920d51ef8a6 100644
--- a/lib/libpam/modules/pam_rootok/Makefile.depend
+++ b/lib/libpam/modules/pam_rootok/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/lib/libpam/modules/pam_securetty/Makefile.depend b/lib/libpam/modules/pam_securetty/Makefile.depend
index a3a7ac4e5850..85c2aebab760 100644
--- a/lib/libpam/modules/pam_securetty/Makefile.depend
+++ b/lib/libpam/modules/pam_securetty/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_self/Makefile.depend b/lib/libpam/modules/pam_self/Makefile.depend
index 5fb710255efc..0920d51ef8a6 100644
--- a/lib/libpam/modules/pam_self/Makefile.depend
+++ b/lib/libpam/modules/pam_self/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/lib/libpam/modules/pam_ssh/Makefile.depend b/lib/libpam/modules/pam_ssh/Makefile.depend
index bee3c0e355ef..5f16d03aafc8 100644
--- a/lib/libpam/modules/pam_ssh/Makefile.depend
+++ b/lib/libpam/modules/pam_ssh/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpam/modules/pam_tacplus/Makefile.depend b/lib/libpam/modules/pam_tacplus/Makefile.depend
index bab66eeb796c..75c832f3a454 100644
--- a/lib/libpam/modules/pam_tacplus/Makefile.depend
+++ b/lib/libpam/modules/pam_tacplus/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpathconv/Makefile.depend b/lib/libpathconv/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libpathconv/Makefile.depend
+++ b/lib/libpathconv/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libpfctl/Makefile.depend b/lib/libpfctl/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libpfctl/Makefile.depend
diff --git a/lib/libpjdlog/Makefile.depend b/lib/libpjdlog/Makefile.depend
index 4fc5be2a35f0..08046dbf7337 100644
--- a/lib/libpjdlog/Makefile.depend
+++ b/lib/libpjdlog/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/lib/libpmc/Makefile.depend b/lib/libpmc/Makefile.depend
index f957a79d36b7..5ed410a5b82c 100644
--- a/lib/libpmc/Makefile.depend
+++ b/lib/libpmc/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
lib/libc \
lib/libc++ \
lib/libcompiler_rt \
+ lib/libcxxrt \
lib/libelf \
lib/libpmc/pmu-events.host \
lib/msun \
diff --git a/lib/libproc/Makefile.depend b/lib/libproc/Makefile.depend
index 8de8163ae051..d559b5242a7e 100644
--- a/lib/libproc/Makefile.depend
+++ b/lib/libproc/Makefile.depend
@@ -11,6 +11,7 @@ DIRDEPS = \
lib/libprocstat \
lib/librtld_db \
lib/libutil \
+ lib/libz \
.include <dirdeps.mk>
diff --git a/lib/libprocstat/zfs/Makefile.depend b/lib/libprocstat/zfs/Makefile.depend
index fd3b785437f8..79506ce16b79 100644
--- a/lib/libprocstat/zfs/Makefile.depend
+++ b/lib/libprocstat/zfs/Makefile.depend
@@ -3,9 +3,6 @@
DIRDEPS = \
include \
- include/xlocale \
- lib/libkvm \
- lib/msun \
.include <dirdeps.mk>
diff --git a/lib/libregex/Makefile.depend b/lib/libregex/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libregex/Makefile.depend
diff --git a/lib/librpcsec_gss/Makefile.depend b/lib/librpcsec_gss/Makefile.depend
index 158deb622af3..ed543c607549 100644
--- a/lib/librpcsec_gss/Makefile.depend
+++ b/lib/librpcsec_gss/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
lib/${CSU_DIR} \
diff --git a/lib/librt/Makefile.depend b/lib/librt/Makefile.depend
index 8bb1973e0ff5..25b26ea326c8 100644
--- a/lib/librt/Makefile.depend
+++ b/lib/librt/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libsmb/Makefile.depend b/lib/libsmb/Makefile.depend
index f2cf917f0e4c..1ab6f073e4f0 100644
--- a/lib/libsmb/Makefile.depend
+++ b/lib/libsmb/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/lib/libsmutil/Makefile.depend.options b/lib/libsmutil/Makefile.depend.options
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libsmutil/Makefile.depend.options
diff --git a/lib/libssp/Makefile.depend b/lib/libssp/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libssp/Makefile.depend
diff --git a/lib/libstats/Makefile.depend b/lib/libstats/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libstats/Makefile.depend
diff --git a/lib/libstdbuf/Makefile.depend b/lib/libstdbuf/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libstdbuf/Makefile.depend
+++ b/lib/libstdbuf/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libsysdecode/Makefile.depend b/lib/libsysdecode/Makefile.depend
index 7c789f24ed46..ad753648f10d 100644
--- a/lib/libsysdecode/Makefile.depend
+++ b/lib/libsysdecode/Makefile.depend
@@ -2,13 +2,16 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ cddl/lib/libdtrace \
cddl/lib/libnvpair \
+ cddl/lib/libtpool \
+ cddl/lib/libzfs \
cddl/lib/libzfs_core \
+ cddl/lib/libzfsbootenv \
+ cddl/lib/libzutil \
+ cddl/usr.bin/zinject \
+ cddl/usr.sbin/zdb \
gnu/lib/libdialog \
- gnu/lib/libgomp \
- gnu/lib/libregex \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/arpa \
include/gssapi \
@@ -31,12 +34,15 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/atf/libatf-c \
lib/lib80211 \
+ lib/lib9p \
lib/libalias/libalias \
lib/libarchive \
+ lib/libbe \
lib/libbegemot \
lib/libblacklist \
lib/libblocksruntime \
lib/libbluetooth \
+ lib/libbsddialog \
lib/libbsdstat \
lib/libbsm \
lib/libbsnmp/libbsnmp \
@@ -50,6 +56,8 @@ DIRDEPS = \
lib/libcasper/services/cap_dns \
lib/libcasper/services/cap_fileargs \
lib/libcasper/services/cap_grp \
+ lib/libcasper/services/cap_net \
+ lib/libcasper/services/cap_netdb \
lib/libcasper/services/cap_pwd \
lib/libcasper/services/cap_sysctl \
lib/libcasper/services/cap_syslog \
@@ -66,15 +74,13 @@ DIRDEPS = \
lib/libedit/readline \
lib/libefivar \
lib/libelf \
- lib/libelftc \
- lib/libevent \
+ lib/libevent1 \
lib/libexecinfo \
lib/libexpat \
lib/libfetch \
lib/libfigpar \
lib/libgeom \
lib/libgpio \
- lib/libifconfig \
lib/libjail \
lib/libkvm \
lib/liblzma \
@@ -82,14 +88,14 @@ DIRDEPS = \
lib/libmd \
lib/libmemstat \
lib/libmilter \
+ lib/libmixer \
lib/libmp \
lib/libmt \
lib/libnetgraph \
- lib/libngatm \
lib/libpam/libpam \
+ lib/libpathconv \
lib/libpcap \
lib/libpmc \
- lib/libpmcstat \
lib/libproc \
lib/libprocstat \
lib/libradius \
@@ -98,8 +104,6 @@ DIRDEPS = \
lib/libsdp \
lib/libsecureboot \
lib/libsqlite3 \
- lib/libssp \
- lib/libstand \
lib/libstdthreads \
lib/libtacplus \
lib/libthread_db \
@@ -114,17 +118,18 @@ DIRDEPS = \
lib/libvgl \
lib/libvmmapi \
lib/libwrap \
- lib/libxo \
+ lib/libxo/libxo \
lib/libypclnt \
lib/libz \
lib/libzstd \
lib/msun \
- lib/ncurses/formw \
- lib/ncurses/menuw \
- lib/ncurses/ncursesw \
- lib/ncurses/panelw \
+ lib/ncurses/form \
+ lib/ncurses/menu \
+ lib/ncurses/panel \
+ lib/ncurses/tinfo \
lib/ofed/include \
secure/lib/libcrypto \
+ usr.bin/awk.host \
usr.bin/lex \
usr.sbin/bsnmpd/modules \
usr.sbin/bsnmpd/modules/snmp_bridge \
diff --git a/lib/libthr/Makefile.depend b/lib/libthr/Makefile.depend
index 1c1a9bee1d67..8d409f5263ac 100644
--- a/lib/libthr/Makefile.depend
+++ b/lib/libthr/Makefile.depend
@@ -3,6 +3,7 @@
DIRDEPS = \
include \
+ include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
diff --git a/lib/libunbound/Makefile.depend b/lib/libunbound/Makefile.depend
index c42a7c4def54..61b411afc05f 100644
--- a/lib/libunbound/Makefile.depend
+++ b/lib/libunbound/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/lib/libvmmapi/Makefile.depend b/lib/libvmmapi/Makefile.depend
index bcfa88f57adf..890f8a10aec4 100644
--- a/lib/libvmmapi/Makefile.depend
+++ b/lib/libvmmapi/Makefile.depend
@@ -6,6 +6,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
lib/libutil \
diff --git a/lib/libxo/Makefile.depend b/lib/libxo/Makefile.depend
index bcfa88f57adf..cb359e02d503 100644
--- a/lib/libxo/Makefile.depend
+++ b/lib/libxo/Makefile.depend
@@ -2,13 +2,8 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcompiler_rt \
- lib/libutil \
-
+ ${DEP_RELDIR}/libxo \
+ ${DEP_RELDIR}/encoder \
.include <dirdeps.mk>
diff --git a/lib/libxo/encoder/csv/Makefile.depend b/lib/libxo/encoder/csv/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libxo/encoder/csv/Makefile.depend
diff --git a/lib/libxo/libxo/Makefile.depend b/lib/libxo/libxo/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lib/libxo/libxo/Makefile.depend
diff --git a/lib/ncurses/form/Makefile.depend b/lib/ncurses/form/Makefile.depend
index cb750fde5297..d48a306fe085 100644
--- a/lib/ncurses/form/Makefile.depend
+++ b/lib/ncurses/form/Makefile.depend
@@ -2,14 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/ncurses/ncurses \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/lib/ncurses/menu/Makefile.depend b/lib/ncurses/menu/Makefile.depend
index cb750fde5297..d48a306fe085 100644
--- a/lib/ncurses/menu/Makefile.depend
+++ b/lib/ncurses/menu/Makefile.depend
@@ -2,14 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/ncurses/ncurses \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/lib/ncurses/ncurses/Makefile.depend b/lib/ncurses/ncurses/Makefile.depend
index 9b2a343de2dc..ddb8d5a21ca9 100644
--- a/lib/ncurses/ncurses/Makefile.depend
+++ b/lib/ncurses/ncurses/Makefile.depend
@@ -2,13 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/lib/ncurses/panel/Makefile.depend b/lib/ncurses/panel/Makefile.depend
index cb750fde5297..d48a306fe085 100644
--- a/lib/ncurses/panel/Makefile.depend
+++ b/lib/ncurses/panel/Makefile.depend
@@ -2,14 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/ncurses/ncurses \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/lib/ncurses/tinfo/Makefile.depend b/lib/ncurses/tinfo/Makefile.depend
index 9b2a343de2dc..a24c45c68f70 100644
--- a/lib/ncurses/tinfo/Makefile.depend
+++ b/lib/ncurses/tinfo/Makefile.depend
@@ -2,13 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo.host \
.include <dirdeps.mk>
diff --git a/libexec/atf/atf-check/Makefile.depend b/libexec/atf/atf-check/Makefile.depend
index 5eb060af3bca..f1011cd58be8 100644
--- a/libexec/atf/atf-check/Makefile.depend
+++ b/libexec/atf/atf-check/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/libexec/atf/atf-sh/Makefile.depend b/libexec/atf/atf-sh/Makefile.depend
index 5eb060af3bca..f1011cd58be8 100644
--- a/libexec/atf/atf-sh/Makefile.depend
+++ b/libexec/atf/atf-sh/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/libexec/atrun/Makefile.depend b/libexec/atrun/Makefile.depend
index 0f5cf60ca00c..ffa3cc011ebf 100644
--- a/libexec/atrun/Makefile.depend
+++ b/libexec/atrun/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/libexec/bootpd/Makefile.depend b/libexec/bootpd/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/libexec/bootpd/Makefile.depend
+++ b/libexec/bootpd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/libexec/bootpd/bootpgw/Makefile.depend b/libexec/bootpd/bootpgw/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/libexec/bootpd/bootpgw/Makefile.depend
+++ b/libexec/bootpd/bootpgw/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/libexec/bootpd/tools/bootpef/Makefile.depend b/libexec/bootpd/tools/bootpef/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/libexec/bootpd/tools/bootpef/Makefile.depend
+++ b/libexec/bootpd/tools/bootpef/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/libexec/bootpd/tools/bootptest/Makefile.depend b/libexec/bootpd/tools/bootptest/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/libexec/bootpd/tools/bootptest/Makefile.depend
+++ b/libexec/bootpd/tools/bootptest/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/libexec/comsat/Makefile.depend b/libexec/comsat/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/libexec/comsat/Makefile.depend
+++ b/libexec/comsat/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/libexec/dma/dma-mbox-create/Makefile.depend b/libexec/dma/dma-mbox-create/Makefile.depend
index b3c7edf44920..f30e64d905de 100644
--- a/libexec/dma/dma-mbox-create/Makefile.depend
+++ b/libexec/dma/dma-mbox-create/Makefile.depend
@@ -2,16 +2,15 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
secure/lib/libcrypto \
- secure/lib/libssl \
.include <dirdeps.mk>
diff --git a/libexec/dma/dmagent/Makefile.depend b/libexec/dma/dmagent/Makefile.depend
index c30f467aa7dc..4c7ab9c2ef2e 100644
--- a/libexec/dma/dmagent/Makefile.depend
+++ b/libexec/dma/dmagent/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/libexec/fingerd/Makefile.depend b/libexec/fingerd/Makefile.depend
index c38264b2a435..08046dbf7337 100644
--- a/libexec/fingerd/Makefile.depend
+++ b/libexec/fingerd/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libthr \
lib/libutil \
diff --git a/libexec/ftpd/Makefile.depend b/libexec/ftpd/Makefile.depend
index f87d9cb772d3..a52518928d80 100644
--- a/libexec/ftpd/Makefile.depend
+++ b/libexec/ftpd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libcrypt \
lib/libmd \
- lib/libthr \
lib/libutil \
lib/msun \
usr.bin/yacc.host \
diff --git a/libexec/getty/Makefile.depend b/libexec/getty/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/libexec/getty/Makefile.depend
+++ b/libexec/getty/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/libexec/mail.local/Makefile.depend b/libexec/mail.local/Makefile.depend
index 2c3cbde8d9bb..5659a9aadfc7 100644
--- a/libexec/mail.local/Makefile.depend
+++ b/libexec/mail.local/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/libexec/mknetid/Makefile.depend b/libexec/mknetid/Makefile.depend
index 85338ebe3beb..59ab3d4c55ea 100644
--- a/libexec/mknetid/Makefile.depend
+++ b/libexec/mknetid/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/libexec/pppoed/Makefile.depend b/libexec/pppoed/Makefile.depend
index d64c9ccbda7b..e3629ea243ce 100644
--- a/libexec/pppoed/Makefile.depend
+++ b/libexec/pppoed/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/libexec/rbootd/Makefile.depend b/libexec/rbootd/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/libexec/rbootd/Makefile.depend
+++ b/libexec/rbootd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/libexec/revnetgroup/Makefile.depend b/libexec/revnetgroup/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/libexec/revnetgroup/Makefile.depend
+++ b/libexec/revnetgroup/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/libexec/rpc.rquotad/Makefile.depend b/libexec/rpc.rquotad/Makefile.depend
index 8939901b94fd..a07fdc09b21b 100644
--- a/libexec/rpc.rquotad/Makefile.depend
+++ b/libexec/rpc.rquotad/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/libexec/rpc.rstatd/Makefile.depend b/libexec/rpc.rstatd/Makefile.depend
index 5652cbf7fc78..6b55b5143099 100644
--- a/libexec/rpc.rstatd/Makefile.depend
+++ b/libexec/rpc.rstatd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
@@ -11,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libdevstat \
- lib/libelf \
lib/libkvm \
lib/librpcsvc \
diff --git a/libexec/rpc.rusersd/Makefile.depend b/libexec/rpc.rusersd/Makefile.depend
index 5b0587ae477a..01d50925c161 100644
--- a/libexec/rpc.rusersd/Makefile.depend
+++ b/libexec/rpc.rusersd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/libexec/rpc.rwalld/Makefile.depend b/libexec/rpc.rwalld/Makefile.depend
index 741d5bc5bd59..ec88a5da803c 100644
--- a/libexec/rpc.rwalld/Makefile.depend
+++ b/libexec/rpc.rwalld/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/libexec/rpc.sprayd/Makefile.depend b/libexec/rpc.sprayd/Makefile.depend
index 5b0587ae477a..01d50925c161 100644
--- a/libexec/rpc.sprayd/Makefile.depend
+++ b/libexec/rpc.sprayd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/libexec/rtld-elf/Makefile.depend b/libexec/rtld-elf/Makefile.depend
index 2eb281bb27ad..305e9b312b00 100644
--- a/libexec/rtld-elf/Makefile.depend
+++ b/libexec/rtld-elf/Makefile.depend
@@ -5,6 +5,7 @@ DIRDEPS = \
include \
include/xlocale \
lib/libc \
+ lib/libcompiler_rt \
.include <dirdeps.mk>
diff --git a/libexec/smrsh/Makefile.depend b/libexec/smrsh/Makefile.depend
index e07330e48118..8aa382deb920 100644
--- a/libexec/smrsh/Makefile.depend
+++ b/libexec/smrsh/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/libexec/talkd/Makefile.depend b/libexec/talkd/Makefile.depend
index 782b0d5c171e..44eab20d710d 100644
--- a/libexec/talkd/Makefile.depend
+++ b/libexec/talkd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/protocols \
diff --git a/libexec/tcpd/Makefile.depend b/libexec/tcpd/Makefile.depend
index dd20b7a68735..af2a4ebf0a09 100644
--- a/libexec/tcpd/Makefile.depend
+++ b/libexec/tcpd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/libexec/tftp-proxy/Makefile.depend b/libexec/tftp-proxy/Makefile.depend
index d5ed563ecfc8..849ee65a3d19 100644
--- a/libexec/tftp-proxy/Makefile.depend
+++ b/libexec/tftp-proxy/Makefile.depend
@@ -2,13 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libnv \
+ lib/libpfctl \
.include <dirdeps.mk>
diff --git a/libexec/ulog-helper/Makefile.depend b/libexec/ulog-helper/Makefile.depend
index e9d5b7d57150..65508529559b 100644
--- a/libexec/ulog-helper/Makefile.depend
+++ b/libexec/ulog-helper/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libmd \
lib/libulog \
diff --git a/libexec/ypxfr/Makefile.depend b/libexec/ypxfr/Makefile.depend
index 572fc8dbf41a..ddf4ee2f8b49 100644
--- a/libexec/ypxfr/Makefile.depend
+++ b/libexec/ypxfr/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/rescue/rescue/Makefile.depend b/rescue/rescue/Makefile.depend
index 1a01391d2b90..d30542ffdb83 100644
--- a/rescue/rescue/Makefile.depend
+++ b/rescue/rescue/Makefile.depend
@@ -3,56 +3,57 @@
DIRDEPS = \
cddl/lib/libavl \
+ cddl/lib/libicp_rescue \
cddl/lib/libnvpair \
+ cddl/lib/libspl \
+ cddl/lib/libtpool \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
+ cddl/lib/libzfsbootenv \
cddl/lib/libzpool \
- gnu/lib/csu \
- include \
- include/arpa \
- include/protocols \
- include/rpc \
- include/rpcsvc \
- include/xlocale \
+ cddl/lib/libzutil \
lib/${CSU_DIR} \
lib/lib80211 \
lib/libalias/libalias \
lib/libarchive \
+ lib/libbe \
lib/libbz2 \
lib/libc \
lib/libcam \
- lib/libcapsicum \
- lib/libcasper/libcasper \
- lib/libcasper/services/cap_dns \
lib/libcompiler_rt \
lib/libcrypt \
lib/libdevstat \
lib/libedit \
lib/libelf \
lib/libexpat \
+ lib/libfetch \
lib/libgeom \
+ lib/libifconfig \
lib/libipsec \
+ lib/libiscsiutil \
lib/libjail \
lib/libkiconv \
lib/libkvm \
lib/liblzma \
lib/libmd \
lib/libmt \
+ lib/libnv \
lib/libsbuf \
lib/libthr \
lib/libufs \
lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
lib/libz \
lib/libzstd \
lib/msun \
- lib/ncurses/ncursesw \
+ lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
rescue/librescue \
+ sbin/ipf/libipf \
secure/lib/libcrypto \
- usr.bin/lex/lib \
- usr.bin/yacc.host \
+ secure/lib/libssl \
usr.sbin/crunch/crunchgen.host \
usr.sbin/crunch/crunchide.host \
diff --git a/sbin/adjkerntz/Makefile.depend b/sbin/adjkerntz/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/adjkerntz/Makefile.depend
+++ b/sbin/adjkerntz/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/bsdlabel/Makefile.depend b/sbin/bsdlabel/Makefile.depend
index 0220673c9076..bbea616cfc48 100644
--- a/sbin/bsdlabel/Makefile.depend
+++ b/sbin/bsdlabel/Makefile.depend
@@ -2,15 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libsbuf \
.include <dirdeps.mk>
diff --git a/sbin/camcontrol/Makefile.depend b/sbin/camcontrol/Makefile.depend
index ee06e1c20939..ad8b5ffaef1c 100644
--- a/sbin/camcontrol/Makefile.depend
+++ b/sbin/camcontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/ccdconfig/Makefile.depend b/sbin/ccdconfig/Makefile.depend
index 0220673c9076..bbea616cfc48 100644
--- a/sbin/ccdconfig/Makefile.depend
+++ b/sbin/ccdconfig/Makefile.depend
@@ -2,15 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libsbuf \
.include <dirdeps.mk>
diff --git a/sbin/clri/Makefile.depend b/sbin/clri/Makefile.depend
index 6cfaab1c3644..b2b51212acfc 100644
--- a/sbin/clri/Makefile.depend
+++ b/sbin/clri/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libufs \
.include <dirdeps.mk>
diff --git a/sbin/comcontrol/Makefile.depend b/sbin/comcontrol/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/comcontrol/Makefile.depend
+++ b/sbin/comcontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/conscontrol/Makefile.depend b/sbin/conscontrol/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/conscontrol/Makefile.depend
+++ b/sbin/conscontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/ddb/Makefile.depend b/sbin/ddb/Makefile.depend
index 4a0ebeceed6f..bca04fbadbba 100644
--- a/sbin/ddb/Makefile.depend
+++ b/sbin/ddb/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
diff --git a/sbin/decryptcore/Makefile.depend b/sbin/decryptcore/Makefile.depend
index d718b860472f..480deb4e085e 100644
--- a/sbin/decryptcore/Makefile.depend
+++ b/sbin/decryptcore/Makefile.depend
@@ -2,14 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
lib/libpjdlog \
- lib/libutil \
secure/lib/libcrypto \
diff --git a/sbin/devd/Makefile.depend b/sbin/devd/Makefile.depend
index 8c3f699ac991..69e5cad08af8 100644
--- a/sbin/devd/Makefile.depend
+++ b/sbin/devd/Makefile.depend
@@ -2,16 +2,15 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
lib/libcompiler_rt \
+ lib/libcxxrt \
lib/libutil \
lib/msun \
- usr.bin/lex/lib \
usr.bin/yacc.host \
diff --git a/sbin/devfs/Makefile.depend b/sbin/devfs/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/devfs/Makefile.depend
+++ b/sbin/devfs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/dhclient/Makefile.depend b/sbin/dhclient/Makefile.depend
index 7d9bf2cd046a..d897c480ee77 100644
--- a/sbin/dhclient/Makefile.depend
+++ b/sbin/dhclient/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/libc \
lib/libcapsicum \
lib/libcompiler_rt \
- lib/libnv \
lib/libutil \
diff --git a/sbin/dmesg/Makefile.depend b/sbin/dmesg/Makefile.depend
index 4a0ebeceed6f..bca04fbadbba 100644
--- a/sbin/dmesg/Makefile.depend
+++ b/sbin/dmesg/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
diff --git a/sbin/dump/Makefile.depend b/sbin/dump/Makefile.depend
index 4bd09984c29d..f2d4f50fdce2 100644
--- a/sbin/dump/Makefile.depend
+++ b/sbin/dump/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/protocols \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libufs \
.include <dirdeps.mk>
diff --git a/sbin/dumpfs/Makefile.depend b/sbin/dumpfs/Makefile.depend
index 735bf03b75b6..b2b51212acfc 100644
--- a/sbin/dumpfs/Makefile.depend
+++ b/sbin/dumpfs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/dumpon/Makefile.depend b/sbin/dumpon/Makefile.depend
index 9a1f7bd0d413..8377eefe2757 100644
--- a/sbin/dumpon/Makefile.depend
+++ b/sbin/dumpon/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libcapsicum \
lib/libcasper/libcasper \
lib/libcompiler_rt \
- lib/libthr \
.include <dirdeps.mk>
diff --git a/sbin/etherswitchcfg/Makefile.depend b/sbin/etherswitchcfg/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/etherswitchcfg/Makefile.depend
+++ b/sbin/etherswitchcfg/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/fdisk/Makefile.depend b/sbin/fdisk/Makefile.depend
index 0220673c9076..bbea616cfc48 100644
--- a/sbin/fdisk/Makefile.depend
+++ b/sbin/fdisk/Makefile.depend
@@ -2,15 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libsbuf \
.include <dirdeps.mk>
diff --git a/sbin/ffsinfo/Makefile.depend b/sbin/ffsinfo/Makefile.depend
index 735bf03b75b6..b2b51212acfc 100644
--- a/sbin/ffsinfo/Makefile.depend
+++ b/sbin/ffsinfo/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/fsck/Makefile.depend b/sbin/fsck/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/fsck/Makefile.depend
+++ b/sbin/fsck/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/fsck_ffs/Makefile.depend b/sbin/fsck_ffs/Makefile.depend
index 735bf03b75b6..b2b51212acfc 100644
--- a/sbin/fsck_ffs/Makefile.depend
+++ b/sbin/fsck_ffs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/fsck_msdosfs/Makefile.depend b/sbin/fsck_msdosfs/Makefile.depend
index 6cfaab1c3644..bcfa88f57adf 100644
--- a/sbin/fsck_msdosfs/Makefile.depend
+++ b/sbin/fsck_msdosfs/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libutil \
.include <dirdeps.mk>
diff --git a/sbin/fsdb/Makefile.depend b/sbin/fsdb/Makefile.depend
index 7fdfb8aa8455..ef2b586681c4 100644
--- a/sbin/fsdb/Makefile.depend
+++ b/sbin/fsdb/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libedit \
lib/libufs \
- lib/ncurses/ncursesw \
.include <dirdeps.mk>
diff --git a/sbin/fsirand/Makefile.depend b/sbin/fsirand/Makefile.depend
index 6cfaab1c3644..b2b51212acfc 100644
--- a/sbin/fsirand/Makefile.depend
+++ b/sbin/fsirand/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libufs \
.include <dirdeps.mk>
diff --git a/sbin/gbde/Makefile.depend b/sbin/gbde/Makefile.depend
index 262aec4302c7..236548db4f9c 100644
--- a/sbin/gbde/Makefile.depend
+++ b/sbin/gbde/Makefile.depend
@@ -2,16 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
lib/libmd \
- lib/libsbuf \
lib/libutil \
diff --git a/sbin/ggate/ggatec/Makefile.depend b/sbin/ggate/ggatec/Makefile.depend
index 4fb720d36316..b0685ba5ae57 100644
--- a/sbin/ggate/ggatec/Makefile.depend
+++ b/sbin/ggate/ggatec/Makefile.depend
@@ -2,16 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libsbuf \
lib/libthr \
lib/libutil \
diff --git a/sbin/ggate/ggated/Makefile.depend b/sbin/ggate/ggated/Makefile.depend
index 408a62870b41..b0685ba5ae57 100644
--- a/sbin/ggate/ggated/Makefile.depend
+++ b/sbin/ggate/ggated/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/sbin/ggate/ggatel/Makefile.depend b/sbin/ggate/ggatel/Makefile.depend
index 1096cf51d094..3b137487d002 100644
--- a/sbin/ggate/ggatel/Makefile.depend
+++ b/sbin/ggate/ggatel/Makefile.depend
@@ -2,16 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libsbuf \
lib/libutil \
diff --git a/sbin/growfs/Makefile.depend b/sbin/growfs/Makefile.depend
index 51f2384d1c84..ca3f9bc0a6c4 100644
--- a/sbin/growfs/Makefile.depend
+++ b/sbin/growfs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/gvinum/Makefile.depend b/sbin/gvinum/Makefile.depend
index bc5225ea2a80..4ae0bd771f72 100644
--- a/sbin/gvinum/Makefile.depend
+++ b/sbin/gvinum/Makefile.depend
@@ -2,18 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libedit \
- lib/libedit/edit/readline \
- lib/libexpat \
+ lib/libedit/readline \
lib/libgeom \
- lib/libsbuf \
- lib/ncurses/ncursesw \
.include <dirdeps.mk>
diff --git a/sbin/hastctl/Makefile.depend b/sbin/hastctl/Makefile.depend
index 371ab3746dcc..cacdf236f253 100644
--- a/sbin/hastctl/Makefile.depend
+++ b/sbin/hastctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -11,6 +10,7 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libmd \
lib/libutil \
+ lib/libz \
usr.bin/yacc.host \
diff --git a/sbin/hastd/Makefile.depend b/sbin/hastd/Makefile.depend
index 9a828fd8932d..afc685806ad1 100644
--- a/sbin/hastd/Makefile.depend
+++ b/sbin/hastd/Makefile.depend
@@ -2,19 +2,17 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
lib/libmd \
- lib/libsbuf \
lib/libthr \
lib/libutil \
+ lib/libz \
usr.bin/yacc.host \
diff --git a/sbin/ifconfig/Makefile.depend b/sbin/ifconfig/Makefile.depend
index 896ebc6ade5f..48fafdebcfd0 100644
--- a/sbin/ifconfig/Makefile.depend
+++ b/sbin/ifconfig/Makefile.depend
@@ -8,8 +8,9 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
- lib/libsbuf \
+ lib/libifconfig \
+ lib/libnv \
+ lib/libutil \
lib/msun \
diff --git a/sbin/init/Makefile.depend b/sbin/init/Makefile.depend
index 10a95e7fdc38..41653b767d04 100644
--- a/sbin/init/Makefile.depend
+++ b/sbin/init/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/ipf/ipf/Makefile.depend b/sbin/ipf/ipf/Makefile.depend
index 84ddd8bb35de..618c6fecf706 100644
--- a/sbin/ipf/ipf/Makefile.depend
+++ b/sbin/ipf/ipf/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
lib/libpcap \
sbin/ipf/libipf \
diff --git a/sbin/ipf/ipfs/Makefile.depend b/sbin/ipf/ipfs/Makefile.depend
index 2b60f342cc06..635afa00011e 100644
--- a/sbin/ipf/ipfs/Makefile.depend
+++ b/sbin/ipf/ipfs/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
sbin/ipf/libipf \
diff --git a/sbin/ipf/ipfstat/Makefile.depend b/sbin/ipf/ipfstat/Makefile.depend
index 8e480ba0d4ec..82d7f58d19da 100644
--- a/sbin/ipf/ipfstat/Makefile.depend
+++ b/sbin/ipf/ipfstat/Makefile.depend
@@ -2,16 +2,15 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
- lib/ncurses/ncursesw \
+ lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
sbin/ipf/libipf \
diff --git a/sbin/ipf/ipmon/Makefile.depend b/sbin/ipf/ipmon/Makefile.depend
index cfe5ad5352e5..b8da07122fa0 100644
--- a/sbin/ipf/ipmon/Makefile.depend
+++ b/sbin/ipf/ipmon/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
sbin/ipf/libipf \
usr.bin/yacc.host \
diff --git a/sbin/ipf/ipnat/Makefile.depend b/sbin/ipf/ipnat/Makefile.depend
index cfe5ad5352e5..b8da07122fa0 100644
--- a/sbin/ipf/ipnat/Makefile.depend
+++ b/sbin/ipf/ipnat/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
sbin/ipf/libipf \
usr.bin/yacc.host \
diff --git a/sbin/ipf/ippool/Makefile.depend b/sbin/ipf/ippool/Makefile.depend
index cfe5ad5352e5..b8da07122fa0 100644
--- a/sbin/ipf/ippool/Makefile.depend
+++ b/sbin/ipf/ippool/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
sbin/ipf/libipf \
usr.bin/yacc.host \
diff --git a/sbin/ipfw/Makefile.depend b/sbin/ipfw/Makefile.depend
index 5700139d85dd..88934cfadd19 100644
--- a/sbin/ipfw/Makefile.depend
+++ b/sbin/ipfw/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,6 +9,7 @@ DIRDEPS = \
lib/libalias/libalias \
lib/libc \
lib/libcompiler_rt \
+ lib/libjail \
lib/libutil \
diff --git a/sbin/kldconfig/Makefile.depend b/sbin/kldconfig/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/kldconfig/Makefile.depend
+++ b/sbin/kldconfig/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/kldload/Makefile.depend b/sbin/kldload/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/kldload/Makefile.depend
+++ b/sbin/kldload/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/kldstat/Makefile.depend b/sbin/kldstat/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/sbin/kldstat/Makefile.depend
+++ b/sbin/kldstat/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/kldunload/Makefile.depend b/sbin/kldunload/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/sbin/kldunload/Makefile.depend
+++ b/sbin/kldunload/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/sbin/ldconfig/Makefile.depend b/sbin/ldconfig/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/ldconfig/Makefile.depend
+++ b/sbin/ldconfig/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/md5/Makefile.depend b/sbin/md5/Makefile.depend
index 18541d6a1857..7de0db31e992 100644
--- a/sbin/md5/Makefile.depend
+++ b/sbin/md5/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
lib/libmd \
diff --git a/sbin/mdconfig/Makefile.depend b/sbin/mdconfig/Makefile.depend
index 7cae0ca03e1e..56c160f32e20 100644
--- a/sbin/mdconfig/Makefile.depend
+++ b/sbin/mdconfig/Makefile.depend
@@ -2,17 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libdevstat \
- lib/libexpat \
lib/libgeom \
lib/libkvm \
- lib/libsbuf \
lib/libutil \
diff --git a/sbin/mdmfs/Makefile.depend b/sbin/mdmfs/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/mdmfs/Makefile.depend
+++ b/sbin/mdmfs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/mknod/Makefile.depend b/sbin/mknod/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/mknod/Makefile.depend
+++ b/sbin/mknod/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/mksnap_ffs/Makefile.depend b/sbin/mksnap_ffs/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/mksnap_ffs/Makefile.depend
+++ b/sbin/mksnap_ffs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/mount/Makefile.depend b/sbin/mount/Makefile.depend
index 991757ecadc0..45a29f192e40 100644
--- a/sbin/mount/Makefile.depend
+++ b/sbin/mount/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libutil \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/sbin/mount_cd9660/Makefile.depend b/sbin/mount_cd9660/Makefile.depend
index f2cf917f0e4c..1ab6f073e4f0 100644
--- a/sbin/mount_cd9660/Makefile.depend
+++ b/sbin/mount_cd9660/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/sbin/mount_fusefs/Makefile.depend b/sbin/mount_fusefs/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/mount_fusefs/Makefile.depend
+++ b/sbin/mount_fusefs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/mount_msdosfs/Makefile.depend b/sbin/mount_msdosfs/Makefile.depend
index cdb18932a6c2..797b495ac526 100644
--- a/sbin/mount_msdosfs/Makefile.depend
+++ b/sbin/mount_msdosfs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/mount_nfs/Makefile.depend b/sbin/mount_nfs/Makefile.depend
index faed4b4cc2aa..722af65039b3 100644
--- a/sbin/mount_nfs/Makefile.depend
+++ b/sbin/mount_nfs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/sbin/mount_nullfs/Makefile.depend b/sbin/mount_nullfs/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/mount_nullfs/Makefile.depend
+++ b/sbin/mount_nullfs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/mount_udf/Makefile.depend b/sbin/mount_udf/Makefile.depend
index 9258f1c2123f..020d3f539c64 100644
--- a/sbin/mount_udf/Makefile.depend
+++ b/sbin/mount_udf/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/mount_unionfs/Makefile.depend b/sbin/mount_unionfs/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/mount_unionfs/Makefile.depend
+++ b/sbin/mount_unionfs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/natd/Makefile.depend b/sbin/natd/Makefile.depend
index ed80e66dfc4b..349749a155b6 100644
--- a/sbin/natd/Makefile.depend
+++ b/sbin/natd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/sbin/newfs/Makefile.depend b/sbin/newfs/Makefile.depend
index 51f2384d1c84..ca3f9bc0a6c4 100644
--- a/sbin/newfs/Makefile.depend
+++ b/sbin/newfs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/newfs_msdos/Makefile.depend b/sbin/newfs_msdos/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/newfs_msdos/Makefile.depend
+++ b/sbin/newfs_msdos/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/nfsiod/Makefile.depend b/sbin/nfsiod/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/sbin/nfsiod/Makefile.depend
+++ b/sbin/nfsiod/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/sbin/nos-tun/Makefile.depend b/sbin/nos-tun/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/sbin/nos-tun/Makefile.depend
+++ b/sbin/nos-tun/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/sbin/nvmecontrol/Makefile.depend b/sbin/nvmecontrol/Makefile.depend
index 6cfaab1c3644..bcfa88f57adf 100644
--- a/sbin/nvmecontrol/Makefile.depend
+++ b/sbin/nvmecontrol/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libutil \
.include <dirdeps.mk>
diff --git a/sbin/pfctl/Makefile.depend b/sbin/pfctl/Makefile.depend
index dc2c63d06b09..57c85e45b659 100644
--- a/sbin/pfctl/Makefile.depend
+++ b/sbin/pfctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,6 +9,8 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libmd \
+ lib/libnv \
+ lib/libpfctl \
lib/msun \
usr.bin/yacc.host \
diff --git a/sbin/pflogd/Makefile.depend b/sbin/pflogd/Makefile.depend
index 893e74eb908c..17d2b6288c59 100644
--- a/sbin/pflogd/Makefile.depend
+++ b/sbin/pflogd/Makefile.depend
@@ -2,8 +2,8 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
+ include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
diff --git a/sbin/ping/Makefile.depend b/sbin/ping/Makefile.depend
index c3985c1343dd..ef1881cf1d21 100644
--- a/sbin/ping/Makefile.depend
+++ b/sbin/ping/Makefile.depend
@@ -10,7 +10,7 @@ DIRDEPS = \
lib/libcapsicum \
lib/libcompiler_rt \
lib/libipsec \
- lib/libnv \
+ lib/libmd \
lib/msun \
diff --git a/sbin/quotacheck/Makefile.depend b/sbin/quotacheck/Makefile.depend
index 991757ecadc0..ca3f9bc0a6c4 100644
--- a/sbin/quotacheck/Makefile.depend
+++ b/sbin/quotacheck/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libufs \
lib/libutil \
diff --git a/sbin/rcorder/Makefile.depend b/sbin/rcorder/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/sbin/rcorder/Makefile.depend
+++ b/sbin/rcorder/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/reboot/Makefile.depend b/sbin/reboot/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/reboot/Makefile.depend
+++ b/sbin/reboot/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/recoverdisk/Makefile.depend b/sbin/recoverdisk/Makefile.depend
index 6cfaab1c3644..5f1a802404d8 100644
--- a/sbin/recoverdisk/Makefile.depend
+++ b/sbin/recoverdisk/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/msun \
.include <dirdeps.mk>
diff --git a/sbin/restore/Makefile.depend b/sbin/restore/Makefile.depend
index 4bd09984c29d..18d0fecc0c96 100644
--- a/sbin/restore/Makefile.depend
+++ b/sbin/restore/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/protocols \
include/xlocale \
diff --git a/sbin/route/Makefile.depend b/sbin/route/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/sbin/route/Makefile.depend
+++ b/sbin/route/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/sbin/routed/Makefile.depend b/sbin/routed/Makefile.depend
index c369ae60fd72..d91c3ca3ce72 100644
--- a/sbin/routed/Makefile.depend
+++ b/sbin/routed/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/protocols \
diff --git a/sbin/routed/rtquery/Makefile.depend b/sbin/routed/rtquery/Makefile.depend
index c369ae60fd72..d91c3ca3ce72 100644
--- a/sbin/routed/rtquery/Makefile.depend
+++ b/sbin/routed/rtquery/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/protocols \
diff --git a/sbin/savecore/Makefile.depend b/sbin/savecore/Makefile.depend
index 9252d37765d2..d83cde1c15d9 100644
--- a/sbin/savecore/Makefile.depend
+++ b/sbin/savecore/Makefile.depend
@@ -8,10 +8,9 @@ DIRDEPS = \
lib/libc \
lib/libcapsicum \
lib/libcompiler_rt \
- lib/libnv \
- lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
lib/libz \
+ lib/libzstd \
.include <dirdeps.mk>
diff --git a/sbin/setkey/Makefile.depend b/sbin/setkey/Makefile.depend
index ca3301c271b9..ee39f3d5cdaf 100644
--- a/sbin/setkey/Makefile.depend
+++ b/sbin/setkey/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,8 +9,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libipsec \
- lib/liby \
- usr.bin/lex/lib \
usr.bin/yacc.host \
diff --git a/sbin/shutdown/Makefile.depend b/sbin/shutdown/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/shutdown/Makefile.depend
+++ b/sbin/shutdown/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/swapon/Makefile.depend b/sbin/swapon/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/sbin/swapon/Makefile.depend
+++ b/sbin/swapon/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/sysctl/Makefile.depend b/sbin/sysctl/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/sbin/sysctl/Makefile.depend
+++ b/sbin/sysctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/tunefs/Makefile.depend b/sbin/tunefs/Makefile.depend
index 735bf03b75b6..b2b51212acfc 100644
--- a/sbin/tunefs/Makefile.depend
+++ b/sbin/tunefs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/umount/Makefile.depend b/sbin/umount/Makefile.depend
index 85338ebe3beb..59ab3d4c55ea 100644
--- a/sbin/umount/Makefile.depend
+++ b/sbin/umount/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/sbin/zfsbootcfg/Makefile.depend b/sbin/zfsbootcfg/Makefile.depend
index 53090da6e2fc..34c7d44e1fd1 100644
--- a/sbin/zfsbootcfg/Makefile.depend
+++ b/sbin/zfsbootcfg/Makefile.depend
@@ -2,26 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- cddl/lib/libavl \
- cddl/lib/libnvpair \
- cddl/lib/libumem \
- cddl/lib/libuutil \
- cddl/lib/libzfs \
- cddl/lib/libzfs_core \
- gnu/lib/csu \
+ cddl/lib/libzfsbootenv \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
- lib/libgeom \
- lib/libmd \
- lib/libsbuf \
- lib/libthr \
- lib/libutil \
- lib/libz \
- lib/msun \
.include <dirdeps.mk>
diff --git a/secure/libexec/sftp-server/Makefile.depend b/secure/libexec/sftp-server/Makefile.depend
index 270b7612d3a6..1577383c0439 100644
--- a/secure/libexec/sftp-server/Makefile.depend
+++ b/secure/libexec/sftp-server/Makefile.depend
@@ -2,18 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libldns \
lib/libpam/libpam \
lib/libutil \
- lib/libz \
secure/lib/libcrypto \
secure/lib/libssh \
diff --git a/secure/libexec/ssh-keysign/Makefile.depend b/secure/libexec/ssh-keysign/Makefile.depend
index 270b7612d3a6..1577383c0439 100644
--- a/secure/libexec/ssh-keysign/Makefile.depend
+++ b/secure/libexec/ssh-keysign/Makefile.depend
@@ -2,18 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libldns \
lib/libpam/libpam \
lib/libutil \
- lib/libz \
secure/lib/libcrypto \
secure/lib/libssh \
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile.depend b/secure/libexec/ssh-pkcs11-helper/Makefile.depend
index 270b7612d3a6..1577383c0439 100644
--- a/secure/libexec/ssh-pkcs11-helper/Makefile.depend
+++ b/secure/libexec/ssh-pkcs11-helper/Makefile.depend
@@ -2,18 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libldns \
lib/libpam/libpam \
lib/libutil \
- lib/libz \
secure/lib/libcrypto \
secure/lib/libssh \
diff --git a/secure/usr.bin/openssl/Makefile.depend b/secure/usr.bin/openssl/Makefile.depend
index e383274b1a46..77b203805a73 100644
--- a/secure/usr.bin/openssl/Makefile.depend
+++ b/secure/usr.bin/openssl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -11,6 +10,7 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/msun \
secure/lib/libcrypto \
+ secure/lib/libcrypto/openssl.amd64 \
secure/lib/libssl \
diff --git a/secure/usr.bin/scp/Makefile.depend b/secure/usr.bin/scp/Makefile.depend
index 270b7612d3a6..1577383c0439 100644
--- a/secure/usr.bin/scp/Makefile.depend
+++ b/secure/usr.bin/scp/Makefile.depend
@@ -2,18 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libldns \
lib/libpam/libpam \
lib/libutil \
- lib/libz \
secure/lib/libcrypto \
secure/lib/libssh \
diff --git a/secure/usr.bin/sftp/Makefile.depend b/secure/usr.bin/sftp/Makefile.depend
index 255a2ea15c03..4b5127f824a0 100644
--- a/secure/usr.bin/sftp/Makefile.depend
+++ b/secure/usr.bin/sftp/Makefile.depend
@@ -2,20 +2,15 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
lib/libedit \
- lib/libldns \
lib/libpam/libpam \
lib/libutil \
- lib/libz \
- lib/ncurses/ncursesw \
secure/lib/libcrypto \
secure/lib/libssh \
diff --git a/secure/usr.bin/ssh-add/Makefile.depend b/secure/usr.bin/ssh-add/Makefile.depend
index 270b7612d3a6..1577383c0439 100644
--- a/secure/usr.bin/ssh-add/Makefile.depend
+++ b/secure/usr.bin/ssh-add/Makefile.depend
@@ -2,18 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libldns \
lib/libpam/libpam \
lib/libutil \
- lib/libz \
secure/lib/libcrypto \
secure/lib/libssh \
diff --git a/secure/usr.bin/ssh-agent/Makefile.depend b/secure/usr.bin/ssh-agent/Makefile.depend
index 270b7612d3a6..1577383c0439 100644
--- a/secure/usr.bin/ssh-agent/Makefile.depend
+++ b/secure/usr.bin/ssh-agent/Makefile.depend
@@ -2,18 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libldns \
lib/libpam/libpam \
lib/libutil \
- lib/libz \
secure/lib/libcrypto \
secure/lib/libssh \
diff --git a/secure/usr.bin/ssh-keygen/Makefile.depend b/secure/usr.bin/ssh-keygen/Makefile.depend
index 270b7612d3a6..1577383c0439 100644
--- a/secure/usr.bin/ssh-keygen/Makefile.depend
+++ b/secure/usr.bin/ssh-keygen/Makefile.depend
@@ -2,18 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libldns \
lib/libpam/libpam \
lib/libutil \
- lib/libz \
secure/lib/libcrypto \
secure/lib/libssh \
diff --git a/secure/usr.bin/ssh-keyscan/Makefile.depend b/secure/usr.bin/ssh-keyscan/Makefile.depend
index 270b7612d3a6..1577383c0439 100644
--- a/secure/usr.bin/ssh-keyscan/Makefile.depend
+++ b/secure/usr.bin/ssh-keyscan/Makefile.depend
@@ -2,18 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libldns \
lib/libpam/libpam \
lib/libutil \
- lib/libz \
secure/lib/libcrypto \
secure/lib/libssh \
diff --git a/secure/usr.bin/ssh/Makefile.depend b/secure/usr.bin/ssh/Makefile.depend
index 508fced30457..b75db2eec148 100644
--- a/secure/usr.bin/ssh/Makefile.depend
+++ b/secure/usr.bin/ssh/Makefile.depend
@@ -5,20 +5,14 @@ DIRDEPS = \
include \
include/arpa \
include/gssapi \
- include/rpc \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libldns \
lib/libpam/libpam \
- lib/libthr \
lib/libutil \
- lib/libz \
secure/lib/libcrypto \
secure/lib/libssh \
- secure/lib/libssl \
.include <dirdeps.mk>
diff --git a/secure/usr.sbin/sshd/Makefile.depend b/secure/usr.sbin/sshd/Makefile.depend
index bee632901328..5a128c5a4800 100644
--- a/secure/usr.sbin/sshd/Makefile.depend
+++ b/secure/usr.sbin/sshd/Makefile.depend
@@ -11,17 +11,11 @@ DIRDEPS = \
lib/libc \
lib/libcapsicum \
lib/libcasper/libcasper \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
- lib/libldns \
lib/libpam/libpam \
- lib/libthr \
lib/libutil \
- lib/libz \
secure/lib/libcrypto \
secure/lib/libssh \
- secure/lib/libssl \
.include <dirdeps.mk>
diff --git a/share/examples/Makefile.depend b/share/examples/Makefile.depend
index d7cfba0e4f6e..f80275d86ab1 100644
--- a/share/examples/Makefile.depend
+++ b/share/examples/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/APPLE/Makefile.depend b/share/i18n/csmapper/APPLE/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/APPLE/Makefile.depend
+++ b/share/i18n/csmapper/APPLE/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/AST/Makefile.depend b/share/i18n/csmapper/AST/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/AST/Makefile.depend
+++ b/share/i18n/csmapper/AST/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/BIG5/Makefile.depend b/share/i18n/csmapper/BIG5/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/BIG5/Makefile.depend
+++ b/share/i18n/csmapper/BIG5/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/CNS/Makefile.depend b/share/i18n/csmapper/CNS/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/CNS/Makefile.depend
+++ b/share/i18n/csmapper/CNS/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/CP/Makefile.depend b/share/i18n/csmapper/CP/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/CP/Makefile.depend
+++ b/share/i18n/csmapper/CP/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/EBCDIC/Makefile.depend b/share/i18n/csmapper/EBCDIC/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/EBCDIC/Makefile.depend
+++ b/share/i18n/csmapper/EBCDIC/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/GB/Makefile.depend b/share/i18n/csmapper/GB/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/GB/Makefile.depend
+++ b/share/i18n/csmapper/GB/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/GEORGIAN/Makefile.depend b/share/i18n/csmapper/GEORGIAN/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/GEORGIAN/Makefile.depend
+++ b/share/i18n/csmapper/GEORGIAN/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/ISO-8859/Makefile.depend b/share/i18n/csmapper/ISO-8859/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/ISO-8859/Makefile.depend
+++ b/share/i18n/csmapper/ISO-8859/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/JIS/Makefile.depend b/share/i18n/csmapper/JIS/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/JIS/Makefile.depend
+++ b/share/i18n/csmapper/JIS/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/KAZAKH/Makefile.depend b/share/i18n/csmapper/KAZAKH/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/KAZAKH/Makefile.depend
+++ b/share/i18n/csmapper/KAZAKH/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/KOI/Makefile.depend b/share/i18n/csmapper/KOI/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/KOI/Makefile.depend
+++ b/share/i18n/csmapper/KOI/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/KS/Makefile.depend b/share/i18n/csmapper/KS/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/KS/Makefile.depend
+++ b/share/i18n/csmapper/KS/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/MISC/Makefile.depend b/share/i18n/csmapper/MISC/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/MISC/Makefile.depend
+++ b/share/i18n/csmapper/MISC/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/Makefile.depend b/share/i18n/csmapper/Makefile.depend
index b221179100ca..d78ca54b99d9 100644
--- a/share/i18n/csmapper/Makefile.depend
+++ b/share/i18n/csmapper/Makefile.depend
@@ -18,7 +18,6 @@ DIRDEPS = \
share/i18n/csmapper/KS \
share/i18n/csmapper/MISC \
share/i18n/csmapper/TCVN \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/csmapper/TCVN/Makefile.depend b/share/i18n/csmapper/TCVN/Makefile.depend
index e2e5f90e73e3..f80275d86ab1 100644
--- a/share/i18n/csmapper/TCVN/Makefile.depend
+++ b/share/i18n/csmapper/TCVN/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkcsmapper_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/APPLE/Makefile.depend b/share/i18n/esdb/APPLE/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/APPLE/Makefile.depend
+++ b/share/i18n/esdb/APPLE/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/AST/Makefile.depend b/share/i18n/esdb/AST/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/AST/Makefile.depend
+++ b/share/i18n/esdb/AST/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/BIG5/Makefile.depend b/share/i18n/esdb/BIG5/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/BIG5/Makefile.depend
+++ b/share/i18n/esdb/BIG5/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/CP/Makefile.depend b/share/i18n/esdb/CP/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/CP/Makefile.depend
+++ b/share/i18n/esdb/CP/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/DEC/Makefile.depend b/share/i18n/esdb/DEC/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/DEC/Makefile.depend
+++ b/share/i18n/esdb/DEC/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/EBCDIC/Makefile.depend b/share/i18n/esdb/EBCDIC/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/EBCDIC/Makefile.depend
+++ b/share/i18n/esdb/EBCDIC/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/EUC/Makefile.depend b/share/i18n/esdb/EUC/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/EUC/Makefile.depend
+++ b/share/i18n/esdb/EUC/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/GB/Makefile.depend b/share/i18n/esdb/GB/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/GB/Makefile.depend
+++ b/share/i18n/esdb/GB/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/GEORGIAN/Makefile.depend b/share/i18n/esdb/GEORGIAN/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/GEORGIAN/Makefile.depend
+++ b/share/i18n/esdb/GEORGIAN/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/ISO-2022/Makefile.depend b/share/i18n/esdb/ISO-2022/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/ISO-2022/Makefile.depend
+++ b/share/i18n/esdb/ISO-2022/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/ISO-8859/Makefile.depend b/share/i18n/esdb/ISO-8859/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/ISO-8859/Makefile.depend
+++ b/share/i18n/esdb/ISO-8859/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/ISO646/Makefile.depend b/share/i18n/esdb/ISO646/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/ISO646/Makefile.depend
+++ b/share/i18n/esdb/ISO646/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/KAZAKH/Makefile.depend b/share/i18n/esdb/KAZAKH/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/KAZAKH/Makefile.depend
+++ b/share/i18n/esdb/KAZAKH/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/KOI/Makefile.depend b/share/i18n/esdb/KOI/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/KOI/Makefile.depend
+++ b/share/i18n/esdb/KOI/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/MISC/Makefile.depend b/share/i18n/esdb/MISC/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/MISC/Makefile.depend
+++ b/share/i18n/esdb/MISC/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/Makefile.depend b/share/i18n/esdb/Makefile.depend
index 2b8adbf82240..fe80b3bde424 100644
--- a/share/i18n/esdb/Makefile.depend
+++ b/share/i18n/esdb/Makefile.depend
@@ -19,7 +19,6 @@ DIRDEPS = \
share/i18n/esdb/MISC \
share/i18n/esdb/TCVN \
share/i18n/esdb/UTF \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/TCVN/Makefile.depend b/share/i18n/esdb/TCVN/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/TCVN/Makefile.depend
+++ b/share/i18n/esdb/TCVN/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/i18n/esdb/UTF/Makefile.depend b/share/i18n/esdb/UTF/Makefile.depend
index 0f8bc725d2ec..f80275d86ab1 100644
--- a/share/i18n/esdb/UTF/Makefile.depend
+++ b/share/i18n/esdb/UTF/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- usr.bin/mkesdb_static.host \
.include <dirdeps.mk>
diff --git a/share/syscons/scrnmaps/Makefile.depend b/share/syscons/scrnmaps/Makefile.depend
index cae7e645ef6a..8a886bea1643 100644
--- a/share/syscons/scrnmaps/Makefile.depend
+++ b/share/syscons/scrnmaps/Makefile.depend
@@ -2,11 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
- include \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcompiler_rt \
+ share/syscons/scrnmaps.host \
.include <dirdeps.mk>
diff --git a/share/zoneinfo/Makefile.depend b/share/zoneinfo/Makefile.depend
index d7cfba0e4f6e..864936bceab5 100644
--- a/share/zoneinfo/Makefile.depend
+++ b/share/zoneinfo/Makefile.depend
@@ -3,6 +3,7 @@
DIRDEPS = \
usr.bin/xinstall.host \
+ usr.sbin/zic.host \
.include <dirdeps.mk>
diff --git a/stand/efi/boot1/Makefile.depend b/stand/efi/boot1/Makefile.depend
index ffc5430cceec..995af7195891 100644
--- a/stand/efi/boot1/Makefile.depend
+++ b/stand/efi/boot1/Makefile.depend
@@ -2,12 +2,8 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- include \
- include/xlocale \
- lib/libmd \
stand/efi/libefi \
stand/libsa \
- stand/zfs \
.include <dirdeps.mk>
diff --git a/stand/efi/loader_4th/Makefile.depend b/stand/efi/loader_4th/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/stand/efi/loader_4th/Makefile.depend
diff --git a/stand/ficl32/Makefile.depend b/stand/ficl32/Makefile.depend
index 73bc18c8c0fc..528877a1f067 100644
--- a/stand/ficl32/Makefile.depend
+++ b/stand/ficl32/Makefile.depend
@@ -2,7 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- stand/libsa \
+ stand/libsa32 \
.include <dirdeps.mk>
diff --git a/stand/i386/libi386/Makefile.depend b/stand/i386/libi386/Makefile.depend
index df20c96b20e1..73bc18c8c0fc 100644
--- a/stand/i386/libi386/Makefile.depend
+++ b/stand/i386/libi386/Makefile.depend
@@ -2,9 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- include \
- include/xlocale \
- lib/libmd \
+ stand/libsa \
.include <dirdeps.mk>
diff --git a/stand/i386/loader/Makefile.depend b/stand/i386/loader/Makefile.depend
index 8807f64e88d6..423e95ee365d 100644
--- a/stand/i386/loader/Makefile.depend
+++ b/stand/i386/loader/Makefile.depend
@@ -2,11 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- stand/${MACHINE_CPUARCH}/btx/btx \
- stand/${MACHINE_CPUARCH}/btx/btxldr \
- stand/${MACHINE_CPUARCH}/btx/lib \
- stand/${MACHINE_CPUARCH}/libi386 \
stand/ficl \
+ stand/i386/btx/btx \
+ stand/i386/btx/btxldr \
+ stand/i386/btx/lib \
+ stand/i386/libi386 \
stand/libsa \
diff --git a/stand/i386/pxeldr/Makefile.depend b/stand/i386/pxeldr/Makefile.depend
index 35b75b1ca42b..4f870797e486 100644
--- a/stand/i386/pxeldr/Makefile.depend
+++ b/stand/i386/pxeldr/Makefile.depend
@@ -3,10 +3,8 @@
DIRDEPS = \
include \
- stand/i386/btx/btx \
- stand/i386/btx/btxldr \
- stand/i386/loader \
-
+ ${BOOT_MACHINE_DIR}/btx/btx \
+ ${BOOT_MACHINE_DIR}/btx/btxldr \
.include <dirdeps.mk>
diff --git a/stand/i386/pxeldr/Makefile.depend.options b/stand/i386/pxeldr/Makefile.depend.options
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/stand/i386/pxeldr/Makefile.depend.options
diff --git a/stand/libsa32/Makefile.depend b/stand/libsa32/Makefile.depend
index 73bc18c8c0fc..f80275d86ab1 100644
--- a/stand/libsa32/Makefile.depend
+++ b/stand/libsa32/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- stand/libsa \
.include <dirdeps.mk>
diff --git a/stand/userboot/test/Makefile.depend b/stand/userboot/test/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/stand/userboot/test/Makefile.depend
+++ b/stand/userboot/test/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/stand/userboot/userboot/Makefile.depend b/stand/userboot/userboot/Makefile.depend
index 87e0acc0f3b5..52b0bbdaac9e 100644
--- a/stand/userboot/userboot/Makefile.depend
+++ b/stand/userboot/userboot/Makefile.depend
@@ -2,11 +2,8 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- include \
- include/xlocale \
stand/ficl \
stand/libsa \
- stand/zfs \
.include <dirdeps.mk>
diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend
index 9e044815c2b9..add9cc8f8c4c 100644
--- a/targets/pseudo/userland/lib/Makefile.depend
+++ b/targets/pseudo/userland/lib/Makefile.depend
@@ -4,6 +4,8 @@
.include <src.opts.mk>
+DEP_MACHINE_CPUARCH?= ${MACHINE_CPUARCH}
+
DIRDEPS = \
lib/${CSU_DIR} \
lib/atf/libatf-c \
@@ -35,9 +37,11 @@ DIRDEPS = \
lib/libalias/modules/smedia \
lib/libarchive \
lib/libauditd \
+ lib/libbe \
lib/libbegemot \
lib/libblocksruntime \
lib/libbluetooth \
+ lib/libbsddialog \
lib/libbsdstat \
lib/libbsm \
lib/libbsnmp/libbsnmp \
@@ -64,6 +68,7 @@ DIRDEPS = \
lib/libedit/edit/readline \
lib/libelf \
lib/libelftc \
+ lib/libevent1 \
lib/libevent \
lib/libexecinfo \
lib/libexpat \
@@ -97,6 +102,7 @@ DIRDEPS = \
lib/libifconfig \
lib/libipsec \
lib/libipx \
+ lib/libiscsiutil \
lib/libjail \
lib/libkiconv \
lib/libkvm \
@@ -107,6 +113,7 @@ DIRDEPS = \
lib/libmd \
lib/libmemstat \
lib/libmilter \
+ lib/libmixer \
lib/libmp \
lib/libnetgraph \
lib/libngatm \
@@ -142,6 +149,7 @@ DIRDEPS = \
lib/libproc \
lib/libprocstat \
lib/libradius \
+ lib/libregex \
lib/librpcsec_gss \
lib/librpcsvc \
lib/librss \
@@ -155,6 +163,7 @@ DIRDEPS = \
lib/libsmdb \
lib/libsmutil \
lib/libsqlite3 \
+ lib/libstats \
lib/libstdbuf \
lib/libstdthreads \
lib/libsysdecode \
@@ -173,6 +182,7 @@ DIRDEPS = \
lib/libvgl \
lib/libvmmapi \
lib/libwrap \
+ lib/libxo \
lib/liby \
lib/libyaml \
lib/libypclnt \
@@ -189,8 +199,8 @@ DIRDEPS = \
lib/ncurses/panelw \
.if ${MK_CLANG} != "no" && \
- (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
- ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386")
+ (${DEP_MACHINE_CPUARCH} == "aarch64" || ${DEP_MACHINE_CPUARCH} == "amd64" || \
+ ${DEP_MACHINE_CPUARCH} == "arm" || ${DEP_MACHINE_CPUARCH} == "i386")
DIRDEPS+= \
lib/libclang_rt/asan-preinit \
lib/libclang_rt/asan \
@@ -206,8 +216,8 @@ DIRDEPS+= \
.endif
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
- ${MACHINE_CPUARCH} == "powerpc"
+.if ${DEP_MACHINE_CPUARCH} == "amd64" || ${DEP_MACHINE_CPUARCH} == "i386" || \
+ ${DEP_MACHINE_CPUARCH} == "powerpc"
DIRDEPS+= stand/libsa32
.endif
@@ -247,4 +257,8 @@ DIRDEPS+= \
DIRDEPS+= lib/libblacklist
.endif
+.if ${MK_ZFS} != "no"
+DIRDEPS+= cddl/lib/libzutil
+.endif
+
.include <dirdeps.mk>
diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend
index a4723e8dff1b..6ec3ad6c4a6d 100644
--- a/targets/pseudo/userland/misc/Makefile.depend
+++ b/targets/pseudo/userland/misc/Makefile.depend
@@ -6,6 +6,8 @@
.include <src.opts.mk>
.endif
+DEP_MACHINE?= ${MACHINE}
+
_sys_boot_efi= stand/efi/loader stand/efi/boot1
.if ${MK_FDT} != "no"
_sys_boot_fdt= stand/fdt stand/efi/fdt
@@ -88,6 +90,11 @@ DIRDEPS.powerpc= ${_sys_boot_fdt} stand/libsa32 stand/ofw stand/uboot
DIRDEPS.sparc64= stand/ofw ${_sys_boot_zfs}
.endif
-DIRDEPS+= ${DIRDEPS.${MACHINE}:U}
+DIRDEPS+= ${DIRDEPS.${DEP_MACHINE}:U}
+
+.if ${DEP_MACHINE} == "amd64"
+# do not build stand/i386 for amd64
+DIRDEPS:= ${DIRDEPS:Nstand/i386*} ${DIRDEPS:Mstand/i386*:S/$/.i386,i386/}
+.endif
.include <dirdeps.mk>
diff --git a/usr.bin/apply/Makefile.depend b/usr.bin/apply/Makefile.depend
index cfec878c09d0..e1468f4dd35c 100644
--- a/usr.bin/apply/Makefile.depend
+++ b/usr.bin/apply/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/ar/Makefile.depend b/usr.bin/ar/Makefile.depend
index d35ec72622d9..293e93a8f446 100644
--- a/usr.bin/ar/Makefile.depend
+++ b/usr.bin/ar/Makefile.depend
@@ -2,20 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libarchive \
- lib/libbz2 \
lib/libc \
lib/libcompiler_rt \
lib/libelf \
- lib/libexpat \
- lib/liblzma \
- lib/libthr \
- lib/libz \
- secure/lib/libcrypto \
usr.bin/yacc.host \
diff --git a/usr.bin/asa/Makefile.depend b/usr.bin/asa/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/asa/Makefile.depend
+++ b/usr.bin/asa/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/at/Makefile.depend b/usr.bin/at/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/at/Makefile.depend
+++ b/usr.bin/at/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/awk/Makefile.depend b/usr.bin/awk/Makefile.depend
index 7e06312d1eb7..8327df679fe1 100644
--- a/usr.bin/awk/Makefile.depend
+++ b/usr.bin/awk/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/msun \
+ usr.bin/awk.host \
usr.bin/yacc.host \
diff --git a/usr.bin/awk/tests/Makefile.depend b/usr.bin/awk/tests/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.bin/awk/tests/Makefile.depend
diff --git a/usr.bin/awk/tests/bugs-fixed/Makefile.depend b/usr.bin/awk/tests/bugs-fixed/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.bin/awk/tests/bugs-fixed/Makefile.depend
diff --git a/usr.bin/awk/tests/netbsd/Makefile.depend b/usr.bin/awk/tests/netbsd/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.bin/awk/tests/netbsd/Makefile.depend
diff --git a/usr.bin/banner/Makefile.depend b/usr.bin/banner/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/banner/Makefile.depend
+++ b/usr.bin/banner/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/basename/Makefile.depend b/usr.bin/basename/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/basename/Makefile.depend
+++ b/usr.bin/basename/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/bc/Makefile.depend b/usr.bin/bc/Makefile.depend
index 23785ca7f9b4..27760b44133c 100644
--- a/usr.bin/bc/Makefile.depend
+++ b/usr.bin/bc/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libedit \
- lib/ncurses/ncursesw \
usr.bin/yacc.host \
diff --git a/usr.bin/biff/Makefile.depend b/usr.bin/biff/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/biff/Makefile.depend
+++ b/usr.bin/biff/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/bintrans/Makefile.depend b/usr.bin/bintrans/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.bin/bintrans/Makefile.depend
+++ b/usr.bin/bintrans/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.bin/bluetooth/bthost/Makefile.depend b/usr.bin/bluetooth/bthost/Makefile.depend
index f556d37ea8e6..4f2136b4abb1 100644
--- a/usr.bin/bluetooth/bthost/Makefile.depend
+++ b/usr.bin/bluetooth/bthost/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/bluetooth/btsockstat/Makefile.depend b/usr.bin/bluetooth/btsockstat/Makefile.depend
index ab1720427ef9..e6c5eed052c2 100644
--- a/usr.bin/bluetooth/btsockstat/Makefile.depend
+++ b/usr.bin/bluetooth/btsockstat/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
diff --git a/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend b/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
index b4d153024640..6dc75077402e 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
+++ b/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/brandelf/Makefile.depend b/usr.bin/brandelf/Makefile.depend
index 24258c3b8ba6..74c302a89819 100644
--- a/usr.bin/brandelf/Makefile.depend
+++ b/usr.bin/brandelf/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
lib/libc \
lib/libcapsicum \
lib/libcompiler_rt \
- lib/libnv \
.include <dirdeps.mk>
diff --git a/usr.bin/bsdcat/Makefile.depend b/usr.bin/bsdcat/Makefile.depend
index 138ae4120671..91ee35cb21eb 100644
--- a/usr.bin/bsdcat/Makefile.depend
+++ b/usr.bin/bsdcat/Makefile.depend
@@ -2,19 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libarchive \
- lib/libbz2 \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
- lib/liblzma \
- lib/libthr \
- lib/libz \
- secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/usr.bin/bsdiff/bsdiff/Makefile.depend b/usr.bin/bsdiff/bsdiff/Makefile.depend
index c93d137e9c2e..8ba8ef176b63 100644
--- a/usr.bin/bsdiff/bsdiff/Makefile.depend
+++ b/usr.bin/bsdiff/bsdiff/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/bsdiff/bspatch/Makefile.depend b/usr.bin/bsdiff/bspatch/Makefile.depend
index c93d137e9c2e..8ba8ef176b63 100644
--- a/usr.bin/bsdiff/bspatch/Makefile.depend
+++ b/usr.bin/bsdiff/bspatch/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/bzip2/Makefile.depend b/usr.bin/bzip2/Makefile.depend
index 81ca59e9e1be..dafa6a954bd4 100644
--- a/usr.bin/bzip2/Makefile.depend
+++ b/usr.bin/bzip2/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/bzip2recover/Makefile.depend b/usr.bin/bzip2recover/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/bzip2recover/Makefile.depend
+++ b/usr.bin/bzip2recover/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/c89/Makefile.depend b/usr.bin/c89/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/c89/Makefile.depend
+++ b/usr.bin/c89/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/c99/Makefile.depend b/usr.bin/c99/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/c99/Makefile.depend
+++ b/usr.bin/c99/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/calendar/Makefile.depend b/usr.bin/calendar/Makefile.depend
index 905e67cc66c9..f4843e55accb 100644
--- a/usr.bin/calendar/Makefile.depend
+++ b/usr.bin/calendar/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libutil \
lib/msun \
diff --git a/usr.bin/cap_mkdb/Makefile.depend b/usr.bin/cap_mkdb/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/cap_mkdb/Makefile.depend
+++ b/usr.bin/cap_mkdb/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/chat/Makefile.depend b/usr.bin/chat/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/chat/Makefile.depend
+++ b/usr.bin/chat/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/chkey/Makefile.depend b/usr.bin/chkey/Makefile.depend
index 881498109fc9..7c0ec98bf50e 100644
--- a/usr.bin/chkey/Makefile.depend
+++ b/usr.bin/chkey/Makefile.depend
@@ -7,7 +7,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libthr \
secure/lib/libcrypto \
diff --git a/usr.bin/cksum/Makefile.depend b/usr.bin/cksum/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/cksum/Makefile.depend
+++ b/usr.bin/cksum/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/cmp/Makefile.depend b/usr.bin/cmp/Makefile.depend
index 1adfc08a54d6..890f8a10aec4 100644
--- a/usr.bin/cmp/Makefile.depend
+++ b/usr.bin/cmp/Makefile.depend
@@ -2,13 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
+ lib/libutil \
.include <dirdeps.mk>
diff --git a/usr.bin/col/Makefile.depend b/usr.bin/col/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/col/Makefile.depend
+++ b/usr.bin/col/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/colrm/Makefile.depend b/usr.bin/colrm/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/colrm/Makefile.depend
+++ b/usr.bin/colrm/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/column/Makefile.depend b/usr.bin/column/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/column/Makefile.depend
+++ b/usr.bin/column/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/comm/Makefile.depend b/usr.bin/comm/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/comm/Makefile.depend
+++ b/usr.bin/comm/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/compile_et/Makefile.depend b/usr.bin/compile_et/Makefile.depend
index 5eff1f3d88e9..a92f5af8620c 100644
--- a/usr.bin/compile_et/Makefile.depend
+++ b/usr.bin/compile_et/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -11,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
usr.bin/yacc.host \
diff --git a/usr.bin/compress/Makefile.depend b/usr.bin/compress/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/compress/Makefile.depend
+++ b/usr.bin/compress/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/cpio/Makefile.depend b/usr.bin/cpio/Makefile.depend
index 138ae4120671..91ee35cb21eb 100644
--- a/usr.bin/cpio/Makefile.depend
+++ b/usr.bin/cpio/Makefile.depend
@@ -2,19 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libarchive \
- lib/libbz2 \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
- lib/liblzma \
- lib/libthr \
- lib/libz \
- secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/usr.bin/cpuset/Makefile.depend b/usr.bin/cpuset/Makefile.depend
index 6cfaab1c3644..1c40cf7442bb 100644
--- a/usr.bin/cpuset/Makefile.depend
+++ b/usr.bin/cpuset/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libjail \
.include <dirdeps.mk>
diff --git a/usr.bin/csplit/Makefile.depend b/usr.bin/csplit/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/csplit/Makefile.depend
+++ b/usr.bin/csplit/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/ctags/Makefile.depend b/usr.bin/ctags/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/ctags/Makefile.depend
+++ b/usr.bin/ctags/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/ctlstat/Makefile.depend b/usr.bin/ctlstat/Makefile.depend
index 6cfaab1c3644..e26877265ee5 100644
--- a/usr.bin/ctlstat/Makefile.depend
+++ b/usr.bin/ctlstat/Makefile.depend
@@ -2,12 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libexpat \
+ lib/libsbuf \
.include <dirdeps.mk>
diff --git a/usr.bin/cut/Makefile.depend b/usr.bin/cut/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/cut/Makefile.depend
+++ b/usr.bin/cut/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/dc/Makefile.depend b/usr.bin/dc/Makefile.depend
index 83920ef06124..c0b178d1b206 100644
--- a/usr.bin/dc/Makefile.depend
+++ b/usr.bin/dc/Makefile.depend
@@ -2,15 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
secure/lib/libcrypto \
- secure/lib/libssl \
.include <dirdeps.mk>
diff --git a/usr.bin/dirname/Makefile.depend b/usr.bin/dirname/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/dirname/Makefile.depend
+++ b/usr.bin/dirname/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/dpv/Makefile.depend b/usr.bin/dpv/Makefile.depend
index a64291919578..17c61c48b97e 100644
--- a/usr.bin/dpv/Makefile.depend
+++ b/usr.bin/dpv/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
gnu/lib/libdialog \
include \
include/xlocale \
@@ -11,9 +10,8 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libdpv \
lib/libfigpar \
- lib/libutil \
lib/msun \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/drill/Makefile.depend b/usr.bin/drill/Makefile.depend
index 6df275334c05..57615b00b60a 100644
--- a/usr.bin/drill/Makefile.depend
+++ b/usr.bin/drill/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -11,7 +10,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libldns \
secure/lib/libcrypto \
- secure/lib/libssl \
.include <dirdeps.mk>
diff --git a/usr.bin/dtc/Makefile.depend b/usr.bin/dtc/Makefile.depend
index ea8bba31ec06..847c6af2c23b 100644
--- a/usr.bin/dtc/Makefile.depend
+++ b/usr.bin/dtc/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/du/Makefile.depend b/usr.bin/du/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.bin/du/Makefile.depend
+++ b/usr.bin/du/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/ee/Makefile.depend b/usr.bin/ee/Makefile.depend
index 9b2a343de2dc..d48a306fe085 100644
--- a/usr.bin/ee/Makefile.depend
+++ b/usr.bin/ee/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/ncurses/ncursesw \
+ lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/elfdump/Makefile.depend b/usr.bin/elfdump/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/elfdump/Makefile.depend
+++ b/usr.bin/elfdump/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/enigma/Makefile.depend b/usr.bin/enigma/Makefile.depend
index 931a9e5f35c5..3051f177bd0c 100644
--- a/usr.bin/enigma/Makefile.depend
+++ b/usr.bin/enigma/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/env/Makefile.depend b/usr.bin/env/Makefile.depend
index 6cfaab1c3644..bcfa88f57adf 100644
--- a/usr.bin/env/Makefile.depend
+++ b/usr.bin/env/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libutil \
.include <dirdeps.mk>
diff --git a/usr.bin/expand/Makefile.depend b/usr.bin/expand/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/expand/Makefile.depend
+++ b/usr.bin/expand/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/false/Makefile.depend b/usr.bin/false/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/false/Makefile.depend
+++ b/usr.bin/false/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/fetch/Makefile.depend b/usr.bin/fetch/Makefile.depend
index 853edec5b9da..21633cebe66a 100644
--- a/usr.bin/fetch/Makefile.depend
+++ b/usr.bin/fetch/Makefile.depend
@@ -2,15 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libfetch \
- secure/lib/libcrypto \
- secure/lib/libssl \
.include <dirdeps.mk>
diff --git a/usr.bin/file/Makefile.depend b/usr.bin/file/Makefile.depend
index 1d4438985327..e12da58f64d5 100644
--- a/usr.bin/file/Makefile.depend
+++ b/usr.bin/file/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libmagic \
- lib/libz \
.include <dirdeps.mk>
diff --git a/usr.bin/file2c/Makefile.depend b/usr.bin/file2c/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/file2c/Makefile.depend
+++ b/usr.bin/file2c/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/find/Makefile.depend b/usr.bin/find/Makefile.depend
index d084433f911c..1648dc46a813 100644
--- a/usr.bin/find/Makefile.depend
+++ b/usr.bin/find/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/finger/Makefile.depend b/usr.bin/finger/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/finger/Makefile.depend
+++ b/usr.bin/finger/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/fmt/Makefile.depend b/usr.bin/fmt/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/fmt/Makefile.depend
+++ b/usr.bin/fmt/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/fold/Makefile.depend b/usr.bin/fold/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/fold/Makefile.depend
+++ b/usr.bin/fold/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/from/Makefile.depend b/usr.bin/from/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/from/Makefile.depend
+++ b/usr.bin/from/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/fstat/Makefile.depend b/usr.bin/fstat/Makefile.depend
index 15bf667a0adc..46cbb4ee538a 100644
--- a/usr.bin/fstat/Makefile.depend
+++ b/usr.bin/fstat/Makefile.depend
@@ -2,16 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
+ include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
- lib/libkvm \
lib/libprocstat \
- lib/libutil \
.include <dirdeps.mk>
diff --git a/usr.bin/fsync/Makefile.depend b/usr.bin/fsync/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/fsync/Makefile.depend
+++ b/usr.bin/fsync/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/ftp/Makefile.depend b/usr.bin/ftp/Makefile.depend
index 965e3a120be6..bbc40437e410 100644
--- a/usr.bin/ftp/Makefile.depend
+++ b/usr.bin/ftp/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,7 +9,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libedit \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/gcore/Makefile.depend b/usr.bin/gcore/Makefile.depend
index c3cca03a0705..66a9ff69832f 100644
--- a/usr.bin/gcore/Makefile.depend
+++ b/usr.bin/gcore/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/gencat/Makefile.depend b/usr.bin/gencat/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.bin/gencat/Makefile.depend
+++ b/usr.bin/gencat/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.bin/getaddrinfo/Makefile.depend b/usr.bin/getaddrinfo/Makefile.depend
index 21c8dc037003..ba6f3b0d703f 100644
--- a/usr.bin/getaddrinfo/Makefile.depend
+++ b/usr.bin/getaddrinfo/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,6 +9,7 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libnetbsd \
lib/libutil \
+ usr.bin/awk.host \
.include <dirdeps.mk>
diff --git a/usr.bin/getconf/Makefile.depend b/usr.bin/getconf/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/getconf/Makefile.depend
+++ b/usr.bin/getconf/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/getent/Makefile.depend b/usr.bin/getent/Makefile.depend
index ff7c06a53300..4423cb3f9387 100644
--- a/usr.bin/getent/Makefile.depend
+++ b/usr.bin/getent/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.bin/getopt/Makefile.depend b/usr.bin/getopt/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/getopt/Makefile.depend
+++ b/usr.bin/getopt/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/gprof/Makefile.depend b/usr.bin/gprof/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/gprof/Makefile.depend
+++ b/usr.bin/gprof/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/grep/Makefile.depend b/usr.bin/grep/Makefile.depend
index 0914589ed3d2..2dfcee44e5bb 100644
--- a/usr.bin/grep/Makefile.depend
+++ b/usr.bin/grep/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
lib/libbz2 \
lib/libc \
lib/libcompiler_rt \
+ lib/libregex \
lib/libz \
diff --git a/usr.bin/gzip/Makefile.depend b/usr.bin/gzip/Makefile.depend
index 9a4b70335fec..429275585277 100644
--- a/usr.bin/gzip/Makefile.depend
+++ b/usr.bin/gzip/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/liblzma \
- lib/libthr \
lib/libz \
lib/libzstd \
diff --git a/usr.bin/head/Makefile.depend b/usr.bin/head/Makefile.depend
index 24258c3b8ba6..8cdbcafad307 100644
--- a/usr.bin/head/Makefile.depend
+++ b/usr.bin/head/Makefile.depend
@@ -8,7 +8,7 @@ DIRDEPS = \
lib/libc \
lib/libcapsicum \
lib/libcompiler_rt \
- lib/libnv \
+ lib/libutil \
.include <dirdeps.mk>
diff --git a/usr.bin/hexdump/Makefile.depend b/usr.bin/hexdump/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/hexdump/Makefile.depend
+++ b/usr.bin/hexdump/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/host/Makefile.depend b/usr.bin/host/Makefile.depend
index 8c17f93c9a8e..65986678ade2 100644
--- a/usr.bin/host/Makefile.depend
+++ b/usr.bin/host/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libldns \
secure/lib/libcrypto \
- secure/lib/libssl \
.include <dirdeps.mk>
diff --git a/usr.bin/iconv/Makefile.depend b/usr.bin/iconv/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/iconv/Makefile.depend
+++ b/usr.bin/iconv/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/id/Makefile.depend b/usr.bin/id/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/id/Makefile.depend
+++ b/usr.bin/id/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/ident/Makefile.depend b/usr.bin/ident/Makefile.depend
index 0ea507d1bbb6..8941ee6d8ae2 100644
--- a/usr.bin/ident/Makefile.depend
+++ b/usr.bin/ident/Makefile.depend
@@ -2,14 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
- lib/libsbuf \
.include <dirdeps.mk>
diff --git a/usr.bin/indent/Makefile.depend b/usr.bin/indent/Makefile.depend
index 6cfaab1c3644..8941ee6d8ae2 100644
--- a/usr.bin/indent/Makefile.depend
+++ b/usr.bin/indent/Makefile.depend
@@ -2,11 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/ipcrm/Makefile.depend b/usr.bin/ipcrm/Makefile.depend
index 4a0ebeceed6f..bca04fbadbba 100644
--- a/usr.bin/ipcrm/Makefile.depend
+++ b/usr.bin/ipcrm/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
diff --git a/usr.bin/ipcs/Makefile.depend b/usr.bin/ipcs/Makefile.depend
index 4a0ebeceed6f..bca04fbadbba 100644
--- a/usr.bin/ipcs/Makefile.depend
+++ b/usr.bin/ipcs/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
diff --git a/usr.bin/iscsictl/Makefile.depend b/usr.bin/iscsictl/Makefile.depend
index 4f526892ed67..d52dae466851 100644
--- a/usr.bin/iscsictl/Makefile.depend
+++ b/usr.bin/iscsictl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,7 +9,7 @@ DIRDEPS = \
lib/libcam \
lib/libcompiler_rt \
lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
usr.bin/yacc.host \
diff --git a/usr.bin/join/Makefile.depend b/usr.bin/join/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/join/Makefile.depend
+++ b/usr.bin/join/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/jot/Makefile.depend b/usr.bin/jot/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/jot/Makefile.depend
+++ b/usr.bin/jot/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/kdump/Makefile.depend b/usr.bin/kdump/Makefile.depend
index c75db3d64eac..bca9b554f2ae 100644
--- a/usr.bin/kdump/Makefile.depend
+++ b/usr.bin/kdump/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/libc \
lib/libcapsicum \
lib/libcompiler_rt \
- lib/libnv \
lib/libsysdecode \
diff --git a/usr.bin/keylogin/Makefile.depend b/usr.bin/keylogin/Makefile.depend
index 5b0587ae477a..01d50925c161 100644
--- a/usr.bin/keylogin/Makefile.depend
+++ b/usr.bin/keylogin/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.bin/keylogout/Makefile.depend b/usr.bin/keylogout/Makefile.depend
index 85338ebe3beb..59ab3d4c55ea 100644
--- a/usr.bin/keylogout/Makefile.depend
+++ b/usr.bin/keylogout/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.bin/killall/Makefile.depend b/usr.bin/killall/Makefile.depend
index 832aef499286..1c40cf7442bb 100644
--- a/usr.bin/killall/Makefile.depend
+++ b/usr.bin/killall/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/ktrace/Makefile.depend b/usr.bin/ktrace/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/ktrace/Makefile.depend
+++ b/usr.bin/ktrace/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/ktrdump/Makefile.depend b/usr.bin/ktrdump/Makefile.depend
index 1ff7af5cf330..6444d5b849c3 100644
--- a/usr.bin/ktrdump/Makefile.depend
+++ b/usr.bin/ktrdump/Makefile.depend
@@ -2,14 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
diff --git a/usr.bin/lam/Makefile.depend b/usr.bin/lam/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/lam/Makefile.depend
+++ b/usr.bin/lam/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/last/Makefile.depend b/usr.bin/last/Makefile.depend
index 1adfc08a54d6..617de5038459 100644
--- a/usr.bin/last/Makefile.depend
+++ b/usr.bin/last/Makefile.depend
@@ -2,13 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.bin/lastcomm/Makefile.depend b/usr.bin/lastcomm/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/lastcomm/Makefile.depend
+++ b/usr.bin/lastcomm/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/ldd/Makefile.depend b/usr.bin/ldd/Makefile.depend
index d5ed563ecfc8..38cb76817939 100644
--- a/usr.bin/ldd/Makefile.depend
+++ b/usr.bin/ldd/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libelf \
.include <dirdeps.mk>
diff --git a/usr.bin/leave/Makefile.depend b/usr.bin/leave/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/leave/Makefile.depend
+++ b/usr.bin/leave/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/less/Makefile.depend b/usr.bin/less/Makefile.depend
index 9b2a343de2dc..ddb8d5a21ca9 100644
--- a/usr.bin/less/Makefile.depend
+++ b/usr.bin/less/Makefile.depend
@@ -2,13 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/lessecho/Makefile.depend b/usr.bin/lessecho/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/lessecho/Makefile.depend
+++ b/usr.bin/lessecho/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/lesskey/Makefile.depend b/usr.bin/lesskey/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/lesskey/Makefile.depend
+++ b/usr.bin/lesskey/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/lex/lib/Makefile.depend b/usr.bin/lex/lib/Makefile.depend
index f80275d86ab1..79506ce16b79 100644
--- a/usr.bin/lex/lib/Makefile.depend
+++ b/usr.bin/lex/lib/Makefile.depend
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ include \
.include <dirdeps.mk>
diff --git a/usr.bin/limits/Makefile.depend b/usr.bin/limits/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.bin/limits/Makefile.depend
+++ b/usr.bin/limits/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/locale/Makefile.depend b/usr.bin/locale/Makefile.depend
index 6cfaab1c3644..e1468f4dd35c 100644
--- a/usr.bin/locale/Makefile.depend
+++ b/usr.bin/locale/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libsbuf \
.include <dirdeps.mk>
diff --git a/usr.bin/localedef/Makefile.depend b/usr.bin/localedef/Makefile.depend
index d084433f911c..1648dc46a813 100644
--- a/usr.bin/localedef/Makefile.depend
+++ b/usr.bin/localedef/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/locate/bigram/Makefile.depend b/usr.bin/locate/bigram/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/locate/bigram/Makefile.depend
+++ b/usr.bin/locate/bigram/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/locate/code/Makefile.depend b/usr.bin/locate/code/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/locate/code/Makefile.depend
+++ b/usr.bin/locate/code/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/locate/locate/Makefile.depend b/usr.bin/locate/locate/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.bin/locate/locate/Makefile.depend
+++ b/usr.bin/locate/locate/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.bin/lock/Makefile.depend b/usr.bin/lock/Makefile.depend
index 931a9e5f35c5..85c2aebab760 100644
--- a/usr.bin/lock/Makefile.depend
+++ b/usr.bin/lock/Makefile.depend
@@ -2,13 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcrypt \
+ lib/libpam/libpam \
.include <dirdeps.mk>
diff --git a/usr.bin/lockf/Makefile.depend b/usr.bin/lockf/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/lockf/Makefile.depend
+++ b/usr.bin/lockf/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/logger/Makefile.depend b/usr.bin/logger/Makefile.depend
index 6cfaab1c3644..2c76356f2369 100644
--- a/usr.bin/logger/Makefile.depend
+++ b/usr.bin/logger/Makefile.depend
@@ -2,11 +2,13 @@
# 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_syslog \
lib/libcompiler_rt \
diff --git a/usr.bin/logins/Makefile.depend b/usr.bin/logins/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/logins/Makefile.depend
+++ b/usr.bin/logins/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/logname/Makefile.depend b/usr.bin/logname/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/logname/Makefile.depend
+++ b/usr.bin/logname/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/look/Makefile.depend b/usr.bin/look/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/look/Makefile.depend
+++ b/usr.bin/look/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/lsvfs/Makefile.depend b/usr.bin/lsvfs/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/lsvfs/Makefile.depend
+++ b/usr.bin/lsvfs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/lzmainfo/Makefile.depend b/usr.bin/lzmainfo/Makefile.depend
index c02c88a2cd25..937f1d458301 100644
--- a/usr.bin/lzmainfo/Makefile.depend
+++ b/usr.bin/lzmainfo/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/liblzma \
- lib/libthr \
.include <dirdeps.mk>
diff --git a/usr.bin/m4/Makefile.depend b/usr.bin/m4/Makefile.depend
index 6fd1ab689225..b6374334d906 100644
--- a/usr.bin/m4/Makefile.depend
+++ b/usr.bin/m4/Makefile.depend
@@ -2,16 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libopenbsd \
- lib/liby \
lib/msun \
- usr.bin/lex/lib \
usr.bin/yacc.host \
diff --git a/usr.bin/mail/Makefile.depend b/usr.bin/mail/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/mail/Makefile.depend
+++ b/usr.bin/mail/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/mandoc/Makefile.depend b/usr.bin/mandoc/Makefile.depend
index 858582db5662..b6d3e14981a5 100644
--- a/usr.bin/mandoc/Makefile.depend
+++ b/usr.bin/mandoc/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/mesg/Makefile.depend b/usr.bin/mesg/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/mesg/Makefile.depend
+++ b/usr.bin/mesg/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/ministat/Makefile.depend b/usr.bin/ministat/Makefile.depend
index ca713780ce7f..f410fe5dfa7b 100644
--- a/usr.bin/ministat/Makefile.depend
+++ b/usr.bin/ministat/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
lib/msun \
diff --git a/usr.bin/mkcsmapper/Makefile.depend b/usr.bin/mkcsmapper/Makefile.depend
index f2071f254a6b..67d52d808cf5 100644
--- a/usr.bin/mkcsmapper/Makefile.depend
+++ b/usr.bin/mkcsmapper/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.bin/mkesdb/Makefile.depend b/usr.bin/mkesdb/Makefile.depend
index d084433f911c..1648dc46a813 100644
--- a/usr.bin/mkesdb/Makefile.depend
+++ b/usr.bin/mkesdb/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/mkfifo/Makefile.depend b/usr.bin/mkfifo/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/mkfifo/Makefile.depend
+++ b/usr.bin/mkfifo/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/mkimg/Makefile.depend b/usr.bin/mkimg/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.bin/mkimg/Makefile.depend
+++ b/usr.bin/mkimg/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/mkstr/Makefile.depend b/usr.bin/mkstr/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/mkstr/Makefile.depend
+++ b/usr.bin/mkstr/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/mktemp/Makefile.depend b/usr.bin/mktemp/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/mktemp/Makefile.depend
+++ b/usr.bin/mktemp/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/mkuzip/Makefile.depend b/usr.bin/mkuzip/Makefile.depend
index 562bfa7a8a33..f9b4992daebd 100644
--- a/usr.bin/mkuzip/Makefile.depend
+++ b/usr.bin/mkuzip/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -12,6 +11,7 @@ DIRDEPS = \
lib/libmd \
lib/libthr \
lib/libz \
+ lib/libzstd \
lib/msun \
diff --git a/usr.bin/msgs/Makefile.depend b/usr.bin/msgs/Makefile.depend
index 9b2a343de2dc..ddb8d5a21ca9 100644
--- a/usr.bin/msgs/Makefile.depend
+++ b/usr.bin/msgs/Makefile.depend
@@ -2,13 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/mt/Makefile.depend b/usr.bin/mt/Makefile.depend
index 1cb7c6b18e99..4e6c54c4570f 100644
--- a/usr.bin/mt/Makefile.depend
+++ b/usr.bin/mt/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libexpat \
lib/libmt \
- lib/libsbuf \
.include <dirdeps.mk>
diff --git a/usr.bin/nc/Makefile.depend b/usr.bin/nc/Makefile.depend
index b78c121a5f29..02e39a3eff4e 100644
--- a/usr.bin/nc/Makefile.depend
+++ b/usr.bin/nc/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,6 +9,8 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libipsec \
+ lib/libsbuf \
+ lib/libstats \
.include <dirdeps.mk>
diff --git a/usr.bin/ncal/Makefile.depend b/usr.bin/ncal/Makefile.depend
index ab7455b54eda..63df66cff900 100644
--- a/usr.bin/ncal/Makefile.depend
+++ b/usr.bin/ncal/Makefile.depend
@@ -2,14 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcalendar \
lib/libcompiler_rt \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/netstat/Makefile.depend b/usr.bin/netstat/Makefile.depend
index 5bdd351d7b5d..e5b5082c85b1 100644
--- a/usr.bin/netstat/Makefile.depend
+++ b/usr.bin/netstat/Makefile.depend
@@ -8,11 +8,11 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
lib/libmemstat \
lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
+ usr.bin/awk.host \
.include <dirdeps.mk>
diff --git a/usr.bin/newgrp/Makefile.depend b/usr.bin/newgrp/Makefile.depend
index 10a95e7fdc38..41653b767d04 100644
--- a/usr.bin/newgrp/Makefile.depend
+++ b/usr.bin/newgrp/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/newkey/Makefile.depend b/usr.bin/newkey/Makefile.depend
index 97ec617dcc81..db92a2beda5b 100644
--- a/usr.bin/newkey/Makefile.depend
+++ b/usr.bin/newkey/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.bin/nfsstat/Makefile.depend b/usr.bin/nfsstat/Makefile.depend
index 4ea94319c964..e7d076721e5f 100644
--- a/usr.bin/nfsstat/Makefile.depend
+++ b/usr.bin/nfsstat/Makefile.depend
@@ -2,15 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libdevstat \
- lib/libelf \
lib/libkvm \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.bin/nice/Makefile.depend b/usr.bin/nice/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/nice/Makefile.depend
+++ b/usr.bin/nice/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/nl/Makefile.depend b/usr.bin/nl/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/nl/Makefile.depend
+++ b/usr.bin/nl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/nohup/Makefile.depend b/usr.bin/nohup/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/nohup/Makefile.depend
+++ b/usr.bin/nohup/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/passwd/Makefile.depend b/usr.bin/passwd/Makefile.depend
index 5fb710255efc..0920d51ef8a6 100644
--- a/usr.bin/passwd/Makefile.depend
+++ b/usr.bin/passwd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/paste/Makefile.depend b/usr.bin/paste/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/paste/Makefile.depend
+++ b/usr.bin/paste/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/patch/Makefile.depend b/usr.bin/patch/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/patch/Makefile.depend
+++ b/usr.bin/patch/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/pathchk/Makefile.depend b/usr.bin/pathchk/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/pathchk/Makefile.depend
+++ b/usr.bin/pathchk/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/perror/Makefile.depend b/usr.bin/perror/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/perror/Makefile.depend
+++ b/usr.bin/perror/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/pr/Makefile.depend b/usr.bin/pr/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/pr/Makefile.depend
+++ b/usr.bin/pr/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/printenv/Makefile.depend b/usr.bin/printenv/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/printenv/Makefile.depend
+++ b/usr.bin/printenv/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/printf/Makefile.depend b/usr.bin/printf/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/printf/Makefile.depend
+++ b/usr.bin/printf/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/proccontrol/Makefile.depend b/usr.bin/proccontrol/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/proccontrol/Makefile.depend
+++ b/usr.bin/proccontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/procstat/Makefile.depend b/usr.bin/procstat/Makefile.depend
index 8707112a6300..06b9ded5b04e 100644
--- a/usr.bin/procstat/Makefile.depend
+++ b/usr.bin/procstat/Makefile.depend
@@ -2,19 +2,16 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
- lib/libkvm \
lib/libprocstat \
lib/libsbuf \
lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.bin/protect/Makefile.depend b/usr.bin/protect/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/protect/Makefile.depend
+++ b/usr.bin/protect/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/quota/Makefile.depend b/usr.bin/quota/Makefile.depend
index 3866c0bbf1f9..18703320dc28 100644
--- a/usr.bin/quota/Makefile.depend
+++ b/usr.bin/quota/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.bin/rctl/Makefile.depend b/usr.bin/rctl/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.bin/rctl/Makefile.depend
+++ b/usr.bin/rctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/renice/Makefile.depend b/usr.bin/renice/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/renice/Makefile.depend
+++ b/usr.bin/renice/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/resizewin/Makefile.depend b/usr.bin/resizewin/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/resizewin/Makefile.depend
+++ b/usr.bin/resizewin/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/rev/Makefile.depend b/usr.bin/rev/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/rev/Makefile.depend
+++ b/usr.bin/rev/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/revoke/Makefile.depend b/usr.bin/revoke/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/revoke/Makefile.depend
+++ b/usr.bin/revoke/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/rpcgen/Makefile.depend b/usr.bin/rpcgen/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/rpcgen/Makefile.depend
+++ b/usr.bin/rpcgen/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/rpcinfo/Makefile.depend b/usr.bin/rpcinfo/Makefile.depend
index ff7c06a53300..4423cb3f9387 100644
--- a/usr.bin/rpcinfo/Makefile.depend
+++ b/usr.bin/rpcinfo/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.bin/rs/Makefile.depend b/usr.bin/rs/Makefile.depend
index 6cfaab1c3644..847c6af2c23b 100644
--- a/usr.bin/rs/Makefile.depend
+++ b/usr.bin/rs/Makefile.depend
@@ -2,12 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
+ lib/libcxxrt \
+ lib/msun \
.include <dirdeps.mk>
diff --git a/usr.bin/rup/Makefile.depend b/usr.bin/rup/Makefile.depend
index 572fc8dbf41a..ddf4ee2f8b49 100644
--- a/usr.bin/rup/Makefile.depend
+++ b/usr.bin/rup/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.bin/ruptime/Makefile.depend b/usr.bin/ruptime/Makefile.depend
index 4bd09984c29d..18d0fecc0c96 100644
--- a/usr.bin/ruptime/Makefile.depend
+++ b/usr.bin/ruptime/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/protocols \
include/xlocale \
diff --git a/usr.bin/rusers/Makefile.depend b/usr.bin/rusers/Makefile.depend
index 572fc8dbf41a..ddf4ee2f8b49 100644
--- a/usr.bin/rusers/Makefile.depend
+++ b/usr.bin/rusers/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.bin/rwall/Makefile.depend b/usr.bin/rwall/Makefile.depend
index 85338ebe3beb..59ab3d4c55ea 100644
--- a/usr.bin/rwall/Makefile.depend
+++ b/usr.bin/rwall/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.bin/rwho/Makefile.depend b/usr.bin/rwho/Makefile.depend
index 4bd09984c29d..6c7d9ed521c2 100644
--- a/usr.bin/rwho/Makefile.depend
+++ b/usr.bin/rwho/Makefile.depend
@@ -2,12 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/protocols \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/script/Makefile.depend b/usr.bin/script/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.bin/script/Makefile.depend
+++ b/usr.bin/script/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/sdiff/Makefile.depend b/usr.bin/sdiff/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/sdiff/Makefile.depend
+++ b/usr.bin/sdiff/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/sed/Makefile.depend b/usr.bin/sed/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/sed/Makefile.depend
+++ b/usr.bin/sed/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/seq/Makefile.depend b/usr.bin/seq/Makefile.depend
index 905e67cc66c9..5f1a802404d8 100644
--- a/usr.bin/seq/Makefile.depend
+++ b/usr.bin/seq/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/showmount/Makefile.depend b/usr.bin/showmount/Makefile.depend
index 85338ebe3beb..59ab3d4c55ea 100644
--- a/usr.bin/showmount/Makefile.depend
+++ b/usr.bin/showmount/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.bin/smbutil/Makefile.depend b/usr.bin/smbutil/Makefile.depend
index 53bd740fd597..a0b5e6b51b49 100644
--- a/usr.bin/smbutil/Makefile.depend
+++ b/usr.bin/smbutil/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libkiconv \
lib/libsmb \
diff --git a/usr.bin/sockstat/Makefile.depend b/usr.bin/sockstat/Makefile.depend
index d5ed563ecfc8..808b4ed66272 100644
--- a/usr.bin/sockstat/Makefile.depend
+++ b/usr.bin/sockstat/Makefile.depend
@@ -2,13 +2,19 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
+ lib/libcasper/services/cap_net \
+ lib/libcasper/services/cap_netdb \
+ lib/libcasper/services/cap_pwd \
+ lib/libcasper/services/cap_sysctl \
lib/libcompiler_rt \
+ lib/libjail \
.include <dirdeps.mk>
diff --git a/usr.bin/soelim/Makefile.depend b/usr.bin/soelim/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/soelim/Makefile.depend
+++ b/usr.bin/soelim/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/split/Makefile.depend b/usr.bin/split/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.bin/split/Makefile.depend
+++ b/usr.bin/split/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/stat/Makefile.depend b/usr.bin/stat/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/stat/Makefile.depend
+++ b/usr.bin/stat/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/stdbuf/Makefile.depend b/usr.bin/stdbuf/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/stdbuf/Makefile.depend
+++ b/usr.bin/stdbuf/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/systat/Makefile.depend b/usr.bin/systat/Makefile.depend
index 01628d979f33..3a50cdd77267 100644
--- a/usr.bin/systat/Makefile.depend
+++ b/usr.bin/systat/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,10 +9,12 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libdevstat \
- lib/libelf \
lib/libkvm \
+ lib/libprocstat \
+ lib/libutil \
lib/msun \
- lib/ncurses/ncursesw \
+ lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/tabs/Makefile.depend b/usr.bin/tabs/Makefile.depend
index 9b2a343de2dc..ddb8d5a21ca9 100644
--- a/usr.bin/tabs/Makefile.depend
+++ b/usr.bin/tabs/Makefile.depend
@@ -2,13 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/tail/Makefile.depend b/usr.bin/tail/Makefile.depend
index 24258c3b8ba6..8cdbcafad307 100644
--- a/usr.bin/tail/Makefile.depend
+++ b/usr.bin/tail/Makefile.depend
@@ -8,7 +8,7 @@ DIRDEPS = \
lib/libc \
lib/libcapsicum \
lib/libcompiler_rt \
- lib/libnv \
+ lib/libutil \
.include <dirdeps.mk>
diff --git a/usr.bin/talk/Makefile.depend b/usr.bin/talk/Makefile.depend
index e812fe003083..f47edec1d62d 100644
--- a/usr.bin/talk/Makefile.depend
+++ b/usr.bin/talk/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/protocols \
@@ -10,7 +9,8 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/ncurses/ncursesw \
+ lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/tar/Makefile.depend b/usr.bin/tar/Makefile.depend
index 138ae4120671..91ee35cb21eb 100644
--- a/usr.bin/tar/Makefile.depend
+++ b/usr.bin/tar/Makefile.depend
@@ -2,19 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libarchive \
- lib/libbz2 \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
- lib/liblzma \
- lib/libthr \
- lib/libz \
- secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/usr.bin/tcopy/Makefile.depend b/usr.bin/tcopy/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/tcopy/Makefile.depend
+++ b/usr.bin/tcopy/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/tee/Makefile.depend b/usr.bin/tee/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/tee/Makefile.depend
+++ b/usr.bin/tee/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/telnet/Makefile.depend b/usr.bin/telnet/Makefile.depend
index 4e155dc5ca50..e1cc6426df2d 100644
--- a/usr.bin/telnet/Makefile.depend
+++ b/usr.bin/telnet/Makefile.depend
@@ -7,12 +7,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
lib/libtelnet \
- lib/libthr \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/tftp/Makefile.depend b/usr.bin/tftp/Makefile.depend
index 965e3a120be6..eac46b5bf56f 100644
--- a/usr.bin/tftp/Makefile.depend
+++ b/usr.bin/tftp/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libedit \
- lib/ncurses/ncursesw \
.include <dirdeps.mk>
diff --git a/usr.bin/time/Makefile.depend b/usr.bin/time/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/time/Makefile.depend
+++ b/usr.bin/time/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/tip/tip/Makefile.depend b/usr.bin/tip/tip/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/tip/tip/Makefile.depend
+++ b/usr.bin/tip/tip/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/top/Makefile.depend b/usr.bin/top/Makefile.depend
index 9fc529fc3ec7..184590f3c4de 100644
--- a/usr.bin/top/Makefile.depend
+++ b/usr.bin/top/Makefile.depend
@@ -2,17 +2,17 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libjail \
lib/libkvm \
+ lib/libsbuf \
+ lib/libutil \
lib/msun \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/touch/Makefile.depend b/usr.bin/touch/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/touch/Makefile.depend
+++ b/usr.bin/touch/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/tr/Makefile.depend b/usr.bin/tr/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/tr/Makefile.depend
+++ b/usr.bin/tr/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/true/Makefile.depend b/usr.bin/true/Makefile.depend
index 03d33794d0e3..ccb95051f965 100644
--- a/usr.bin/true/Makefile.depend
+++ b/usr.bin/true/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
diff --git a/usr.bin/truncate/Makefile.depend b/usr.bin/truncate/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.bin/truncate/Makefile.depend
+++ b/usr.bin/truncate/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/truss/Makefile.depend b/usr.bin/truss/Makefile.depend
index fa7ed60a07d9..9bb7bdb74582 100644
--- a/usr.bin/truss/Makefile.depend
+++ b/usr.bin/truss/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.bin/tsort/Makefile.depend b/usr.bin/tsort/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/tsort/Makefile.depend
+++ b/usr.bin/tsort/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/tty/Makefile.depend b/usr.bin/tty/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/tty/Makefile.depend
+++ b/usr.bin/tty/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/ul/Makefile.depend b/usr.bin/ul/Makefile.depend
index 9b2a343de2dc..ddb8d5a21ca9 100644
--- a/usr.bin/ul/Makefile.depend
+++ b/usr.bin/ul/Makefile.depend
@@ -2,13 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/uname/Makefile.depend b/usr.bin/uname/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/uname/Makefile.depend
+++ b/usr.bin/uname/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/unexpand/Makefile.depend b/usr.bin/unexpand/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/unexpand/Makefile.depend
+++ b/usr.bin/unexpand/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/unifdef/Makefile.depend b/usr.bin/unifdef/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/unifdef/Makefile.depend
+++ b/usr.bin/unifdef/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/uniq/Makefile.depend b/usr.bin/uniq/Makefile.depend
index 6cfaab1c3644..8941ee6d8ae2 100644
--- a/usr.bin/uniq/Makefile.depend
+++ b/usr.bin/uniq/Makefile.depend
@@ -2,11 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/units/Makefile.depend b/usr.bin/units/Makefile.depend
index 0e0490b10835..a0bd59f6de76 100644
--- a/usr.bin/units/Makefile.depend
+++ b/usr.bin/units/Makefile.depend
@@ -2,14 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
lib/libedit \
- lib/ncurses/ncursesw \
.include <dirdeps.mk>
diff --git a/usr.bin/unvis/Makefile.depend b/usr.bin/unvis/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/unvis/Makefile.depend
+++ b/usr.bin/unvis/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/unzip/Makefile.depend b/usr.bin/unzip/Makefile.depend
index 138ae4120671..91ee35cb21eb 100644
--- a/usr.bin/unzip/Makefile.depend
+++ b/usr.bin/unzip/Makefile.depend
@@ -2,19 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libarchive \
- lib/libbz2 \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
- lib/liblzma \
- lib/libthr \
- lib/libz \
- secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/usr.bin/usbhidaction/Makefile.depend b/usr.bin/usbhidaction/Makefile.depend
index e80cab0974c8..57ccd1e243db 100644
--- a/usr.bin/usbhidaction/Makefile.depend
+++ b/usr.bin/usbhidaction/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/usbhidctl/Makefile.depend b/usr.bin/usbhidctl/Makefile.depend
index e80cab0974c8..57ccd1e243db 100644
--- a/usr.bin/usbhidctl/Makefile.depend
+++ b/usr.bin/usbhidctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/users/Makefile.depend b/usr.bin/users/Makefile.depend
index ea8bba31ec06..f2ede85914a1 100644
--- a/usr.bin/users/Makefile.depend
+++ b/usr.bin/users/Makefile.depend
@@ -2,12 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/usr.bin/vacation/Makefile.depend b/usr.bin/vacation/Makefile.depend
index 0feabbf167e0..52e72d168a20 100644
--- a/usr.bin/vacation/Makefile.depend
+++ b/usr.bin/vacation/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/vgrind/Makefile.depend b/usr.bin/vgrind/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/vgrind/Makefile.depend
+++ b/usr.bin/vgrind/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/vi/Makefile.depend b/usr.bin/vi/Makefile.depend
index 274b0a661c9d..8609c0fda5ef 100644
--- a/usr.bin/vi/Makefile.depend
+++ b/usr.bin/vi/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,7 +9,8 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libutil \
- lib/ncurses/ncursesw \
+ lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.bin/vi/catalog/Makefile.depend b/usr.bin/vi/catalog/Makefile.depend
index f80275d86ab1..8d409f5263ac 100644
--- a/usr.bin/vi/catalog/Makefile.depend
+++ b/usr.bin/vi/catalog/Makefile.depend
@@ -2,6 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ include \
+ include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
.include <dirdeps.mk>
diff --git a/usr.bin/vis/Makefile.depend b/usr.bin/vis/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/vis/Makefile.depend
+++ b/usr.bin/vis/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/vmstat/Makefile.depend b/usr.bin/vmstat/Makefile.depend
index 322cfcb729e6..71f04226a221 100644
--- a/usr.bin/vmstat/Makefile.depend
+++ b/usr.bin/vmstat/Makefile.depend
@@ -2,18 +2,16 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libdevstat \
- lib/libelf \
lib/libkvm \
lib/libmemstat \
lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.bin/vtfontcvt/Makefile.depend b/usr.bin/vtfontcvt/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/vtfontcvt/Makefile.depend
+++ b/usr.bin/vtfontcvt/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/w/Makefile.depend b/usr.bin/w/Makefile.depend
index 93b426d97e90..63371aa63c43 100644
--- a/usr.bin/w/Makefile.depend
+++ b/usr.bin/w/Makefile.depend
@@ -2,18 +2,16 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
lib/libsbuf \
lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.bin/wall/Makefile.depend b/usr.bin/wall/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/wall/Makefile.depend
+++ b/usr.bin/wall/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/wc/Makefile.depend b/usr.bin/wc/Makefile.depend
index d2f6f2b8f05f..bfbae4ea1b5d 100644
--- a/usr.bin/wc/Makefile.depend
+++ b/usr.bin/wc/Makefile.depend
@@ -8,9 +8,7 @@ DIRDEPS = \
lib/libc \
lib/libcapsicum \
lib/libcompiler_rt \
- lib/libnv \
- lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.bin/what/Makefile.depend b/usr.bin/what/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.bin/what/Makefile.depend
+++ b/usr.bin/what/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.bin/whereis/Makefile.depend b/usr.bin/whereis/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/whereis/Makefile.depend
+++ b/usr.bin/whereis/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/which/Makefile.depend b/usr.bin/which/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/which/Makefile.depend
+++ b/usr.bin/which/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/who/Makefile.depend b/usr.bin/who/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/who/Makefile.depend
+++ b/usr.bin/who/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/whois/Makefile.depend b/usr.bin/whois/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.bin/whois/Makefile.depend
+++ b/usr.bin/whois/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.bin/write/Makefile.depend b/usr.bin/write/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/write/Makefile.depend
+++ b/usr.bin/write/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/xargs/Makefile.depend b/usr.bin/xargs/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/xargs/Makefile.depend
+++ b/usr.bin/xargs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/xinstall/Makefile.depend b/usr.bin/xinstall/Makefile.depend
index a2d871d3f1b9..b5de6f881d76 100644
--- a/usr.bin/xinstall/Makefile.depend
+++ b/usr.bin/xinstall/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/xo/Makefile.depend b/usr.bin/xo/Makefile.depend
index 5770a091f2a6..45a29f192e40 100644
--- a/usr.bin/xo/Makefile.depend
+++ b/usr.bin/xo/Makefile.depend
@@ -2,14 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.bin/xstr/Makefile.depend b/usr.bin/xstr/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/xstr/Makefile.depend
+++ b/usr.bin/xstr/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/xz/Makefile.depend b/usr.bin/xz/Makefile.depend
index c02c88a2cd25..937f1d458301 100644
--- a/usr.bin/xz/Makefile.depend
+++ b/usr.bin/xz/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/liblzma \
- lib/libthr \
.include <dirdeps.mk>
diff --git a/usr.bin/xzdec/Makefile.depend b/usr.bin/xzdec/Makefile.depend
index c02c88a2cd25..937f1d458301 100644
--- a/usr.bin/xzdec/Makefile.depend
+++ b/usr.bin/xzdec/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/liblzma \
- lib/libthr \
.include <dirdeps.mk>
diff --git a/usr.bin/yacc/Makefile.depend b/usr.bin/yacc/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.bin/yacc/Makefile.depend
+++ b/usr.bin/yacc/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/yes/Makefile.depend b/usr.bin/yes/Makefile.depend
index 1adfc08a54d6..8941ee6d8ae2 100644
--- a/usr.bin/yes/Makefile.depend
+++ b/usr.bin/yes/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.bin/ypcat/Makefile.depend b/usr.bin/ypcat/Makefile.depend
index 85338ebe3beb..59ab3d4c55ea 100644
--- a/usr.bin/ypcat/Makefile.depend
+++ b/usr.bin/ypcat/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.bin/ypmatch/Makefile.depend b/usr.bin/ypmatch/Makefile.depend
index 85338ebe3beb..59ab3d4c55ea 100644
--- a/usr.bin/ypmatch/Makefile.depend
+++ b/usr.bin/ypmatch/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.bin/ypwhich/Makefile.depend b/usr.bin/ypwhich/Makefile.depend
index faed4b4cc2aa..722af65039b3 100644
--- a/usr.bin/ypwhich/Makefile.depend
+++ b/usr.bin/ypwhich/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.bin/zstd/Makefile.depend b/usr.bin/zstd/Makefile.depend
index dc77a14e7964..adbefef93484 100644
--- a/usr.bin/zstd/Makefile.depend
+++ b/usr.bin/zstd/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libthr \
lib/libzstd \
diff --git a/usr.sbin/ac/Makefile.depend b/usr.sbin/ac/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/ac/Makefile.depend
+++ b/usr.sbin/ac/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/accton/Makefile.depend b/usr.sbin/accton/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/accton/Makefile.depend
+++ b/usr.sbin/accton/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/acpi/acpiconf/Makefile.depend b/usr.sbin/acpi/acpiconf/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/acpi/acpiconf/Makefile.depend
+++ b/usr.sbin/acpi/acpiconf/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/acpi/acpidb/Makefile.depend b/usr.sbin/acpi/acpidb/Makefile.depend
index 8bb1973e0ff5..25b26ea326c8 100644
--- a/usr.sbin/acpi/acpidb/Makefile.depend
+++ b/usr.sbin/acpi/acpidb/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/acpi/acpidump/Makefile.depend b/usr.sbin/acpi/acpidump/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/acpi/acpidump/Makefile.depend
+++ b/usr.sbin/acpi/acpidump/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/acpi/iasl/Makefile.depend b/usr.sbin/acpi/iasl/Makefile.depend
index d084433f911c..1648dc46a813 100644
--- a/usr.sbin/acpi/iasl/Makefile.depend
+++ b/usr.sbin/acpi/iasl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/apm/Makefile.depend b/usr.sbin/apm/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/apm/Makefile.depend
+++ b/usr.sbin/apm/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/arp/Makefile.depend b/usr.sbin/arp/Makefile.depend
index a0d0ea100062..d88bf7aeba80 100644
--- a/usr.sbin/arp/Makefile.depend
+++ b/usr.sbin/arp/Makefile.depend
@@ -2,15 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.sbin/audit/Makefile.depend b/usr.sbin/audit/Makefile.depend
index 2511c90c76b0..7720c829115c 100644
--- a/usr.sbin/audit/Makefile.depend
+++ b/usr.sbin/audit/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/auditd/Makefile.depend b/usr.sbin/auditd/Makefile.depend
index b5a4efa4ee85..0833b5c51de3 100644
--- a/usr.sbin/auditd/Makefile.depend
+++ b/usr.sbin/auditd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/auditdistd/Makefile.depend b/usr.sbin/auditdistd/Makefile.depend
index 5d5b308975cf..f125c6077613 100644
--- a/usr.sbin/auditdistd/Makefile.depend
+++ b/usr.sbin/auditdistd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -13,7 +12,6 @@ DIRDEPS = \
lib/libutil \
secure/lib/libcrypto \
secure/lib/libssl \
- usr.bin/lex/lib \
usr.bin/yacc.host \
diff --git a/usr.sbin/auditreduce/Makefile.depend b/usr.sbin/auditreduce/Makefile.depend
index 2511c90c76b0..7720c829115c 100644
--- a/usr.sbin/auditreduce/Makefile.depend
+++ b/usr.sbin/auditreduce/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/authpf/Makefile.depend b/usr.sbin/authpf/Makefile.depend
index 0f7ec3606b47..f2b9b2179a78 100644
--- a/usr.sbin/authpf/Makefile.depend
+++ b/usr.sbin/authpf/Makefile.depend
@@ -2,13 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libnv \
+ lib/libpfctl \
lib/libutil \
lib/msun \
diff --git a/usr.sbin/autofs/Makefile.depend b/usr.sbin/autofs/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/autofs/Makefile.depend
+++ b/usr.sbin/autofs/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bhyve/Makefile.depend b/usr.sbin/bhyve/Makefile.depend
index 8222ceb6ad25..f85ddefdf085 100644
--- a/usr.sbin/bhyve/Makefile.depend
+++ b/usr.sbin/bhyve/Makefile.depend
@@ -6,17 +6,18 @@ DIRDEPS = \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
+ lib/lib9p \
lib/libc \
lib/libcam \
lib/libcapsicum \
lib/libcasper/libcasper \
lib/libcompiler_rt \
+ lib/libnetgraph \
+ lib/libnv \
lib/libsbuf \
lib/libthr \
- lib/libucl \
lib/libutil \
lib/libvmmapi \
- lib/libxo \
lib/libz \
diff --git a/usr.sbin/bhyvectl/Makefile.depend b/usr.sbin/bhyvectl/Makefile.depend
index 0550c3e85424..5add767fb801 100644
--- a/usr.sbin/bhyvectl/Makefile.depend
+++ b/usr.sbin/bhyvectl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bhyveload/Makefile.depend b/usr.sbin/bhyveload/Makefile.depend
index 0550c3e85424..ce140380c0c9 100644
--- a/usr.sbin/bhyveload/Makefile.depend
+++ b/usr.sbin/bhyveload/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libutil \
lib/libvmmapi \
diff --git a/usr.sbin/binmiscctl/Makefile.depend b/usr.sbin/binmiscctl/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/binmiscctl/Makefile.depend
+++ b/usr.sbin/binmiscctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/blacklistctl/Makefile.depend b/usr.sbin/blacklistctl/Makefile.depend
index 741c9b987127..eea01a6726ca 100644
--- a/usr.sbin/blacklistctl/Makefile.depend
+++ b/usr.sbin/blacklistctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libblacklist \
lib/libc \
lib/libcompiler_rt \
- lib/libthr \
lib/libutil \
diff --git a/usr.sbin/blacklistd/Makefile.depend b/usr.sbin/blacklistd/Makefile.depend
index 741c9b987127..eea01a6726ca 100644
--- a/usr.sbin/blacklistd/Makefile.depend
+++ b/usr.sbin/blacklistd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libblacklist \
lib/libc \
lib/libcompiler_rt \
- lib/libthr \
lib/libutil \
diff --git a/usr.sbin/bluetooth/ath3kfw/Makefile.depend b/usr.sbin/bluetooth/ath3kfw/Makefile.depend
index a93901938c4b..6b278b826fd0 100644
--- a/usr.sbin/bluetooth/ath3kfw/Makefile.depend
+++ b/usr.sbin/bluetooth/ath3kfw/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libthr \
lib/libusb \
diff --git a/usr.sbin/bluetooth/bcmfw/Makefile.depend b/usr.sbin/bluetooth/bcmfw/Makefile.depend
index 3f4cb50e1709..be45a99a5bf4 100644
--- a/usr.sbin/bluetooth/bcmfw/Makefile.depend
+++ b/usr.sbin/bluetooth/bcmfw/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bluetooth/bthidcontrol/Makefile.depend b/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
index 025b326c97f5..edf2d16e4e1d 100644
--- a/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bluetooth/bthidd/Makefile.depend b/usr.sbin/bluetooth/bthidd/Makefile.depend
index 1549057016d2..7cc41100affb 100644
--- a/usr.sbin/bluetooth/bthidd/Makefile.depend
+++ b/usr.sbin/bluetooth/bthidd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bluetooth/btpand/Makefile.depend b/usr.sbin/bluetooth/btpand/Makefile.depend
index b4d153024640..6dc75077402e 100644
--- a/usr.sbin/bluetooth/btpand/Makefile.depend
+++ b/usr.sbin/bluetooth/btpand/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bluetooth/hccontrol/Makefile.depend b/usr.sbin/bluetooth/hccontrol/Makefile.depend
index f556d37ea8e6..4f2136b4abb1 100644
--- a/usr.sbin/bluetooth/hccontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/hccontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bluetooth/hcsecd/Makefile.depend b/usr.sbin/bluetooth/hcsecd/Makefile.depend
index 0ef8a0651b9f..7e0390fbdaee 100644
--- a/usr.sbin/bluetooth/hcsecd/Makefile.depend
+++ b/usr.sbin/bluetooth/hcsecd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bluetooth/iwmbtfw/Makefile.depend b/usr.sbin/bluetooth/iwmbtfw/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/bluetooth/iwmbtfw/Makefile.depend
diff --git a/usr.sbin/bluetooth/l2control/Makefile.depend b/usr.sbin/bluetooth/l2control/Makefile.depend
index f556d37ea8e6..4f2136b4abb1 100644
--- a/usr.sbin/bluetooth/l2control/Makefile.depend
+++ b/usr.sbin/bluetooth/l2control/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bluetooth/l2ping/Makefile.depend b/usr.sbin/bluetooth/l2ping/Makefile.depend
index 3dfd9699a934..4d80c28161cb 100644
--- a/usr.sbin/bluetooth/l2ping/Makefile.depend
+++ b/usr.sbin/bluetooth/l2ping/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend b/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
index 65af16d12ab3..0a9860a6f4b2 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
+++ b/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bluetooth/sdpcontrol/Makefile.depend b/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
index 65af16d12ab3..0a9860a6f4b2 100644
--- a/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bluetooth/sdpd/Makefile.depend b/usr.sbin/bluetooth/sdpd/Makefile.depend
index feddf3a700bc..17973fb71bcf 100644
--- a/usr.sbin/bluetooth/sdpd/Makefile.depend
+++ b/usr.sbin/bluetooth/sdpd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/boot0cfg/Makefile.depend b/usr.sbin/boot0cfg/Makefile.depend
index 0220673c9076..bbea616cfc48 100644
--- a/usr.sbin/boot0cfg/Makefile.depend
+++ b/usr.sbin/boot0cfg/Makefile.depend
@@ -2,15 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libsbuf \
.include <dirdeps.mk>
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile.depend b/usr.sbin/bootparamd/bootparamd/Makefile.depend
index faed4b4cc2aa..722af65039b3 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile.depend
+++ b/usr.sbin/bootparamd/bootparamd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.sbin/bootparamd/callbootd/Makefile.depend b/usr.sbin/bootparamd/callbootd/Makefile.depend
index faed4b4cc2aa..722af65039b3 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile.depend
+++ b/usr.sbin/bootparamd/callbootd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.sbin/bsdinstall/distextract/Makefile.depend b/usr.sbin/bsdinstall/distextract/Makefile.depend
index 78020ffb2489..96ba4076496c 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile.depend
+++ b/usr.sbin/bsdinstall/distextract/Makefile.depend
@@ -2,25 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
- gnu/lib/libdialog \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libarchive \
- lib/libbz2 \
+ lib/libbsddialog \
lib/libc \
lib/libcompiler_rt \
- lib/libdpv \
- lib/libexpat \
- lib/libfigpar \
- lib/liblzma \
- lib/libthr \
- lib/libutil \
- lib/libz \
lib/msun \
- lib/ncurses/ncursesw \
- secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile.depend b/usr.sbin/bsdinstall/distfetch/Makefile.depend
index c1195d955ced..f5d314e7c048 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile.depend
+++ b/usr.sbin/bsdinstall/distfetch/Makefile.depend
@@ -2,18 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
- gnu/lib/libdialog \
include \
include/xlocale \
lib/${CSU_DIR} \
+ lib/libbsddialog \
lib/libc \
lib/libcompiler_rt \
lib/libfetch \
- lib/msun \
- lib/ncurses/ncursesw \
- secure/lib/libcrypto \
- secure/lib/libssl \
+ usr.sbin/bsdinstall/distextract \
.include <dirdeps.mk>
diff --git a/usr.sbin/bsdinstall/partedit/Makefile.depend b/usr.sbin/bsdinstall/partedit/Makefile.depend
index 2c3bc47c6d42..59a62dfcd464 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile.depend
+++ b/usr.sbin/bsdinstall/partedit/Makefile.depend
@@ -2,19 +2,15 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
- gnu/lib/libdialog \
include \
include/xlocale \
lib/${CSU_DIR} \
+ lib/libbsddialog \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libsbuf \
lib/libutil \
- lib/msun \
- lib/ncurses/ncursesw \
+ usr.sbin/bsdinstall/distextract \
.include <dirdeps.mk>
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
index 382b25c6a944..995a8fb9244b 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
@@ -10,8 +10,6 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- lib/libthr \
- secure/lib/libcrypto \
usr.sbin/bsnmpd/gensnmptree.host \
diff --git a/usr.sbin/bsnmpd/gensnmptree/Makefile.depend b/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
+++ b/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
index 3202aed9b615..159809a23c6c 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -11,6 +10,8 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libutil \
+ usr.bin/yacc.host \
+ usr.sbin/bsnmpd/gensnmptree.host \
usr.sbin/bsnmpd/modules \
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
index 2d5480637707..b5a31b2843a5 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -14,6 +13,7 @@ DIRDEPS = \
lib/libkvm \
lib/libmemstat \
lib/msun \
+ usr.sbin/bsnmpd/gensnmptree.host \
usr.sbin/bsnmpd/modules \
usr.sbin/bsnmpd/modules/snmp_mibII \
diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
index b9ab90d16f85..4884c656c660 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
+ usr.sbin/bsnmpd/gensnmptree.host \
usr.sbin/bsnmpd/modules \
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
index b9ab90d16f85..0e289e2bcf84 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
@@ -2,13 +2,15 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
+ lib/libnv \
+ lib/libpfctl \
+ usr.sbin/bsnmpd/gensnmptree.host \
usr.sbin/bsnmpd/modules \
diff --git a/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
index 8abd5d2de4ea..79cddccaa897 100644
--- a/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
+ usr.sbin/bsnmpd/gensnmptree.host \
.include <dirdeps.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
index 8abd5d2de4ea..79cddccaa897 100644
--- a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
+ usr.sbin/bsnmpd/gensnmptree.host \
.include <dirdeps.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
index 8abd5d2de4ea..79cddccaa897 100644
--- a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
+ usr.sbin/bsnmpd/gensnmptree.host \
.include <dirdeps.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
index f927b80bbaed..290addd65b07 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
+ usr.sbin/bsnmpd/gensnmptree.host \
usr.sbin/bsnmpd/modules \
usr.sbin/bsnmpd/modules/snmp_mibII \
diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend
index 8bc992fec38f..48acfd7f9acc 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend
+++ b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- secure/lib/libcrypto \
usr.sbin/bsnmpd/tools/libbsnmptools \
diff --git a/usr.sbin/btxld/Makefile.depend b/usr.sbin/btxld/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/btxld/Makefile.depend
+++ b/usr.sbin/btxld/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/camdd/Makefile.depend b/usr.sbin/camdd/Makefile.depend
index 0c2bad278bed..be75d62d1c48 100644
--- a/usr.sbin/camdd/Makefile.depend
+++ b/usr.sbin/camdd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -11,7 +10,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libexpat \
lib/libmt \
- lib/libsbuf \
lib/libthr \
lib/libutil \
lib/libz \
diff --git a/usr.sbin/cdcontrol/Makefile.depend b/usr.sbin/cdcontrol/Makefile.depend
index 965e3a120be6..eac46b5bf56f 100644
--- a/usr.sbin/cdcontrol/Makefile.depend
+++ b/usr.sbin/cdcontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,7 +9,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libedit \
- lib/ncurses/ncursesw \
.include <dirdeps.mk>
diff --git a/usr.sbin/chkgrp/Makefile.depend b/usr.sbin/chkgrp/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/chkgrp/Makefile.depend
+++ b/usr.sbin/chkgrp/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/chown/Makefile.depend b/usr.sbin/chown/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/chown/Makefile.depend
+++ b/usr.sbin/chown/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/chroot/Makefile.depend b/usr.sbin/chroot/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/chroot/Makefile.depend
+++ b/usr.sbin/chroot/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/ckdist/Makefile.depend b/usr.sbin/ckdist/Makefile.depend
index 31fbf9bc2f9f..f4186de03814 100644
--- a/usr.sbin/ckdist/Makefile.depend
+++ b/usr.sbin/ckdist/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/clear_locks/Makefile.depend b/usr.sbin/clear_locks/Makefile.depend
index 5b0587ae477a..01d50925c161 100644
--- a/usr.sbin/clear_locks/Makefile.depend
+++ b/usr.sbin/clear_locks/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.sbin/config/Makefile.depend b/usr.sbin/config/Makefile.depend
index 7d98418717a1..214a404afe66 100644
--- a/usr.sbin/config/Makefile.depend
+++ b/usr.sbin/config/Makefile.depend
@@ -2,14 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
- lib/libsbuf \
- usr.bin/lex/lib \
+ lib/libcxxrt \
+ lib/msun \
usr.bin/yacc.host \
diff --git a/usr.sbin/cpucontrol/Makefile.depend b/usr.sbin/cpucontrol/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/cpucontrol/Makefile.depend
+++ b/usr.sbin/cpucontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/cron/cron/Makefile.depend b/usr.sbin/cron/cron/Makefile.depend
index c4674852688f..2fdceff9e755 100644
--- a/usr.sbin/cron/cron/Makefile.depend
+++ b/usr.sbin/cron/cron/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/cron/crontab/Makefile.depend b/usr.sbin/cron/crontab/Makefile.depend
index cfb82e7beff4..46d2eea93236 100644
--- a/usr.sbin/cron/crontab/Makefile.depend
+++ b/usr.sbin/cron/crontab/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/crunch/crunchgen/Makefile.depend b/usr.sbin/crunch/crunchgen/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/crunch/crunchgen/Makefile.depend
+++ b/usr.sbin/crunch/crunchgen/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/crunch/crunchide/Makefile.depend b/usr.sbin/crunch/crunchide/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/crunch/crunchide/Makefile.depend
+++ b/usr.sbin/crunch/crunchide/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/ctladm/Makefile.depend b/usr.sbin/ctladm/Makefile.depend
index 89190e05b84a..2534ca612089 100644
--- a/usr.sbin/ctladm/Makefile.depend
+++ b/usr.sbin/ctladm/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,6 +9,7 @@ DIRDEPS = \
lib/libcam \
lib/libcompiler_rt \
lib/libexpat \
+ lib/libnv \
lib/libsbuf \
lib/libutil \
diff --git a/usr.sbin/ctld/Makefile.depend b/usr.sbin/ctld/Makefile.depend
index b19183257618..7a1a59c07e82 100644
--- a/usr.sbin/ctld/Makefile.depend
+++ b/usr.sbin/ctld/Makefile.depend
@@ -2,20 +2,22 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
lib/libexpat \
+ lib/libiscsiutil \
lib/libmd \
+ lib/libnv \
lib/libsbuf \
lib/libucl \
lib/libutil \
lib/msun \
- usr.bin/lex/lib \
usr.bin/yacc.host \
diff --git a/usr.sbin/cxgbetool/Makefile.depend b/usr.sbin/cxgbetool/Makefile.depend
index d5ed563ecfc8..17d2b6288c59 100644
--- a/usr.sbin/cxgbetool/Makefile.depend
+++ b/usr.sbin/cxgbetool/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libpcap \
.include <dirdeps.mk>
diff --git a/usr.sbin/daemon/Makefile.depend b/usr.sbin/daemon/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/daemon/Makefile.depend
+++ b/usr.sbin/daemon/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/dconschat/Makefile.depend b/usr.sbin/dconschat/Makefile.depend
index daaa39c06eaf..e7cb15ff1270 100644
--- a/usr.sbin/dconschat/Makefile.depend
+++ b/usr.sbin/dconschat/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
diff --git a/usr.sbin/devctl/Makefile.depend b/usr.sbin/devctl/Makefile.depend
index 74130daab290..0f4ac1143083 100644
--- a/usr.sbin/devctl/Makefile.depend
+++ b/usr.sbin/devctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/devinfo/Makefile.depend b/usr.sbin/devinfo/Makefile.depend
index 2c68d7ccef0d..fe15dd35be95 100644
--- a/usr.sbin/devinfo/Makefile.depend
+++ b/usr.sbin/devinfo/Makefile.depend
@@ -2,8 +2,8 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
+ include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
diff --git a/usr.sbin/diskinfo/Makefile.depend b/usr.sbin/diskinfo/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/diskinfo/Makefile.depend
+++ b/usr.sbin/diskinfo/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/dumpcis/Makefile.depend b/usr.sbin/dumpcis/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/dumpcis/Makefile.depend
+++ b/usr.sbin/dumpcis/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/editmap/Makefile.depend b/usr.sbin/editmap/Makefile.depend
index 0feabbf167e0..52e72d168a20 100644
--- a/usr.sbin/editmap/Makefile.depend
+++ b/usr.sbin/editmap/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/edquota/Makefile.depend b/usr.sbin/edquota/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/edquota/Makefile.depend
+++ b/usr.sbin/edquota/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/efidp/Makefile.depend b/usr.sbin/efidp/Makefile.depend
index 204b8d257e53..286bc81d49e9 100644
--- a/usr.sbin/efidp/Makefile.depend
+++ b/usr.sbin/efidp/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libefivar \
+ lib/libgeom \
.include <dirdeps.mk>
diff --git a/usr.sbin/efivar/Makefile.depend b/usr.sbin/efivar/Makefile.depend
index 204b8d257e53..286bc81d49e9 100644
--- a/usr.sbin/efivar/Makefile.depend
+++ b/usr.sbin/efivar/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libefivar \
+ lib/libgeom \
.include <dirdeps.mk>
diff --git a/usr.sbin/extattr/Makefile.depend b/usr.sbin/extattr/Makefile.depend
index c3cca03a0705..66a9ff69832f 100644
--- a/usr.sbin/extattr/Makefile.depend
+++ b/usr.sbin/extattr/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/extattrctl/Makefile.depend b/usr.sbin/extattrctl/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/extattrctl/Makefile.depend
+++ b/usr.sbin/extattrctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/fdcontrol/Makefile.depend b/usr.sbin/fdcontrol/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/fdcontrol/Makefile.depend
+++ b/usr.sbin/fdcontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/fdformat/Makefile.depend b/usr.sbin/fdformat/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/fdformat/Makefile.depend
+++ b/usr.sbin/fdformat/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/fdread/Makefile.depend b/usr.sbin/fdread/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/fdread/Makefile.depend
+++ b/usr.sbin/fdread/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/fdwrite/Makefile.depend b/usr.sbin/fdwrite/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/fdwrite/Makefile.depend
+++ b/usr.sbin/fdwrite/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/fifolog/fifolog_create/Makefile.depend b/usr.sbin/fifolog/fifolog_create/Makefile.depend
index ce13a0df74aa..e735a121bc49 100644
--- a/usr.sbin/fifolog/fifolog_create/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_create/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.sbin/fifolog/fifolog_reader/Makefile.depend b/usr.sbin/fifolog/fifolog_reader/Makefile.depend
index d223e22c5c58..8243babef9b2 100644
--- a/usr.sbin/fifolog/fifolog_reader/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_reader/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/fifolog/fifolog_writer/Makefile.depend b/usr.sbin/fifolog/fifolog_writer/Makefile.depend
index d223e22c5c58..8243babef9b2 100644
--- a/usr.sbin/fifolog/fifolog_writer/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_writer/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/flowctl/Makefile.depend b/usr.sbin/flowctl/Makefile.depend
index d64c9ccbda7b..e3629ea243ce 100644
--- a/usr.sbin/flowctl/Makefile.depend
+++ b/usr.sbin/flowctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/fstyp/Makefile.depend b/usr.sbin/fstyp/Makefile.depend
index 9371e83a7830..ccc9126326c6 100644
--- a/usr.sbin/fstyp/Makefile.depend
+++ b/usr.sbin/fstyp/Makefile.depend
@@ -2,9 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- cddl/lib/libavl \
- cddl/lib/libumem \
- cddl/lib/libuutil \
+ cddl/lib/libspl \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -12,15 +10,9 @@ DIRDEPS = \
lib/libcapsicum \
lib/libcasper/libcasper \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
lib/libmd \
- lib/libsbuf \
- lib/libthr \
lib/libufs \
- lib/libutil \
- lib/libz \
- lib/msun \
.include <dirdeps.mk>
diff --git a/usr.sbin/ftp-proxy/Makefile.depend b/usr.sbin/ftp-proxy/Makefile.depend
index 34af16caac3e..465b2b8dd032 100644
--- a/usr.sbin/ftp-proxy/Makefile.depend
+++ b/usr.sbin/ftp-proxy/Makefile.depend
@@ -2,14 +2,15 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libevent \
+ lib/libevent1 \
+ lib/libnv \
+ lib/libpfctl \
.include <dirdeps.mk>
diff --git a/usr.sbin/fwcontrol/Makefile.depend b/usr.sbin/fwcontrol/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.sbin/fwcontrol/Makefile.depend
+++ b/usr.sbin/fwcontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/getfmac/Makefile.depend b/usr.sbin/getfmac/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/getfmac/Makefile.depend
+++ b/usr.sbin/getfmac/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/getpmac/Makefile.depend b/usr.sbin/getpmac/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/getpmac/Makefile.depend
+++ b/usr.sbin/getpmac/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/gpioctl/Makefile.depend b/usr.sbin/gpioctl/Makefile.depend
index fd3b3da66347..c0038349dbac 100644
--- a/usr.sbin/gpioctl/Makefile.depend
+++ b/usr.sbin/gpioctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/gssd/Makefile.depend b/usr.sbin/gssd/Makefile.depend
index 8b377d145a7a..3d05d265f945 100644
--- a/usr.sbin/gssd/Makefile.depend
+++ b/usr.sbin/gssd/Makefile.depend
@@ -8,12 +8,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libcom_err \
lib/libcompiler_rt \
- lib/libcrypt \
lib/libgssapi \
- lib/libthr \
- secure/lib/libcrypto \
.include <dirdeps.mk>
diff --git a/usr.sbin/gstat/Makefile.depend b/usr.sbin/gstat/Makefile.depend
index 7a3e02950915..802d928ce345 100644
--- a/usr.sbin/gstat/Makefile.depend
+++ b/usr.sbin/gstat/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -10,12 +9,10 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libdevstat \
lib/libedit \
- lib/libelf \
- lib/libexpat \
lib/libgeom \
lib/libkvm \
- lib/libsbuf \
- lib/ncurses/ncursesw \
+ lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.sbin/hyperv/tools/kvp/Makefile.depend b/usr.sbin/hyperv/tools/kvp/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.sbin/hyperv/tools/kvp/Makefile.depend
+++ b/usr.sbin/hyperv/tools/kvp/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/hyperv/tools/vss/Makefile.depend b/usr.sbin/hyperv/tools/vss/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/hyperv/tools/vss/Makefile.depend
+++ b/usr.sbin/hyperv/tools/vss/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/i2c/Makefile.depend b/usr.sbin/i2c/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/i2c/Makefile.depend
+++ b/usr.sbin/i2c/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/ifmcstat/Makefile.depend b/usr.sbin/ifmcstat/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.sbin/ifmcstat/Makefile.depend
+++ b/usr.sbin/ifmcstat/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/iostat/Makefile.depend b/usr.sbin/iostat/Makefile.depend
index 70e72f3ef71d..12b0b299f28b 100644
--- a/usr.sbin/iostat/Makefile.depend
+++ b/usr.sbin/iostat/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libdevstat \
- lib/libelf \
lib/libkvm \
lib/msun \
diff --git a/usr.sbin/iovctl/Makefile.depend b/usr.sbin/iovctl/Makefile.depend
index 2082bfb7951c..299940e6140b 100644
--- a/usr.sbin/iovctl/Makefile.depend
+++ b/usr.sbin/iovctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/ip6addrctl/Makefile.depend b/usr.sbin/ip6addrctl/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/ip6addrctl/Makefile.depend
+++ b/usr.sbin/ip6addrctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/ipfwpcap/Makefile.depend b/usr.sbin/ipfwpcap/Makefile.depend
index 893e74eb908c..17d2b6288c59 100644
--- a/usr.sbin/ipfwpcap/Makefile.depend
+++ b/usr.sbin/ipfwpcap/Makefile.depend
@@ -2,8 +2,8 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
+ include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.sbin/iscsid/Makefile.depend b/usr.sbin/iscsid/Makefile.depend
index aa7d77115eb0..b267871cfcb7 100644
--- a/usr.sbin/iscsid/Makefile.depend
+++ b/usr.sbin/iscsid/Makefile.depend
@@ -2,13 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
- include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
+ lib/libiscsiutil \
lib/libmd \
lib/libutil \
diff --git a/usr.sbin/jail/Makefile.depend b/usr.sbin/jail/Makefile.depend
index 7f608aab0712..fd4f02fe9136 100644
--- a/usr.sbin/jail/Makefile.depend
+++ b/usr.sbin/jail/Makefile.depend
@@ -2,18 +2,15 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libjail \
lib/libkvm \
lib/libutil \
- usr.bin/lex/lib \
usr.bin/yacc.host \
diff --git a/usr.sbin/jexec/Makefile.depend b/usr.sbin/jexec/Makefile.depend
index 98929049af54..b8db796951d2 100644
--- a/usr.sbin/jexec/Makefile.depend
+++ b/usr.sbin/jexec/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/jls/Makefile.depend b/usr.sbin/jls/Makefile.depend
index d4d0b05e7f43..76b68d122d11 100644
--- a/usr.sbin/jls/Makefile.depend
+++ b/usr.sbin/jls/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,8 +9,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libjail \
- lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.sbin/kbdcontrol/Makefile.depend b/usr.sbin/kbdcontrol/Makefile.depend
index b3c7e9af13c7..8d409f5263ac 100644
--- a/usr.sbin/kbdcontrol/Makefile.depend
+++ b/usr.sbin/kbdcontrol/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/lex/lib \
.include <dirdeps.mk>
diff --git a/usr.sbin/kbdmap/Makefile.depend b/usr.sbin/kbdmap/Makefile.depend
index 6cfaab1c3644..ab6c7e3facf5 100644
--- a/usr.sbin/kbdmap/Makefile.depend
+++ b/usr.sbin/kbdmap/Makefile.depend
@@ -2,10 +2,10 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
+ lib/libbsddialog \
lib/libc \
lib/libcompiler_rt \
diff --git a/usr.sbin/keyserv/Makefile.depend b/usr.sbin/keyserv/Makefile.depend
index 97ec617dcc81..db92a2beda5b 100644
--- a/usr.sbin/keyserv/Makefile.depend
+++ b/usr.sbin/keyserv/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.sbin/kldxref/Makefile.depend b/usr.sbin/kldxref/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/kldxref/Makefile.depend
+++ b/usr.sbin/kldxref/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/lastlogin/Makefile.depend b/usr.sbin/lastlogin/Makefile.depend
index 6cfaab1c3644..c8fede0bd5ec 100644
--- a/usr.sbin/lastlogin/Makefile.depend
+++ b/usr.sbin/lastlogin/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.sbin/lpr/chkprintcap/Makefile.depend b/usr.sbin/lpr/chkprintcap/Makefile.depend
index 5ca32400912b..34715566deeb 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile.depend
+++ b/usr.sbin/lpr/chkprintcap/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend b/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
+++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend b/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
+++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.sbin/lpr/filters/Makefile.depend b/usr.sbin/lpr/filters/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/lpr/filters/Makefile.depend
+++ b/usr.sbin/lpr/filters/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/lpr/lpc/Makefile.depend b/usr.sbin/lpr/lpc/Makefile.depend
index e59ad46a72f3..c714451490b5 100644
--- a/usr.sbin/lpr/lpc/Makefile.depend
+++ b/usr.sbin/lpr/lpc/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libedit \
- lib/ncurses/ncursesw \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lpr/lpd/Makefile.depend b/usr.sbin/lpr/lpd/Makefile.depend
index 288e8eec083e..dbb20a3bc522 100644
--- a/usr.sbin/lpr/lpd/Makefile.depend
+++ b/usr.sbin/lpr/lpd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/lpr/lpq/Makefile.depend b/usr.sbin/lpr/lpq/Makefile.depend
index 5ca32400912b..34715566deeb 100644
--- a/usr.sbin/lpr/lpq/Makefile.depend
+++ b/usr.sbin/lpr/lpq/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/lpr/lpr/Makefile.depend b/usr.sbin/lpr/lpr/Makefile.depend
index 5ca32400912b..34715566deeb 100644
--- a/usr.sbin/lpr/lpr/Makefile.depend
+++ b/usr.sbin/lpr/lpr/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/lpr/lprm/Makefile.depend b/usr.sbin/lpr/lprm/Makefile.depend
index 5ca32400912b..34715566deeb 100644
--- a/usr.sbin/lpr/lprm/Makefile.depend
+++ b/usr.sbin/lpr/lprm/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/lpr/lptest/Makefile.depend b/usr.sbin/lpr/lptest/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.sbin/lpr/lptest/Makefile.depend
+++ b/usr.sbin/lpr/lptest/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.sbin/lpr/pac/Makefile.depend b/usr.sbin/lpr/pac/Makefile.depend
index 5ca32400912b..34715566deeb 100644
--- a/usr.sbin/lpr/pac/Makefile.depend
+++ b/usr.sbin/lpr/pac/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/lptcontrol/Makefile.depend b/usr.sbin/lptcontrol/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.sbin/lptcontrol/Makefile.depend
+++ b/usr.sbin/lptcontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.sbin/mailstats/Makefile.depend b/usr.sbin/mailstats/Makefile.depend
index d1b41fcc8417..e60b577c6853 100644
--- a/usr.sbin/mailstats/Makefile.depend
+++ b/usr.sbin/mailstats/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/mailwrapper/Makefile.depend b/usr.sbin/mailwrapper/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/mailwrapper/Makefile.depend
+++ b/usr.sbin/mailwrapper/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/makemap/Makefile.depend b/usr.sbin/makemap/Makefile.depend
index 0feabbf167e0..52e72d168a20 100644
--- a/usr.sbin/makemap/Makefile.depend
+++ b/usr.sbin/makemap/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/memcontrol/Makefile.depend b/usr.sbin/memcontrol/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/memcontrol/Makefile.depend
+++ b/usr.sbin/memcontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/mfiutil/Makefile.depend b/usr.sbin/mfiutil/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/mfiutil/Makefile.depend
+++ b/usr.sbin/mfiutil/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/mixer/Makefile.depend b/usr.sbin/mixer/Makefile.depend
index 6cfaab1c3644..a525da452de0 100644
--- a/usr.sbin/mixer/Makefile.depend
+++ b/usr.sbin/mixer/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libmixer \
.include <dirdeps.mk>
diff --git a/usr.sbin/mld6query/Makefile.depend b/usr.sbin/mld6query/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.sbin/mld6query/Makefile.depend
+++ b/usr.sbin/mld6query/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/mlx5tool/Makefile.depend b/usr.sbin/mlx5tool/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/mlx5tool/Makefile.depend
diff --git a/usr.sbin/mlxcontrol/Makefile.depend b/usr.sbin/mlxcontrol/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/mlxcontrol/Makefile.depend
+++ b/usr.sbin/mlxcontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/mount_smbfs/Makefile.depend b/usr.sbin/mount_smbfs/Makefile.depend
index 6d0625c20465..32f494c9b20a 100644
--- a/usr.sbin/mount_smbfs/Makefile.depend
+++ b/usr.sbin/mount_smbfs/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libkiconv \
lib/libsmb \
diff --git a/usr.sbin/mountd/Makefile.depend b/usr.sbin/mountd/Makefile.depend
index 741d5bc5bd59..ec88a5da803c 100644
--- a/usr.sbin/mountd/Makefile.depend
+++ b/usr.sbin/mountd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.sbin/moused/Makefile.depend b/usr.sbin/moused/Makefile.depend
index a015e205da56..f4843e55accb 100644
--- a/usr.sbin/moused/Makefile.depend
+++ b/usr.sbin/moused/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/mpsutil/Makefile.depend b/usr.sbin/mpsutil/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/mpsutil/Makefile.depend
+++ b/usr.sbin/mpsutil/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/mptable/Makefile.depend b/usr.sbin/mptable/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/mptable/Makefile.depend
+++ b/usr.sbin/mptable/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/mptutil/Makefile.depend b/usr.sbin/mptutil/Makefile.depend
index ee06e1c20939..277bc5313ae5 100644
--- a/usr.sbin/mptutil/Makefile.depend
+++ b/usr.sbin/mptutil/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcam \
lib/libcompiler_rt \
- lib/libsbuf \
lib/libutil \
diff --git a/usr.sbin/mtest/Makefile.depend b/usr.sbin/mtest/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.sbin/mtest/Makefile.depend
+++ b/usr.sbin/mtest/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/ndp/Makefile.depend b/usr.sbin/ndp/Makefile.depend
index d5ed563ecfc8..d88bf7aeba80 100644
--- a/usr.sbin/ndp/Makefile.depend
+++ b/usr.sbin/ndp/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.sbin/newsyslog/Makefile.depend b/usr.sbin/newsyslog/Makefile.depend
index 6cfaab1c3644..e1468f4dd35c 100644
--- a/usr.sbin/newsyslog/Makefile.depend
+++ b/usr.sbin/newsyslog/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libsbuf \
.include <dirdeps.mk>
diff --git a/usr.sbin/nfscbd/Makefile.depend b/usr.sbin/nfscbd/Makefile.depend
index 74a3ee19f459..5ebbd88ef6e5 100644
--- a/usr.sbin/nfscbd/Makefile.depend
+++ b/usr.sbin/nfscbd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/xlocale \
diff --git a/usr.sbin/nfsd/Makefile.depend b/usr.sbin/nfsd/Makefile.depend
index faed4b4cc2aa..722af65039b3 100644
--- a/usr.sbin/nfsd/Makefile.depend
+++ b/usr.sbin/nfsd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.sbin/nfsdumpstate/Makefile.depend b/usr.sbin/nfsdumpstate/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.sbin/nfsdumpstate/Makefile.depend
+++ b/usr.sbin/nfsdumpstate/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/nfsrevoke/Makefile.depend b/usr.sbin/nfsrevoke/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/nfsrevoke/Makefile.depend
+++ b/usr.sbin/nfsrevoke/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/nfsuserd/Makefile.depend b/usr.sbin/nfsuserd/Makefile.depend
index 74a3ee19f459..4423cb3f9387 100644
--- a/usr.sbin/nfsuserd/Makefile.depend
+++ b/usr.sbin/nfsuserd/Makefile.depend
@@ -2,8 +2,8 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
+ include/arpa \
include/rpc \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/ngctl/Makefile.depend b/usr.sbin/ngctl/Makefile.depend
index 6f7dfbccc4f0..ce486b763bb3 100644
--- a/usr.sbin/ngctl/Makefile.depend
+++ b/usr.sbin/ngctl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libnetgraph \
lib/libthr \
- lib/ncurses/ncursesw \
.include <dirdeps.mk>
diff --git a/usr.sbin/nghook/Makefile.depend b/usr.sbin/nghook/Makefile.depend
index 3f4cb50e1709..be45a99a5bf4 100644
--- a/usr.sbin/nghook/Makefile.depend
+++ b/usr.sbin/nghook/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/nmtree/Makefile.depend b/usr.sbin/nmtree/Makefile.depend
index 4e01fee15c05..7b57e377b814 100644
--- a/usr.sbin/nmtree/Makefile.depend
+++ b/usr.sbin/nmtree/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/nologin/Makefile.depend b/usr.sbin/nologin/Makefile.depend
index cae7e645ef6a..1c1a9bee1d67 100644
--- a/usr.sbin/nologin/Makefile.depend
+++ b/usr.sbin/nologin/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.sbin/nscd/Makefile.depend b/usr.sbin/nscd/Makefile.depend
index b208e1c5f44c..4785c7f2d2fd 100644
--- a/usr.sbin/nscd/Makefile.depend
+++ b/usr.sbin/nscd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/ntp/libntp/Makefile.depend b/usr.sbin/ntp/libntp/Makefile.depend
index 1fd58260f7dd..240c31501f3d 100644
--- a/usr.sbin/ntp/libntp/Makefile.depend
+++ b/usr.sbin/ntp/libntp/Makefile.depend
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ bin/sh.host \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/ntp/ntpd/Makefile.depend b/usr.sbin/ntp/ntpd/Makefile.depend
index 2d2229dcbd62..4942363e7491 100644
--- a/usr.sbin/ntp/ntpd/Makefile.depend
+++ b/usr.sbin/ntp/ntpd/Makefile.depend
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ bin/sh.host \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/ntp/ntpdate/Makefile.depend b/usr.sbin/ntp/ntpdate/Makefile.depend
index dccc5fcb536f..fdfe9dde51f5 100644
--- a/usr.sbin/ntp/ntpdate/Makefile.depend
+++ b/usr.sbin/ntp/ntpdate/Makefile.depend
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ bin/sh.host \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/ntp/ntpdc/Makefile.depend b/usr.sbin/ntp/ntpdc/Makefile.depend
index b41e2855ad23..5d8281d36481 100644
--- a/usr.sbin/ntp/ntpdc/Makefile.depend
+++ b/usr.sbin/ntp/ntpdc/Makefile.depend
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ bin/sh.host \
include \
include/arpa \
include/xlocale \
@@ -11,7 +12,6 @@ DIRDEPS = \
lib/libedit \
lib/libthr \
lib/msun \
- lib/ncurses/ncursesw \
usr.sbin/ntp/libntp \
usr.sbin/ntp/libopts \
diff --git a/usr.sbin/ntp/ntpq/Makefile.depend b/usr.sbin/ntp/ntpq/Makefile.depend
index b41e2855ad23..5d8281d36481 100644
--- a/usr.sbin/ntp/ntpq/Makefile.depend
+++ b/usr.sbin/ntp/ntpq/Makefile.depend
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ bin/sh.host \
include \
include/arpa \
include/xlocale \
@@ -11,7 +12,6 @@ DIRDEPS = \
lib/libedit \
lib/libthr \
lib/msun \
- lib/ncurses/ncursesw \
usr.sbin/ntp/libntp \
usr.sbin/ntp/libopts \
diff --git a/usr.sbin/ntp/ntptime/Makefile.depend b/usr.sbin/ntp/ntptime/Makefile.depend
index c7f2a7c3eff4..3ad27c6f88be 100644
--- a/usr.sbin/ntp/ntptime/Makefile.depend
+++ b/usr.sbin/ntp/ntptime/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/pciconf/Makefile.depend b/usr.sbin/pciconf/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/pciconf/Makefile.depend
+++ b/usr.sbin/pciconf/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/pkg/Makefile.depend b/usr.sbin/pkg/Makefile.depend
index 0d93f91b60de..c1fcf1925a31 100644
--- a/usr.sbin/pkg/Makefile.depend
+++ b/usr.sbin/pkg/Makefile.depend
@@ -2,23 +2,17 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libarchive \
- lib/libbz2 \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libfetch \
- lib/liblzma \
- lib/libsbuf \
- lib/libthr \
+ lib/libmd \
lib/libucl \
- lib/libz \
- lib/msun \
+ lib/libutil \
secure/lib/libcrypto \
secure/lib/libssl \
diff --git a/usr.sbin/pmcannotate/Makefile.depend b/usr.sbin/pmcannotate/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/pmcannotate/Makefile.depend
+++ b/usr.sbin/pmcannotate/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/pmccontrol/Makefile.depend b/usr.sbin/pmccontrol/Makefile.depend
index a52f7b8c67dc..7aa4a6596af7 100644
--- a/usr.sbin/pmccontrol/Makefile.depend
+++ b/usr.sbin/pmccontrol/Makefile.depend
@@ -2,13 +2,15 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
+ lib/libcxxrt \
lib/libpmc \
+ lib/msun \
.include <dirdeps.mk>
diff --git a/usr.sbin/pmcstat/Makefile.depend b/usr.sbin/pmcstat/Makefile.depend
index 6d010477ce76..86be03e3eee5 100644
--- a/usr.sbin/pmcstat/Makefile.depend
+++ b/usr.sbin/pmcstat/Makefile.depend
@@ -2,18 +2,20 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
+ lib/libcxxrt \
lib/libelf \
lib/libkvm \
lib/libpmc \
lib/libpmcstat \
lib/msun \
- lib/ncurses/ncursesw \
+ lib/ncurses/ncurses \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.sbin/pmcstudy/Makefile.depend b/usr.sbin/pmcstudy/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/pmcstudy/Makefile.depend
+++ b/usr.sbin/pmcstudy/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/portsnap/make_index/Makefile.depend b/usr.sbin/portsnap/make_index/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/portsnap/make_index/Makefile.depend
+++ b/usr.sbin/portsnap/make_index/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/powerd/Makefile.depend b/usr.sbin/powerd/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/powerd/Makefile.depend
+++ b/usr.sbin/powerd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/ppp/Makefile.depend b/usr.sbin/ppp/Makefile.depend
index 92ea9e3b6910..c2cae4b0c210 100644
--- a/usr.sbin/ppp/Makefile.depend
+++ b/usr.sbin/ppp/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/pppctl/Makefile.depend b/usr.sbin/pppctl/Makefile.depend
index 199e18875437..1889fc6e31e4 100644
--- a/usr.sbin/pppctl/Makefile.depend
+++ b/usr.sbin/pppctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -11,7 +10,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libedit \
lib/libthr \
- lib/ncurses/ncursesw \
.include <dirdeps.mk>
diff --git a/usr.sbin/praliases/Makefile.depend b/usr.sbin/praliases/Makefile.depend
index 0feabbf167e0..52e72d168a20 100644
--- a/usr.sbin/praliases/Makefile.depend
+++ b/usr.sbin/praliases/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/praudit/Makefile.depend b/usr.sbin/praudit/Makefile.depend
index 2511c90c76b0..7720c829115c 100644
--- a/usr.sbin/praudit/Makefile.depend
+++ b/usr.sbin/praudit/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/prometheus_sysctl_exporter/Makefile.depend b/usr.sbin/prometheus_sysctl_exporter/Makefile.depend
index 5ed09d7880db..0608523121ef 100644
--- a/usr.sbin/prometheus_sysctl_exporter/Makefile.depend
+++ b/usr.sbin/prometheus_sysctl_exporter/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/pstat/Makefile.depend b/usr.sbin/pstat/Makefile.depend
index 1487255a4257..df101e259171 100644
--- a/usr.sbin/pstat/Makefile.depend
+++ b/usr.sbin/pstat/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libelf \
lib/libkvm \
lib/libutil \
diff --git a/usr.sbin/pw/Makefile.depend b/usr.sbin/pw/Makefile.depend
index f746d7af1b21..41653b767d04 100644
--- a/usr.sbin/pw/Makefile.depend
+++ b/usr.sbin/pw/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libcrypt \
- lib/libsbuf \
lib/libutil \
diff --git a/usr.sbin/pwd_mkdb/Makefile.depend b/usr.sbin/pwd_mkdb/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.sbin/pwd_mkdb/Makefile.depend
+++ b/usr.sbin/pwd_mkdb/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/quot/Makefile.depend b/usr.sbin/quot/Makefile.depend
index 6cfaab1c3644..b2b51212acfc 100644
--- a/usr.sbin/quot/Makefile.depend
+++ b/usr.sbin/quot/Makefile.depend
@@ -2,12 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libufs \
.include <dirdeps.mk>
diff --git a/usr.sbin/quotaon/Makefile.depend b/usr.sbin/quotaon/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/quotaon/Makefile.depend
+++ b/usr.sbin/quotaon/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/rarpd/Makefile.depend b/usr.sbin/rarpd/Makefile.depend
index 4fc5be2a35f0..08046dbf7337 100644
--- a/usr.sbin/rarpd/Makefile.depend
+++ b/usr.sbin/rarpd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/repquota/Makefile.depend b/usr.sbin/repquota/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/repquota/Makefile.depend
+++ b/usr.sbin/repquota/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/rip6query/Makefile.depend b/usr.sbin/rip6query/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.sbin/rip6query/Makefile.depend
+++ b/usr.sbin/rip6query/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/rmt/Makefile.depend b/usr.sbin/rmt/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/rmt/Makefile.depend
+++ b/usr.sbin/rmt/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/route6d/Makefile.depend b/usr.sbin/route6d/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.sbin/route6d/Makefile.depend
+++ b/usr.sbin/route6d/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/rpc.lockd/Makefile.depend b/usr.sbin/rpc.lockd/Makefile.depend
index 8939901b94fd..a07fdc09b21b 100644
--- a/usr.sbin/rpc.lockd/Makefile.depend
+++ b/usr.sbin/rpc.lockd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.sbin/rpc.statd/Makefile.depend b/usr.sbin/rpc.statd/Makefile.depend
index 572fc8dbf41a..ddf4ee2f8b49 100644
--- a/usr.sbin/rpc.statd/Makefile.depend
+++ b/usr.sbin/rpc.statd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.sbin/rpc.umntall/Makefile.depend b/usr.sbin/rpc.umntall/Makefile.depend
index 85338ebe3beb..59ab3d4c55ea 100644
--- a/usr.sbin/rpc.umntall/Makefile.depend
+++ b/usr.sbin/rpc.umntall/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.sbin/rpc.yppasswdd/Makefile.depend b/usr.sbin/rpc.yppasswdd/Makefile.depend
index f4474e3dffda..60750be20945 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile.depend
+++ b/usr.sbin/rpc.yppasswdd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.sbin/rpc.ypupdated/Makefile.depend b/usr.sbin/rpc.ypupdated/Makefile.depend
index 5b0587ae477a..01d50925c161 100644
--- a/usr.sbin/rpc.ypupdated/Makefile.depend
+++ b/usr.sbin/rpc.ypupdated/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.sbin/rpc.ypxfrd/Makefile.depend b/usr.sbin/rpc.ypxfrd/Makefile.depend
index 572fc8dbf41a..ddf4ee2f8b49 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile.depend
+++ b/usr.sbin/rpc.ypxfrd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.sbin/rrenumd/Makefile.depend b/usr.sbin/rrenumd/Makefile.depend
index ca3301c271b9..ee39f3d5cdaf 100644
--- a/usr.sbin/rrenumd/Makefile.depend
+++ b/usr.sbin/rrenumd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,8 +9,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libipsec \
- lib/liby \
- usr.bin/lex/lib \
usr.bin/yacc.host \
diff --git a/usr.sbin/rtadvctl/Makefile.depend b/usr.sbin/rtadvctl/Makefile.depend
index d5ed563ecfc8..b9209eb15132 100644
--- a/usr.sbin/rtadvctl/Makefile.depend
+++ b/usr.sbin/rtadvctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/rtadvd/Makefile.depend b/usr.sbin/rtadvd/Makefile.depend
index 4fc5be2a35f0..08046dbf7337 100644
--- a/usr.sbin/rtadvd/Makefile.depend
+++ b/usr.sbin/rtadvd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/rtprio/Makefile.depend b/usr.sbin/rtprio/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/rtprio/Makefile.depend
+++ b/usr.sbin/rtprio/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/rwhod/Makefile.depend b/usr.sbin/rwhod/Makefile.depend
index 782b0d5c171e..f32a6591a4ce 100644
--- a/usr.sbin/rwhod/Makefile.depend
+++ b/usr.sbin/rwhod/Makefile.depend
@@ -2,13 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/protocols \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
diff --git a/usr.sbin/sa/Makefile.depend b/usr.sbin/sa/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/sa/Makefile.depend
+++ b/usr.sbin/sa/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/sendmail/Makefile.depend b/usr.sbin/sendmail/Makefile.depend
index 4a376e6292e9..a1d0cb2b132b 100644
--- a/usr.sbin/sendmail/Makefile.depend
+++ b/usr.sbin/sendmail/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libsm \
lib/libsmutil \
- lib/libthr \
lib/libutil \
diff --git a/usr.sbin/services_mkdb/Makefile.depend b/usr.sbin/services_mkdb/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/services_mkdb/Makefile.depend
+++ b/usr.sbin/services_mkdb/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/sesutil/Makefile.depend b/usr.sbin/sesutil/Makefile.depend
index 5770a091f2a6..c8fede0bd5ec 100644
--- a/usr.sbin/sesutil/Makefile.depend
+++ b/usr.sbin/sesutil/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libutil \
- lib/libxo \
+ lib/libxo/libxo \
.include <dirdeps.mk>
diff --git a/usr.sbin/setfib/Makefile.depend b/usr.sbin/setfib/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/setfib/Makefile.depend
+++ b/usr.sbin/setfib/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/setfmac/Makefile.depend b/usr.sbin/setfmac/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/setfmac/Makefile.depend
+++ b/usr.sbin/setfmac/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/setpmac/Makefile.depend b/usr.sbin/setpmac/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/setpmac/Makefile.depend
+++ b/usr.sbin/setpmac/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/smbmsg/Makefile.depend b/usr.sbin/smbmsg/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/smbmsg/Makefile.depend
+++ b/usr.sbin/smbmsg/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/snapinfo/Makefile.depend b/usr.sbin/snapinfo/Makefile.depend
index 735bf03b75b6..b2b51212acfc 100644
--- a/usr.sbin/snapinfo/Makefile.depend
+++ b/usr.sbin/snapinfo/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/spray/Makefile.depend b/usr.sbin/spray/Makefile.depend
index 5b0587ae477a..01d50925c161 100644
--- a/usr.sbin/spray/Makefile.depend
+++ b/usr.sbin/spray/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.sbin/syslogd/Makefile.depend b/usr.sbin/syslogd/Makefile.depend
index 4fc5be2a35f0..08046dbf7337 100644
--- a/usr.sbin/syslogd/Makefile.depend
+++ b/usr.sbin/syslogd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/tcpdchk/Makefile.depend b/usr.sbin/tcpdchk/Makefile.depend
index 8af4779ea996..94cc8543e921 100644
--- a/usr.sbin/tcpdchk/Makefile.depend
+++ b/usr.sbin/tcpdchk/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/tcpdmatch/Makefile.depend b/usr.sbin/tcpdmatch/Makefile.depend
index 8af4779ea996..94cc8543e921 100644
--- a/usr.sbin/tcpdmatch/Makefile.depend
+++ b/usr.sbin/tcpdmatch/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/tcpdrop/Makefile.depend b/usr.sbin/tcpdrop/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/tcpdrop/Makefile.depend
+++ b/usr.sbin/tcpdrop/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile.depend b/usr.sbin/tcpdump/tcpdump/Makefile.depend
index 45d244118e6d..8b219ef8c3ed 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile.depend
+++ b/usr.sbin/tcpdump/tcpdump/Makefile.depend
@@ -9,12 +9,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libnv \
lib/libpcap \
- lib/libthr \
- lib/ofed/libibverbs \
- lib/ofed/libmlx5 \
- usr.bin/lex/lib \
.include <dirdeps.mk>
diff --git a/usr.sbin/traceroute/Makefile.depend b/usr.sbin/traceroute/Makefile.depend
index 12fc57a4aaf9..f290ee70ea4d 100644
--- a/usr.sbin/traceroute/Makefile.depend
+++ b/usr.sbin/traceroute/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libcapsicum \
lib/libcompiler_rt \
lib/libipsec \
- lib/libnv \
.include <dirdeps.mk>
diff --git a/usr.sbin/traceroute6/Makefile.depend b/usr.sbin/traceroute6/Makefile.depend
index b78c121a5f29..08dfa5e8265a 100644
--- a/usr.sbin/traceroute6/Makefile.depend
+++ b/usr.sbin/traceroute6/Makefile.depend
@@ -2,12 +2,14 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
+ lib/libcasper/services/cap_dns \
lib/libcompiler_rt \
lib/libipsec \
diff --git a/usr.sbin/tzsetup/Makefile.depend b/usr.sbin/tzsetup/Makefile.depend
index 5f1a802404d8..ab6c7e3facf5 100644
--- a/usr.sbin/tzsetup/Makefile.depend
+++ b/usr.sbin/tzsetup/Makefile.depend
@@ -5,9 +5,9 @@ DIRDEPS = \
include \
include/xlocale \
lib/${CSU_DIR} \
+ lib/libbsddialog \
lib/libc \
lib/libcompiler_rt \
- lib/msun \
.include <dirdeps.mk>
diff --git a/usr.sbin/uathload/Makefile.depend b/usr.sbin/uathload/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/uathload/Makefile.depend
+++ b/usr.sbin/uathload/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/uefisign/Makefile.depend b/usr.sbin/uefisign/Makefile.depend
index cdd96948933d..c0b178d1b206 100644
--- a/usr.sbin/uefisign/Makefile.depend
+++ b/usr.sbin/uefisign/Makefile.depend
@@ -2,11 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
+ lib/libcasper/libcasper \
lib/libcompiler_rt \
secure/lib/libcrypto \
diff --git a/usr.sbin/ugidfw/Makefile.depend b/usr.sbin/ugidfw/Makefile.depend
index 65c3644dbf39..4279a5fc6baf 100644
--- a/usr.sbin/ugidfw/Makefile.depend
+++ b/usr.sbin/ugidfw/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/uhsoctl/Makefile.depend b/usr.sbin/uhsoctl/Makefile.depend
index 4fc5be2a35f0..08046dbf7337 100644
--- a/usr.sbin/uhsoctl/Makefile.depend
+++ b/usr.sbin/uhsoctl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/unbound/anchor/Makefile.depend b/usr.sbin/unbound/anchor/Makefile.depend
index 75cb691c1c91..759e9aab3710 100644
--- a/usr.sbin/unbound/anchor/Makefile.depend
+++ b/usr.sbin/unbound/anchor/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/unbound/checkconf/Makefile.depend b/usr.sbin/unbound/checkconf/Makefile.depend
index 37b991b9f24c..0369e95a51e5 100644
--- a/usr.sbin/unbound/checkconf/Makefile.depend
+++ b/usr.sbin/unbound/checkconf/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -11,8 +10,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libthr \
lib/libunbound \
- secure/lib/libcrypto \
- secure/lib/libssl \
.include <dirdeps.mk>
diff --git a/usr.sbin/unbound/control/Makefile.depend b/usr.sbin/unbound/control/Makefile.depend
index 37b991b9f24c..56cbccec1236 100644
--- a/usr.sbin/unbound/control/Makefile.depend
+++ b/usr.sbin/unbound/control/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/unbound/daemon/Makefile.depend b/usr.sbin/unbound/daemon/Makefile.depend
index fb63d6473d7b..9d9a1fbdc174 100644
--- a/usr.sbin/unbound/daemon/Makefile.depend
+++ b/usr.sbin/unbound/daemon/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
diff --git a/usr.sbin/usbconfig/Makefile.depend b/usr.sbin/usbconfig/Makefile.depend
index a93901938c4b..6b278b826fd0 100644
--- a/usr.sbin/usbconfig/Makefile.depend
+++ b/usr.sbin/usbconfig/Makefile.depend
@@ -2,13 +2,11 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libthr \
lib/libusb \
diff --git a/usr.sbin/usbdump/Makefile.depend b/usr.sbin/usbdump/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/usbdump/Makefile.depend
+++ b/usr.sbin/usbdump/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/utx/Makefile.depend b/usr.sbin/utx/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/utx/Makefile.depend
+++ b/usr.sbin/utx/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/vidcontrol/Makefile.depend b/usr.sbin/vidcontrol/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/vidcontrol/Makefile.depend
+++ b/usr.sbin/vidcontrol/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/vipw/Makefile.depend b/usr.sbin/vipw/Makefile.depend
index 991757ecadc0..bcfa88f57adf 100644
--- a/usr.sbin/vipw/Makefile.depend
+++ b/usr.sbin/vipw/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/wake/Makefile.depend b/usr.sbin/wake/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/usr.sbin/wake/Makefile.depend
+++ b/usr.sbin/wake/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/watch/Makefile.depend b/usr.sbin/watch/Makefile.depend
index 9b2a343de2dc..ddb8d5a21ca9 100644
--- a/usr.sbin/watch/Makefile.depend
+++ b/usr.sbin/watch/Makefile.depend
@@ -2,13 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/ncurses/ncursesw \
+ lib/ncurses/tinfo \
.include <dirdeps.mk>
diff --git a/usr.sbin/watchdogd/Makefile.depend b/usr.sbin/watchdogd/Makefile.depend
index a015e205da56..f4843e55accb 100644
--- a/usr.sbin/watchdogd/Makefile.depend
+++ b/usr.sbin/watchdogd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/wlandebug/Makefile.depend b/usr.sbin/wlandebug/Makefile.depend
index 37b288fd73d8..a0547b7dd5fa 100644
--- a/usr.sbin/wlandebug/Makefile.depend
+++ b/usr.sbin/wlandebug/Makefile.depend
@@ -2,13 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libifconfig \
+ lib/msun \
.include <dirdeps.mk>
diff --git a/usr.sbin/wpa/Makefile.depend b/usr.sbin/wpa/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/Makefile.depend
diff --git a/usr.sbin/wpa/hostapd/Makefile.depend b/usr.sbin/wpa/hostapd/Makefile.depend
index 59c29ce26572..c84ae78cf589 100644
--- a/usr.sbin/wpa/hostapd/Makefile.depend
+++ b/usr.sbin/wpa/hostapd/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -13,6 +12,18 @@ DIRDEPS = \
lib/libutil \
secure/lib/libcrypto \
secure/lib/libssl \
+ usr.sbin/wpa/src/ap \
+ usr.sbin/wpa/src/common \
+ usr.sbin/wpa/src/crypto \
+ usr.sbin/wpa/src/drivers \
+ usr.sbin/wpa/src/eap_common \
+ usr.sbin/wpa/src/eap_server \
+ usr.sbin/wpa/src/eapol_auth \
+ usr.sbin/wpa/src/l2_packet \
+ usr.sbin/wpa/src/radius \
+ usr.sbin/wpa/src/tls \
+ usr.sbin/wpa/src/utils \
+ usr.sbin/wpa/src/wps \
.include <dirdeps.mk>
diff --git a/usr.sbin/wpa/hostapd_cli/Makefile.depend b/usr.sbin/wpa/hostapd_cli/Makefile.depend
index 4fc5be2a35f0..a6e8ed0e2831 100644
--- a/usr.sbin/wpa/hostapd_cli/Makefile.depend
+++ b/usr.sbin/wpa/hostapd_cli/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,6 +9,10 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libutil \
+ secure/lib/libcrypto \
+ secure/lib/libssl \
+ usr.sbin/wpa/src/common \
+ usr.sbin/wpa/src/utils \
.include <dirdeps.mk>
diff --git a/usr.sbin/wpa/src/ap/Makefile.depend b/usr.sbin/wpa/src/ap/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/ap/Makefile.depend
diff --git a/usr.sbin/wpa/src/common/Makefile.depend b/usr.sbin/wpa/src/common/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/common/Makefile.depend
diff --git a/usr.sbin/wpa/src/crypto/Makefile.depend b/usr.sbin/wpa/src/crypto/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/crypto/Makefile.depend
diff --git a/usr.sbin/wpa/src/drivers/Makefile.depend b/usr.sbin/wpa/src/drivers/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/drivers/Makefile.depend
diff --git a/usr.sbin/wpa/src/eap_common/Makefile.depend b/usr.sbin/wpa/src/eap_common/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/eap_common/Makefile.depend
diff --git a/usr.sbin/wpa/src/eap_peer/Makefile.depend b/usr.sbin/wpa/src/eap_peer/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/eap_peer/Makefile.depend
diff --git a/usr.sbin/wpa/src/eap_server/Makefile.depend b/usr.sbin/wpa/src/eap_server/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/eap_server/Makefile.depend
diff --git a/usr.sbin/wpa/src/eapol_auth/Makefile.depend b/usr.sbin/wpa/src/eapol_auth/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/eapol_auth/Makefile.depend
diff --git a/usr.sbin/wpa/src/eapol_supp/Makefile.depend b/usr.sbin/wpa/src/eapol_supp/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/eapol_supp/Makefile.depend
diff --git a/usr.sbin/wpa/src/l2_packet/Makefile.depend b/usr.sbin/wpa/src/l2_packet/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/l2_packet/Makefile.depend
diff --git a/usr.sbin/wpa/src/radius/Makefile.depend b/usr.sbin/wpa/src/radius/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/radius/Makefile.depend
diff --git a/usr.sbin/wpa/src/rsn_supp/Makefile.depend b/usr.sbin/wpa/src/rsn_supp/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/rsn_supp/Makefile.depend
diff --git a/usr.sbin/wpa/src/tls/Makefile.depend b/usr.sbin/wpa/src/tls/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/tls/Makefile.depend
diff --git a/usr.sbin/wpa/src/utils/Makefile.depend b/usr.sbin/wpa/src/utils/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/utils/Makefile.depend
diff --git a/usr.sbin/wpa/src/wps/Makefile.depend b/usr.sbin/wpa/src/wps/Makefile.depend
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/usr.sbin/wpa/src/wps/Makefile.depend
diff --git a/usr.sbin/wpa/wpa_cli/Makefile.depend b/usr.sbin/wpa/wpa_cli/Makefile.depend
index 4fc5be2a35f0..6def3d29de2d 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile.depend
+++ b/usr.sbin/wpa/wpa_cli/Makefile.depend
@@ -2,14 +2,28 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
+ lib/libpcap \
lib/libutil \
+ secure/lib/libcrypto \
+ secure/lib/libssl \
+ usr.sbin/wpa/src/common \
+ usr.sbin/wpa/src/crypto \
+ usr.sbin/wpa/src/eap_common \
+ usr.sbin/wpa/src/eap_peer \
+ usr.sbin/wpa/src/eap_server \
+ usr.sbin/wpa/src/eapol_auth \
+ usr.sbin/wpa/src/eapol_supp \
+ usr.sbin/wpa/src/l2_packet \
+ usr.sbin/wpa/src/radius \
+ usr.sbin/wpa/src/rsn_supp \
+ usr.sbin/wpa/src/tls \
+ usr.sbin/wpa/src/utils \
.include <dirdeps.mk>
diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile.depend b/usr.sbin/wpa/wpa_passphrase/Makefile.depend
index 4fc5be2a35f0..9afe98795667 100644
--- a/usr.sbin/wpa/wpa_passphrase/Makefile.depend
+++ b/usr.sbin/wpa/wpa_passphrase/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -10,6 +9,10 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libutil \
+ secure/lib/libcrypto \
+ secure/lib/libssl \
+ usr.sbin/wpa/src/crypto \
+ usr.sbin/wpa/src/utils \
.include <dirdeps.mk>
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile.depend b/usr.sbin/wpa/wpa_supplicant/Makefile.depend
index 59c29ce26572..7bb4192aaca7 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile.depend
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/xlocale \
@@ -13,6 +12,18 @@ DIRDEPS = \
lib/libutil \
secure/lib/libcrypto \
secure/lib/libssl \
+ usr.sbin/wpa/src/common \
+ usr.sbin/wpa/src/crypto \
+ usr.sbin/wpa/src/drivers \
+ usr.sbin/wpa/src/eap_common \
+ usr.sbin/wpa/src/eap_peer \
+ usr.sbin/wpa/src/eap_server \
+ usr.sbin/wpa/src/eapol_supp \
+ usr.sbin/wpa/src/l2_packet \
+ usr.sbin/wpa/src/rsn_supp \
+ usr.sbin/wpa/src/tls \
+ usr.sbin/wpa/src/utils \
+ usr.sbin/wpa/src/wps \
.include <dirdeps.mk>
diff --git a/usr.sbin/yp_mkdb/Makefile.depend b/usr.sbin/yp_mkdb/Makefile.depend
index 85338ebe3beb..59ab3d4c55ea 100644
--- a/usr.sbin/yp_mkdb/Makefile.depend
+++ b/usr.sbin/yp_mkdb/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.sbin/ypbind/Makefile.depend b/usr.sbin/ypbind/Makefile.depend
index faed4b4cc2aa..722af65039b3 100644
--- a/usr.sbin/ypbind/Makefile.depend
+++ b/usr.sbin/ypbind/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.sbin/ypldap/Makefile.depend b/usr.sbin/ypldap/Makefile.depend
index 2a162b74233c..ead1fbc3c1f6 100644
--- a/usr.sbin/ypldap/Makefile.depend
+++ b/usr.sbin/ypldap/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
@@ -11,7 +10,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libevent \
+ lib/libevent1 \
lib/libopenbsd \
lib/librpcsvc \
lib/libutil \
diff --git a/usr.sbin/yppoll/Makefile.depend b/usr.sbin/yppoll/Makefile.depend
index faed4b4cc2aa..722af65039b3 100644
--- a/usr.sbin/yppoll/Makefile.depend
+++ b/usr.sbin/yppoll/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.sbin/yppush/Makefile.depend b/usr.sbin/yppush/Makefile.depend
index 85338ebe3beb..59ab3d4c55ea 100644
--- a/usr.sbin/yppush/Makefile.depend
+++ b/usr.sbin/yppush/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/usr.sbin/ypset/Makefile.depend b/usr.sbin/ypset/Makefile.depend
index faed4b4cc2aa..722af65039b3 100644
--- a/usr.sbin/ypset/Makefile.depend
+++ b/usr.sbin/ypset/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/arpa \
include/rpc \
diff --git a/usr.sbin/zonectl/Makefile.depend b/usr.sbin/zonectl/Makefile.depend
index ee06e1c20939..ad8b5ffaef1c 100644
--- a/usr.sbin/zonectl/Makefile.depend
+++ b/usr.sbin/zonectl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \