aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cddl/lib/libavl/Makefile.depend1
-rw-r--r--cddl/lib/libctf/Makefile.depend1
-rw-r--r--cddl/lib/libdtrace/Makefile.depend1
-rw-r--r--cddl/lib/libnvpair/Makefile.depend1
-rw-r--r--cddl/lib/libumem/Makefile.depend1
-rw-r--r--cddl/lib/libuutil/Makefile.depend1
-rw-r--r--cddl/lib/libzfs/Makefile.depend1
-rw-r--r--cddl/lib/libzfs_core/Makefile.depend1
-rw-r--r--cddl/lib/libzpool/Makefile.depend1
-rw-r--r--gnu/lib/libdialog/Makefile.depend1
-rw-r--r--gnu/lib/libgcc/Makefile.depend1
-rw-r--r--gnu/lib/libgomp/Makefile.depend1
-rw-r--r--gnu/lib/libregex/Makefile.depend1
-rw-r--r--gnu/lib/libstdc++/Makefile.depend1
-rw-r--r--gnu/lib/libsupc++/Makefile.depend1
-rw-r--r--kerberos5/lib/libasn1/Makefile.depend1
-rw-r--r--kerberos5/lib/libgssapi_krb5/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/libhdb/Makefile.depend1
-rw-r--r--kerberos5/lib/libheimbase/Makefile.depend1
-rw-r--r--kerberos5/lib/libheimipcc/Makefile.depend1
-rw-r--r--kerberos5/lib/libheimipcs/Makefile.depend1
-rw-r--r--kerberos5/lib/libheimntlm/Makefile.depend1
-rw-r--r--kerberos5/lib/libhx509/Makefile.depend1
-rw-r--r--kerberos5/lib/libkadm5clnt/Makefile.depend1
-rw-r--r--kerberos5/lib/libkadm5srv/Makefile.depend1
-rw-r--r--kerberos5/lib/libkafs5/Makefile.depend1
-rw-r--r--kerberos5/lib/libkdc/Makefile.depend1
-rw-r--r--kerberos5/lib/libkrb5/Makefile.depend1
-rw-r--r--kerberos5/lib/libroken/Makefile.depend1
-rw-r--r--kerberos5/lib/libwind/Makefile.depend1
-rw-r--r--lib/atf/libatf-c++/Makefile.depend1
-rw-r--r--lib/atf/libatf-c/Makefile.depend1
-rw-r--r--lib/libalias/libalias/Makefile.depend1
-rw-r--r--lib/libarchive/Makefile.depend1
-rw-r--r--lib/libauditd/Makefile.depend1
-rw-r--r--lib/libbegemot/Makefile.depend1
-rw-r--r--lib/libblocksruntime/Makefile.depend1
-rw-r--r--lib/libbluetooth/Makefile.depend1
-rw-r--r--lib/libbsm/Makefile.depend1
-rw-r--r--lib/libbsnmp/libbsnmp/Makefile.depend1
-rw-r--r--lib/libbz2/Makefile.depend1
-rw-r--r--lib/libcalendar/Makefile.depend1
-rw-r--r--lib/libcam/Makefile.depend1
-rw-r--r--lib/libcapsicum/Makefile.depend1
-rw-r--r--lib/libcom_err/Makefile.depend1
-rw-r--r--lib/libcrypt/Makefile.depend1
-rw-r--r--lib/libcuse/Makefile.depend1
-rw-r--r--lib/libcxxrt/Makefile.depend1
-rw-r--r--lib/libdevinfo/Makefile.depend1
-rw-r--r--lib/libdevstat/Makefile.depend1
-rw-r--r--lib/libdpv/Makefile.depend1
-rw-r--r--lib/libdwarf/Makefile.depend1
-rw-r--r--lib/libedit/Makefile.depend1
-rw-r--r--lib/libelf/Makefile.depend1
-rw-r--r--lib/libexecinfo/Makefile.depend1
-rw-r--r--lib/libexpat/Makefile.depend1
-rw-r--r--lib/libfetch/Makefile.depend1
-rw-r--r--lib/libfigpar/Makefile.depend1
-rw-r--r--lib/libgeom/Makefile.depend1
-rw-r--r--lib/libgpio/Makefile.depend1
-rw-r--r--lib/libgssapi/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/libipsec/Makefile.depend1
-rw-r--r--lib/libjail/Makefile.depend1
-rw-r--r--lib/libkiconv/Makefile.depend1
-rw-r--r--lib/libkvm/Makefile.depend1
-rw-r--r--lib/libldns/Makefile.depend1
-rw-r--r--lib/liblzma/Makefile.depend1
-rw-r--r--lib/libmagic/Makefile.depend1
-rw-r--r--lib/libmd/Makefile.depend1
-rw-r--r--lib/libmemstat/Makefile.depend1
-rw-r--r--lib/libmilter/Makefile.depend1
-rw-r--r--lib/libmp/Makefile.depend1
-rw-r--r--lib/libmt/Makefile.depend1
-rw-r--r--lib/libnetgraph/Makefile.depend1
-rw-r--r--lib/libngatm/Makefile.depend1
-rw-r--r--lib/libnv/Makefile.depend1
-rw-r--r--lib/libopie/Makefile.depend1
-rw-r--r--lib/libpam/libpam/Makefile.depend1
-rw-r--r--lib/libpcap/Makefile.depend1
-rw-r--r--lib/libpmc/Makefile.depend1
-rw-r--r--lib/libproc/Makefile.depend1
-rw-r--r--lib/libprocstat/Makefile.depend1
-rw-r--r--lib/libradius/Makefile.depend1
-rw-r--r--lib/librpcsec_gss/Makefile.depend1
-rw-r--r--lib/librpcsvc/Makefile.depend1
-rw-r--r--lib/librt/Makefile.depend1
-rw-r--r--lib/librtld_db/Makefile.depend1
-rw-r--r--lib/libsbuf/Makefile.depend1
-rw-r--r--lib/libsdp/Makefile.depend1
-rw-r--r--lib/libsmb/Makefile.depend1
-rw-r--r--lib/libsqlite3/Makefile.depend1
-rw-r--r--lib/libstdbuf/Makefile.depend1
-rw-r--r--lib/libstdthreads/Makefile.depend1
-rw-r--r--lib/libthr/Makefile.depend1
-rw-r--r--lib/libthread_db/Makefile.depend1
-rw-r--r--lib/libucl/Makefile.depend1
-rw-r--r--lib/libufs/Makefile.depend1
-rw-r--r--lib/libugidfw/Makefile.depend1
-rw-r--r--lib/libulog/Makefile.depend1
-rw-r--r--lib/libunbound/Makefile.depend1
-rw-r--r--lib/libusb/Makefile.depend1
-rw-r--r--lib/libusbhid/Makefile.depend1
-rw-r--r--lib/libutil/Makefile.depend1
-rw-r--r--lib/libvgl/Makefile.depend1
-rw-r--r--lib/libvmmapi/Makefile.depend1
-rw-r--r--lib/libwrap/Makefile.depend1
-rw-r--r--lib/libxo/Makefile.depend1
-rw-r--r--lib/libypclnt/Makefile.depend1
-rw-r--r--lib/libz/Makefile.depend1
-rw-r--r--lib/msun/Makefile.depend1
-rw-r--r--lib/ncurses/form/Makefile.depend1
-rw-r--r--lib/ncurses/formw/Makefile.depend1
-rw-r--r--lib/ncurses/menu/Makefile.depend1
-rw-r--r--lib/ncurses/menuw/Makefile.depend1
-rw-r--r--lib/ncurses/ncurses/Makefile.depend1
-rw-r--r--lib/ncurses/ncursesw/Makefile.depend1
-rw-r--r--lib/ncurses/panel/Makefile.depend1
-rw-r--r--lib/ncurses/panelw/Makefile.depend1
-rw-r--r--secure/lib/libcrypto/Makefile.depend1
-rw-r--r--secure/lib/libssh/Makefile.depend1
-rw-r--r--secure/lib/libssl/Makefile.depend1
-rw-r--r--share/mk/local.meta.sys.mk7
-rw-r--r--targets/pseudo/bootstrap-tools/Makefile10
-rw-r--r--targets/pseudo/stage/Makefile4
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend1
161 files changed, 15 insertions, 164 deletions
diff --git a/cddl/lib/libavl/Makefile.depend b/cddl/lib/libavl/Makefile.depend
index 3699b06bcb19..9cb890b58360 100644
--- a/cddl/lib/libavl/Makefile.depend
+++ b/cddl/lib/libavl/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libctf/Makefile.depend b/cddl/lib/libctf/Makefile.depend
index 4b536f737d01..ff9d79528313 100644
--- a/cddl/lib/libctf/Makefile.depend
+++ b/cddl/lib/libctf/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libelf \
lib/libz \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libdtrace/Makefile.depend b/cddl/lib/libdtrace/Makefile.depend
index 124d5c7985b0..50ab52c138f5 100644
--- a/cddl/lib/libdtrace/Makefile.depend
+++ b/cddl/lib/libdtrace/Makefile.depend
@@ -15,7 +15,6 @@ DIRDEPS = \
lib/libproc \
lib/librtld_db \
lib/libthr \
- usr.bin/xinstall.host \
usr.bin/yacc.host \
diff --git a/cddl/lib/libnvpair/Makefile.depend b/cddl/lib/libnvpair/Makefile.depend
index 3dce64a91c96..c9f9d52f6e26 100644
--- a/cddl/lib/libnvpair/Makefile.depend
+++ b/cddl/lib/libnvpair/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/msun \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libumem/Makefile.depend b/cddl/lib/libumem/Makefile.depend
index 3699b06bcb19..9cb890b58360 100644
--- a/cddl/lib/libumem/Makefile.depend
+++ b/cddl/lib/libumem/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libuutil/Makefile.depend b/cddl/lib/libuutil/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/cddl/lib/libuutil/Makefile.depend
+++ b/cddl/lib/libuutil/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libzfs/Makefile.depend b/cddl/lib/libzfs/Makefile.depend
index 8c2b34bbbefa..be130df5f548 100644
--- a/cddl/lib/libzfs/Makefile.depend
+++ b/cddl/lib/libzfs/Makefile.depend
@@ -20,7 +20,6 @@ DIRDEPS = \
lib/libthr \
lib/libutil \
lib/msun \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libzfs_core/Makefile.depend b/cddl/lib/libzfs_core/Makefile.depend
index 9e7fae278316..86e045ff4aa0 100644
--- a/cddl/lib/libzfs_core/Makefile.depend
+++ b/cddl/lib/libzfs_core/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/msun \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libzpool/Makefile.depend b/cddl/lib/libzpool/Makefile.depend
index cb67e224b88b..c91de43e0c03 100644
--- a/cddl/lib/libzpool/Makefile.depend
+++ b/cddl/lib/libzpool/Makefile.depend
@@ -16,7 +16,6 @@ DIRDEPS = \
lib/libthr \
lib/libz \
lib/msun \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libdialog/Makefile.depend b/gnu/lib/libdialog/Makefile.depend
index 1c00d9252b2f..8b0f9a72f3a9 100644
--- a/gnu/lib/libdialog/Makefile.depend
+++ b/gnu/lib/libdialog/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/msun \
lib/ncurses/ncursesw \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libgcc/Makefile.depend b/gnu/lib/libgcc/Makefile.depend
index 6dd413bb7f38..ce724946e3c5 100644
--- a/gnu/lib/libgcc/Makefile.depend
+++ b/gnu/lib/libgcc/Makefile.depend
@@ -7,7 +7,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libgomp/Makefile.depend b/gnu/lib/libgomp/Makefile.depend
index d8c89db18af1..fd53a3fcc90f 100644
--- a/gnu/lib/libgomp/Makefile.depend
+++ b/gnu/lib/libgomp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libregex/Makefile.depend b/gnu/lib/libregex/Makefile.depend
index 1eb05a009fcb..2defba8dfe19 100644
--- a/gnu/lib/libregex/Makefile.depend
+++ b/gnu/lib/libregex/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libstdc++/Makefile.depend b/gnu/lib/libstdc++/Makefile.depend
index 760b9b8d54a2..0e1a73c75c91 100644
--- a/gnu/lib/libstdc++/Makefile.depend
+++ b/gnu/lib/libstdc++/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/msun \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libsupc++/Makefile.depend b/gnu/lib/libsupc++/Makefile.depend
index 2ffe3c4ddabb..5584517497a5 100644
--- a/gnu/lib/libsupc++/Makefile.depend
+++ b/gnu/lib/libsupc++/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libasn1/Makefile.depend b/kerberos5/lib/libasn1/Makefile.depend
index 2b73dcd16da6..b94475929eb5 100644
--- a/kerberos5/lib/libasn1/Makefile.depend
+++ b/kerberos5/lib/libasn1/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/libc \
lib/libcom_err \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libgssapi_krb5/Makefile.depend b/kerberos5/lib/libgssapi_krb5/Makefile.depend
index f265a8d0889c..e37825c811c7 100644
--- a/kerberos5/lib/libgssapi_krb5/Makefile.depend
+++ b/kerberos5/lib/libgssapi_krb5/Makefile.depend
@@ -20,7 +20,6 @@ DIRDEPS = \
lib/libgssapi \
lib/libthr \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile.depend b/kerberos5/lib/libgssapi_ntlm/Makefile.depend
index ded534ac5c0b..db48cf0b4d49 100644
--- a/kerberos5/lib/libgssapi_ntlm/Makefile.depend
+++ b/kerberos5/lib/libgssapi_ntlm/Makefile.depend
@@ -17,7 +17,6 @@ DIRDEPS = \
lib/libgssapi \
lib/libthr \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libgssapi_spnego/Makefile.depend b/kerberos5/lib/libgssapi_spnego/Makefile.depend
index ba78e765f078..43eaf3d778f1 100644
--- a/kerberos5/lib/libgssapi_spnego/Makefile.depend
+++ b/kerberos5/lib/libgssapi_spnego/Makefile.depend
@@ -15,7 +15,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libgssapi \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libhdb/Makefile.depend b/kerberos5/lib/libhdb/Makefile.depend
index 04a35d31c88d..38020be96201 100644
--- a/kerberos5/lib/libhdb/Makefile.depend
+++ b/kerberos5/lib/libhdb/Makefile.depend
@@ -20,7 +20,6 @@ DIRDEPS = \
lib/libsqlite3 \
lib/libthr \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libheimbase/Makefile.depend b/kerberos5/lib/libheimbase/Makefile.depend
index 0a2f3515b716..7b92dbd89f4a 100644
--- a/kerberos5/lib/libheimbase/Makefile.depend
+++ b/kerberos5/lib/libheimbase/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libthr \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libheimipcc/Makefile.depend b/kerberos5/lib/libheimipcc/Makefile.depend
index f59f10fb8945..78a2d56cabd2 100644
--- a/kerberos5/lib/libheimipcc/Makefile.depend
+++ b/kerberos5/lib/libheimipcc/Makefile.depend
@@ -14,7 +14,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libthr \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libheimipcs/Makefile.depend b/kerberos5/lib/libheimipcs/Makefile.depend
index a9a0d8dfd877..38b9ffdbfca7 100644
--- a/kerberos5/lib/libheimipcs/Makefile.depend
+++ b/kerberos5/lib/libheimipcs/Makefile.depend
@@ -15,7 +15,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libthr \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libheimntlm/Makefile.depend b/kerberos5/lib/libheimntlm/Makefile.depend
index 7959ad5d40a9..ff20bcee95f4 100644
--- a/kerberos5/lib/libheimntlm/Makefile.depend
+++ b/kerberos5/lib/libheimntlm/Makefile.depend
@@ -16,7 +16,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libthr \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libhx509/Makefile.depend b/kerberos5/lib/libhx509/Makefile.depend
index d737a691eae5..c422d1785da8 100644
--- a/kerberos5/lib/libhx509/Makefile.depend
+++ b/kerberos5/lib/libhx509/Makefile.depend
@@ -15,7 +15,6 @@ DIRDEPS = \
lib/libcom_err \
lib/libcompiler_rt \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
usr.bin/yacc.host \
diff --git a/kerberos5/lib/libkadm5clnt/Makefile.depend b/kerberos5/lib/libkadm5clnt/Makefile.depend
index 29886896d034..8b5c57d286b1 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile.depend
+++ b/kerberos5/lib/libkadm5clnt/Makefile.depend
@@ -16,7 +16,6 @@ DIRDEPS = \
lib/libcom_err \
lib/libcompiler_rt \
lib/libthr \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libkadm5srv/Makefile.depend b/kerberos5/lib/libkadm5srv/Makefile.depend
index 15a07883c073..bf42cd8056c2 100644
--- a/kerberos5/lib/libkadm5srv/Makefile.depend
+++ b/kerberos5/lib/libkadm5srv/Makefile.depend
@@ -16,7 +16,6 @@ DIRDEPS = \
lib/libcom_err \
lib/libcompiler_rt \
lib/libthr \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libkafs5/Makefile.depend b/kerberos5/lib/libkafs5/Makefile.depend
index 8f9723c019df..e8bb93c155e9 100644
--- a/kerberos5/lib/libkafs5/Makefile.depend
+++ b/kerberos5/lib/libkafs5/Makefile.depend
@@ -15,7 +15,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libthr \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libkdc/Makefile.depend b/kerberos5/lib/libkdc/Makefile.depend
index 0f4b829fa128..2f174fa704fa 100644
--- a/kerberos5/lib/libkdc/Makefile.depend
+++ b/kerberos5/lib/libkdc/Makefile.depend
@@ -22,7 +22,6 @@ DIRDEPS = \
lib/libthr \
lib/libutil \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libkrb5/Makefile.depend b/kerberos5/lib/libkrb5/Makefile.depend
index edf6cf833c8a..0adc7b648611 100644
--- a/kerberos5/lib/libkrb5/Makefile.depend
+++ b/kerberos5/lib/libkrb5/Makefile.depend
@@ -19,7 +19,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libcrypt \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libroken/Makefile.depend b/kerberos5/lib/libroken/Makefile.depend
index 102ac86153be..e280c94bcfea 100644
--- a/kerberos5/lib/libroken/Makefile.depend
+++ b/kerberos5/lib/libroken/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libcrypt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libwind/Makefile.depend b/kerberos5/lib/libwind/Makefile.depend
index 6ed1a57ca186..87bc4c144c56 100644
--- a/kerberos5/lib/libwind/Makefile.depend
+++ b/kerberos5/lib/libwind/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/libc \
lib/libcom_err \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/atf/libatf-c++/Makefile.depend b/lib/atf/libatf-c++/Makefile.depend
index 5de4727c00bd..4cca715bf897 100644
--- a/lib/atf/libatf-c++/Makefile.depend
+++ b/lib/atf/libatf-c++/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/atf/libatf-c/Makefile.depend b/lib/atf/libatf-c/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/atf/libatf-c/Makefile.depend
+++ b/lib/atf/libatf-c/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libalias/libalias/Makefile.depend b/lib/libalias/libalias/Makefile.depend
index 69d17244ef00..54c1f6f1442e 100644
--- a/lib/libalias/libalias/Makefile.depend
+++ b/lib/libalias/libalias/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libarchive/Makefile.depend b/lib/libarchive/Makefile.depend
index b2549939a85d..1d68a5a5ded7 100644
--- a/lib/libarchive/Makefile.depend
+++ b/lib/libarchive/Makefile.depend
@@ -14,7 +14,6 @@ DIRDEPS = \
lib/liblzma \
lib/libz \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libauditd/Makefile.depend b/lib/libauditd/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libauditd/Makefile.depend
+++ b/lib/libauditd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbegemot/Makefile.depend b/lib/libbegemot/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libbegemot/Makefile.depend
+++ b/lib/libbegemot/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libblocksruntime/Makefile.depend b/lib/libblocksruntime/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libblocksruntime/Makefile.depend
+++ b/lib/libblocksruntime/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbluetooth/Makefile.depend b/lib/libbluetooth/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libbluetooth/Makefile.depend
+++ b/lib/libbluetooth/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbsm/Makefile.depend b/lib/libbsm/Makefile.depend
index 69d17244ef00..54c1f6f1442e 100644
--- a/lib/libbsm/Makefile.depend
+++ b/lib/libbsm/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbsnmp/libbsnmp/Makefile.depend b/lib/libbsnmp/libbsnmp/Makefile.depend
index 5781764a81db..fc0b63320671 100644
--- a/lib/libbsnmp/libbsnmp/Makefile.depend
+++ b/lib/libbsnmp/libbsnmp/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbz2/Makefile.depend b/lib/libbz2/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libbz2/Makefile.depend
+++ b/lib/libbz2/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcalendar/Makefile.depend b/lib/libcalendar/Makefile.depend
index 3699b06bcb19..9cb890b58360 100644
--- a/lib/libcalendar/Makefile.depend
+++ b/lib/libcalendar/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcam/Makefile.depend b/lib/libcam/Makefile.depend
index 114b84237529..6002005509a1 100644
--- a/lib/libcam/Makefile.depend
+++ b/lib/libcam/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libsbuf \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcapsicum/Makefile.depend b/lib/libcapsicum/Makefile.depend
index 5016551eabbe..4f7989bd2e64 100644
--- a/lib/libcapsicum/Makefile.depend
+++ b/lib/libcapsicum/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libnv \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcom_err/Makefile.depend b/lib/libcom_err/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libcom_err/Makefile.depend
+++ b/lib/libcom_err/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcrypt/Makefile.depend b/lib/libcrypt/Makefile.depend
index 69d17244ef00..54c1f6f1442e 100644
--- a/lib/libcrypt/Makefile.depend
+++ b/lib/libcrypt/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcuse/Makefile.depend b/lib/libcuse/Makefile.depend
index 0a2f3515b716..7b92dbd89f4a 100644
--- a/lib/libcuse/Makefile.depend
+++ b/lib/libcuse/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libthr \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcxxrt/Makefile.depend b/lib/libcxxrt/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libcxxrt/Makefile.depend
+++ b/lib/libcxxrt/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libdevinfo/Makefile.depend b/lib/libdevinfo/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libdevinfo/Makefile.depend
+++ b/lib/libdevinfo/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libdevstat/Makefile.depend b/lib/libdevstat/Makefile.depend
index 96ad505a4ff0..a1ac545aff09 100644
--- a/lib/libdevstat/Makefile.depend
+++ b/lib/libdevstat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libkvm \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libdpv/Makefile.depend b/lib/libdpv/Makefile.depend
index 6f24a3305c4c..7de4367f1fe9 100644
--- a/lib/libdpv/Makefile.depend
+++ b/lib/libdpv/Makefile.depend
@@ -14,7 +14,6 @@ DIRDEPS = \
lib/libutil \
lib/msun \
lib/ncurses/ncursesw \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libdwarf/Makefile.depend b/lib/libdwarf/Makefile.depend
index 36075d53dc56..ea167ef60139 100644
--- a/lib/libdwarf/Makefile.depend
+++ b/lib/libdwarf/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libelf \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libedit/Makefile.depend b/lib/libedit/Makefile.depend
index 3c91e803b676..607ebe0df8a0 100644
--- a/lib/libedit/Makefile.depend
+++ b/lib/libedit/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libelf/Makefile.depend b/lib/libelf/Makefile.depend
index cc4f1d23f1bc..814c094965ae 100644
--- a/lib/libelf/Makefile.depend
+++ b/lib/libelf/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libexecinfo/Makefile.depend b/lib/libexecinfo/Makefile.depend
index 5bc90396a513..b76756941743 100644
--- a/lib/libexecinfo/Makefile.depend
+++ b/lib/libexecinfo/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libelf \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libexpat/Makefile.depend b/lib/libexpat/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libexpat/Makefile.depend
+++ b/lib/libexpat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libfetch/Makefile.depend b/lib/libfetch/Makefile.depend
index 4bcc4bf3eaea..3de414854a34 100644
--- a/lib/libfetch/Makefile.depend
+++ b/lib/libfetch/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \
secure/lib/libcrypto \
secure/lib/libssl \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libfigpar/Makefile.depend b/lib/libfigpar/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libfigpar/Makefile.depend
+++ b/lib/libfigpar/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libgeom/Makefile.depend b/lib/libgeom/Makefile.depend
index 9af47280b10f..7f43259d6ba3 100644
--- a/lib/libgeom/Makefile.depend
+++ b/lib/libgeom/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libexpat \
lib/libsbuf \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libgpio/Makefile.depend b/lib/libgpio/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libgpio/Makefile.depend
+++ b/lib/libgpio/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libgssapi/Makefile.depend b/lib/libgssapi/Makefile.depend
index 7602ef91780d..08a5ffff1f63 100644
--- a/lib/libgssapi/Makefile.depend
+++ b/lib/libgssapi/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/BIG5/Makefile.depend b/lib/libiconv_modules/BIG5/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/BIG5/Makefile.depend
+++ b/lib/libiconv_modules/BIG5/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/DECHanyu/Makefile.depend b/lib/libiconv_modules/DECHanyu/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/DECHanyu/Makefile.depend
+++ b/lib/libiconv_modules/DECHanyu/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/EUC/Makefile.depend b/lib/libiconv_modules/EUC/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/EUC/Makefile.depend
+++ b/lib/libiconv_modules/EUC/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/EUCTW/Makefile.depend b/lib/libiconv_modules/EUCTW/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/EUCTW/Makefile.depend
+++ b/lib/libiconv_modules/EUCTW/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/GBK2K/Makefile.depend b/lib/libiconv_modules/GBK2K/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/GBK2K/Makefile.depend
+++ b/lib/libiconv_modules/GBK2K/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/HZ/Makefile.depend b/lib/libiconv_modules/HZ/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/HZ/Makefile.depend
+++ b/lib/libiconv_modules/HZ/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/ISO2022/Makefile.depend b/lib/libiconv_modules/ISO2022/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/ISO2022/Makefile.depend
+++ b/lib/libiconv_modules/ISO2022/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/JOHAB/Makefile.depend b/lib/libiconv_modules/JOHAB/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/JOHAB/Makefile.depend
+++ b/lib/libiconv_modules/JOHAB/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/MSKanji/Makefile.depend b/lib/libiconv_modules/MSKanji/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/MSKanji/Makefile.depend
+++ b/lib/libiconv_modules/MSKanji/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UES/Makefile.depend b/lib/libiconv_modules/UES/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/UES/Makefile.depend
+++ b/lib/libiconv_modules/UES/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UTF1632/Makefile.depend b/lib/libiconv_modules/UTF1632/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/UTF1632/Makefile.depend
+++ b/lib/libiconv_modules/UTF1632/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UTF7/Makefile.depend b/lib/libiconv_modules/UTF7/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/UTF7/Makefile.depend
+++ b/lib/libiconv_modules/UTF7/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UTF8/Makefile.depend b/lib/libiconv_modules/UTF8/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/UTF8/Makefile.depend
+++ b/lib/libiconv_modules/UTF8/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/VIQR/Makefile.depend b/lib/libiconv_modules/VIQR/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/VIQR/Makefile.depend
+++ b/lib/libiconv_modules/VIQR/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/ZW/Makefile.depend b/lib/libiconv_modules/ZW/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/ZW/Makefile.depend
+++ b/lib/libiconv_modules/ZW/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/iconv_none/Makefile.depend b/lib/libiconv_modules/iconv_none/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/iconv_none/Makefile.depend
+++ b/lib/libiconv_modules/iconv_none/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/iconv_std/Makefile.depend b/lib/libiconv_modules/iconv_std/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/iconv_std/Makefile.depend
+++ b/lib/libiconv_modules/iconv_std/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_646/Makefile.depend b/lib/libiconv_modules/mapper_646/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/mapper_646/Makefile.depend
+++ b/lib/libiconv_modules/mapper_646/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_none/Makefile.depend b/lib/libiconv_modules/mapper_none/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/mapper_none/Makefile.depend
+++ b/lib/libiconv_modules/mapper_none/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_parallel/Makefile.depend b/lib/libiconv_modules/mapper_parallel/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/mapper_parallel/Makefile.depend
+++ b/lib/libiconv_modules/mapper_parallel/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_serial/Makefile.depend b/lib/libiconv_modules/mapper_serial/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/mapper_serial/Makefile.depend
+++ b/lib/libiconv_modules/mapper_serial/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_std/Makefile.depend b/lib/libiconv_modules/mapper_std/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/mapper_std/Makefile.depend
+++ b/lib/libiconv_modules/mapper_std/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_zone/Makefile.depend b/lib/libiconv_modules/mapper_zone/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libiconv_modules/mapper_zone/Makefile.depend
+++ b/lib/libiconv_modules/mapper_zone/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libipsec/Makefile.depend b/lib/libipsec/Makefile.depend
index d1ba46b00e10..7583d2489c76 100644
--- a/lib/libipsec/Makefile.depend
+++ b/lib/libipsec/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
usr.bin/yacc.host \
diff --git a/lib/libjail/Makefile.depend b/lib/libjail/Makefile.depend
index 69d17244ef00..54c1f6f1442e 100644
--- a/lib/libjail/Makefile.depend
+++ b/lib/libjail/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libkiconv/Makefile.depend b/lib/libkiconv/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libkiconv/Makefile.depend
+++ b/lib/libkiconv/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libkvm/Makefile.depend b/lib/libkvm/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libkvm/Makefile.depend
+++ b/lib/libkvm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libldns/Makefile.depend b/lib/libldns/Makefile.depend
index f35aa11c2878..b3f22d1b14c1 100644
--- a/lib/libldns/Makefile.depend
+++ b/lib/libldns/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/libcompiler_rt \
secure/lib/libcrypto \
secure/lib/libssl \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/liblzma/Makefile.depend b/lib/liblzma/Makefile.depend
index 18b76e538afd..6f716c20397e 100644
--- a/lib/liblzma/Makefile.depend
+++ b/lib/liblzma/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libthr \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmagic/Makefile.depend b/lib/libmagic/Makefile.depend
index 3842c54d0c2f..d209adbd4ff2 100644
--- a/lib/libmagic/Makefile.depend
+++ b/lib/libmagic/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libz \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmd/Makefile.depend b/lib/libmd/Makefile.depend
index c145c032d938..00038a0b92d0 100644
--- a/lib/libmd/Makefile.depend
+++ b/lib/libmd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmemstat/Makefile.depend b/lib/libmemstat/Makefile.depend
index 96ad505a4ff0..a1ac545aff09 100644
--- a/lib/libmemstat/Makefile.depend
+++ b/lib/libmemstat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libkvm \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmilter/Makefile.depend b/lib/libmilter/Makefile.depend
index d66a25bfdd84..b1db66906358 100644
--- a/lib/libmilter/Makefile.depend
+++ b/lib/libmilter/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmp/Makefile.depend b/lib/libmp/Makefile.depend
index 5781764a81db..fc0b63320671 100644
--- a/lib/libmp/Makefile.depend
+++ b/lib/libmp/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmt/Makefile.depend b/lib/libmt/Makefile.depend
index 9af47280b10f..7f43259d6ba3 100644
--- a/lib/libmt/Makefile.depend
+++ b/lib/libmt/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libexpat \
lib/libsbuf \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libnetgraph/Makefile.depend b/lib/libnetgraph/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libnetgraph/Makefile.depend
+++ b/lib/libnetgraph/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libngatm/Makefile.depend b/lib/libngatm/Makefile.depend
index 69d17244ef00..54c1f6f1442e 100644
--- a/lib/libngatm/Makefile.depend
+++ b/lib/libngatm/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libnv/Makefile.depend b/lib/libnv/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libnv/Makefile.depend
+++ b/lib/libnv/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libopie/Makefile.depend b/lib/libopie/Makefile.depend
index 4ed0db266d6b..6a2d4068b6cc 100644
--- a/lib/libopie/Makefile.depend
+++ b/lib/libopie/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libmd \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/libpam/Makefile.depend b/lib/libpam/libpam/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libpam/libpam/Makefile.depend
+++ b/lib/libpam/libpam/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpcap/Makefile.depend b/lib/libpcap/Makefile.depend
index 74262990d27c..7dd09ccaaf57 100644
--- a/lib/libpcap/Makefile.depend
+++ b/lib/libpcap/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
usr.bin/yacc.host \
diff --git a/lib/libpmc/Makefile.depend b/lib/libpmc/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libpmc/Makefile.depend
+++ b/lib/libpmc/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libproc/Makefile.depend b/lib/libproc/Makefile.depend
index feb045f03343..1615031b8685 100644
--- a/lib/libproc/Makefile.depend
+++ b/lib/libproc/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
lib/libcxxrt \
lib/libelf \
lib/libutil \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libprocstat/Makefile.depend b/lib/libprocstat/Makefile.depend
index 11ffd8d53590..433756b15d29 100644
--- a/lib/libprocstat/Makefile.depend
+++ b/lib/libprocstat/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
lib/libkvm \
lib/libprocstat/zfs \
lib/libutil \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libradius/Makefile.depend b/lib/libradius/Makefile.depend
index 5d73f9748ce4..f318cc1a6b40 100644
--- a/lib/libradius/Makefile.depend
+++ b/lib/libradius/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librpcsec_gss/Makefile.depend b/lib/librpcsec_gss/Makefile.depend
index a352749f23b2..506fcea71482 100644
--- a/lib/librpcsec_gss/Makefile.depend
+++ b/lib/librpcsec_gss/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libgssapi \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librpcsvc/Makefile.depend b/lib/librpcsvc/Makefile.depend
index e431374ab05c..0c8b0212e088 100644
--- a/lib/librpcsvc/Makefile.depend
+++ b/lib/librpcsvc/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librt/Makefile.depend b/lib/librt/Makefile.depend
index 0a2f3515b716..7b92dbd89f4a 100644
--- a/lib/librt/Makefile.depend
+++ b/lib/librt/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libthr \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librtld_db/Makefile.depend b/lib/librtld_db/Makefile.depend
index fad79f2b77d0..4a7dcd9e15d9 100644
--- a/lib/librtld_db/Makefile.depend
+++ b/lib/librtld_db/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/libelf \
lib/libproc \
lib/libutil \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libsbuf/Makefile.depend b/lib/libsbuf/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libsbuf/Makefile.depend
+++ b/lib/libsbuf/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libsdp/Makefile.depend b/lib/libsdp/Makefile.depend
index 37f8632bc706..179dbbe07ac2 100644
--- a/lib/libsdp/Makefile.depend
+++ b/lib/libsdp/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libbluetooth \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libsmb/Makefile.depend b/lib/libsmb/Makefile.depend
index 4d66c46b2bc8..5a8df4c360b0 100644
--- a/lib/libsmb/Makefile.depend
+++ b/lib/libsmb/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libkiconv \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libsqlite3/Makefile.depend b/lib/libsqlite3/Makefile.depend
index 0a2f3515b716..7b92dbd89f4a 100644
--- a/lib/libsqlite3/Makefile.depend
+++ b/lib/libsqlite3/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libthr \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libstdbuf/Makefile.depend b/lib/libstdbuf/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libstdbuf/Makefile.depend
+++ b/lib/libstdbuf/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libstdthreads/Makefile.depend b/lib/libstdthreads/Makefile.depend
index 0a2f3515b716..7b92dbd89f4a 100644
--- a/lib/libstdthreads/Makefile.depend
+++ b/lib/libstdthreads/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libthr \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libthr/Makefile.depend b/lib/libthr/Makefile.depend
index 3699b06bcb19..9cb890b58360 100644
--- a/lib/libthr/Makefile.depend
+++ b/lib/libthr/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libthread_db/Makefile.depend b/lib/libthread_db/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libthread_db/Makefile.depend
+++ b/lib/libthread_db/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libucl/Makefile.depend b/lib/libucl/Makefile.depend
index 3dce64a91c96..c9f9d52f6e26 100644
--- a/lib/libucl/Makefile.depend
+++ b/lib/libucl/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/msun \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libufs/Makefile.depend b/lib/libufs/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libufs/Makefile.depend
+++ b/lib/libufs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libugidfw/Makefile.depend b/lib/libugidfw/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libugidfw/Makefile.depend
+++ b/lib/libugidfw/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libulog/Makefile.depend b/lib/libulog/Makefile.depend
index 2e2a25ec08c5..064e492dd3e7 100644
--- a/lib/libulog/Makefile.depend
+++ b/lib/libulog/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libmd \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libunbound/Makefile.depend b/lib/libunbound/Makefile.depend
index 9ae472efaee8..aaf8d6d8d8f1 100644
--- a/lib/libunbound/Makefile.depend
+++ b/lib/libunbound/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
lib/libthr \
secure/lib/libcrypto \
secure/lib/libssl \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libusb/Makefile.depend b/lib/libusb/Makefile.depend
index 0a2f3515b716..7b92dbd89f4a 100644
--- a/lib/libusb/Makefile.depend
+++ b/lib/libusb/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libthr \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libusbhid/Makefile.depend b/lib/libusbhid/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libusbhid/Makefile.depend
+++ b/lib/libusbhid/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libutil/Makefile.depend b/lib/libutil/Makefile.depend
index 69d17244ef00..54c1f6f1442e 100644
--- a/lib/libutil/Makefile.depend
+++ b/lib/libutil/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libvgl/Makefile.depend b/lib/libvgl/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libvgl/Makefile.depend
+++ b/lib/libvgl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libvmmapi/Makefile.depend b/lib/libvmmapi/Makefile.depend
index e2942710d8e3..58f9a3347b00 100644
--- a/lib/libvmmapi/Makefile.depend
+++ b/lib/libvmmapi/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libutil \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libwrap/Makefile.depend b/lib/libwrap/Makefile.depend
index 69d17244ef00..54c1f6f1442e 100644
--- a/lib/libwrap/Makefile.depend
+++ b/lib/libwrap/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libxo/Makefile.depend b/lib/libxo/Makefile.depend
index e2942710d8e3..58f9a3347b00 100644
--- a/lib/libxo/Makefile.depend
+++ b/lib/libxo/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libutil \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libypclnt/Makefile.depend b/lib/libypclnt/Makefile.depend
index 36ab5e393883..8ee531b94c6b 100644
--- a/lib/libypclnt/Makefile.depend
+++ b/lib/libypclnt/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libz/Makefile.depend b/lib/libz/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/libz/Makefile.depend
+++ b/lib/libz/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/msun/Makefile.depend b/lib/msun/Makefile.depend
index dde2d604a47c..3646e2e2b1af 100644
--- a/lib/msun/Makefile.depend
+++ b/lib/msun/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/form/Makefile.depend b/lib/ncurses/form/Makefile.depend
index e7537474830f..6956fecca19d 100644
--- a/lib/ncurses/form/Makefile.depend
+++ b/lib/ncurses/form/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/formw/Makefile.depend b/lib/ncurses/formw/Makefile.depend
index 1448c10d1198..767a76027213 100644
--- a/lib/ncurses/formw/Makefile.depend
+++ b/lib/ncurses/formw/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/menu/Makefile.depend b/lib/ncurses/menu/Makefile.depend
index 7dbcb2bab48c..fa2fcb4fd201 100644
--- a/lib/ncurses/menu/Makefile.depend
+++ b/lib/ncurses/menu/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/menuw/Makefile.depend b/lib/ncurses/menuw/Makefile.depend
index 0ffbc9b5a117..6d65e746b3b2 100644
--- a/lib/ncurses/menuw/Makefile.depend
+++ b/lib/ncurses/menuw/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/ncurses/Makefile.depend b/lib/ncurses/ncurses/Makefile.depend
index df76371d32ec..8ad41a6a83a5 100644
--- a/lib/ncurses/ncurses/Makefile.depend
+++ b/lib/ncurses/ncurses/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/ncursesw/Makefile.depend b/lib/ncurses/ncursesw/Makefile.depend
index 443698d5d078..b6ffa953f3fb 100644
--- a/lib/ncurses/ncursesw/Makefile.depend
+++ b/lib/ncurses/ncursesw/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/panel/Makefile.depend b/lib/ncurses/panel/Makefile.depend
index fa0a8e066c81..7ed28bcc1e73 100644
--- a/lib/ncurses/panel/Makefile.depend
+++ b/lib/ncurses/panel/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/panelw/Makefile.depend b/lib/ncurses/panelw/Makefile.depend
index 0db35405ecdf..0bb0107343d4 100644
--- a/lib/ncurses/panelw/Makefile.depend
+++ b/lib/ncurses/panelw/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/secure/lib/libcrypto/Makefile.depend b/secure/lib/libcrypto/Makefile.depend
index 723f45ee46a4..0742ab226ec3 100644
--- a/secure/lib/libcrypto/Makefile.depend
+++ b/secure/lib/libcrypto/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/msun \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/secure/lib/libssh/Makefile.depend b/secure/lib/libssh/Makefile.depend
index fbf95e59e8c0..51e45b4efd13 100644
--- a/secure/lib/libssh/Makefile.depend
+++ b/secure/lib/libssh/Makefile.depend
@@ -17,7 +17,6 @@ DIRDEPS = \
lib/libz \
secure/lib/libcrypto \
secure/lib/libssl \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/secure/lib/libssl/Makefile.depend b/secure/lib/libssl/Makefile.depend
index 5d73f9748ce4..f318cc1a6b40 100644
--- a/secure/lib/libssl/Makefile.depend
+++ b/secure/lib/libssl/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk
index 5c91450c4b69..6df0688d0d71 100644
--- a/share/mk/local.meta.sys.mk
+++ b/share/mk/local.meta.sys.mk
@@ -150,6 +150,13 @@ STAGE_OBJTOP:= ${STAGE_ROOT}/${STAGE_MACHINE}
STAGE_COMMON_OBJTOP:= ${STAGE_ROOT}/common
STAGE_HOST_OBJTOP:= ${STAGE_ROOT}/${HOST_TARGET}
+# Use tools/install.sh which can avoid the need for xinstall for simple cases.
+INSTALL?= sh ${SRCTOP}/tools/install.sh
+# This is for stage-install to pickup from the environment.
+REAL_INSTALL:= ${INSTALL}
+.export REAL_INSTALL
+STAGE_INSTALL= sh ${.PARSEDIR:tA}/stage-install.sh OBJDIR=${.OBJDIR:tA}
+
STAGE_LIBDIR= ${STAGE_OBJTOP}${_LIBDIR:U${LIBDIR:U/lib}}
STAGE_INCLUDEDIR= ${STAGE_OBJTOP}${INCLUDEDIR:U/usr/include}
# this is not the same as INCLUDEDIR
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile
index aa6166c85ef0..a9cdfe5ee9d8 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -20,7 +20,8 @@ BSENV= \
MAKESYSPATH=${SRCTOP}/tools/build/mk:${SRCTOP}/share/mk \
TARGET=${HOST_MACHINE} TARGET_ARCH=${HOST_MACHINE_ARCH} \
WITHOUT_STAGING=1 STAGE_ROOT= BOOTSTRAPPING_TOOLS=1 \
- WORLDTMP=${BTOOLSDIR} LEGACY_TOOLS=${LEGACY_TOOLS}
+ WORLDTMP=${BTOOLSDIR} LEGACY_TOOLS=${LEGACY_TOOLS} \
+ INSTALL="sh ${SRCTOP}/tools/install.sh"
.if !defined(OSRELDATE)
ord_h= /usr/include/osreldate.h
@@ -41,11 +42,12 @@ BSARGS= DESTDIR= \
MK_LLDB=no MK_TESTS=no \
MK_INCLUDES=yes
+DISTRIB_ENV= INSTALL="sh ${SRCTOP}/tools/install.sh" NO_FSCHG=1
legacy: .MAKE .META
mkdir -p ${LEGACY_TOOLS}
- ${MAKE} -C ${SRCTOP}/etc distrib-dirs -DNO_FSCHG DESTDIR=${BTOOLSDIR} \
- > $@.distrib-dirs_btoolsdir
- ${MAKE} -C ${SRCTOP}/etc distrib-dirs -DNO_FSCHG \
+ ${DISTRIB_ENV} ${MAKE} -C ${SRCTOP}/etc distrib-dirs \
+ DESTDIR=${BTOOLSDIR} > $@.distrib-dirs_btoolsdir
+ ${DISTRIB_ENV} ${MAKE} -C ${SRCTOP}/etc distrib-dirs \
DESTDIR=${LEGACY_TOOLS} > $@.distrib-dirs_legacy_tools
${BSENV} ${MAKE} -C ${SRCTOP} -f Makefile.inc1 ${BSARGS} $@
touch $@
diff --git a/targets/pseudo/stage/Makefile b/targets/pseudo/stage/Makefile
index e1041a2c2742..daa352d9257a 100644
--- a/targets/pseudo/stage/Makefile
+++ b/targets/pseudo/stage/Makefile
@@ -8,8 +8,8 @@ all:
# we don't need to see it.
stage-distrib-dirs: .META
mkdir -p ${STAGE_OBJTOP}
- ${.MAKE} -C ${SRCTOP}/etc distrib-dirs -DNO_FSCHG -DWITH_TESTS \
- DESTDIR=${STAGE_OBJTOP} > $@.distrib_dirs
+ INSTALL="sh ${SRCTOP}/tools/install.sh" ${.MAKE} -C ${SRCTOP}/etc \
+ distrib-dirs -DNO_FSCHG -DWITH_TESTS DESTDIR=${STAGE_OBJTOP}
touch $@
.include <bsd.prog.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
index 06b5e37e0d33..aecafbc0c584 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
usr.sbin/bsnmpd/modules \
usr.sbin/bsnmpd/modules/snmp_mibII \
usr.sbin/bsnmpd/modules/snmp_netgraph \
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
index 7d1ccb6c69f8..f391300b1b51 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
usr.sbin/bsnmpd/modules \
usr.sbin/bsnmpd/modules/snmp_mibII \
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
index 64bb2df1f058..a49208062076 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
@@ -15,7 +15,6 @@ DIRDEPS = \
lib/libkvm \
lib/libmemstat \
lib/msun \
- usr.bin/xinstall.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 ea1a0a58406e..e3d050621b55 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
usr.sbin/bsnmpd/modules \
diff --git a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
index 8e546b01aa5c..32018d0049dc 100644
--- a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
index 19bbcd5a592a..cad32c92f217 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libnetgraph \
- usr.bin/xinstall.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 6843d75eb767..855779d789ca 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.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 c8536c4bdd25..66ec571066e7 100644
--- a/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.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 2e9a3fed0393..a7180f99e1e3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.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 25501c845609..89b4f2b0e975 100644
--- a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.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 80b1aea8a5f2..329da3d2d2f3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
usr.sbin/bsnmpd/modules \
usr.sbin/bsnmpd/modules/snmp_mibII \
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend b/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend
index 06abcea13c6e..fc795736c34a 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
- usr.bin/xinstall.host \
.include <dirdeps.mk>