Index: head/kerberos5/lib/libgssapi_krb5/Makefile.depend
===================================================================
--- head/kerberos5/lib/libgssapi_krb5/Makefile.depend	(revision 291971)
+++ head/kerberos5/lib/libgssapi_krb5/Makefile.depend	(revision 291972)
@@ -1,191 +1,190 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libgssapi \
-	lib/libthr \
 	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 8003.So: gkrb5_err.h
 8003.o: gkrb5_err.h
 8003.po: gkrb5_err.h
 accept_sec_context.So: gkrb5_err.h
 accept_sec_context.o: gkrb5_err.h
 accept_sec_context.po: gkrb5_err.h
 acquire_cred.So: gkrb5_err.h
 acquire_cred.o: gkrb5_err.h
 acquire_cred.po: gkrb5_err.h
 add_cred.So: gkrb5_err.h
 add_cred.o: gkrb5_err.h
 add_cred.po: gkrb5_err.h
 address_to_krb5addr.So: gkrb5_err.h
 address_to_krb5addr.o: gkrb5_err.h
 address_to_krb5addr.po: gkrb5_err.h
 aeap.So: gkrb5_err.h
 aeap.o: gkrb5_err.h
 aeap.po: gkrb5_err.h
 arcfour.So: gkrb5_err.h
 arcfour.o: gkrb5_err.h
 arcfour.po: gkrb5_err.h
 authorize_localname.So: gkrb5_err.h
 authorize_localname.o: gkrb5_err.h
 authorize_localname.po: gkrb5_err.h
 canonicalize_name.So: gkrb5_err.h
 canonicalize_name.o: gkrb5_err.h
 canonicalize_name.po: gkrb5_err.h
 ccache_name.So: gkrb5_err.h
 ccache_name.o: gkrb5_err.h
 ccache_name.po: gkrb5_err.h
 cfx.So: gkrb5_err.h
 cfx.o: gkrb5_err.h
 cfx.po: gkrb5_err.h
 compare_name.So: gkrb5_err.h
 compare_name.o: gkrb5_err.h
 compare_name.po: gkrb5_err.h
 compat.So: gkrb5_err.h
 compat.o: gkrb5_err.h
 compat.po: gkrb5_err.h
 context_time.So: gkrb5_err.h
 context_time.o: gkrb5_err.h
 context_time.po: gkrb5_err.h
 copy_ccache.So: gkrb5_err.h
 copy_ccache.o: gkrb5_err.h
 copy_ccache.po: gkrb5_err.h
 creds.So: gkrb5_err.h
 creds.o: gkrb5_err.h
 creds.po: gkrb5_err.h
 decapsulate.So: gkrb5_err.h
 decapsulate.o: gkrb5_err.h
 decapsulate.po: gkrb5_err.h
 delete_sec_context.So: gkrb5_err.h
 delete_sec_context.o: gkrb5_err.h
 delete_sec_context.po: gkrb5_err.h
 display_name.So: gkrb5_err.h
 display_name.o: gkrb5_err.h
 display_name.po: gkrb5_err.h
 display_status.So: gkrb5_err.h
 display_status.o: gkrb5_err.h
 display_status.po: gkrb5_err.h
 duplicate_name.So: gkrb5_err.h
 duplicate_name.o: gkrb5_err.h
 duplicate_name.po: gkrb5_err.h
 encapsulate.So: gkrb5_err.h
 encapsulate.o: gkrb5_err.h
 encapsulate.po: gkrb5_err.h
 export_name.So: gkrb5_err.h
 export_name.o: gkrb5_err.h
 export_name.po: gkrb5_err.h
 export_sec_context.So: gkrb5_err.h
 export_sec_context.o: gkrb5_err.h
 export_sec_context.po: gkrb5_err.h
 external.So: gkrb5_err.h
 external.o: gkrb5_err.h
 external.po: gkrb5_err.h
 get_mic.So: gkrb5_err.h
 get_mic.o: gkrb5_err.h
 get_mic.po: gkrb5_err.h
 gkrb5_err.So: gkrb5_err.c
 gkrb5_err.So: gkrb5_err.h
 gkrb5_err.o: gkrb5_err.c
 gkrb5_err.o: gkrb5_err.h
 gkrb5_err.po: gkrb5_err.c
 gkrb5_err.po: gkrb5_err.h
 import_name.So: gkrb5_err.h
 import_name.o: gkrb5_err.h
 import_name.po: gkrb5_err.h
 import_sec_context.So: gkrb5_err.h
 import_sec_context.o: gkrb5_err.h
 import_sec_context.po: gkrb5_err.h
 indicate_mechs.So: gkrb5_err.h
 indicate_mechs.o: gkrb5_err.h
 indicate_mechs.po: gkrb5_err.h
 init.So: gkrb5_err.h
 init.o: gkrb5_err.h
 init.po: gkrb5_err.h
 init_sec_context.So: gkrb5_err.h
 init_sec_context.o: gkrb5_err.h
 init_sec_context.po: gkrb5_err.h
 inquire_context.So: gkrb5_err.h
 inquire_context.o: gkrb5_err.h
 inquire_context.po: gkrb5_err.h
 inquire_cred.So: gkrb5_err.h
 inquire_cred.o: gkrb5_err.h
 inquire_cred.po: gkrb5_err.h
 inquire_cred_by_mech.So: gkrb5_err.h
 inquire_cred_by_mech.o: gkrb5_err.h
 inquire_cred_by_mech.po: gkrb5_err.h
 inquire_cred_by_oid.So: gkrb5_err.h
 inquire_cred_by_oid.o: gkrb5_err.h
 inquire_cred_by_oid.po: gkrb5_err.h
 inquire_mechs_for_name.So: gkrb5_err.h
 inquire_mechs_for_name.o: gkrb5_err.h
 inquire_mechs_for_name.po: gkrb5_err.h
 inquire_names_for_mech.So: gkrb5_err.h
 inquire_names_for_mech.o: gkrb5_err.h
 inquire_names_for_mech.po: gkrb5_err.h
 inquire_sec_context_by_oid.So: gkrb5_err.h
 inquire_sec_context_by_oid.o: gkrb5_err.h
 inquire_sec_context_by_oid.po: gkrb5_err.h
 pname_to_uid.So: gkrb5_err.h
 pname_to_uid.o: gkrb5_err.h
 pname_to_uid.po: gkrb5_err.h
 prf.So: gkrb5_err.h
 prf.o: gkrb5_err.h
 prf.po: gkrb5_err.h
 process_context_token.So: gkrb5_err.h
 process_context_token.o: gkrb5_err.h
 process_context_token.po: gkrb5_err.h
 release_buffer.So: gkrb5_err.h
 release_buffer.o: gkrb5_err.h
 release_buffer.po: gkrb5_err.h
 release_cred.So: gkrb5_err.h
 release_cred.o: gkrb5_err.h
 release_cred.po: gkrb5_err.h
 release_name.So: gkrb5_err.h
 release_name.o: gkrb5_err.h
 release_name.po: gkrb5_err.h
 sequence.So: gkrb5_err.h
 sequence.o: gkrb5_err.h
 sequence.po: gkrb5_err.h
 set_cred_option.So: gkrb5_err.h
 set_cred_option.o: gkrb5_err.h
 set_cred_option.po: gkrb5_err.h
 set_sec_context_option.So: gkrb5_err.h
 set_sec_context_option.o: gkrb5_err.h
 set_sec_context_option.po: gkrb5_err.h
 store_cred.So: gkrb5_err.h
 store_cred.o: gkrb5_err.h
 store_cred.po: gkrb5_err.h
 ticket_flags.So: gkrb5_err.h
 ticket_flags.o: gkrb5_err.h
 ticket_flags.po: gkrb5_err.h
 unwrap.So: gkrb5_err.h
 unwrap.o: gkrb5_err.h
 unwrap.po: gkrb5_err.h
 verify_mic.So: gkrb5_err.h
 verify_mic.o: gkrb5_err.h
 verify_mic.po: gkrb5_err.h
 wrap.So: gkrb5_err.h
 wrap.o: gkrb5_err.h
 wrap.po: gkrb5_err.h
 .endif
Index: head/kerberos5/lib/libgssapi_ntlm/Makefile.depend
===================================================================
--- head/kerberos5/lib/libgssapi_ntlm/Makefile.depend	(revision 291971)
+++ head/kerberos5/lib/libgssapi_ntlm/Makefile.depend	(revision 291972)
@@ -1,26 +1,25 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libheimntlm \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libgssapi \
-	lib/libthr \
 	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/kerberos5/lib/libhdb/Makefile.depend
===================================================================
--- head/kerberos5/lib/libhdb/Makefile.depend	(revision 291971)
+++ head/kerberos5/lib/libhdb/Makefile.depend	(revision 291972)
@@ -1,278 +1,277 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libsqlite3 \
-	lib/libthr \
 	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 asn1_Event.So: asn1_Event.c
 asn1_Event.So: hdb_asn1-priv.h
 asn1_Event.So: hdb_asn1.h
 asn1_Event.o: asn1_Event.c
 asn1_Event.o: hdb_asn1-priv.h
 asn1_Event.o: hdb_asn1.h
 asn1_Event.po: asn1_Event.c
 asn1_Event.po: hdb_asn1-priv.h
 asn1_Event.po: hdb_asn1.h
 asn1_GENERATION.So: asn1_GENERATION.c
 asn1_GENERATION.So: hdb_asn1-priv.h
 asn1_GENERATION.So: hdb_asn1.h
 asn1_GENERATION.o: asn1_GENERATION.c
 asn1_GENERATION.o: hdb_asn1-priv.h
 asn1_GENERATION.o: hdb_asn1.h
 asn1_GENERATION.po: asn1_GENERATION.c
 asn1_GENERATION.po: hdb_asn1-priv.h
 asn1_GENERATION.po: hdb_asn1.h
 asn1_HDBFlags.So: asn1_HDBFlags.c
 asn1_HDBFlags.So: hdb_asn1-priv.h
 asn1_HDBFlags.So: hdb_asn1.h
 asn1_HDBFlags.o: asn1_HDBFlags.c
 asn1_HDBFlags.o: hdb_asn1-priv.h
 asn1_HDBFlags.o: hdb_asn1.h
 asn1_HDBFlags.po: asn1_HDBFlags.c
 asn1_HDBFlags.po: hdb_asn1-priv.h
 asn1_HDBFlags.po: hdb_asn1.h
 asn1_HDB_Ext_Aliases.So: asn1_HDB_Ext_Aliases.c
 asn1_HDB_Ext_Aliases.So: hdb_asn1-priv.h
 asn1_HDB_Ext_Aliases.So: hdb_asn1.h
 asn1_HDB_Ext_Aliases.o: asn1_HDB_Ext_Aliases.c
 asn1_HDB_Ext_Aliases.o: hdb_asn1-priv.h
 asn1_HDB_Ext_Aliases.o: hdb_asn1.h
 asn1_HDB_Ext_Aliases.po: asn1_HDB_Ext_Aliases.c
 asn1_HDB_Ext_Aliases.po: hdb_asn1-priv.h
 asn1_HDB_Ext_Aliases.po: hdb_asn1.h
 asn1_HDB_Ext_Constrained_delegation_acl.So: asn1_HDB_Ext_Constrained_delegation_acl.c
 asn1_HDB_Ext_Constrained_delegation_acl.So: hdb_asn1-priv.h
 asn1_HDB_Ext_Constrained_delegation_acl.So: hdb_asn1.h
 asn1_HDB_Ext_Constrained_delegation_acl.o: asn1_HDB_Ext_Constrained_delegation_acl.c
 asn1_HDB_Ext_Constrained_delegation_acl.o: hdb_asn1-priv.h
 asn1_HDB_Ext_Constrained_delegation_acl.o: hdb_asn1.h
 asn1_HDB_Ext_Constrained_delegation_acl.po: asn1_HDB_Ext_Constrained_delegation_acl.c
 asn1_HDB_Ext_Constrained_delegation_acl.po: hdb_asn1-priv.h
 asn1_HDB_Ext_Constrained_delegation_acl.po: hdb_asn1.h
 asn1_HDB_Ext_Lan_Manager_OWF.So: asn1_HDB_Ext_Lan_Manager_OWF.c
 asn1_HDB_Ext_Lan_Manager_OWF.So: hdb_asn1-priv.h
 asn1_HDB_Ext_Lan_Manager_OWF.So: hdb_asn1.h
 asn1_HDB_Ext_Lan_Manager_OWF.o: asn1_HDB_Ext_Lan_Manager_OWF.c
 asn1_HDB_Ext_Lan_Manager_OWF.o: hdb_asn1-priv.h
 asn1_HDB_Ext_Lan_Manager_OWF.o: hdb_asn1.h
 asn1_HDB_Ext_Lan_Manager_OWF.po: asn1_HDB_Ext_Lan_Manager_OWF.c
 asn1_HDB_Ext_Lan_Manager_OWF.po: hdb_asn1-priv.h
 asn1_HDB_Ext_Lan_Manager_OWF.po: hdb_asn1.h
 asn1_HDB_Ext_PKINIT_acl.So: asn1_HDB_Ext_PKINIT_acl.c
 asn1_HDB_Ext_PKINIT_acl.So: hdb_asn1-priv.h
 asn1_HDB_Ext_PKINIT_acl.So: hdb_asn1.h
 asn1_HDB_Ext_PKINIT_acl.o: asn1_HDB_Ext_PKINIT_acl.c
 asn1_HDB_Ext_PKINIT_acl.o: hdb_asn1-priv.h
 asn1_HDB_Ext_PKINIT_acl.o: hdb_asn1.h
 asn1_HDB_Ext_PKINIT_acl.po: asn1_HDB_Ext_PKINIT_acl.c
 asn1_HDB_Ext_PKINIT_acl.po: hdb_asn1-priv.h
 asn1_HDB_Ext_PKINIT_acl.po: hdb_asn1.h
 asn1_HDB_Ext_PKINIT_cert.So: asn1_HDB_Ext_PKINIT_cert.c
 asn1_HDB_Ext_PKINIT_cert.So: hdb_asn1-priv.h
 asn1_HDB_Ext_PKINIT_cert.So: hdb_asn1.h
 asn1_HDB_Ext_PKINIT_cert.o: asn1_HDB_Ext_PKINIT_cert.c
 asn1_HDB_Ext_PKINIT_cert.o: hdb_asn1-priv.h
 asn1_HDB_Ext_PKINIT_cert.o: hdb_asn1.h
 asn1_HDB_Ext_PKINIT_cert.po: asn1_HDB_Ext_PKINIT_cert.c
 asn1_HDB_Ext_PKINIT_cert.po: hdb_asn1-priv.h
 asn1_HDB_Ext_PKINIT_cert.po: hdb_asn1.h
 asn1_HDB_Ext_PKINIT_hash.So: asn1_HDB_Ext_PKINIT_hash.c
 asn1_HDB_Ext_PKINIT_hash.So: hdb_asn1-priv.h
 asn1_HDB_Ext_PKINIT_hash.So: hdb_asn1.h
 asn1_HDB_Ext_PKINIT_hash.o: asn1_HDB_Ext_PKINIT_hash.c
 asn1_HDB_Ext_PKINIT_hash.o: hdb_asn1-priv.h
 asn1_HDB_Ext_PKINIT_hash.o: hdb_asn1.h
 asn1_HDB_Ext_PKINIT_hash.po: asn1_HDB_Ext_PKINIT_hash.c
 asn1_HDB_Ext_PKINIT_hash.po: hdb_asn1-priv.h
 asn1_HDB_Ext_PKINIT_hash.po: hdb_asn1.h
 asn1_HDB_Ext_Password.So: asn1_HDB_Ext_Password.c
 asn1_HDB_Ext_Password.So: hdb_asn1-priv.h
 asn1_HDB_Ext_Password.So: hdb_asn1.h
 asn1_HDB_Ext_Password.o: asn1_HDB_Ext_Password.c
 asn1_HDB_Ext_Password.o: hdb_asn1-priv.h
 asn1_HDB_Ext_Password.o: hdb_asn1.h
 asn1_HDB_Ext_Password.po: asn1_HDB_Ext_Password.c
 asn1_HDB_Ext_Password.po: hdb_asn1-priv.h
 asn1_HDB_Ext_Password.po: hdb_asn1.h
 asn1_HDB_extension.So: asn1_HDB_extension.c
 asn1_HDB_extension.So: hdb_asn1-priv.h
 asn1_HDB_extension.So: hdb_asn1.h
 asn1_HDB_extension.o: asn1_HDB_extension.c
 asn1_HDB_extension.o: hdb_asn1-priv.h
 asn1_HDB_extension.o: hdb_asn1.h
 asn1_HDB_extension.po: asn1_HDB_extension.c
 asn1_HDB_extension.po: hdb_asn1-priv.h
 asn1_HDB_extension.po: hdb_asn1.h
 asn1_HDB_extensions.So: asn1_HDB_extensions.c
 asn1_HDB_extensions.So: hdb_asn1-priv.h
 asn1_HDB_extensions.So: hdb_asn1.h
 asn1_HDB_extensions.o: asn1_HDB_extensions.c
 asn1_HDB_extensions.o: hdb_asn1-priv.h
 asn1_HDB_extensions.o: hdb_asn1.h
 asn1_HDB_extensions.po: asn1_HDB_extensions.c
 asn1_HDB_extensions.po: hdb_asn1-priv.h
 asn1_HDB_extensions.po: hdb_asn1.h
 asn1_Key.So: asn1_Key.c
 asn1_Key.So: hdb_asn1-priv.h
 asn1_Key.So: hdb_asn1.h
 asn1_Key.o: asn1_Key.c
 asn1_Key.o: hdb_asn1-priv.h
 asn1_Key.o: hdb_asn1.h
 asn1_Key.po: asn1_Key.c
 asn1_Key.po: hdb_asn1-priv.h
 asn1_Key.po: hdb_asn1.h
 asn1_Salt.So: asn1_Salt.c
 asn1_Salt.So: hdb_asn1-priv.h
 asn1_Salt.So: hdb_asn1.h
 asn1_Salt.o: asn1_Salt.c
 asn1_Salt.o: hdb_asn1-priv.h
 asn1_Salt.o: hdb_asn1.h
 asn1_Salt.po: asn1_Salt.c
 asn1_Salt.po: hdb_asn1-priv.h
 asn1_Salt.po: hdb_asn1.h
 asn1_hdb_entry.So: asn1_hdb_entry.c
 asn1_hdb_entry.So: hdb_asn1-priv.h
 asn1_hdb_entry.So: hdb_asn1.h
 asn1_hdb_entry.o: asn1_hdb_entry.c
 asn1_hdb_entry.o: hdb_asn1-priv.h
 asn1_hdb_entry.o: hdb_asn1.h
 asn1_hdb_entry.po: asn1_hdb_entry.c
 asn1_hdb_entry.po: hdb_asn1-priv.h
 asn1_hdb_entry.po: hdb_asn1.h
 asn1_hdb_entry_alias.So: asn1_hdb_entry_alias.c
 asn1_hdb_entry_alias.So: hdb_asn1-priv.h
 asn1_hdb_entry_alias.So: hdb_asn1.h
 asn1_hdb_entry_alias.o: asn1_hdb_entry_alias.c
 asn1_hdb_entry_alias.o: hdb_asn1-priv.h
 asn1_hdb_entry_alias.o: hdb_asn1.h
 asn1_hdb_entry_alias.po: asn1_hdb_entry_alias.c
 asn1_hdb_entry_alias.po: hdb_asn1-priv.h
 asn1_hdb_entry_alias.po: hdb_asn1.h
 asn1_hdb_keyset.So: asn1_hdb_keyset.c
 asn1_hdb_keyset.So: hdb_asn1-priv.h
 asn1_hdb_keyset.So: hdb_asn1.h
 asn1_hdb_keyset.o: asn1_hdb_keyset.c
 asn1_hdb_keyset.o: hdb_asn1-priv.h
 asn1_hdb_keyset.o: hdb_asn1.h
 asn1_hdb_keyset.po: asn1_hdb_keyset.c
 asn1_hdb_keyset.po: hdb_asn1-priv.h
 asn1_hdb_keyset.po: hdb_asn1.h
 common.So: hdb_asn1.h
 common.So: hdb_err.h
 common.o: hdb_asn1.h
 common.o: hdb_err.h
 common.po: hdb_asn1.h
 common.po: hdb_err.h
 db.So: hdb_asn1.h
 db.So: hdb_err.h
 db.o: hdb_asn1.h
 db.o: hdb_err.h
 db.po: hdb_asn1.h
 db.po: hdb_err.h
 db3.So: hdb_asn1.h
 db3.So: hdb_err.h
 db3.o: hdb_asn1.h
 db3.o: hdb_err.h
 db3.po: hdb_asn1.h
 db3.po: hdb_err.h
 dbinfo.So: hdb_asn1.h
 dbinfo.So: hdb_err.h
 dbinfo.o: hdb_asn1.h
 dbinfo.o: hdb_err.h
 dbinfo.po: hdb_asn1.h
 dbinfo.po: hdb_err.h
 ext.So: hdb_asn1.h
 ext.So: hdb_err.h
 ext.o: hdb_asn1.h
 ext.o: hdb_err.h
 ext.po: hdb_asn1.h
 ext.po: hdb_err.h
 hdb-keytab.So: hdb_asn1.h
 hdb-keytab.So: hdb_err.h
 hdb-keytab.o: hdb_asn1.h
 hdb-keytab.o: hdb_err.h
 hdb-keytab.po: hdb_asn1.h
 hdb-keytab.po: hdb_err.h
 hdb-ldap.So: hdb_asn1.h
 hdb-ldap.So: hdb_err.h
 hdb-ldap.o: hdb_asn1.h
 hdb-ldap.o: hdb_err.h
 hdb-ldap.po: hdb_asn1.h
 hdb-ldap.po: hdb_err.h
 hdb-mitdb.So: hdb_asn1.h
 hdb-mitdb.So: hdb_err.h
 hdb-mitdb.o: hdb_asn1.h
 hdb-mitdb.o: hdb_err.h
 hdb-mitdb.po: hdb_asn1.h
 hdb-mitdb.po: hdb_err.h
 hdb-sqlite.So: hdb_asn1.h
 hdb-sqlite.So: hdb_err.h
 hdb-sqlite.o: hdb_asn1.h
 hdb-sqlite.o: hdb_err.h
 hdb-sqlite.po: hdb_asn1.h
 hdb-sqlite.po: hdb_err.h
 hdb.So: hdb_asn1.h
 hdb.So: hdb_err.h
 hdb.o: hdb_asn1.h
 hdb.o: hdb_err.h
 hdb.po: hdb_asn1.h
 hdb.po: hdb_err.h
 hdb_err.So: hdb_err.c
 hdb_err.So: hdb_err.h
 hdb_err.o: hdb_err.c
 hdb_err.o: hdb_err.h
 hdb_err.po: hdb_err.c
 hdb_err.po: hdb_err.h
 keys.So: hdb_asn1.h
 keys.So: hdb_err.h
 keys.o: hdb_asn1.h
 keys.o: hdb_err.h
 keys.po: hdb_asn1.h
 keys.po: hdb_err.h
 keytab.So: hdb_asn1.h
 keytab.So: hdb_err.h
 keytab.o: hdb_asn1.h
 keytab.o: hdb_err.h
 keytab.po: hdb_asn1.h
 keytab.po: hdb_err.h
 mkey.So: hdb_asn1.h
 mkey.So: hdb_err.h
 mkey.o: hdb_asn1.h
 mkey.o: hdb_err.h
 mkey.po: hdb_asn1.h
 mkey.po: hdb_err.h
 ndbm.So: hdb_asn1.h
 ndbm.So: hdb_err.h
 ndbm.o: hdb_asn1.h
 ndbm.o: hdb_err.h
 ndbm.po: hdb_asn1.h
 ndbm.po: hdb_err.h
 print.So: hdb_asn1.h
 print.So: hdb_err.h
 print.o: hdb_asn1.h
 print.o: hdb_err.h
 print.po: hdb_asn1.h
 print.po: hdb_err.h
 .endif
Index: head/kerberos5/lib/libheimntlm/Makefile.depend
===================================================================
--- head/kerberos5/lib/libheimntlm/Makefile.depend	(revision 291971)
+++ head/kerberos5/lib/libheimntlm/Makefile.depend	(revision 291972)
@@ -1,31 +1,30 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
-	lib/libthr \
 	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 ntlm_err.So: ntlm_err.c
 ntlm_err.So: ntlm_err.h
 ntlm_err.o: ntlm_err.c
 ntlm_err.o: ntlm_err.h
 ntlm_err.po: ntlm_err.c
 ntlm_err.po: ntlm_err.h
 .endif
Index: head/kerberos5/lib/libkadm5clnt/Makefile.depend
===================================================================
--- head/kerberos5/lib/libkadm5clnt/Makefile.depend	(revision 291971)
+++ head/kerberos5/lib/libkadm5clnt/Makefile.depend	(revision 291972)
@@ -1,85 +1,84 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
-	lib/libthr \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 ad.So: kadm5_err.h
 ad.o: kadm5_err.h
 ad.po: kadm5_err.h
 chpass_c.So: kadm5_err.h
 chpass_c.o: kadm5_err.h
 chpass_c.po: kadm5_err.h
 client_glue.So: kadm5_err.h
 client_glue.o: kadm5_err.h
 client_glue.po: kadm5_err.h
 common_glue.So: kadm5_err.h
 common_glue.o: kadm5_err.h
 common_glue.po: kadm5_err.h
 create_c.So: kadm5_err.h
 create_c.o: kadm5_err.h
 create_c.po: kadm5_err.h
 delete_c.So: kadm5_err.h
 delete_c.o: kadm5_err.h
 delete_c.po: kadm5_err.h
 destroy_c.So: kadm5_err.h
 destroy_c.o: kadm5_err.h
 destroy_c.po: kadm5_err.h
 flush_c.So: kadm5_err.h
 flush_c.o: kadm5_err.h
 flush_c.po: kadm5_err.h
 free.So: kadm5_err.h
 free.o: kadm5_err.h
 free.po: kadm5_err.h
 get_c.So: kadm5_err.h
 get_c.o: kadm5_err.h
 get_c.po: kadm5_err.h
 get_princs_c.So: kadm5_err.h
 get_princs_c.o: kadm5_err.h
 get_princs_c.po: kadm5_err.h
 init_c.So: kadm5_err.h
 init_c.o: kadm5_err.h
 init_c.po: kadm5_err.h
 kadm5_err.So: kadm5_err.c
 kadm5_err.So: kadm5_err.h
 kadm5_err.o: kadm5_err.c
 kadm5_err.o: kadm5_err.h
 kadm5_err.po: kadm5_err.c
 kadm5_err.po: kadm5_err.h
 marshall.So: kadm5_err.h
 marshall.o: kadm5_err.h
 marshall.po: kadm5_err.h
 modify_c.So: kadm5_err.h
 modify_c.o: kadm5_err.h
 modify_c.po: kadm5_err.h
 privs_c.So: kadm5_err.h
 privs_c.o: kadm5_err.h
 privs_c.po: kadm5_err.h
 randkey_c.So: kadm5_err.h
 randkey_c.o: kadm5_err.h
 randkey_c.po: kadm5_err.h
 rename_c.So: kadm5_err.h
 rename_c.o: kadm5_err.h
 rename_c.po: kadm5_err.h
 send_recv.So: kadm5_err.h
 send_recv.o: kadm5_err.h
 send_recv.po: kadm5_err.h
 .endif
Index: head/kerberos5/lib/libkadm5srv/Makefile.depend
===================================================================
--- head/kerberos5/lib/libkadm5srv/Makefile.depend	(revision 291971)
+++ head/kerberos5/lib/libkadm5srv/Makefile.depend	(revision 291972)
@@ -1,109 +1,108 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
-	lib/libthr \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 acl.So: kadm5_err.h
 acl.o: kadm5_err.h
 acl.po: kadm5_err.h
 bump_pw_expire.So: kadm5_err.h
 bump_pw_expire.o: kadm5_err.h
 bump_pw_expire.po: kadm5_err.h
 chpass_s.So: kadm5_err.h
 chpass_s.o: kadm5_err.h
 chpass_s.po: kadm5_err.h
 common_glue.So: kadm5_err.h
 common_glue.o: kadm5_err.h
 common_glue.po: kadm5_err.h
 context_s.So: kadm5_err.h
 context_s.o: kadm5_err.h
 context_s.po: kadm5_err.h
 create_s.So: kadm5_err.h
 create_s.o: kadm5_err.h
 create_s.po: kadm5_err.h
 delete_s.So: kadm5_err.h
 delete_s.o: kadm5_err.h
 delete_s.po: kadm5_err.h
 destroy_s.So: kadm5_err.h
 destroy_s.o: kadm5_err.h
 destroy_s.po: kadm5_err.h
 ent_setup.So: kadm5_err.h
 ent_setup.o: kadm5_err.h
 ent_setup.po: kadm5_err.h
 error.So: kadm5_err.h
 error.o: kadm5_err.h
 error.po: kadm5_err.h
 flush_s.So: kadm5_err.h
 flush_s.o: kadm5_err.h
 flush_s.po: kadm5_err.h
 free.So: kadm5_err.h
 free.o: kadm5_err.h
 free.po: kadm5_err.h
 get_princs_s.So: kadm5_err.h
 get_princs_s.o: kadm5_err.h
 get_princs_s.po: kadm5_err.h
 get_s.So: kadm5_err.h
 get_s.o: kadm5_err.h
 get_s.po: kadm5_err.h
 init_s.So: kadm5_err.h
 init_s.o: kadm5_err.h
 init_s.po: kadm5_err.h
 kadm5_err.So: kadm5_err.c
 kadm5_err.So: kadm5_err.h
 kadm5_err.o: kadm5_err.c
 kadm5_err.o: kadm5_err.h
 kadm5_err.po: kadm5_err.c
 kadm5_err.po: kadm5_err.h
 keys.So: kadm5_err.h
 keys.o: kadm5_err.h
 keys.po: kadm5_err.h
 log.So: kadm5_err.h
 log.o: kadm5_err.h
 log.po: kadm5_err.h
 marshall.So: kadm5_err.h
 marshall.o: kadm5_err.h
 marshall.po: kadm5_err.h
 modify_s.So: kadm5_err.h
 modify_s.o: kadm5_err.h
 modify_s.po: kadm5_err.h
 password_quality.So: kadm5_err.h
 password_quality.o: kadm5_err.h
 password_quality.po: kadm5_err.h
 privs_s.So: kadm5_err.h
 privs_s.o: kadm5_err.h
 privs_s.po: kadm5_err.h
 randkey_s.So: kadm5_err.h
 randkey_s.o: kadm5_err.h
 randkey_s.po: kadm5_err.h
 rename_s.So: kadm5_err.h
 rename_s.o: kadm5_err.h
 rename_s.po: kadm5_err.h
 server_glue.So: kadm5_err.h
 server_glue.o: kadm5_err.h
 server_glue.po: kadm5_err.h
 set_keys.So: kadm5_err.h
 set_keys.o: kadm5_err.h
 set_keys.po: kadm5_err.h
 set_modifier.So: kadm5_err.h
 set_modifier.o: kadm5_err.h
 set_modifier.po: kadm5_err.h
 .endif
Index: head/kerberos5/lib/libkafs5/Makefile.depend
===================================================================
--- head/kerberos5/lib/libkafs5/Makefile.depend	(revision 291971)
+++ head/kerberos5/lib/libkafs5/Makefile.depend	(revision 291972)
@@ -1,24 +1,23 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/libthr \
 	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/kerberos5/lib/libkdc/Makefile.depend
===================================================================
--- head/kerberos5/lib/libkdc/Makefile.depend	(revision 291971)
+++ head/kerberos5/lib/libkdc/Makefile.depend	(revision 291972)
@@ -1,31 +1,30 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimntlm \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
-	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/lib/lib80211/Makefile.depend
===================================================================
--- head/lib/lib80211/Makefile.depend	(revision 291971)
+++ head/lib/lib80211/Makefile.depend	(revision 291972)
@@ -1,19 +1,20 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libexpat \
+	lib/libsbuf \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/lib/libpam/modules/pam_krb5/Makefile.depend
===================================================================
--- head/lib/libpam/modules/pam_krb5/Makefile.depend	(revision 291971)
+++ head/lib/libpam/modules/pam_krb5/Makefile.depend	(revision 291972)
@@ -1,23 +1,22 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libkrb5 \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libpam/libpam \
-	lib/libthr \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/lib/libpam/modules/pam_ksu/Makefile.depend
===================================================================
--- head/lib/libpam/modules/pam_ksu/Makefile.depend	(revision 291971)
+++ head/lib/libpam/modules/pam_ksu/Makefile.depend	(revision 291972)
@@ -1,22 +1,21 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libkrb5 \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libpam/libpam \
-	lib/libthr \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/sys/boot/userboot/test/Makefile.depend
===================================================================
--- head/sys/boot/userboot/test/Makefile.depend	(revision 291971)
+++ head/sys/boot/userboot/test/Makefile.depend	(revision 291972)
@@ -1,18 +1,19 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/usr.bin/clang/lldb/Makefile.depend
===================================================================
--- head/usr.bin/clang/lldb/Makefile.depend	(revision 291971)
+++ head/usr.bin/clang/lldb/Makefile.depend	(revision 291972)
@@ -1,154 +1,155 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/clang/libclanganalysis \
 	lib/clang/libclangast \
 	lib/clang/libclangbasic \
 	lib/clang/libclangcodegen \
 	lib/clang/libclangdriver \
 	lib/clang/libclangedit \
 	lib/clang/libclangfrontend \
 	lib/clang/libclanglex \
 	lib/clang/libclangparse \
 	lib/clang/libclangsema \
 	lib/clang/libclangserialization \
 	lib/clang/liblldb \
 	lib/clang/liblldbAPI \
 	lib/clang/liblldbBreakpoint \
 	lib/clang/liblldbCommands \
 	lib/clang/liblldbCore \
 	lib/clang/liblldbDataFormatters \
 	lib/clang/liblldbExpression \
 	lib/clang/liblldbHostCommon \
 	lib/clang/liblldbHostFreeBSD \
 	lib/clang/liblldbHostPOSIX \
 	lib/clang/liblldbInitialization \
 	lib/clang/liblldbInterpreter \
 	lib/clang/liblldbPluginABISysV_arm \
 	lib/clang/liblldbPluginABISysV_arm64 \
 	lib/clang/liblldbPluginABISysV_i386 \
 	lib/clang/liblldbPluginABISysV_mips \
 	lib/clang/liblldbPluginABISysV_mips64 \
 	lib/clang/liblldbPluginABISysV_ppc \
 	lib/clang/liblldbPluginABISysV_ppc64 \
 	lib/clang/liblldbPluginABISysV_x86_64 \
 	lib/clang/liblldbPluginCXXItaniumABI \
 	lib/clang/liblldbPluginDisassemblerLLVM \
 	lib/clang/liblldbPluginDynamicLoaderPosixDYLD \
 	lib/clang/liblldbPluginDynamicLoaderStatic \
 	lib/clang/liblldbPluginInstructionARM \
 	lib/clang/liblldbPluginInstructionARM64 \
 	lib/clang/liblldbPluginInstructionMIPS \
 	lib/clang/liblldbPluginInstructionMIPS64 \
 	lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer \
 	lib/clang/liblldbPluginJITLoaderGDB \
 	lib/clang/liblldbPluginMemoryHistoryASan \
 	lib/clang/liblldbPluginObjectContainerBSDArchive \
 	lib/clang/liblldbPluginObjectFileELF \
 	lib/clang/liblldbPluginObjectFileJIT \
 	lib/clang/liblldbPluginPlatformFreeBSD \
 	lib/clang/liblldbPluginPlatformGDB \
 	lib/clang/liblldbPluginProcessElfCore \
 	lib/clang/liblldbPluginProcessFreeBSD \
 	lib/clang/liblldbPluginProcessGDBRemote \
 	lib/clang/liblldbPluginProcessPOSIX \
 	lib/clang/liblldbPluginProcessUtility \
 	lib/clang/liblldbPluginSymbolFileDWARF \
 	lib/clang/liblldbPluginSymbolFileSymtab \
 	lib/clang/liblldbPluginSymbolVendorELF \
 	lib/clang/liblldbPluginUnwindAssemblyInstEmulation \
 	lib/clang/liblldbPluginUnwindAssemblyX86 \
 	lib/clang/liblldbSymbol \
 	lib/clang/liblldbTarget \
 	lib/clang/liblldbUtility \
 	lib/clang/libllvmaarch64asmparser \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64disassembler \
 	lib/clang/libllvmaarch64info \
 	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
 	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
 	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmparser \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
 	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcodegen \
 	lib/clang/libllvmcore \
 	lib/clang/libllvmexecutionengine \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
 	lib/clang/libllvmipa \
 	lib/clang/libllvmipo \
 	lib/clang/libllvmirreader \
 	lib/clang/libllvmlinker \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcdisassembler \
 	lib/clang/libllvmmcjit \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
 	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobjcarcopts \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmoption \
 	lib/clang/libllvmpowerpcasmparser \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
 	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmruntimedyld \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcdisassembler \
 	lib/clang/libllvmsparcinfo \
 	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmvectorize \
 	lib/clang/libllvmx86asmparser \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
 	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
 	lib/libcompiler_rt \
 	lib/libedit \
 	lib/libelf \
 	lib/libexecinfo \
 	lib/libthr \
 	lib/libz \
 	lib/msun \
+	lib/ncurses/ncurses \
 	lib/ncurses/ncursesw \
 	lib/ncurses/panel \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/usr.sbin/ofwdump/Makefile.depend
===================================================================
--- head/usr.sbin/ofwdump/Makefile.depend	(revision 291971)
+++ head/usr.sbin/ofwdump/Makefile.depend	(revision 291972)
@@ -1,16 +1,19 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif