summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2014-05-16 14:09:51 +0000
committersjg <sjg@FreeBSD.org>2014-05-16 14:09:51 +0000
commit5860f0d10657dc9748acf6637885ee7fbf6fb212 (patch)
tree017fbe630c7f277a4aa9398d351a6e623ff1fcaa /usr.sbin
parent0cc4f7a058b5e1894ceeb0d9d3a3550e167ef0d2 (diff)
downloadFreeBSD-src-5860f0d10657dc9748acf6637885ee7fbf6fb212.zip
FreeBSD-src-5860f0d10657dc9748acf6637885ee7fbf6fb212.tar.gz
Updated dependencies
Diffstat (limited to 'usr.sbin')
-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/amd/amd/Makefile.depend1
-rw-r--r--usr.sbin/amd/amq/Makefile.depend1
-rw-r--r--usr.sbin/amd/fixmount/Makefile.depend1
-rw-r--r--usr.sbin/amd/fsinfo/Makefile.depend1
-rw-r--r--usr.sbin/amd/hlfsd/Makefile.depend1
-rw-r--r--usr.sbin/amd/mk-amd-map/Makefile.depend1
-rw-r--r--usr.sbin/amd/pawd/Makefile.depend1
-rw-r--r--usr.sbin/amd/wire-test/Makefile.depend1
-rw-r--r--usr.sbin/ancontrol/Makefile.depend1
-rw-r--r--usr.sbin/apm/Makefile.depend1
-rw-r--r--usr.sbin/arp/Makefile.depend1
-rw-r--r--usr.sbin/asf/Makefile.depend1
-rw-r--r--usr.sbin/audit/Makefile.depend1
-rw-r--r--usr.sbin/auditd/Makefile.depend1
-rw-r--r--usr.sbin/auditreduce/Makefile.depend1
-rw-r--r--usr.sbin/authpf/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/ath3kfw/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bcmfw/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bt3cfw/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/hcseriald/Makefile.depend1
-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.depend1
-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.depend1
-rw-r--r--usr.sbin/bsdinstall/distfetch/Makefile.depend1
-rw-r--r--usr.sbin/bsdinstall/partedit/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/bsnmpd/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/gensnmptree/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend2
-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.depend1
-rw-r--r--usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend2
-rw-r--r--usr.sbin/btxld/Makefile.depend1
-rw-r--r--usr.sbin/cdcontrol/Makefile.depend1
-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.depend1
-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.depend1
-rw-r--r--usr.sbin/ctm/ctm/Makefile.depend1
-rw-r--r--usr.sbin/ctm/ctm_dequeue/Makefile.depend1
-rw-r--r--usr.sbin/ctm/ctm_rmail/Makefile.depend1
-rw-r--r--usr.sbin/ctm/ctm_smail/Makefile.depend1
-rw-r--r--usr.sbin/daemon/Makefile.depend1
-rw-r--r--usr.sbin/dconschat/Makefile.depend1
-rw-r--r--usr.sbin/devinfo/Makefile.depend1
-rw-r--r--usr.sbin/digictl/Makefile.depend1
-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/extattr/Makefile.depend1
-rw-r--r--usr.sbin/extattrctl/Makefile.depend1
-rw-r--r--usr.sbin/faithd/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/ftp-proxy/ftp-proxy/Makefile.depend1
-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.depend1
-rw-r--r--usr.sbin/gstat/Makefile.depend1
-rw-r--r--usr.sbin/i2c/Makefile.depend1
-rw-r--r--usr.sbin/ifmcstat/Makefile.depend1
-rw-r--r--usr.sbin/inetd/Makefile.depend1
-rw-r--r--usr.sbin/iostat/Makefile.depend1
-rw-r--r--usr.sbin/ip6addrctl/Makefile.depend1
-rw-r--r--usr.sbin/ipfwpcap/Makefile.depend1
-rw-r--r--usr.sbin/jail/Makefile.depend1
-rw-r--r--usr.sbin/jexec/Makefile.depend1
-rw-r--r--usr.sbin/jls/Makefile.depend1
-rw-r--r--usr.sbin/kbdcontrol/Makefile.depend1
-rw-r--r--usr.sbin/kbdmap/Makefile.depend1
-rw-r--r--usr.sbin/keyserv/Makefile.depend1
-rw-r--r--usr.sbin/kgmon/Makefile.depend1
-rw-r--r--usr.sbin/kldxref/Makefile.depend1
-rw-r--r--usr.sbin/lastlogin/Makefile.depend1
-rw-r--r--usr.sbin/lmcconfig/Makefile.depend1
-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.depend1
-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/makefs/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.depend1
-rw-r--r--usr.sbin/mld6query/Makefile.depend1
-rw-r--r--usr.sbin/mlxcontrol/Makefile.depend1
-rw-r--r--usr.sbin/mountd/Makefile.depend1
-rw-r--r--usr.sbin/moused/Makefile.depend1
-rw-r--r--usr.sbin/mptable/Makefile.depend1
-rw-r--r--usr.sbin/mptutil/Makefile.depend1
-rw-r--r--usr.sbin/mtest/Makefile.depend1
-rw-r--r--usr.sbin/mtree/Makefile.depend1
-rw-r--r--usr.sbin/ndiscvt/Makefile.depend1
-rw-r--r--usr.sbin/ndp/Makefile.depend1
-rw-r--r--usr.sbin/newsyslog/Makefile.depend1
-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.depend1
-rw-r--r--usr.sbin/ngctl/Makefile.depend1
-rw-r--r--usr.sbin/nghook/Makefile.depend1
-rw-r--r--usr.sbin/nscd/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntp-keygen/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.depend1
-rw-r--r--usr.sbin/ntp/ntpq/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntptime/Makefile.depend1
-rw-r--r--usr.sbin/ntp/sntp/Makefile.depend1
-rw-r--r--usr.sbin/pciconf/Makefile.depend1
-rw-r--r--usr.sbin/pkg/Makefile.depend4
-rw-r--r--usr.sbin/pmcannotate/Makefile.depend1
-rw-r--r--usr.sbin/pmccontrol/Makefile.depend1
-rw-r--r--usr.sbin/pmcstat/Makefile.depend1
-rw-r--r--usr.sbin/portsnap/make_index/Makefile.depend1
-rw-r--r--usr.sbin/portsnap/phttpget/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.depend1
-rw-r--r--usr.sbin/praliases/Makefile.depend1
-rw-r--r--usr.sbin/praudit/Makefile.depend1
-rw-r--r--usr.sbin/procctl/Makefile.depend1
-rw-r--r--usr.sbin/pstat/Makefile.depend1
-rw-r--r--usr.sbin/pw/Makefile.depend1
-rw-r--r--usr.sbin/pwd_mkdb/Makefile.depend1
-rw-r--r--usr.sbin/quot/Makefile.depend1
-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/rpcbind/Makefile.depend1
-rw-r--r--usr.sbin/rrenumd/Makefile.depend1
-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/rtsold/Makefile.depend1
-rw-r--r--usr.sbin/rwhod/Makefile.depend1
-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/setfib/Makefile.depend1
-rw-r--r--usr.sbin/setfmac/Makefile.depend1
-rw-r--r--usr.sbin/setpmac/Makefile.depend1
-rw-r--r--usr.sbin/sicontrol/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.depend3
-rw-r--r--usr.sbin/timed/timed/Makefile.depend1
-rw-r--r--usr.sbin/timed/timedc/Makefile.depend1
-rw-r--r--usr.sbin/traceroute/Makefile.depend1
-rw-r--r--usr.sbin/traceroute6/Makefile.depend1
-rw-r--r--usr.sbin/trpt/Makefile.depend1
-rw-r--r--usr.sbin/tzsetup/Makefile.depend1
-rw-r--r--usr.sbin/uathload/Makefile.depend1
-rw-r--r--usr.sbin/ugidfw/Makefile.depend1
-rw-r--r--usr.sbin/uhsoctl/Makefile.depend1
-rw-r--r--usr.sbin/usbconfig/Makefile.depend1
-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.depend1
-rw-r--r--usr.sbin/watchdogd/Makefile.depend1
-rw-r--r--usr.sbin/wlandebug/Makefile.depend1
-rw-r--r--usr.sbin/wpa/hostapd/Makefile.depend1
-rw-r--r--usr.sbin/wpa/hostapd_cli/Makefile.depend1
-rw-r--r--usr.sbin/wpa/ndis_events/Makefile.depend1
-rw-r--r--usr.sbin/wpa/wpa_cli/Makefile.depend1
-rw-r--r--usr.sbin/wpa/wpa_passphrase/Makefile.depend1
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Makefile.depend1
-rw-r--r--usr.sbin/yp_mkdb/Makefile.depend1
-rw-r--r--usr.sbin/ypbind/Makefile.depend1
-rw-r--r--usr.sbin/yppoll/Makefile.depend1
-rw-r--r--usr.sbin/yppush/Makefile.depend1
-rw-r--r--usr.sbin/ypserv/Makefile.depend1
-rw-r--r--usr.sbin/ypset/Makefile.depend1
-rw-r--r--usr.sbin/zic/zdump/Makefile.depend1
-rw-r--r--usr.sbin/zic/zic/Makefile.depend1
244 files changed, 44 insertions, 216 deletions
diff --git a/usr.sbin/ac/Makefile.depend b/usr.sbin/ac/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/ac/Makefile.depend
+++ b/usr.sbin/ac/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/accton/Makefile.depend b/usr.sbin/accton/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/accton/Makefile.depend
+++ b/usr.sbin/accton/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/acpi/acpiconf/Makefile.depend b/usr.sbin/acpi/acpiconf/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/acpi/acpiconf/Makefile.depend
+++ b/usr.sbin/acpi/acpiconf/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/acpi/acpidb/Makefile.depend b/usr.sbin/acpi/acpidb/Makefile.depend
index e1ba496..0a21182 100644
--- a/usr.sbin/acpi/acpidb/Makefile.depend
+++ b/usr.sbin/acpi/acpidb/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
diff --git a/usr.sbin/acpi/acpidump/Makefile.depend b/usr.sbin/acpi/acpidump/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/acpi/acpidump/Makefile.depend
+++ b/usr.sbin/acpi/acpidump/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/acpi/iasl/Makefile.depend b/usr.sbin/acpi/iasl/Makefile.depend
index 107b2f1..d12ff04 100644
--- a/usr.sbin/acpi/iasl/Makefile.depend
+++ b/usr.sbin/acpi/iasl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/amd/amd/Makefile.depend b/usr.sbin/amd/amd/Makefile.depend
index 9fe831b..bdfb4b3 100644
--- a/usr.sbin/amd/amd/Makefile.depend
+++ b/usr.sbin/amd/amd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/amq/Makefile.depend b/usr.sbin/amd/amq/Makefile.depend
index 092b301..2035894 100644
--- a/usr.sbin/amd/amq/Makefile.depend
+++ b/usr.sbin/amd/amq/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/fixmount/Makefile.depend b/usr.sbin/amd/fixmount/Makefile.depend
index d7a7ddc..f7c2c03 100644
--- a/usr.sbin/amd/fixmount/Makefile.depend
+++ b/usr.sbin/amd/fixmount/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
lib/libwrap \
diff --git a/usr.sbin/amd/fsinfo/Makefile.depend b/usr.sbin/amd/fsinfo/Makefile.depend
index 293b778..bec1372 100644
--- a/usr.sbin/amd/fsinfo/Makefile.depend
+++ b/usr.sbin/amd/fsinfo/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/hlfsd/Makefile.depend b/usr.sbin/amd/hlfsd/Makefile.depend
index 092b301..2035894 100644
--- a/usr.sbin/amd/hlfsd/Makefile.depend
+++ b/usr.sbin/amd/hlfsd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/mk-amd-map/Makefile.depend b/usr.sbin/amd/mk-amd-map/Makefile.depend
index 092b301..2035894 100644
--- a/usr.sbin/amd/mk-amd-map/Makefile.depend
+++ b/usr.sbin/amd/mk-amd-map/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/pawd/Makefile.depend b/usr.sbin/amd/pawd/Makefile.depend
index 092b301..2035894 100644
--- a/usr.sbin/amd/pawd/Makefile.depend
+++ b/usr.sbin/amd/pawd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/wire-test/Makefile.depend b/usr.sbin/amd/wire-test/Makefile.depend
index 092b301..2035894 100644
--- a/usr.sbin/amd/wire-test/Makefile.depend
+++ b/usr.sbin/amd/wire-test/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/ancontrol/Makefile.depend b/usr.sbin/ancontrol/Makefile.depend
index c1f494f..adfa321 100644
--- a/usr.sbin/ancontrol/Makefile.depend
+++ b/usr.sbin/ancontrol/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
diff --git a/usr.sbin/apm/Makefile.depend b/usr.sbin/apm/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/apm/Makefile.depend
+++ b/usr.sbin/apm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/arp/Makefile.depend b/usr.sbin/arp/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/arp/Makefile.depend
+++ b/usr.sbin/arp/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/asf/Makefile.depend b/usr.sbin/asf/Makefile.depend
index b7d414c..384b675 100644
--- a/usr.sbin/asf/Makefile.depend
+++ b/usr.sbin/asf/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.sbin/audit/Makefile.depend b/usr.sbin/audit/Makefile.depend
index cfab525..24594da 100644
--- a/usr.sbin/audit/Makefile.depend
+++ b/usr.sbin/audit/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbsm \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/auditd/Makefile.depend b/usr.sbin/auditd/Makefile.depend
index 0de12f7..f0b54f7 100644
--- a/usr.sbin/auditd/Makefile.depend
+++ b/usr.sbin/auditd/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/libauditd \
lib/libbsm \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/auditreduce/Makefile.depend b/usr.sbin/auditreduce/Makefile.depend
index cfab525..24594da 100644
--- a/usr.sbin/auditreduce/Makefile.depend
+++ b/usr.sbin/auditreduce/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbsm \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/authpf/Makefile.depend b/usr.sbin/authpf/Makefile.depend
index 5a23e70..b28c0ae 100644
--- a/usr.sbin/authpf/Makefile.depend
+++ b/usr.sbin/authpf/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libutil \
diff --git a/usr.sbin/bluetooth/ath3kfw/Makefile.depend b/usr.sbin/bluetooth/ath3kfw/Makefile.depend
index fad2a1d..91ae73e 100644
--- a/usr.sbin/bluetooth/ath3kfw/Makefile.depend
+++ b/usr.sbin/bluetooth/ath3kfw/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
lib/libusb \
diff --git a/usr.sbin/bluetooth/bcmfw/Makefile.depend b/usr.sbin/bluetooth/bcmfw/Makefile.depend
index f560350..181b85a 100644
--- a/usr.sbin/bluetooth/bcmfw/Makefile.depend
+++ b/usr.sbin/bluetooth/bcmfw/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
diff --git a/usr.sbin/bluetooth/bt3cfw/Makefile.depend b/usr.sbin/bluetooth/bt3cfw/Makefile.depend
index f560350..181b85a 100644
--- a/usr.sbin/bluetooth/bt3cfw/Makefile.depend
+++ b/usr.sbin/bluetooth/bt3cfw/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
diff --git a/usr.sbin/bluetooth/bthidcontrol/Makefile.depend b/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
index 93c221e..7ce677b 100644
--- a/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
lib/libusbhid \
diff --git a/usr.sbin/bluetooth/bthidd/Makefile.depend b/usr.sbin/bluetooth/bthidd/Makefile.depend
index b9d70b7..c4c93a2 100644
--- a/usr.sbin/bluetooth/bthidd/Makefile.depend
+++ b/usr.sbin/bluetooth/bthidd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libusbhid \
diff --git a/usr.sbin/bluetooth/btpand/Makefile.depend b/usr.sbin/bluetooth/btpand/Makefile.depend
index 994099d..9b6c133 100644
--- a/usr.sbin/bluetooth/btpand/Makefile.depend
+++ b/usr.sbin/bluetooth/btpand/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
lib/libutil \
diff --git a/usr.sbin/bluetooth/hccontrol/Makefile.depend b/usr.sbin/bluetooth/hccontrol/Makefile.depend
index 3343480..9e752f4 100644
--- a/usr.sbin/bluetooth/hccontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/hccontrol/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bluetooth/hcsecd/Makefile.depend b/usr.sbin/bluetooth/hcsecd/Makefile.depend
index 71286d9..cba7fb1 100644
--- a/usr.sbin/bluetooth/hcsecd/Makefile.depend
+++ b/usr.sbin/bluetooth/hcsecd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bluetooth/hcseriald/Makefile.depend b/usr.sbin/bluetooth/hcseriald/Makefile.depend
index f560350..181b85a 100644
--- a/usr.sbin/bluetooth/hcseriald/Makefile.depend
+++ b/usr.sbin/bluetooth/hcseriald/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
diff --git a/usr.sbin/bluetooth/l2control/Makefile.depend b/usr.sbin/bluetooth/l2control/Makefile.depend
index 3343480..9e752f4 100644
--- a/usr.sbin/bluetooth/l2control/Makefile.depend
+++ b/usr.sbin/bluetooth/l2control/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bluetooth/l2ping/Makefile.depend b/usr.sbin/bluetooth/l2ping/Makefile.depend
index beb6403..4d05200 100644
--- a/usr.sbin/bluetooth/l2ping/Makefile.depend
+++ b/usr.sbin/bluetooth/l2ping/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend b/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
index 8402227..70283d4 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
+++ b/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
diff --git a/usr.sbin/bluetooth/sdpcontrol/Makefile.depend b/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
index 8402227..70283d4 100644
--- a/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
diff --git a/usr.sbin/bluetooth/sdpd/Makefile.depend b/usr.sbin/bluetooth/sdpd/Makefile.depend
index 461c623..d95c08f 100644
--- a/usr.sbin/bluetooth/sdpd/Makefile.depend
+++ b/usr.sbin/bluetooth/sdpd/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
diff --git a/usr.sbin/boot0cfg/Makefile.depend b/usr.sbin/boot0cfg/Makefile.depend
index bac69c0..df63617 100644
--- a/usr.sbin/boot0cfg/Makefile.depend
+++ b/usr.sbin/boot0cfg/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile.depend b/usr.sbin/bootparamd/bootparamd/Makefile.depend
index 49a473e..1d3642f 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile.depend
+++ b/usr.sbin/bootparamd/bootparamd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bootparamd/callbootd/Makefile.depend b/usr.sbin/bootparamd/callbootd/Makefile.depend
index 2b23406..3c40b30 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile.depend
+++ b/usr.sbin/bootparamd/callbootd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bsdinstall/distextract/Makefile.depend b/usr.sbin/bsdinstall/distextract/Makefile.depend
index bf6f768..2a012b9 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile.depend
+++ b/usr.sbin/bsdinstall/distextract/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libdialog \
gnu/lib/libgcc \
include \
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile.depend b/usr.sbin/bsdinstall/distfetch/Makefile.depend
index 9bf11e3..a585356 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile.depend
+++ b/usr.sbin/bsdinstall/distfetch/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libdialog \
gnu/lib/libgcc \
include \
diff --git a/usr.sbin/bsdinstall/partedit/Makefile.depend b/usr.sbin/bsdinstall/partedit/Makefile.depend
index c0c3ad8..d7a53af 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile.depend
+++ b/usr.sbin/bsdinstall/partedit/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
index aa5ee3c..a67edf4 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/usr.sbin/bsnmpd/gensnmptree/Makefile.depend b/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
+++ b/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
index fb49014..126a6e0 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -10,6 +11,7 @@ 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 2d95ace..520d81c 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -10,6 +11,7 @@ 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 5158a23..1b63124 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -15,6 +16,7 @@ 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_mibII/Makefile.depend b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
index f950f14..86837f0 100644
--- a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ 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 d32cc0c..bb997d6 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -11,6 +12,7 @@ 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 7a31aae..e8e3f4a 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -10,6 +11,7 @@ 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 2b6c9af..a4fddaa 100644
--- a/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -10,6 +11,7 @@ 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 4ef736e..941d9e3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -10,6 +11,7 @@ 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 36af018..0bb35f2 100644
--- a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -10,6 +11,7 @@ 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 cbd984e..cedaa27 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -10,6 +11,7 @@ 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/bsnmptools/Makefile.depend b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend
index 9ebea21..a6f194b 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend
+++ b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend b/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend
index a340095..ead6599 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
lib/libbsnmp/libbsnmp \
lib/libc \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/usr.sbin/btxld/Makefile.depend b/usr.sbin/btxld/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/btxld/Makefile.depend
+++ b/usr.sbin/btxld/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/cdcontrol/Makefile.depend b/usr.sbin/cdcontrol/Makefile.depend
index 6033e4a..a0d576d 100644
--- a/usr.sbin/cdcontrol/Makefile.depend
+++ b/usr.sbin/cdcontrol/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/ncurses/ncurses \
diff --git a/usr.sbin/chkgrp/Makefile.depend b/usr.sbin/chkgrp/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/chkgrp/Makefile.depend
+++ b/usr.sbin/chkgrp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/chown/Makefile.depend b/usr.sbin/chown/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/chown/Makefile.depend
+++ b/usr.sbin/chown/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/chroot/Makefile.depend b/usr.sbin/chroot/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/chroot/Makefile.depend
+++ b/usr.sbin/chroot/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ckdist/Makefile.depend b/usr.sbin/ckdist/Makefile.depend
index f3adefe..50e2e74 100644
--- a/usr.sbin/ckdist/Makefile.depend
+++ b/usr.sbin/ckdist/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
diff --git a/usr.sbin/clear_locks/Makefile.depend b/usr.sbin/clear_locks/Makefile.depend
index 3b0eba6..e44fad3 100644
--- a/usr.sbin/clear_locks/Makefile.depend
+++ b/usr.sbin/clear_locks/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/usr.sbin/config/Makefile.depend b/usr.sbin/config/Makefile.depend
index 3766605..6f629ac 100644
--- a/usr.sbin/config/Makefile.depend
+++ b/usr.sbin/config/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsbuf \
usr.bin/lex/lib \
diff --git a/usr.sbin/cpucontrol/Makefile.depend b/usr.sbin/cpucontrol/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/cpucontrol/Makefile.depend
+++ b/usr.sbin/cpucontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/cron/cron/Makefile.depend b/usr.sbin/cron/cron/Makefile.depend
index 956f113..87e49fd 100644
--- a/usr.sbin/cron/cron/Makefile.depend
+++ b/usr.sbin/cron/cron/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libutil \
diff --git a/usr.sbin/cron/crontab/Makefile.depend b/usr.sbin/cron/crontab/Makefile.depend
index 479fd4b..6e07a85 100644
--- a/usr.sbin/cron/crontab/Makefile.depend
+++ b/usr.sbin/cron/crontab/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libutil \
diff --git a/usr.sbin/crunch/crunchgen/Makefile.depend b/usr.sbin/crunch/crunchgen/Makefile.depend
index b088091..41b04bf 100644
--- a/usr.sbin/crunch/crunchgen/Makefile.depend
+++ b/usr.sbin/crunch/crunchgen/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/crunch/crunchide/Makefile.depend b/usr.sbin/crunch/crunchide/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/crunch/crunchide/Makefile.depend
+++ b/usr.sbin/crunch/crunchide/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ctladm/Makefile.depend b/usr.sbin/ctladm/Makefile.depend
index 9fb65fb..24b66eb 100644
--- a/usr.sbin/ctladm/Makefile.depend
+++ b/usr.sbin/ctladm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcam \
lib/libcompiler_rt \
lib/libexpat \
diff --git a/usr.sbin/ctm/ctm/Makefile.depend b/usr.sbin/ctm/ctm/Makefile.depend
index f3adefe..50e2e74 100644
--- a/usr.sbin/ctm/ctm/Makefile.depend
+++ b/usr.sbin/ctm/ctm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile.depend b/usr.sbin/ctm/ctm_dequeue/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/ctm/ctm_dequeue/Makefile.depend
+++ b/usr.sbin/ctm/ctm_dequeue/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ctm/ctm_rmail/Makefile.depend b/usr.sbin/ctm/ctm_rmail/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/ctm/ctm_rmail/Makefile.depend
+++ b/usr.sbin/ctm/ctm_rmail/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ctm/ctm_smail/Makefile.depend b/usr.sbin/ctm/ctm_smail/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/ctm/ctm_smail/Makefile.depend
+++ b/usr.sbin/ctm/ctm_smail/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/daemon/Makefile.depend b/usr.sbin/daemon/Makefile.depend
index bd2426a..7df683f 100644
--- a/usr.sbin/daemon/Makefile.depend
+++ b/usr.sbin/daemon/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/dconschat/Makefile.depend b/usr.sbin/dconschat/Makefile.depend
index 803dc63..3820cc8 100644
--- a/usr.sbin/dconschat/Makefile.depend
+++ b/usr.sbin/dconschat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.sbin/devinfo/Makefile.depend b/usr.sbin/devinfo/Makefile.depend
index 62d6960..608934c 100644
--- a/usr.sbin/devinfo/Makefile.depend
+++ b/usr.sbin/devinfo/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdevinfo \
diff --git a/usr.sbin/digictl/Makefile.depend b/usr.sbin/digictl/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/digictl/Makefile.depend
+++ b/usr.sbin/digictl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/diskinfo/Makefile.depend b/usr.sbin/diskinfo/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.sbin/diskinfo/Makefile.depend
+++ b/usr.sbin/diskinfo/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/dumpcis/Makefile.depend b/usr.sbin/dumpcis/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/dumpcis/Makefile.depend
+++ b/usr.sbin/dumpcis/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/editmap/Makefile.depend b/usr.sbin/editmap/Makefile.depend
index 93db1c4..fdd3789 100644
--- a/usr.sbin/editmap/Makefile.depend
+++ b/usr.sbin/editmap/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsm \
lib/libsmdb \
diff --git a/usr.sbin/edquota/Makefile.depend b/usr.sbin/edquota/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.sbin/edquota/Makefile.depend
+++ b/usr.sbin/edquota/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/extattr/Makefile.depend b/usr.sbin/extattr/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.sbin/extattr/Makefile.depend
+++ b/usr.sbin/extattr/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/extattrctl/Makefile.depend b/usr.sbin/extattrctl/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.sbin/extattrctl/Makefile.depend
+++ b/usr.sbin/extattrctl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/faithd/Makefile.depend b/usr.sbin/faithd/Makefile.depend
index e3af085..d9ecce6 100644
--- a/usr.sbin/faithd/Makefile.depend
+++ b/usr.sbin/faithd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/fdcontrol/Makefile.depend b/usr.sbin/fdcontrol/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/fdcontrol/Makefile.depend
+++ b/usr.sbin/fdcontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/fdformat/Makefile.depend b/usr.sbin/fdformat/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/fdformat/Makefile.depend
+++ b/usr.sbin/fdformat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/fdread/Makefile.depend b/usr.sbin/fdread/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/fdread/Makefile.depend
+++ b/usr.sbin/fdread/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/fdwrite/Makefile.depend b/usr.sbin/fdwrite/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/fdwrite/Makefile.depend
+++ b/usr.sbin/fdwrite/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/fifolog/fifolog_create/Makefile.depend b/usr.sbin/fifolog/fifolog_create/Makefile.depend
index 8e9bccfd..793b497 100644
--- a/usr.sbin/fifolog/fifolog_create/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_create/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
usr.sbin/fifolog/lib \
diff --git a/usr.sbin/fifolog/fifolog_reader/Makefile.depend b/usr.sbin/fifolog/fifolog_reader/Makefile.depend
index e191871..c6cbc3e 100644
--- a/usr.sbin/fifolog/fifolog_reader/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_reader/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
lib/libz \
diff --git a/usr.sbin/fifolog/fifolog_writer/Makefile.depend b/usr.sbin/fifolog/fifolog_writer/Makefile.depend
index e191871..c6cbc3e 100644
--- a/usr.sbin/fifolog/fifolog_writer/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_writer/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
lib/libz \
diff --git a/usr.sbin/flowctl/Makefile.depend b/usr.sbin/flowctl/Makefile.depend
index a206005..83a8148 100644
--- a/usr.sbin/flowctl/Makefile.depend
+++ b/usr.sbin/flowctl/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile.depend b/usr.sbin/ftp-proxy/ftp-proxy/Makefile.depend
index 149691f..bbe5cc8 100644
--- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile.depend
+++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/ftp-proxy/libevent \
diff --git a/usr.sbin/fwcontrol/Makefile.depend b/usr.sbin/fwcontrol/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/fwcontrol/Makefile.depend
+++ b/usr.sbin/fwcontrol/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/getfmac/Makefile.depend b/usr.sbin/getfmac/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/getfmac/Makefile.depend
+++ b/usr.sbin/getfmac/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/getpmac/Makefile.depend b/usr.sbin/getpmac/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/getpmac/Makefile.depend
+++ b/usr.sbin/getpmac/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/gpioctl/Makefile.depend b/usr.sbin/gpioctl/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/gpioctl/Makefile.depend
+++ b/usr.sbin/gpioctl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/gssd/Makefile.depend b/usr.sbin/gssd/Makefile.depend
index c298b13..4f3249e 100644
--- a/usr.sbin/gssd/Makefile.depend
+++ b/usr.sbin/gssd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/gssapi \
diff --git a/usr.sbin/gstat/Makefile.depend b/usr.sbin/gstat/Makefile.depend
index 35163f8..aee289a 100644
--- a/usr.sbin/gstat/Makefile.depend
+++ b/usr.sbin/gstat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdevstat \
lib/libedit \
diff --git a/usr.sbin/i2c/Makefile.depend b/usr.sbin/i2c/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/i2c/Makefile.depend
+++ b/usr.sbin/i2c/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ifmcstat/Makefile.depend b/usr.sbin/ifmcstat/Makefile.depend
index 803dc63..3820cc8 100644
--- a/usr.sbin/ifmcstat/Makefile.depend
+++ b/usr.sbin/ifmcstat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.sbin/inetd/Makefile.depend b/usr.sbin/inetd/Makefile.depend
index 9143faf..0713fe0 100644
--- a/usr.sbin/inetd/Makefile.depend
+++ b/usr.sbin/inetd/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libipsec \
lib/libutil \
diff --git a/usr.sbin/iostat/Makefile.depend b/usr.sbin/iostat/Makefile.depend
index 7c9f840..819a99f 100644
--- a/usr.sbin/iostat/Makefile.depend
+++ b/usr.sbin/iostat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdevstat \
lib/libkvm \
diff --git a/usr.sbin/ip6addrctl/Makefile.depend b/usr.sbin/ip6addrctl/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/ip6addrctl/Makefile.depend
+++ b/usr.sbin/ip6addrctl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ipfwpcap/Makefile.depend b/usr.sbin/ipfwpcap/Makefile.depend
index b42437a..fb2e1ea 100644
--- a/usr.sbin/ipfwpcap/Makefile.depend
+++ b/usr.sbin/ipfwpcap/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpcap \
diff --git a/usr.sbin/jail/Makefile.depend b/usr.sbin/jail/Makefile.depend
index db8479a..4dabb74 100644
--- a/usr.sbin/jail/Makefile.depend
+++ b/usr.sbin/jail/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libjail \
lib/libkvm \
diff --git a/usr.sbin/jexec/Makefile.depend b/usr.sbin/jexec/Makefile.depend
index 427ef99..8870ca4 100644
--- a/usr.sbin/jexec/Makefile.depend
+++ b/usr.sbin/jexec/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libjail \
lib/libutil \
diff --git a/usr.sbin/jls/Makefile.depend b/usr.sbin/jls/Makefile.depend
index 6a22d19..a365c22 100644
--- a/usr.sbin/jls/Makefile.depend
+++ b/usr.sbin/jls/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libjail \
diff --git a/usr.sbin/kbdcontrol/Makefile.depend b/usr.sbin/kbdcontrol/Makefile.depend
index cd4d236..e3418c5 100644
--- a/usr.sbin/kbdcontrol/Makefile.depend
+++ b/usr.sbin/kbdcontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
usr.bin/lex/lib \
diff --git a/usr.sbin/kbdmap/Makefile.depend b/usr.sbin/kbdmap/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/kbdmap/Makefile.depend
+++ b/usr.sbin/kbdmap/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/keyserv/Makefile.depend b/usr.sbin/keyserv/Makefile.depend
index acbf9bb..c9aa32c 100644
--- a/usr.sbin/keyserv/Makefile.depend
+++ b/usr.sbin/keyserv/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
diff --git a/usr.sbin/kgmon/Makefile.depend b/usr.sbin/kgmon/Makefile.depend
index b7d414c..384b675 100644
--- a/usr.sbin/kgmon/Makefile.depend
+++ b/usr.sbin/kgmon/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.sbin/kldxref/Makefile.depend b/usr.sbin/kldxref/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/kldxref/Makefile.depend
+++ b/usr.sbin/kldxref/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/lastlogin/Makefile.depend b/usr.sbin/lastlogin/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/lastlogin/Makefile.depend
+++ b/usr.sbin/lastlogin/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/lmcconfig/Makefile.depend b/usr.sbin/lmcconfig/Makefile.depend
index f560350..181b85a 100644
--- a/usr.sbin/lmcconfig/Makefile.depend
+++ b/usr.sbin/lmcconfig/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
diff --git a/usr.sbin/lpr/chkprintcap/Makefile.depend b/usr.sbin/lpr/chkprintcap/Makefile.depend
index 72675fa..003813c 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile.depend
+++ b/usr.sbin/lpr/chkprintcap/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend b/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
+++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend b/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
+++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/lpr/filters/Makefile.depend b/usr.sbin/lpr/filters/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/lpr/filters/Makefile.depend
+++ b/usr.sbin/lpr/filters/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/lpr/lpc/Makefile.depend b/usr.sbin/lpr/lpc/Makefile.depend
index 9d5d53e..4db2287 100644
--- a/usr.sbin/lpr/lpc/Makefile.depend
+++ b/usr.sbin/lpr/lpc/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/ncurses/ncurses \
diff --git a/usr.sbin/lpr/lpd/Makefile.depend b/usr.sbin/lpr/lpd/Makefile.depend
index 9c027ea..167bd2a 100644
--- a/usr.sbin/lpr/lpd/Makefile.depend
+++ b/usr.sbin/lpr/lpd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lpr/lpq/Makefile.depend b/usr.sbin/lpr/lpq/Makefile.depend
index 72675fa..003813c 100644
--- a/usr.sbin/lpr/lpq/Makefile.depend
+++ b/usr.sbin/lpr/lpq/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lpr/lpr/Makefile.depend b/usr.sbin/lpr/lpr/Makefile.depend
index 72675fa..003813c 100644
--- a/usr.sbin/lpr/lpr/Makefile.depend
+++ b/usr.sbin/lpr/lpr/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lpr/lprm/Makefile.depend b/usr.sbin/lpr/lprm/Makefile.depend
index 72675fa..003813c 100644
--- a/usr.sbin/lpr/lprm/Makefile.depend
+++ b/usr.sbin/lpr/lprm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lpr/lptest/Makefile.depend b/usr.sbin/lpr/lptest/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.sbin/lpr/lptest/Makefile.depend
+++ b/usr.sbin/lpr/lptest/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/lpr/pac/Makefile.depend b/usr.sbin/lpr/pac/Makefile.depend
index 72675fa..003813c 100644
--- a/usr.sbin/lpr/pac/Makefile.depend
+++ b/usr.sbin/lpr/pac/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lptcontrol/Makefile.depend b/usr.sbin/lptcontrol/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.sbin/lptcontrol/Makefile.depend
+++ b/usr.sbin/lptcontrol/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/mailstats/Makefile.depend b/usr.sbin/mailstats/Makefile.depend
index 58c5c7f..1e452ff 100644
--- a/usr.sbin/mailstats/Makefile.depend
+++ b/usr.sbin/mailstats/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsm \
lib/libsmutil \
diff --git a/usr.sbin/mailwrapper/Makefile.depend b/usr.sbin/mailwrapper/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.sbin/mailwrapper/Makefile.depend
+++ b/usr.sbin/mailwrapper/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/makefs/Makefile.depend b/usr.sbin/makefs/Makefile.depend
index 8f76fa4..4c55f94 100644
--- a/usr.sbin/makefs/Makefile.depend
+++ b/usr.sbin/makefs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetbsd \
lib/libsbuf \
diff --git a/usr.sbin/makemap/Makefile.depend b/usr.sbin/makemap/Makefile.depend
index f0d84e2..3e6ba43 100644
--- a/usr.sbin/makemap/Makefile.depend
+++ b/usr.sbin/makemap/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsm \
lib/libsmdb \
diff --git a/usr.sbin/memcontrol/Makefile.depend b/usr.sbin/memcontrol/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/memcontrol/Makefile.depend
+++ b/usr.sbin/memcontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/mfiutil/Makefile.depend b/usr.sbin/mfiutil/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.sbin/mfiutil/Makefile.depend
+++ b/usr.sbin/mfiutil/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/mixer/Makefile.depend b/usr.sbin/mixer/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/mixer/Makefile.depend
+++ b/usr.sbin/mixer/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/mld6query/Makefile.depend b/usr.sbin/mld6query/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/mld6query/Makefile.depend
+++ b/usr.sbin/mld6query/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/mlxcontrol/Makefile.depend b/usr.sbin/mlxcontrol/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/mlxcontrol/Makefile.depend
+++ b/usr.sbin/mlxcontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/mountd/Makefile.depend b/usr.sbin/mountd/Makefile.depend
index d9693fd..bcf0e39 100644
--- a/usr.sbin/mountd/Makefile.depend
+++ b/usr.sbin/mountd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/moused/Makefile.depend b/usr.sbin/moused/Makefile.depend
index 6e19c15..9292a7d 100644
--- a/usr.sbin/moused/Makefile.depend
+++ b/usr.sbin/moused/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
lib/msun \
diff --git a/usr.sbin/mptable/Makefile.depend b/usr.sbin/mptable/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/mptable/Makefile.depend
+++ b/usr.sbin/mptable/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/mptutil/Makefile.depend b/usr.sbin/mptutil/Makefile.depend
index c79bce5..981ec38 100644
--- a/usr.sbin/mptutil/Makefile.depend
+++ b/usr.sbin/mptutil/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcam \
lib/libcompiler_rt \
lib/libsbuf \
diff --git a/usr.sbin/mtest/Makefile.depend b/usr.sbin/mtest/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/mtest/Makefile.depend
+++ b/usr.sbin/mtest/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/mtree/Makefile.depend b/usr.sbin/mtree/Makefile.depend
index f3adefe..50e2e74 100644
--- a/usr.sbin/mtree/Makefile.depend
+++ b/usr.sbin/mtree/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
diff --git a/usr.sbin/ndiscvt/Makefile.depend b/usr.sbin/ndiscvt/Makefile.depend
index a4e4485..35458af 100644
--- a/usr.sbin/ndiscvt/Makefile.depend
+++ b/usr.sbin/ndiscvt/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
usr.bin/lex/lib \
diff --git a/usr.sbin/ndp/Makefile.depend b/usr.sbin/ndp/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/ndp/Makefile.depend
+++ b/usr.sbin/ndp/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/newsyslog/Makefile.depend b/usr.sbin/newsyslog/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/newsyslog/Makefile.depend
+++ b/usr.sbin/newsyslog/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/nfscbd/Makefile.depend b/usr.sbin/nfscbd/Makefile.depend
index eaaeea9..102b1c3 100644
--- a/usr.sbin/nfscbd/Makefile.depend
+++ b/usr.sbin/nfscbd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/nfsd/Makefile.depend b/usr.sbin/nfsd/Makefile.depend
index 1c61866..2a44c25 100644
--- a/usr.sbin/nfsd/Makefile.depend
+++ b/usr.sbin/nfsd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/nfsdumpstate/Makefile.depend b/usr.sbin/nfsdumpstate/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/nfsdumpstate/Makefile.depend
+++ b/usr.sbin/nfsdumpstate/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/nfsrevoke/Makefile.depend b/usr.sbin/nfsrevoke/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/nfsrevoke/Makefile.depend
+++ b/usr.sbin/nfsrevoke/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/nfsuserd/Makefile.depend b/usr.sbin/nfsuserd/Makefile.depend
index eaaeea9..102b1c3 100644
--- a/usr.sbin/nfsuserd/Makefile.depend
+++ b/usr.sbin/nfsuserd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ngctl/Makefile.depend b/usr.sbin/ngctl/Makefile.depend
index 37af2e2..35c7a73 100644
--- a/usr.sbin/ngctl/Makefile.depend
+++ b/usr.sbin/ngctl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/libnetgraph \
diff --git a/usr.sbin/nghook/Makefile.depend b/usr.sbin/nghook/Makefile.depend
index f560350..181b85a 100644
--- a/usr.sbin/nghook/Makefile.depend
+++ b/usr.sbin/nghook/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
diff --git a/usr.sbin/nscd/Makefile.depend b/usr.sbin/nscd/Makefile.depend
index 467cf7b..c3952a6 100644
--- a/usr.sbin/nscd/Makefile.depend
+++ b/usr.sbin/nscd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
lib/libutil \
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile.depend b/usr.sbin/ntp/ntp-keygen/Makefile.depend
index 83e4633..0a7e705 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile.depend
+++ b/usr.sbin/ntp/ntp-keygen/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/usr.sbin/ntp/ntpd/Makefile.depend b/usr.sbin/ntp/ntpd/Makefile.depend
index 4bff1e2..d6638a0 100644
--- a/usr.sbin/ntp/ntpd/Makefile.depend
+++ b/usr.sbin/ntp/ntpd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/usr.sbin/ntp/ntpdate/Makefile.depend b/usr.sbin/ntp/ntpdate/Makefile.depend
index 868ca7a..8dabf4f 100644
--- a/usr.sbin/ntp/ntpdate/Makefile.depend
+++ b/usr.sbin/ntp/ntpdate/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/usr.sbin/ntp/ntpdc/Makefile.depend b/usr.sbin/ntp/ntpdc/Makefile.depend
index 69a8559..799bdb7 100644
--- a/usr.sbin/ntp/ntpdc/Makefile.depend
+++ b/usr.sbin/ntp/ntpdc/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/usr.sbin/ntp/ntpq/Makefile.depend b/usr.sbin/ntp/ntpq/Makefile.depend
index 69a8559..799bdb7 100644
--- a/usr.sbin/ntp/ntpq/Makefile.depend
+++ b/usr.sbin/ntp/ntpq/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/usr.sbin/ntp/ntptime/Makefile.depend b/usr.sbin/ntp/ntptime/Makefile.depend
index f0385c9..a173739 100644
--- a/usr.sbin/ntp/ntptime/Makefile.depend
+++ b/usr.sbin/ntp/ntptime/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/usr.sbin/ntp/sntp/Makefile.depend b/usr.sbin/ntp/sntp/Makefile.depend
index 9ceac4e..e7a994a 100644
--- a/usr.sbin/ntp/sntp/Makefile.depend
+++ b/usr.sbin/ntp/sntp/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
usr.sbin/ntp/libopts \
diff --git a/usr.sbin/pciconf/Makefile.depend b/usr.sbin/pciconf/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/pciconf/Makefile.depend
+++ b/usr.sbin/pciconf/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/pkg/Makefile.depend b/usr.sbin/pkg/Makefile.depend
index d25c193..cb18bf6 100644
--- a/usr.sbin/pkg/Makefile.depend
+++ b/usr.sbin/pkg/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -17,8 +18,9 @@ DIRDEPS = \
lib/libfetch \
lib/liblzma \
lib/libsbuf \
- lib/libyaml \
+ lib/libucl \
lib/libz \
+ lib/msun \
secure/lib/libcrypto \
secure/lib/libssl \
diff --git a/usr.sbin/pmcannotate/Makefile.depend b/usr.sbin/pmcannotate/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/pmcannotate/Makefile.depend
+++ b/usr.sbin/pmcannotate/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/pmccontrol/Makefile.depend b/usr.sbin/pmccontrol/Makefile.depend
index efab25b..d033822 100644
--- a/usr.sbin/pmccontrol/Makefile.depend
+++ b/usr.sbin/pmccontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpmc \
diff --git a/usr.sbin/pmcstat/Makefile.depend b/usr.sbin/pmcstat/Makefile.depend
index a12bc72..063d52f 100644
--- a/usr.sbin/pmcstat/Makefile.depend
+++ b/usr.sbin/pmcstat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libkvm \
diff --git a/usr.sbin/portsnap/make_index/Makefile.depend b/usr.sbin/portsnap/make_index/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/portsnap/make_index/Makefile.depend
+++ b/usr.sbin/portsnap/make_index/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/portsnap/phttpget/Makefile.depend b/usr.sbin/portsnap/phttpget/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/portsnap/phttpget/Makefile.depend
+++ b/usr.sbin/portsnap/phttpget/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/powerd/Makefile.depend b/usr.sbin/powerd/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.sbin/powerd/Makefile.depend
+++ b/usr.sbin/powerd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/ppp/Makefile.depend b/usr.sbin/ppp/Makefile.depend
index 24931b0..e1dc9b4 100644
--- a/usr.sbin/ppp/Makefile.depend
+++ b/usr.sbin/ppp/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/usr.sbin/pppctl/Makefile.depend b/usr.sbin/pppctl/Makefile.depend
index 33f3720..8c91260 100644
--- a/usr.sbin/pppctl/Makefile.depend
+++ b/usr.sbin/pppctl/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/libthr \
diff --git a/usr.sbin/praliases/Makefile.depend b/usr.sbin/praliases/Makefile.depend
index 742a51b..95c819c 100644
--- a/usr.sbin/praliases/Makefile.depend
+++ b/usr.sbin/praliases/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsm \
lib/libsmdb \
diff --git a/usr.sbin/praudit/Makefile.depend b/usr.sbin/praudit/Makefile.depend
index cfab525..24594da 100644
--- a/usr.sbin/praudit/Makefile.depend
+++ b/usr.sbin/praudit/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbsm \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/procctl/Makefile.depend b/usr.sbin/procctl/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/procctl/Makefile.depend
+++ b/usr.sbin/procctl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/pstat/Makefile.depend b/usr.sbin/pstat/Makefile.depend
index d5037d2..5181feb 100644
--- a/usr.sbin/pstat/Makefile.depend
+++ b/usr.sbin/pstat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
lib/libutil \
diff --git a/usr.sbin/pw/Makefile.depend b/usr.sbin/pw/Makefile.depend
index 8c9b44e..8595bfc 100644
--- a/usr.sbin/pw/Makefile.depend
+++ b/usr.sbin/pw/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libutil \
diff --git a/usr.sbin/pwd_mkdb/Makefile.depend b/usr.sbin/pwd_mkdb/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/pwd_mkdb/Makefile.depend
+++ b/usr.sbin/pwd_mkdb/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/quot/Makefile.depend b/usr.sbin/quot/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/quot/Makefile.depend
+++ b/usr.sbin/quot/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/quotaon/Makefile.depend b/usr.sbin/quotaon/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.sbin/quotaon/Makefile.depend
+++ b/usr.sbin/quotaon/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/rarpd/Makefile.depend b/usr.sbin/rarpd/Makefile.depend
index e3af085..d9ecce6 100644
--- a/usr.sbin/rarpd/Makefile.depend
+++ b/usr.sbin/rarpd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/repquota/Makefile.depend b/usr.sbin/repquota/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.sbin/repquota/Makefile.depend
+++ b/usr.sbin/repquota/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/rip6query/Makefile.depend b/usr.sbin/rip6query/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/rip6query/Makefile.depend
+++ b/usr.sbin/rip6query/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/rmt/Makefile.depend b/usr.sbin/rmt/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/rmt/Makefile.depend
+++ b/usr.sbin/rmt/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/route6d/Makefile.depend b/usr.sbin/route6d/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/route6d/Makefile.depend
+++ b/usr.sbin/route6d/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/rpc.lockd/Makefile.depend b/usr.sbin/rpc.lockd/Makefile.depend
index 036f983..5d4d881 100644
--- a/usr.sbin/rpc.lockd/Makefile.depend
+++ b/usr.sbin/rpc.lockd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
lib/libutil \
diff --git a/usr.sbin/rpc.statd/Makefile.depend b/usr.sbin/rpc.statd/Makefile.depend
index 57f69da..332bf27 100644
--- a/usr.sbin/rpc.statd/Makefile.depend
+++ b/usr.sbin/rpc.statd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/usr.sbin/rpc.umntall/Makefile.depend b/usr.sbin/rpc.umntall/Makefile.depend
index 5930524..c1655db 100644
--- a/usr.sbin/rpc.umntall/Makefile.depend
+++ b/usr.sbin/rpc.umntall/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/rpc.yppasswdd/Makefile.depend b/usr.sbin/rpc.yppasswdd/Makefile.depend
index a3e7a5e..cdca06f 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile.depend
+++ b/usr.sbin/rpc.yppasswdd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/librpcsvc \
diff --git a/usr.sbin/rpc.ypupdated/Makefile.depend b/usr.sbin/rpc.ypupdated/Makefile.depend
index e39027b..d02c4ba 100644
--- a/usr.sbin/rpc.ypupdated/Makefile.depend
+++ b/usr.sbin/rpc.ypupdated/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/usr.sbin/rpc.ypxfrd/Makefile.depend b/usr.sbin/rpc.ypxfrd/Makefile.depend
index 91c9284..ff79a2e 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile.depend
+++ b/usr.sbin/rpc.ypxfrd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/usr.sbin/rpcbind/Makefile.depend b/usr.sbin/rpcbind/Makefile.depend
index 924e5c4..ee9a1f9 100644
--- a/usr.sbin/rpcbind/Makefile.depend
+++ b/usr.sbin/rpcbind/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
lib/libwrap \
diff --git a/usr.sbin/rrenumd/Makefile.depend b/usr.sbin/rrenumd/Makefile.depend
index 4416d5f..fdcd9a0 100644
--- a/usr.sbin/rrenumd/Makefile.depend
+++ b/usr.sbin/rrenumd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libipsec \
lib/liby \
diff --git a/usr.sbin/rtadvctl/Makefile.depend b/usr.sbin/rtadvctl/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/rtadvctl/Makefile.depend
+++ b/usr.sbin/rtadvctl/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/rtadvd/Makefile.depend b/usr.sbin/rtadvd/Makefile.depend
index e3af085..d9ecce6 100644
--- a/usr.sbin/rtadvd/Makefile.depend
+++ b/usr.sbin/rtadvd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/rtprio/Makefile.depend b/usr.sbin/rtprio/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/rtprio/Makefile.depend
+++ b/usr.sbin/rtprio/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/rtsold/Makefile.depend b/usr.sbin/rtsold/Makefile.depend
index 803dc63..3820cc8 100644
--- a/usr.sbin/rtsold/Makefile.depend
+++ b/usr.sbin/rtsold/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.sbin/rwhod/Makefile.depend b/usr.sbin/rwhod/Makefile.depend
index 11fa4d7..7cc7461 100644
--- a/usr.sbin/rwhod/Makefile.depend
+++ b/usr.sbin/rwhod/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/sa/Makefile.depend b/usr.sbin/sa/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/sa/Makefile.depend
+++ b/usr.sbin/sa/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/sendmail/Makefile.depend b/usr.sbin/sendmail/Makefile.depend
index f8c574c..c86601a 100644
--- a/usr.sbin/sendmail/Makefile.depend
+++ b/usr.sbin/sendmail/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/usr.sbin/services_mkdb/Makefile.depend b/usr.sbin/services_mkdb/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.sbin/services_mkdb/Makefile.depend
+++ b/usr.sbin/services_mkdb/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/setfib/Makefile.depend b/usr.sbin/setfib/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/setfib/Makefile.depend
+++ b/usr.sbin/setfib/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/setfmac/Makefile.depend b/usr.sbin/setfmac/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/setfmac/Makefile.depend
+++ b/usr.sbin/setfmac/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/setpmac/Makefile.depend b/usr.sbin/setpmac/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/setpmac/Makefile.depend
+++ b/usr.sbin/setpmac/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/sicontrol/Makefile.depend b/usr.sbin/sicontrol/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/sicontrol/Makefile.depend
+++ b/usr.sbin/sicontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/smbmsg/Makefile.depend b/usr.sbin/smbmsg/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/smbmsg/Makefile.depend
+++ b/usr.sbin/smbmsg/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/snapinfo/Makefile.depend b/usr.sbin/snapinfo/Makefile.depend
index 7fb8fce..66da85c 100644
--- a/usr.sbin/snapinfo/Makefile.depend
+++ b/usr.sbin/snapinfo/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libufs \
diff --git a/usr.sbin/spray/Makefile.depend b/usr.sbin/spray/Makefile.depend
index 3b0eba6..e44fad3 100644
--- a/usr.sbin/spray/Makefile.depend
+++ b/usr.sbin/spray/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/usr.sbin/syslogd/Makefile.depend b/usr.sbin/syslogd/Makefile.depend
index e3af085..d9ecce6 100644
--- a/usr.sbin/syslogd/Makefile.depend
+++ b/usr.sbin/syslogd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/tcpdchk/Makefile.depend b/usr.sbin/tcpdchk/Makefile.depend
index a02eba6..2e79396 100644
--- a/usr.sbin/tcpdchk/Makefile.depend
+++ b/usr.sbin/tcpdchk/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
diff --git a/usr.sbin/tcpdmatch/Makefile.depend b/usr.sbin/tcpdmatch/Makefile.depend
index a02eba6..2e79396 100644
--- a/usr.sbin/tcpdmatch/Makefile.depend
+++ b/usr.sbin/tcpdmatch/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
diff --git a/usr.sbin/tcpdrop/Makefile.depend b/usr.sbin/tcpdrop/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/tcpdrop/Makefile.depend
+++ b/usr.sbin/tcpdrop/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile.depend b/usr.sbin/tcpdump/tcpdump/Makefile.depend
index 91bd6d3..d6449ae 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile.depend
+++ b/usr.sbin/tcpdump/tcpdump/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,7 +11,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libcapsicum \
lib/libcompiler_rt \
+ lib/libnv \
lib/libpcap \
secure/lib/libcrypto \
usr.bin/lex/lib \
diff --git a/usr.sbin/timed/timed/Makefile.depend b/usr.sbin/timed/timed/Makefile.depend
index b298230..662a339 100644
--- a/usr.sbin/timed/timed/Makefile.depend
+++ b/usr.sbin/timed/timed/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
lib/msun \
diff --git a/usr.sbin/timed/timedc/Makefile.depend b/usr.sbin/timed/timedc/Makefile.depend
index 11fa4d7..7cc7461 100644
--- a/usr.sbin/timed/timedc/Makefile.depend
+++ b/usr.sbin/timed/timedc/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/traceroute/Makefile.depend b/usr.sbin/traceroute/Makefile.depend
index 8ef0d4e..76dabb3 100644
--- a/usr.sbin/traceroute/Makefile.depend
+++ b/usr.sbin/traceroute/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libipsec \
diff --git a/usr.sbin/traceroute6/Makefile.depend b/usr.sbin/traceroute6/Makefile.depend
index 46ae5af..4de996d 100644
--- a/usr.sbin/traceroute6/Makefile.depend
+++ b/usr.sbin/traceroute6/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libipsec \
diff --git a/usr.sbin/trpt/Makefile.depend b/usr.sbin/trpt/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/trpt/Makefile.depend
+++ b/usr.sbin/trpt/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/tzsetup/Makefile.depend b/usr.sbin/tzsetup/Makefile.depend
index 546cb43..d9cc889 100644
--- a/usr.sbin/tzsetup/Makefile.depend
+++ b/usr.sbin/tzsetup/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
lib/ncurses/ncursesw \
diff --git a/usr.sbin/uathload/Makefile.depend b/usr.sbin/uathload/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/uathload/Makefile.depend
+++ b/usr.sbin/uathload/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ugidfw/Makefile.depend b/usr.sbin/ugidfw/Makefile.depend
index 0c062e1..005d012 100644
--- a/usr.sbin/ugidfw/Makefile.depend
+++ b/usr.sbin/ugidfw/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libugidfw \
diff --git a/usr.sbin/uhsoctl/Makefile.depend b/usr.sbin/uhsoctl/Makefile.depend
index e3af085..d9ecce6 100644
--- a/usr.sbin/uhsoctl/Makefile.depend
+++ b/usr.sbin/uhsoctl/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/usbconfig/Makefile.depend b/usr.sbin/usbconfig/Makefile.depend
index fad2a1d..91ae73e 100644
--- a/usr.sbin/usbconfig/Makefile.depend
+++ b/usr.sbin/usbconfig/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
lib/libusb \
diff --git a/usr.sbin/usbdump/Makefile.depend b/usr.sbin/usbdump/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/usbdump/Makefile.depend
+++ b/usr.sbin/usbdump/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/utx/Makefile.depend b/usr.sbin/utx/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/utx/Makefile.depend
+++ b/usr.sbin/utx/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/vidcontrol/Makefile.depend b/usr.sbin/vidcontrol/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/vidcontrol/Makefile.depend
+++ b/usr.sbin/vidcontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/vipw/Makefile.depend b/usr.sbin/vipw/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.sbin/vipw/Makefile.depend
+++ b/usr.sbin/vipw/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.sbin/wake/Makefile.depend b/usr.sbin/wake/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/wake/Makefile.depend
+++ b/usr.sbin/wake/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/watch/Makefile.depend b/usr.sbin/watch/Makefile.depend
index 233a7c6..4f4df65 100644
--- a/usr.sbin/watch/Makefile.depend
+++ b/usr.sbin/watch/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/usr.sbin/watchdogd/Makefile.depend b/usr.sbin/watchdogd/Makefile.depend
index 6e19c15..9292a7d 100644
--- a/usr.sbin/watchdogd/Makefile.depend
+++ b/usr.sbin/watchdogd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
lib/msun \
diff --git a/usr.sbin/wlandebug/Makefile.depend b/usr.sbin/wlandebug/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/wlandebug/Makefile.depend
+++ b/usr.sbin/wlandebug/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/wpa/hostapd/Makefile.depend b/usr.sbin/wpa/hostapd/Makefile.depend
index 4d8f09c..ae45e7b 100644
--- a/usr.sbin/wpa/hostapd/Makefile.depend
+++ b/usr.sbin/wpa/hostapd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/usr.sbin/wpa/hostapd_cli/Makefile.depend b/usr.sbin/wpa/hostapd_cli/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/wpa/hostapd_cli/Makefile.depend
+++ b/usr.sbin/wpa/hostapd_cli/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/wpa/ndis_events/Makefile.depend b/usr.sbin/wpa/ndis_events/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/wpa/ndis_events/Makefile.depend
+++ b/usr.sbin/wpa/ndis_events/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/wpa/wpa_cli/Makefile.depend b/usr.sbin/wpa/wpa_cli/Makefile.depend
index 6033e4a..a0d576d 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile.depend
+++ b/usr.sbin/wpa/wpa_cli/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/ncurses/ncurses \
diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile.depend b/usr.sbin/wpa/wpa_passphrase/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.sbin/wpa/wpa_passphrase/Makefile.depend
+++ b/usr.sbin/wpa/wpa_passphrase/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile.depend b/usr.sbin/wpa/wpa_supplicant/Makefile.depend
index 4d8f09c..ae45e7b 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile.depend
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/usr.sbin/yp_mkdb/Makefile.depend b/usr.sbin/yp_mkdb/Makefile.depend
index 5930524..c1655db 100644
--- a/usr.sbin/yp_mkdb/Makefile.depend
+++ b/usr.sbin/yp_mkdb/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ypbind/Makefile.depend b/usr.sbin/ypbind/Makefile.depend
index 1c61866..2a44c25 100644
--- a/usr.sbin/ypbind/Makefile.depend
+++ b/usr.sbin/ypbind/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/yppoll/Makefile.depend b/usr.sbin/yppoll/Makefile.depend
index 5930524..c1655db 100644
--- a/usr.sbin/yppoll/Makefile.depend
+++ b/usr.sbin/yppoll/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/yppush/Makefile.depend b/usr.sbin/yppush/Makefile.depend
index 52a8367..fcb2738 100644
--- a/usr.sbin/yppush/Makefile.depend
+++ b/usr.sbin/yppush/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ypserv/Makefile.depend b/usr.sbin/ypserv/Makefile.depend
index 2d2fd8a..ed8b35e 100644
--- a/usr.sbin/ypserv/Makefile.depend
+++ b/usr.sbin/ypserv/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
diff --git a/usr.sbin/ypset/Makefile.depend b/usr.sbin/ypset/Makefile.depend
index 1c61866..2a44c25 100644
--- a/usr.sbin/ypset/Makefile.depend
+++ b/usr.sbin/ypset/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/zic/zdump/Makefile.depend b/usr.sbin/zic/zdump/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/zic/zdump/Makefile.depend
+++ b/usr.sbin/zic/zdump/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/zic/zic/Makefile.depend b/usr.sbin/zic/zic/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.sbin/zic/zic/Makefile.depend
+++ b/usr.sbin/zic/zic/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
OpenPOWER on IntegriCloud