36 files changed, 83 insertions, 245 deletions

diff --git a/usr.bin/ar/Makefile.depend b/usr.bin/ar/Makefile.depend
index cabff68821d53..8def7bcfc9a2d 100644
--- a/usr.bin/ar/Makefile.depend
+++ b/usr.bin/ar/Makefile.depend
@@ -24,10 +24,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-acplex.o: acplex.c
-acplex.o: y.tab.h
-acplex.po: acplex.c
-acplex.po: y.tab.h
-acpyacc.o: acpyacc.c
-acpyacc.po: acpyacc.c
 .endif
diff --git a/usr.bin/awk/Makefile.depend b/usr.bin/awk/Makefile.depend
index 2fddd140939d2..cb804542add10 100644
--- a/usr.bin/awk/Makefile.depend
+++ b/usr.bin/awk/Makefile.depend
@@ -17,24 +17,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-awkgram.o: awkgram.c
-awkgram.po: awkgram.c
-b.o: ytab.h
-b.po: ytab.h
-lex.o: ytab.h
-lex.po: ytab.h
-lib.o: ytab.h
-lib.po: ytab.h
-main.o: ytab.h
-main.po: ytab.h
-parse.o: ytab.h
-parse.po: ytab.h
-proctab.o: proctab.c
-proctab.o: ytab.h
-proctab.po: proctab.c
-proctab.po: ytab.h
-run.o: ytab.h
-run.po: ytab.h
-tran.o: ytab.h
-tran.po: ytab.h
 .endif
diff --git a/usr.bin/bc/Makefile.depend b/usr.bin/bc/Makefile.depend
index e75965347b831..eb5b17459733b 100644
--- a/usr.bin/bc/Makefile.depend
+++ b/usr.bin/bc/Makefile.depend
@@ -18,10 +18,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-bc.o: bc.c
-bc.po: bc.c
-scan.o: bc.h
-scan.o: scan.c
-scan.po: bc.h
-scan.po: scan.c
 .endif
diff --git a/usr.bin/clang/bugpoint/Makefile.depend b/usr.bin/clang/bugpoint/Makefile.depend
index 2b2e060ef9b80..45405099072d5 100644
--- a/usr.bin/clang/bugpoint/Makefile.depend
+++ b/usr.bin/clang/bugpoint/Makefile.depend
@@ -42,6 +42,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-bugpoint.o: Intrinsics.inc.h
-bugpoint.po: Intrinsics.inc.h
 .endif
diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend
index bee00f54f0a0d..24611b4a8dbce 100644
--- a/usr.bin/clang/clang/Makefile.depend
+++ b/usr.bin/clang/clang/Makefile.depend
@@ -100,26 +100,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-cc1_main.o: DiagnosticCommonKinds.inc.h
-cc1_main.o: DiagnosticDriverKinds.inc.h
-cc1_main.o: DiagnosticFrontendKinds.inc.h
-cc1_main.o: Options.inc.h
-cc1_main.po: DiagnosticCommonKinds.inc.h
-cc1_main.po: DiagnosticDriverKinds.inc.h
-cc1_main.po: DiagnosticFrontendKinds.inc.h
-cc1_main.po: Options.inc.h
-cc1as_main.o: DiagnosticCommonKinds.inc.h
-cc1as_main.o: DiagnosticDriverKinds.inc.h
-cc1as_main.o: DiagnosticFrontendKinds.inc.h
-cc1as_main.o: Options.inc.h
-cc1as_main.po: DiagnosticCommonKinds.inc.h
-cc1as_main.po: DiagnosticDriverKinds.inc.h
-cc1as_main.po: DiagnosticFrontendKinds.inc.h
-cc1as_main.po: Options.inc.h
-driver.o: DiagnosticCommonKinds.inc.h
-driver.o: DiagnosticDriverKinds.inc.h
-driver.o: Options.inc.h
-driver.po: DiagnosticCommonKinds.inc.h
-driver.po: DiagnosticDriverKinds.inc.h
-driver.po: Options.inc.h
 .endif
diff --git a/usr.bin/clang/llc/Makefile.depend b/usr.bin/clang/llc/Makefile.depend
index b61b8716b112a..89b7aceb33fb6 100644
--- a/usr.bin/clang/llc/Makefile.depend
+++ b/usr.bin/clang/llc/Makefile.depend
@@ -80,6 +80,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-llc.o: Intrinsics.inc.h
-llc.po: Intrinsics.inc.h
 .endif
diff --git a/usr.bin/clang/llvm-dis/Makefile.depend b/usr.bin/clang/llvm-dis/Makefile.depend
index fd4648223f85d..9ff2a96221b27 100644
--- a/usr.bin/clang/llvm-dis/Makefile.depend
+++ b/usr.bin/clang/llvm-dis/Makefile.depend
@@ -24,6 +24,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-llvm-dis.o: Intrinsics.inc.h
-llvm-dis.po: Intrinsics.inc.h
 .endif
diff --git a/usr.bin/clang/llvm-lto/Makefile.depend b/usr.bin/clang/llvm-lto/Makefile.depend
index cea3df4b8be1d..65a810f1ce822 100644
--- a/usr.bin/clang/llvm-lto/Makefile.depend
+++ b/usr.bin/clang/llvm-lto/Makefile.depend
@@ -83,6 +83,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-llvm-lto.o: Intrinsics.inc.h
-llvm-lto.po: Intrinsics.inc.h
 .endif
diff --git a/usr.bin/clang/opt/Makefile.depend b/usr.bin/clang/opt/Makefile.depend
index 029d9562c8737..021f7a640dc59 100644
--- a/usr.bin/clang/opt/Makefile.depend
+++ b/usr.bin/clang/opt/Makefile.depend
@@ -84,12 +84,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-AnalysisWrappers.o: Intrinsics.inc.h
-AnalysisWrappers.po: Intrinsics.inc.h
-PassPrinters.o: Intrinsics.inc.h
-PassPrinters.po: Intrinsics.inc.h
-PrintSCC.o: Intrinsics.inc.h
-PrintSCC.po: Intrinsics.inc.h
-opt.o: Intrinsics.inc.h
-opt.po: Intrinsics.inc.h
 .endif
diff --git a/usr.bin/colldef/Makefile.depend b/usr.bin/colldef/Makefile.depend
index 3ca32c6f31134..26839bd6174aa 100644
--- a/usr.bin/colldef/Makefile.depend
+++ b/usr.bin/colldef/Makefile.depend
@@ -18,10 +18,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-scan.o: scan.c
-scan.o: y.tab.h
-scan.po: scan.c
-scan.po: y.tab.h
 .endif
diff --git a/usr.bin/compile_et/Makefile.depend b/usr.bin/compile_et/Makefile.depend
index 94ad84e01a7be..1288666d2fadb 100644
--- a/usr.bin/compile_et/Makefile.depend
+++ b/usr.bin/compile_et/Makefile.depend
@@ -20,12 +20,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-compile_et.o: parse.h
-compile_et.po: parse.h
-lex.o: lex.c
-lex.o: parse.h
-lex.po: lex.c
-lex.po: parse.h
-parse.o: parse.c
-parse.po: parse.c
 .endif
diff --git a/usr.bin/find/Makefile.depend b/usr.bin/find/Makefile.depend
index 9de4374e496e7..ca0b2f9610f7b 100644
--- a/usr.bin/find/Makefile.depend
+++ b/usr.bin/find/Makefile.depend
@@ -16,6 +16,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-getdate.o: getdate.c
-getdate.po: getdate.c
 .endif
diff --git a/usr.bin/getconf/Makefile.depend b/usr.bin/getconf/Makefile.depend
index cd02691ab448d..3646e2e2b1afa 100644
--- a/usr.bin/getconf/Makefile.depend
+++ b/usr.bin/getconf/Makefile.depend
@@ -15,14 +15,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-confstr.o: confstr.c
-confstr.po: confstr.c
-limits.o: limits.c
-limits.po: limits.c
-pathconf.o: pathconf.c
-pathconf.po: pathconf.c
-progenv.o: progenv.c
-progenv.po: progenv.c
-sysconf.o: sysconf.c
-sysconf.po: sysconf.c
 .endif
diff --git a/usr.bin/iscsictl/Makefile.depend b/usr.bin/iscsictl/Makefile.depend
index 05df0919d6e87..6146f8608f72c 100644
--- a/usr.bin/iscsictl/Makefile.depend
+++ b/usr.bin/iscsictl/Makefile.depend
@@ -19,10 +19,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-token.o: token.c
-token.o: y.tab.h
-token.po: token.c
-token.po: y.tab.h
 .endif
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index 40109f0ca3aba..f80f6684a9e5a 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -11,8 +11,10 @@ CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I.
 
 LIBADD=		sysdecode
 .if ${MK_CASPER} != "no"
-LIBADD+=	capsicum
-CFLAGS+=-DHAVE_LIBCAPSICUM
+LIBADD+=	casper
+LIBADD+=	cap_grp
+LIBADD+=	cap_pwd
+CFLAGS+=-DHAVE_LIBCASPER
 .endif
 
 NO_WERROR?=	YES
diff --git a/usr.bin/kdump/Makefile.depend b/usr.bin/kdump/Makefile.depend
index e3c5ae7bab498..71c8213639209 100644
--- a/usr.bin/kdump/Makefile.depend
+++ b/usr.bin/kdump/Makefile.depend
@@ -9,7 +9,9 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libcapsicum \
+	lib/libcasper/libcasper \
+	lib/libcasper/services/cap_grp \
+	lib/libcasper/services/cap_pwd \
 	lib/libcompiler_rt \
 	lib/libnv \
 	lib/libsysdecode \
@@ -19,10 +21,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-kdump.o: kdump_subr.h
-kdump.po: kdump_subr.h
-kdump_subr.o: kdump_subr.c
-kdump_subr.o: kdump_subr.h
-kdump_subr.po: kdump_subr.c
-kdump_subr.po: kdump_subr.h
 .endif
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index b4a1f69651223..e45a7332eed39 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -61,7 +61,7 @@ extern int errno;
 #include <sys/un.h>
 #include <sys/queue.h>
 #include <sys/wait.h>
-#ifdef HAVE_LIBCAPSICUM
+#ifdef HAVE_LIBCASPER
 #include <sys/nv.h>
 #endif
 #include <arpa/inet.h>
@@ -70,12 +70,6 @@ extern int errno;
 #include <err.h>
 #include <grp.h>
 #include <inttypes.h>
-#ifdef HAVE_LIBCAPSICUM
-#include <libcapsicum.h>
-#include <libcapsicum_grp.h>
-#include <libcapsicum_pwd.h>
-#include <libcapsicum_service.h>
-#endif
 #include <locale.h>
 #include <netdb.h>
 #include <nl_types.h>
@@ -91,6 +85,13 @@ extern int errno;
 #include "ktrace.h"
 #include "kdump_subr.h"
 
+#ifdef HAVE_LIBCASPER
+#include <libcasper.h>
+
+#include <casper/cap_grp.h>
+#include <casper/cap_pwd.h>
+#endif
+
 u_int abidump(struct ktr_header *);
 int fetchprocinfo(struct ktr_header *, u_int *);
 int fread_tail(void *, int, int);
@@ -151,7 +152,7 @@ struct proc_info
 
 static TAILQ_HEAD(trace_procs, proc_info) trace_procs;
 
-#ifdef HAVE_LIBCAPSICUM
+#ifdef HAVE_LIBCASPER
 static cap_channel_t *cappwd, *capgrp;
 #endif
 
@@ -180,7 +181,7 @@ localtime_init(void)
 	(void)localtime(&ltime);
 }
 
-#ifdef HAVE_LIBCAPSICUM
+#ifdef HAVE_LIBCASPER
 static int
 cappwdgrp_setup(cap_channel_t **cappwdp, cap_channel_t **capgrpp)
 {
@@ -189,8 +190,8 @@ cappwdgrp_setup(cap_channel_t **cappwdp, cap_channel_t **capgrpp)
 
 	capcas = cap_init();
 	if (capcas == NULL) {
-		warn("unable to contact casperd");
-		return (-1);
+		err(1, "unable to create casper process");
+		exit(1);
 	}
 	cappwdloc = cap_service_open(capcas, "system.pwd");
 	capgrploc = cap_service_open(capcas, "system.grp");
@@ -222,7 +223,7 @@ cappwdgrp_setup(cap_channel_t **cappwdp, cap_channel_t **capgrpp)
 	*capgrpp = capgrploc;
 	return (0);
 }
-#endif	/* HAVE_LIBCAPSICUM */
+#endif	/* HAVE_LIBCASPER */
 
 int
 main(int argc, char *argv[])
@@ -302,7 +303,7 @@ main(int argc, char *argv[])
 
 	strerror_init();
 	localtime_init();
-#ifdef HAVE_LIBCAPSICUM
+#ifdef HAVE_LIBCASPER
 	if (resolv != 0) {
 		if (cappwdgrp_setup(&cappwd, &capgrp) < 0) {
 			cappwd = NULL;
@@ -520,6 +521,9 @@ abidump(struct ktr_header *kth)
 	case SV_ABI_FREEBSD:
 		abi = "F";
 		break;
+	case SV_ABI_CLOUDABI:
+		abi = "C";
+		break;
 	default:
 		abi = "U";
 		break;
@@ -674,6 +678,10 @@ syscallabi(u_int sv_flags)
 #endif
 		return (SYSDECODE_ABI_LINUX);
 #endif
+#if defined(__aarch64__) || defined(__amd64__)
+	case SV_ABI_CLOUDABI:
+		return (SYSDECODE_ABI_CLOUDABI64);
+#endif
 	default:
 		return (SYSDECODE_ABI_UNKNOWN);
 	}
@@ -1641,7 +1649,7 @@ ktrstat(struct stat *statp)
 	if (resolv == 0) {
 		pwd = NULL;
 	} else {
-#ifdef HAVE_LIBCAPSICUM
+#ifdef HAVE_LIBCASPER
 		if (cappwd != NULL)
 			pwd = cap_getpwuid(cappwd, statp->st_uid);
 		else
@@ -1655,7 +1663,7 @@ ktrstat(struct stat *statp)
 	if (resolv == 0) {
 		grp = NULL;
 	} else {
-#ifdef HAVE_LIBCAPSICUM
+#ifdef HAVE_LIBCASPER
 		if (capgrp != NULL)
 			grp = cap_getgrgid(capgrp, statp->st_gid);
 		else
diff --git a/usr.bin/lex/Makefile.depend b/usr.bin/lex/Makefile.depend
index ae5191b3b702b..ca0b2f9610f7b 100644
--- a/usr.bin/lex/Makefile.depend
+++ b/usr.bin/lex/Makefile.depend
@@ -16,14 +16,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-parse.o: parse.c
-parse.po: parse.c
-scan.o: parse.h
-scan.o: scan.c
-scan.po: parse.h
-scan.po: scan.c
-skel.o: skel.c
-skel.po: skel.c
-yylex.o: parse.h
-yylex.po: parse.h
 .endif
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index 28b09ca0a6227..093a367bad4cc 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -92,6 +92,7 @@ static struct {
 	  { "  pseudo-terminals%-4s %8s", "\n",       1    },
 	  { "  swapuse%-4s          %8s", " kB\n",    1024 },
 	  { "  kqueues%-4s          %8s", "\n",       1    },
+	  { "  umtxp%-4s            %8s", "\n",       1    },
       }
     },
     { "sh", "unlimited", "", " -H", " -S", "",
@@ -110,6 +111,7 @@ static struct {
 	  { "ulimit%s -p %s", ";\n",  1    },
 	  { "ulimit%s -w %s", ";\n",  1024 },
 	  { "ulimit%s -k %s", ";\n",  1    },
+	  { "ulimit%s -o %s", ";\n",  1    },
       }
     },
     { "csh", "unlimited", "", " -h", "", NULL,
@@ -128,6 +130,7 @@ static struct {
 	  { "limit%s pseudoterminals %s", ";\n",  1    },
 	  { "limit%s swapsize %s",        ";\n",  1024 },
 	  { "limit%s kqueues %s",         ";\n",  1    },
+	  { "limit%s umtxp %s",           ";\n",  1    },
       }
     },
     { "bash|bash2", "unlimited", "", " -H", " -S", "",
@@ -163,6 +166,7 @@ static struct {
 	  { "limit%s pseudoterminals %s", ";\n",  1    },
 	  { "limit%s swapsize %s",        ";\n",  1024 },
 	  { "limit%s kqueues %s",         ";\n",  1    },
+	  { "limit%s umtxp %s",           ";\n",  1    },
       }
     },
     { "ksh|pdksh", "unlimited", "", " -H", " -S", "",
@@ -239,6 +243,7 @@ static struct {
     { "pseudoterminals",login_getcapnum  },
     { "swapuse",	login_getcapsize },
     { "kqueues",	login_getcapnum  },
+    { "umtxp",		login_getcapnum  },
 };
 
 /*
@@ -289,7 +294,7 @@ main(int argc, char *argv[])
     pid = -1;
     optarg = NULL;
     while ((ch = getopt(argc, argv,
-      ":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:k:")) != -1) {
+      ":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:k:o:")) != -1) {
 	switch(ch) {
 	case 'a':
 	    doall = 1;
diff --git a/usr.bin/localedef/Makefile.depend b/usr.bin/localedef/Makefile.depend
index ac5eda156c09d..ca0b2f9610f7b 100644
--- a/usr.bin/localedef/Makefile.depend
+++ b/usr.bin/localedef/Makefile.depend
@@ -16,24 +16,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-charmap.o: parser.h
-charmap.po: parser.h
-collate.o: parser.h
-collate.po: parser.h
-ctype.o: parser.h
-ctype.po: parser.h
-localedef.o: parser.h
-localedef.po: parser.h
-messages.o: parser.h
-messages.po: parser.h
-monetary.o: parser.h
-monetary.po: parser.h
-numeric.o: parser.h
-numeric.po: parser.h
-parser.o: parser.c
-parser.po: parser.c
-scanner.o: parser.h
-scanner.po: parser.h
-time.o: parser.h
-time.po: parser.h
 .endif
diff --git a/usr.bin/m4/Makefile.depend b/usr.bin/m4/Makefile.depend
index 8ccf846f0ced4..d97824aedd837 100644
--- a/usr.bin/m4/Makefile.depend
+++ b/usr.bin/m4/Makefile.depend
@@ -20,10 +20,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-parser.o: parser.c
-parser.po: parser.c
-tokenizer.o: parser.h
-tokenizer.o: tokenizer.c
-tokenizer.po: parser.h
-tokenizer.po: tokenizer.c
 .endif
diff --git a/usr.bin/mkcsmapper/Makefile.depend b/usr.bin/mkcsmapper/Makefile.depend
index b0cb3acf0d13d..75e27669e9f30 100644
--- a/usr.bin/mkcsmapper/Makefile.depend
+++ b/usr.bin/mkcsmapper/Makefile.depend
@@ -17,10 +17,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-lex.o: lex.c
-lex.o: yacc.h
-lex.po: lex.c
-lex.po: yacc.h
-yacc.o: yacc.c
-yacc.po: yacc.c
 .endif
diff --git a/usr.bin/mkcsmapper_static/Makefile b/usr.bin/mkcsmapper_static/Makefile
index e16471af0165d..21014e930b63c 100644
--- a/usr.bin/mkcsmapper_static/Makefile
+++ b/usr.bin/mkcsmapper_static/Makefile
@@ -7,9 +7,7 @@ SRCS=	citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
 	citrus_lookup_factory.c citrus_pivot_factory.c
 MAN=
 NO_SHARED= yes
-.if ${MACHINE} == "host"
-NO_WARNS= yes
-.endif
+NO_WMISSING_VARIABLE_DECLARATIONS=
 
 build-tools: mkcsmapper_static
 
diff --git a/usr.bin/mkcsmapper_static/Makefile.depend b/usr.bin/mkcsmapper_static/Makefile.depend
index ffee33f34c2ad..75e27669e9f30 100644
--- a/usr.bin/mkcsmapper_static/Makefile.depend
+++ b/usr.bin/mkcsmapper_static/Makefile.depend
@@ -2,22 +2,19 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	usr.bin/yacc.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-lex.o: lex.c
-lex.o: yacc.h
-lex.po: lex.c
-lex.po: yacc.h
-yacc.o: yacc.c
-yacc.po: yacc.c
 .endif
diff --git a/usr.bin/mkesdb/Makefile.depend b/usr.bin/mkesdb/Makefile.depend
index 091f9505e0083..ca0b2f9610f7b 100644
--- a/usr.bin/mkesdb/Makefile.depend
+++ b/usr.bin/mkesdb/Makefile.depend
@@ -16,10 +16,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-lex.o: lex.c
-lex.o: yacc.h
-lex.po: lex.c
-lex.po: yacc.h
-yacc.o: yacc.c
-yacc.po: yacc.c
 .endif
diff --git a/usr.bin/mkesdb_static/Makefile b/usr.bin/mkesdb_static/Makefile
index fb10f0169b173..2696a23700d59 100644
--- a/usr.bin/mkesdb_static/Makefile
+++ b/usr.bin/mkesdb_static/Makefile
@@ -7,9 +7,7 @@ SRCS=	citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
 	citrus_lookup_factory.c
 MAN=
 NO_SHARED= yes
-.if ${MACHINE} == "host"
-NO_WARNS= yes
-.endif
+NO_WMISSING_VARIABLE_DECLARATIONS=
 
 build-tools: mkesdb_static
 
diff --git a/usr.bin/mkesdb_static/Makefile.depend b/usr.bin/mkesdb_static/Makefile.depend
new file mode 100644
index 0000000000000..75e27669e9f30
--- /dev/null
+++ b/usr.bin/mkesdb_static/Makefile.depend
@@ -0,0 +1,20 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/arpa \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	usr.bin/yacc.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/usr.bin/mklocale/Makefile.depend b/usr.bin/mklocale/Makefile.depend
index b3bfc6d68407c..75e27669e9f30 100644
--- a/usr.bin/mklocale/Makefile.depend
+++ b/usr.bin/mklocale/Makefile.depend
@@ -17,10 +17,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-lex.o: lex.c
-lex.o: y.tab.h
-lex.po: lex.c
-lex.po: y.tab.h
-yacc.o: yacc.c
-yacc.po: yacc.c
 .endif
diff --git a/usr.bin/mkuzip/Makefile.depend b/usr.bin/mkuzip/Makefile.depend
index d209adbd4ff2d..9d045c81162c4 100644
--- a/usr.bin/mkuzip/Makefile.depend
+++ b/usr.bin/mkuzip/Makefile.depend
@@ -9,6 +9,9 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/liblzma \
+	lib/libmd \
+	lib/libthr \
 	lib/libz \
 
 
diff --git a/usr.bin/netstat/Makefile.depend b/usr.bin/netstat/Makefile.depend
index 2abbfbfcd916c..27fa66073706f 100644
--- a/usr.bin/netstat/Makefile.depend
+++ b/usr.bin/netstat/Makefile.depend
@@ -22,14 +22,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-main.o: nl_defs.h
-main.po: nl_defs.h
-mroute.o: nl_defs.h
-mroute.po: nl_defs.h
-netisr.o: nl_defs.h
-netisr.po: nl_defs.h
-nl_symbols.o: nl_symbols.c
-nl_symbols.po: nl_symbols.c
-route.o: nl_defs.h
-route.po: nl_defs.h
 .endif
diff --git a/usr.bin/procstat/procstat_rlimit.c b/usr.bin/procstat/procstat_rlimit.c
index 5e7d12efc55f0..5088c59767e9d 100644
--- a/usr.bin/procstat/procstat_rlimit.c
+++ b/usr.bin/procstat/procstat_rlimit.c
@@ -47,7 +47,7 @@
 static struct {
 	const char *name;
 	const char *suffix;
-} rlimit_param[14] = {
+} rlimit_param[15] = {
 	{"cputime",          "sec"},
 	{"filesize",         "B  "},
 	{"datasize",         "B  "},
@@ -62,9 +62,10 @@ static struct {
 	{"pseudo-terminals", "   "},
 	{"swapuse",          "B  "},
 	{"kqueues",          "   "},
+	{"umtxp",            "   "},
 };
 
-#if RLIM_NLIMITS > 14
+#if RLIM_NLIMITS > 15
 #error "Resource limits have grown. Add new entries to rlimit_param[]."
 #endif
 
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index 81fead6434b5c..687de1e736bc9 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -38,6 +38,7 @@ static const char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
 #include <arpa/inet.h>
 
 #include <errno.h>
+#include <poll.h>
 
 #include "talk.h"
 #include "talk_ctl.h"
@@ -52,23 +53,20 @@ static const char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
 void
 ctl_transact(struct in_addr target, CTL_MSG lmsg, int type, CTL_RESPONSE *rp)
 {
-	fd_set read_mask, ctl_mask;
+	struct pollfd pfd[1];
 	int nready = 0, cc;
-	struct timeval wait;
 
 	lmsg.type = type;
 	daemon_addr.sin_addr = target;
 	daemon_addr.sin_port = daemon_port;
-	FD_ZERO(&ctl_mask);
-	FD_SET(ctl_sockt, &ctl_mask);
+	pfd[0].fd = ctl_sockt;
+	pfd[0].events = POLLIN;
 
 	/*
 	 * Keep sending the message until a response of
 	 * the proper type is obtained.
 	 */
 	do {
-		wait.tv_sec = CTL_WAIT;
-		wait.tv_usec = 0;
 		/* resend message until a response is obtained */
 		do {
 			cc = sendto(ctl_sockt, (char *)&lmsg, sizeof (lmsg), 0,
@@ -79,8 +77,7 @@ ctl_transact(struct in_addr target, CTL_MSG lmsg, int type, CTL_RESPONSE *rp)
 					continue;
 				p_error("Error on write to talk daemon");
 			}
-			read_mask = ctl_mask;
-			nready = select(32, &read_mask, 0, 0, &wait);
+			nready = poll(pfd, 1, CTL_WAIT * 1000);
 			if (nready < 0) {
 				if (errno == EINTR)
 					continue;
@@ -99,10 +96,7 @@ ctl_transact(struct in_addr target, CTL_MSG lmsg, int type, CTL_RESPONSE *rp)
 					continue;
 				p_error("Error on read from talk daemon");
 			}
-			read_mask = ctl_mask;
-			/* an immediate poll */
-			timerclear(&wait);
-			nready = select(32, &read_mask, 0, 0, &wait);
+			nready = poll(pfd, 1, 0);
 		} while (nready > 0 && (rp->vers != TALK_VERSION ||
 		    rp->type != type));
 	} while (rp->vers != TALK_VERSION || rp->type != type);
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index 7e9db73cc1b25..eb5df61646bbb 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -46,6 +46,7 @@ static const char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #include <errno.h>
 #include <signal.h>
 #include <netdb.h>
+#include <poll.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -67,8 +68,8 @@ void
 talk(void)
 {
 	struct hostent *hp, *hp2;
+	struct pollfd fds[2];
 	int nb;
-	fd_set read_set;
 	wchar_t buf[BUFSIZ];
 	char **addr, *his_machine_name;
 	FILE *sockfp;
@@ -107,10 +108,11 @@ talk(void)
 	 * Wait on both the other process (sockt) and standard input.
 	 */
 	for (;;) {
-		FD_ZERO(&read_set);
-		FD_SET(sockt, &read_set);
-		FD_SET(fileno(stdin), &read_set);
-		nb = select(32, &read_set, 0, 0, NULL);
+		fds[0].fd = fileno(stdin);
+		fds[0].events = POLLIN;
+		fds[1].fd = sockt;
+		fds[1].events = POLLIN;
+		nb = poll(fds, 2, INFTIM);
 		if (gotwinch) {
 			resize_display();
 			gotwinch = 0;
@@ -119,10 +121,10 @@ talk(void)
 			if (errno == EINTR)
 				continue;
 			/* Panic, we don't know what happened. */
-			p_error("Unexpected error from select");
+			p_error("Unexpected error from poll");
 			quit();
 		}
-		if (FD_ISSET(sockt, &read_set)) {
+		if (fds[1].revents & POLLIN) {
 			wint_t w;
 
 			/* There is data on sockt. */
@@ -133,7 +135,7 @@ talk(void)
 			}
 			display(&his_win, &w);
 		}
-		if (FD_ISSET(fileno(stdin), &read_set)) {
+		if (fds[0].revents & POLLIN) {
 			wint_t w;
 
 			if ((w = getwchar()) != WEOF) {
diff --git a/usr.bin/top/Makefile.depend b/usr.bin/top/Makefile.depend
index accbe523ac774..fafa76b62245e 100644
--- a/usr.bin/top/Makefile.depend
+++ b/usr.bin/top/Makefile.depend
@@ -20,12 +20,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-commands.o: sigdesc.h
-commands.po: sigdesc.h
-display.o: top.local.h
-display.po: top.local.h
-top.o: top.local.h
-top.po: top.local.h
-username.o: top.local.h
-username.po: top.local.h
 .endif
diff --git a/usr.bin/vacation/Makefile.depend b/usr.bin/vacation/Makefile.depend
index 1636b07220d0c..b0af42fdb9433 100644
--- a/usr.bin/vacation/Makefile.depend
+++ b/usr.bin/vacation/Makefile.depend
@@ -18,6 +18,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-vacation.o: sm_os.h
-vacation.po: sm_os.h
 .endif
diff --git a/usr.bin/xlint/lint1/Makefile.depend b/usr.bin/xlint/lint1/Makefile.depend
index 22a555630b9d5..dab799564cd4c 100644
--- a/usr.bin/xlint/lint1/Makefile.depend
+++ b/usr.bin/xlint/lint1/Makefile.depend
@@ -18,14 +18,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-cgram.o: cgram.c
-cgram.po: cgram.c
-func.o: cgram.h
-func.po: cgram.h
-scan.o: cgram.h
-scan.o: scan.c
-scan.po: cgram.h
-scan.po: scan.c
-tree.o: cgram.h
-tree.po: cgram.h
 .endif