aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2020-10-01 01:10:51 +0000
committerKyle Evans <kevans@FreeBSD.org>2020-10-01 01:10:51 +0000
commit7cc42f6d25ef2e19059d088fa7d4853fe9afefb5 (patch)
tree247f8681872747970b9b38f1c62b58912972ef7d
parent9f669985b281c4e0d8edf80e138a6040c215828c (diff)
downloadsrc-7cc42f6d25ef2e19059d088fa7d4853fe9afefb5.tar.gz
src-7cc42f6d25ef2e19059d088fa7d4853fe9afefb5.zip
Do a sweep and remove most WARNS=6 settings
Repeating the default WARNS here makes it slightly more difficult to experiment with default WARNS changes, e.g. if we did something absolutely bananas and introduced a WARNS=7 and wanted to try lifting the default to that. Drop most of them; there is one in the blake2 kernel module, but I suspect it should be dropped -- the default WARNS in the rest of the build doesn't currently apply to kernel modules, and I haven't put too much thought into whether it makes sense to make it so.
Notes
Notes: svn path=/head/; revision=366304
-rw-r--r--cddl/Makefile.inc2
-rw-r--r--gnu/usr.bin/dialog/Makefile2
-rw-r--r--lib/googletest/Makefile.inc2
-rw-r--r--lib/libcam/tests/Makefile2
-rw-r--r--lib/libcrypt/tests/Makefile1
-rw-r--r--lib/libiconv_modules/Makefile.inc1
-rw-r--r--lib/libkvm/Makefile2
-rw-r--r--lib/libkvm/tests/Makefile2
-rw-r--r--lib/libpathconv/tests/Makefile1
-rw-r--r--lib/libproc/tests/Makefile1
-rw-r--r--lib/libsbuf/tests/Makefile2
-rw-r--r--libexec/Makefile.inc1
-rw-r--r--libexec/getty/Makefile1
-rw-r--r--libexec/rtld-elf/Makefile1
-rw-r--r--libexec/rtld-elf/tests/libpythagoras/Makefile1
-rw-r--r--libexec/tftpd/tests/Makefile1
-rw-r--r--sbin/decryptcore/Makefile2
-rw-r--r--sbin/pfilctl/Makefile1
-rw-r--r--sbin/ping/tests/Makefile2
-rw-r--r--sbin/recoverdisk/Makefile2
-rw-r--r--sys/teken/demo/Makefile2
-rw-r--r--sys/teken/libteken/Makefile1
-rw-r--r--sys/teken/stress/Makefile2
-rw-r--r--tests/sys/Makefile.inc2
-rw-r--r--tests/sys/aio/Makefile2
-rw-r--r--tests/sys/audit/Makefile2
-rw-r--r--tests/sys/auditpipe/Makefile1
-rw-r--r--tests/sys/capsicum/Makefile2
-rw-r--r--tests/sys/devrandom/Makefile1
-rw-r--r--tests/sys/fs/fusefs/Makefile2
-rw-r--r--tests/sys/kern/pipe/Makefile2
-rw-r--r--tests/sys/mqueue/Makefile2
-rw-r--r--tests/sys/net/Makefile2
-rw-r--r--tests/sys/netinet/Makefile2
-rw-r--r--tests/sys/netmap/Makefile2
-rw-r--r--tests/sys/opencrypto/Makefile2
-rw-r--r--tests/sys/pjdfstest/pjdfstest/Makefile2
-rw-r--r--tools/regression/aio/aiop/Makefile2
-rw-r--r--tools/regression/bpf/bpf_filter/Makefile1
-rw-r--r--tools/regression/doat/Makefile1
-rw-r--r--tools/regression/geom_gpt/Makefile2
-rw-r--r--tools/regression/include/stdatomic/Makefile1
-rw-r--r--tools/regression/netinet/ipbroadcast/Makefile2
-rw-r--r--tools/regression/rpcsec_gss/Makefile1
-rw-r--r--tools/regression/sockets/accept_fd_leak/Makefile1
-rw-r--r--tools/regression/sockets/accf_data_attach/Makefile1
-rw-r--r--tools/regression/sockets/fstat/Makefile1
-rw-r--r--tools/regression/sockets/kqueue/Makefile1
-rw-r--r--tools/regression/sockets/listen_backlog/Makefile1
-rw-r--r--tools/regression/sockets/listen_kqueue/Makefile1
-rw-r--r--tools/regression/sockets/listenclose/Makefile1
-rw-r--r--tools/regression/sockets/pr_atomic/Makefile1
-rw-r--r--tools/regression/sockets/reconnect/Makefile1
-rw-r--r--tools/regression/sockets/rtsocket/Makefile1
-rw-r--r--tools/regression/sockets/sblock/Makefile1
-rw-r--r--tools/regression/sockets/sendfile/Makefile1
-rw-r--r--tools/regression/sockets/shutdown/Makefile1
-rw-r--r--tools/regression/sockets/sigpipe/Makefile1
-rw-r--r--tools/regression/sockets/so_setfib/Makefile1
-rw-r--r--tools/regression/sockets/udp_pingpong/Makefile1
-rw-r--r--tools/regression/sockets/unix_bindconnect/Makefile1
-rw-r--r--tools/regression/sockets/unix_close_race/Makefile1
-rw-r--r--tools/regression/sockets/unix_gc/Makefile1
-rw-r--r--tools/regression/sockets/unix_sendtorace/Makefile1
-rw-r--r--tools/regression/sockets/unix_socket/Makefile1
-rw-r--r--tools/regression/sockets/unix_sorflush/Makefile1
-rw-r--r--tools/regression/sockets/zerosend/Makefile1
-rw-r--r--tools/test/auxinfo/Makefile1
-rw-r--r--tools/test/iconv/posix/Makefile2
-rw-r--r--tools/test/malloc/Makefile1
-rw-r--r--tools/test/net/Makefile1
-rw-r--r--tools/test/netfibs/Makefile1
-rw-r--r--tools/test/ptrace/Makefile1
-rw-r--r--tools/tools/aac/Makefile1
-rw-r--r--tools/tools/cfi/Makefile1
-rw-r--r--tools/tools/find-sb/Makefile1
-rw-r--r--tools/tools/fixwhite/Makefile1
-rw-r--r--tools/tools/gensnmpdef/Makefile2
-rw-r--r--tools/tools/ifpifa/Makefile1
-rw-r--r--tools/tools/ioat/Makefile2
-rw-r--r--tools/tools/iwi/Makefile1
-rw-r--r--tools/tools/ncpus/Makefile1
-rw-r--r--tools/tools/pciroms/Makefile2
-rw-r--r--tools/tools/syscall_timing/Makefile2
-rw-r--r--tools/tools/tscdrift/Makefile1
-rw-r--r--tools/tools/vt/mkkfont/Makefile4
-rw-r--r--usr.bin/dpv/Makefile2
-rw-r--r--usr.bin/getconf/tests/Makefile2
-rw-r--r--usr.bin/mkimg/Makefile2
-rw-r--r--usr.bin/posixshmcontrol/Makefile1
-rw-r--r--usr.bin/proccontrol/Makefile1
-rw-r--r--usr.bin/protect/Makefile1
-rw-r--r--usr.sbin/bsdinstall/distextract/Makefile1
-rw-r--r--usr.sbin/bsdinstall/distfetch/Makefile1
-rw-r--r--usr.sbin/bsnmpd/tools/Makefile.inc2
-rw-r--r--usr.sbin/ctld/Makefile1
-rw-r--r--usr.sbin/iovctl/Makefile2
-rw-r--r--usr.sbin/mlx5tool/Makefile1
-rw-r--r--usr.sbin/pw/tests/Makefile1
99 files changed, 2 insertions, 137 deletions
diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc
index 94a42492a4f0..687068d599e8 100644
--- a/cddl/Makefile.inc
+++ b/cddl/Makefile.inc
@@ -7,8 +7,6 @@ IGNORE_PRAGMA= YES
CFLAGS+= -DNEED_SOLARIS_BOOLEAN
-WARNS?= 6
-
# Do not lint the CDDL stuff. It is all externally maintained and
# lint output is wasteful noise here.
diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
index 6e8ebe5f9a53..71496f774830 100644
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@@ -7,6 +7,4 @@ LIBADD= dialog ncursesw m
CFLAGS+= -I${.CURDIR} -I${DIALOG}
.PATH: ${DIALOG}
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc
index 319ce6ec7ec6..36f7228c079b 100644
--- a/lib/googletest/Makefile.inc
+++ b/lib/googletest/Makefile.inc
@@ -10,5 +10,3 @@ CXXFLAGS+= ${GTESTS_FLAGS}
# Silence warnings about usage of deprecated std::auto_ptr
CXXWARNFLAGS+= -Wno-deprecated-declarations
-
-WARNS?= 6
diff --git a/lib/libcam/tests/Makefile b/lib/libcam/tests/Makefile
index 178c30805f92..89e59ca9932e 100644
--- a/lib/libcam/tests/Makefile
+++ b/lib/libcam/tests/Makefile
@@ -5,6 +5,4 @@ ATF_TESTS_C+= cam_test
LIBADD+= cam
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/lib/libcrypt/tests/Makefile b/lib/libcrypt/tests/Makefile
index 22b7fccccbba..15798b215d17 100644
--- a/lib/libcrypt/tests/Makefile
+++ b/lib/libcrypt/tests/Makefile
@@ -4,7 +4,6 @@ ATF_TESTS_C+= crypt_tests
NETBSD_ATF_TESTS_C+= crypt_test
-WARNS?= 6
CFLAGS+= -I${.CURDIR:H}
LIBADD= crypt
diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc
index d42473637534..556997404f99 100644
--- a/lib/libiconv_modules/Makefile.inc
+++ b/lib/libiconv_modules/Makefile.inc
@@ -3,7 +3,6 @@
.PATH: ${SRCTOP}/lib/libc/iconv
SHLIB_MAJOR= 4
-WARNS?= 6
CFLAGS+= -I${SRCTOP}/lib/libc/iconv
CFLAGS+= -Dbool=_Bool
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index cd4872bd5b03..7747518d05eb 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -8,8 +8,6 @@ SHLIBDIR?= /lib
SHLIB_MAJOR= 7
CFLAGS+=-DNO__SCCSID -I${.CURDIR}
-WARNS?= 6
-
SRCS= kvm.c kvm_cptime.c kvm_getloadavg.c \
kvm_getswapinfo.c kvm_pcpu.c kvm_private.c kvm_proc.c kvm_vnet.c \
kvm_minidump_aarch64.c \
diff --git a/lib/libkvm/tests/Makefile b/lib/libkvm/tests/Makefile
index 24caf9108883..1f74aec83f02 100644
--- a/lib/libkvm/tests/Makefile
+++ b/lib/libkvm/tests/Makefile
@@ -13,8 +13,6 @@ CFLAGS.kvm_read_test+= -I${.CURDIR:H}
LIBADD+= kvm
-WARNS?= 6
-
BINDIR= ${TESTSDIR}
.for t in kvm_geterr_test kvm_open_test kvm_open2_test kvm_read_test
diff --git a/lib/libpathconv/tests/Makefile b/lib/libpathconv/tests/Makefile
index f32db22c1db8..c7696c2d6c5d 100644
--- a/lib/libpathconv/tests/Makefile
+++ b/lib/libpathconv/tests/Makefile
@@ -3,7 +3,6 @@
TAP_TESTS_C+= abs2rel
TAP_TESTS_C+= rel2abs
-WARNS?= 6
#LIBADD+= pathconv
#LDADD+= -L .. -lpathconv
LDADD+= ../libpathconv.a
diff --git a/lib/libproc/tests/Makefile b/lib/libproc/tests/Makefile
index 8c7563a33ca6..93f50789c88c 100644
--- a/lib/libproc/tests/Makefile
+++ b/lib/libproc/tests/Makefile
@@ -6,7 +6,6 @@ PROGS= target_prog
SRCS_target_prog= target_prog.c
BINDIR_target_prog= ${TESTSDIR}
-WARNS?= 6
LIBADD= elf proc rtld_db util
# Ensure that symbols aren't stripped from the test program, as they're needed
diff --git a/lib/libsbuf/tests/Makefile b/lib/libsbuf/tests/Makefile
index d3532f01b7b6..b563ebfe1728 100644
--- a/lib/libsbuf/tests/Makefile
+++ b/lib/libsbuf/tests/Makefile
@@ -6,6 +6,4 @@ ATF_TESTS_C+= sbuf_string_test
LIBADD+= sbuf util
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc
index 7b6a65fc7172..5a94bbf52a4b 100644
--- a/libexec/Makefile.inc
+++ b/libexec/Makefile.inc
@@ -3,5 +3,4 @@
BINDIR?= /usr/libexec
-WARNS?= 6
WFORMAT?= 1
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index ff4b91157511..a65d1d7da981 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -7,7 +7,6 @@ SRCS= main.c init.c subr.c chat.c
LIBADD= util
MAN= gettytab.5 ttys.5 getty.8
-WARNS?= 6
WFORMAT=0
.include <bsd.prog.mk>
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index cda56390ebe7..c61477c68236 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -40,7 +40,6 @@ RTLD_ARCH= ${MACHINE_CPUARCH}
CFLAGS+= -I${RTLD_ELF_DIR}/${RTLD_ARCH} -I${RTLD_ELF_DIR}
NO_WCAST_ALIGN= yes
-WARNS?= 6
INSTALLFLAGS= -C -b
PRECIOUSPROG=
BINDIR= /libexec
diff --git a/libexec/rtld-elf/tests/libpythagoras/Makefile b/libexec/rtld-elf/tests/libpythagoras/Makefile
index 7c9583960953..9ad4b883015c 100644
--- a/libexec/rtld-elf/tests/libpythagoras/Makefile
+++ b/libexec/rtld-elf/tests/libpythagoras/Makefile
@@ -10,7 +10,6 @@ SHLIBDIR= ${TESTSBASE}/libexec/rtld-elf
SRCS= pythagoras.c
-WARNS?= 6
LIBADD= m
.include <bsd.lib.mk>
diff --git a/libexec/tftpd/tests/Makefile b/libexec/tftpd/tests/Makefile
index 390921e31de7..88c8e44de495 100644
--- a/libexec/tftpd/tests/Makefile
+++ b/libexec/tftpd/tests/Makefile
@@ -6,7 +6,6 @@ ATF_TESTS_C= functional
TEST_METADATA.functional+= timeout=15
LIBADD= util
-WARNS?= 6
CSTD= c11
.include <bsd.test.mk>
diff --git a/sbin/decryptcore/Makefile b/sbin/decryptcore/Makefile
index 423bca9c454e..3a3a6a029f87 100644
--- a/sbin/decryptcore/Makefile
+++ b/sbin/decryptcore/Makefile
@@ -8,6 +8,4 @@ MAN= decryptcore.8
CFLAGS+=-I${SRCTOP}/lib/libpjdlog
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/sbin/pfilctl/Makefile b/sbin/pfilctl/Makefile
index 04f0a622ce14..d16051b967f0 100644
--- a/sbin/pfilctl/Makefile
+++ b/sbin/pfilctl/Makefile
@@ -2,7 +2,6 @@
PROG= pfilctl
SRCS= pfilctl.c
-WARNS?= 6
MAN= pfilctl.8
diff --git a/sbin/ping/tests/Makefile b/sbin/ping/tests/Makefile
index 678641562d93..2d5082ac839b 100644
--- a/sbin/ping/tests/Makefile
+++ b/sbin/ping/tests/Makefile
@@ -1,7 +1,5 @@
# $FreeBSD$
-WARNS?= 6
-
ATF_TESTS_C+= in_cksum_test
SRCS.in_cksum_test= in_cksum_test.c ../utils.c
diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile
index 24d2bc457ef7..2094ad29d54b 100644
--- a/sbin/recoverdisk/Makefile
+++ b/sbin/recoverdisk/Makefile
@@ -5,8 +5,6 @@ PROG= recoverdisk
LDFLAGS += -lm
-WARNS?= 6
-
.include <bsd.prog.mk>
test: ${PROG}
diff --git a/sys/teken/demo/Makefile b/sys/teken/demo/Makefile
index 1ade690afe22..e39c5742bc96 100644
--- a/sys/teken/demo/Makefile
+++ b/sys/teken/demo/Makefile
@@ -4,6 +4,4 @@ PROG= teken_demo
LDADD= -lncursesw -lteken -lutil
MAN=
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/sys/teken/libteken/Makefile b/sys/teken/libteken/Makefile
index d1c9d3c9da70..20ec0aff0faa 100644
--- a/sys/teken/libteken/Makefile
+++ b/sys/teken/libteken/Makefile
@@ -4,7 +4,6 @@ LIB= teken
SHLIB_MAJOR= 0
CFLAGS+=-I.
-WARNS?= 6
SRCDIR= ${.CURDIR}/..
.PATH: ${SRCDIR}
diff --git a/sys/teken/stress/Makefile b/sys/teken/stress/Makefile
index 7216da0bd60d..9a0257f02760 100644
--- a/sys/teken/stress/Makefile
+++ b/sys/teken/stress/Makefile
@@ -4,6 +4,4 @@ PROG= teken_stress
LDADD= -lteken
MAN=
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/tests/sys/Makefile.inc b/tests/sys/Makefile.inc
index 0b336d3f3ef3..2cba822015ae 100644
--- a/tests/sys/Makefile.inc
+++ b/tests/sys/Makefile.inc
@@ -1,5 +1,3 @@
# $FreeBSD$
-WARNS?= 6
-
.include "${SRCTOP}/tests/Makefile.inc0"
diff --git a/tests/sys/aio/Makefile b/tests/sys/aio/Makefile
index ef44036bf3d8..db9da144c43b 100644
--- a/tests/sys/aio/Makefile
+++ b/tests/sys/aio/Makefile
@@ -17,6 +17,4 @@ LIBADD.lio_test+= rt
CFLAGS+= -I${.CURDIR:H:H}
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/tests/sys/audit/Makefile b/tests/sys/audit/Makefile
index b16402ccb2e0..c2267e52698f 100644
--- a/tests/sys/audit/Makefile
+++ b/tests/sys/audit/Makefile
@@ -51,8 +51,6 @@ TEST_METADATA+= required_user="root"
TEST_METADATA+= is_exclusive="true"
TEST_METADATA+= required_files="/etc/rc.d/auditd /dev/auditpipe"
-WARNS?= 6
-
LDFLAGS+= -lbsm -lutil
CFLAGS.process-control.c+= -I${SRCTOP}/tests
diff --git a/tests/sys/auditpipe/Makefile b/tests/sys/auditpipe/Makefile
index 49b1084f4d13..ac7715d57f5d 100644
--- a/tests/sys/auditpipe/Makefile
+++ b/tests/sys/auditpipe/Makefile
@@ -6,6 +6,5 @@ ATF_TESTS_C= auditpipe_test
TEST_METADATA+= required_user="root"
TEST_METADATA+= required_files="/dev/auditpipe"
-WARNS?= 6
.include <bsd.test.mk>
diff --git a/tests/sys/capsicum/Makefile b/tests/sys/capsicum/Makefile
index 7f5caa4df39a..1b46f9acb471 100644
--- a/tests/sys/capsicum/Makefile
+++ b/tests/sys/capsicum/Makefile
@@ -52,6 +52,4 @@ WARNS.capsicum-test= 3
.endif
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/tests/sys/devrandom/Makefile b/tests/sys/devrandom/Makefile
index db9f9d42a470..e9c71bc781ef 100644
--- a/tests/sys/devrandom/Makefile
+++ b/tests/sys/devrandom/Makefile
@@ -6,7 +6,6 @@ SDEVRANDOM= ${SRCTOP}/sys/dev/random
.PATH: ${SDEVRANDOM}
TESTSDIR= ${TESTSBASE}/sys/devrandom
-WARNS?= 6
CFLAGS+= -I${SRCTOP}/sys
diff --git a/tests/sys/fs/fusefs/Makefile b/tests/sys/fs/fusefs/Makefile
index ebe4061c1668..253078f8b1a7 100644
--- a/tests/sys/fs/fusefs/Makefile
+++ b/tests/sys/fs/fusefs/Makefile
@@ -82,6 +82,4 @@ LIBADD+= pthread
LIBADD+= gmock gtest
LIBADD+= util
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/tests/sys/kern/pipe/Makefile b/tests/sys/kern/pipe/Makefile
index 193676465aa3..9211700ada98 100644
--- a/tests/sys/kern/pipe/Makefile
+++ b/tests/sys/kern/pipe/Makefile
@@ -12,6 +12,4 @@ PLAIN_TESTS_C+= pipe_reverse2_test
PLAIN_TESTS_C+= pipe_reverse_test
PLAIN_TESTS_C+= pipe_wraparound_test
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile
index 251c497e32e4..861694e0b353 100644
--- a/tests/sys/mqueue/Makefile
+++ b/tests/sys/mqueue/Makefile
@@ -16,6 +16,4 @@ PROGS+= mqtest5
LIBADD+= rt
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile
index 805fa16ae71b..3941a502a3a6 100644
--- a/tests/sys/net/Makefile
+++ b/tests/sys/net/Makefile
@@ -25,6 +25,4 @@ PROGS+= randsleep
CFLAGS+= -I${.CURDIR:H:H}
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile
index 751276ace52a..0baf64b18020 100644
--- a/tests/sys/netinet/Makefile
+++ b/tests/sys/netinet/Makefile
@@ -20,6 +20,4 @@ ${PACKAGE}FILESMODE_redirect.py=0555
MAN=
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/tests/sys/netmap/Makefile b/tests/sys/netmap/Makefile
index a1d61ddf8952..0228271dd668 100644
--- a/tests/sys/netmap/Makefile
+++ b/tests/sys/netmap/Makefile
@@ -11,6 +11,4 @@ PLAIN_TESTS_C+= ctrl-api-test
CFLAGS+= -I${SRCTOP}/tests
LIBADD+= pthread
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/tests/sys/opencrypto/Makefile b/tests/sys/opencrypto/Makefile
index f9685b166afc..a0094091ecc6 100644
--- a/tests/sys/opencrypto/Makefile
+++ b/tests/sys/opencrypto/Makefile
@@ -21,6 +21,4 @@ PYMODULES= cryptodev.py cryptodevh.py cryptotest.py
${PACKAGE}FILES+= ${PYMODULES}
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile b/tests/sys/pjdfstest/pjdfstest/Makefile
index e676cc036bad..53e29c3891fb 100644
--- a/tests/sys/pjdfstest/pjdfstest/Makefile
+++ b/tests/sys/pjdfstest/pjdfstest/Makefile
@@ -10,6 +10,4 @@ MAN=
CFLAGS+= -I${.CURDIR:H}
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/tools/regression/aio/aiop/Makefile b/tools/regression/aio/aiop/Makefile
index 38d9db62266a..aac9a3b89e45 100644
--- a/tools/regression/aio/aiop/Makefile
+++ b/tools/regression/aio/aiop/Makefile
@@ -3,6 +3,4 @@
PROG= aiop
MAN=
-WARNS= 6
-
.include <bsd.prog.mk>
diff --git a/tools/regression/bpf/bpf_filter/Makefile b/tools/regression/bpf/bpf_filter/Makefile
index d0038f915239..e01a54e26cb3 100644
--- a/tools/regression/bpf/bpf_filter/Makefile
+++ b/tools/regression/bpf/bpf_filter/Makefile
@@ -46,7 +46,6 @@ SRCS+= ${SYSDIR}/net/bpf_jitter.c \
${SYSDIR}/${MACHINE_ARCH}/${MACHINE_ARCH}/bpf_jit_machdep.c
CFLAGS+= -DBPF_JIT_COMPILER
LIBS+= -lutil
-WARNS?= 6
.else
SRCS+= ${SYSDIR}/net/bpf_filter.c
WARNS?= 2
diff --git a/tools/regression/doat/Makefile b/tools/regression/doat/Makefile
index c04223bbfec8..c31ca53f4579 100644
--- a/tools/regression/doat/Makefile
+++ b/tools/regression/doat/Makefile
@@ -3,6 +3,5 @@
PROG= doat
MAN=
-WARNS?=6
.include <bsd.prog.mk>
diff --git a/tools/regression/geom_gpt/Makefile b/tools/regression/geom_gpt/Makefile
index 92d1f020c916..eb5a9659ff4f 100644
--- a/tools/regression/geom_gpt/Makefile
+++ b/tools/regression/geom_gpt/Makefile
@@ -5,6 +5,4 @@ MAN=
LIBADD+= geom
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/tools/regression/include/stdatomic/Makefile b/tools/regression/include/stdatomic/Makefile
index ae9982ac1418..2bc346a7d6fc 100644
--- a/tools/regression/include/stdatomic/Makefile
+++ b/tools/regression/include/stdatomic/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
PROG= logic
-WARNS=6
MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/ipbroadcast/Makefile b/tools/regression/netinet/ipbroadcast/Makefile
index a1b497ae145c..c1e5bba93dcf 100644
--- a/tools/regression/netinet/ipbroadcast/Makefile
+++ b/tools/regression/netinet/ipbroadcast/Makefile
@@ -5,6 +5,4 @@
PROG= ipbroadcast
MAN=
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/tools/regression/rpcsec_gss/Makefile b/tools/regression/rpcsec_gss/Makefile
index bea9d9c10e21..6f9debb7c2c3 100644
--- a/tools/regression/rpcsec_gss/Makefile
+++ b/tools/regression/rpcsec_gss/Makefile
@@ -2,7 +2,6 @@
PROG= rpctest
MAN=
-WARNS?= 6
LIBADD= rpcsec_gss
DEBUG_FLAGS= -g -O0
diff --git a/tools/regression/sockets/accept_fd_leak/Makefile b/tools/regression/sockets/accept_fd_leak/Makefile
index e9bfba606c10..d3b3f42ce2a8 100644
--- a/tools/regression/sockets/accept_fd_leak/Makefile
+++ b/tools/regression/sockets/accept_fd_leak/Makefile
@@ -4,6 +4,5 @@
PROG= accept_fd_leak
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/accf_data_attach/Makefile b/tools/regression/sockets/accf_data_attach/Makefile
index 4d337282eade..e7942ced5d02 100644
--- a/tools/regression/sockets/accf_data_attach/Makefile
+++ b/tools/regression/sockets/accf_data_attach/Makefile
@@ -4,6 +4,5 @@
PROG= accf_data_attach
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/fstat/Makefile b/tools/regression/sockets/fstat/Makefile
index a583166d10c9..d5cb72419969 100644
--- a/tools/regression/sockets/fstat/Makefile
+++ b/tools/regression/sockets/fstat/Makefile
@@ -4,6 +4,5 @@
PROG= fstat
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/kqueue/Makefile b/tools/regression/sockets/kqueue/Makefile
index 6771d25acf66..e37eadfbb203 100644
--- a/tools/regression/sockets/kqueue/Makefile
+++ b/tools/regression/sockets/kqueue/Makefile
@@ -4,6 +4,5 @@
PROG= kqueue
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/listen_backlog/Makefile b/tools/regression/sockets/listen_backlog/Makefile
index e2eb1350710a..091d7a420c76 100644
--- a/tools/regression/sockets/listen_backlog/Makefile
+++ b/tools/regression/sockets/listen_backlog/Makefile
@@ -2,6 +2,5 @@
PROG= listen_backlog
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/listen_kqueue/Makefile b/tools/regression/sockets/listen_kqueue/Makefile
index d49a597fc8f5..a506f262d06a 100644
--- a/tools/regression/sockets/listen_kqueue/Makefile
+++ b/tools/regression/sockets/listen_kqueue/Makefile
@@ -2,6 +2,5 @@
PROG= listen_kqueue
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/listenclose/Makefile b/tools/regression/sockets/listenclose/Makefile
index 8f4dc4e922d4..ee147dad8cef 100644
--- a/tools/regression/sockets/listenclose/Makefile
+++ b/tools/regression/sockets/listenclose/Makefile
@@ -4,6 +4,5 @@
PROG= listenclose
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/pr_atomic/Makefile b/tools/regression/sockets/pr_atomic/Makefile
index 1dc85ffbeff8..a52433c6ef26 100644
--- a/tools/regression/sockets/pr_atomic/Makefile
+++ b/tools/regression/sockets/pr_atomic/Makefile
@@ -2,6 +2,5 @@
PROG= pr_atomic
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/reconnect/Makefile b/tools/regression/sockets/reconnect/Makefile
index d8fa5e09b502..285d075bca4b 100644
--- a/tools/regression/sockets/reconnect/Makefile
+++ b/tools/regression/sockets/reconnect/Makefile
@@ -4,6 +4,5 @@
PROG= reconnect
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/rtsocket/Makefile b/tools/regression/sockets/rtsocket/Makefile
index f68b6c3a2e2c..fcb2e40acca1 100644
--- a/tools/regression/sockets/rtsocket/Makefile
+++ b/tools/regression/sockets/rtsocket/Makefile
@@ -2,6 +2,5 @@
PROG= rtsocket
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/sblock/Makefile b/tools/regression/sockets/sblock/Makefile
index aa2f890bc447..1992a0a652ac 100644
--- a/tools/regression/sockets/sblock/Makefile
+++ b/tools/regression/sockets/sblock/Makefile
@@ -4,6 +4,5 @@
PROG= sblock
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/sendfile/Makefile b/tools/regression/sockets/sendfile/Makefile
index 6e9c1ab70164..f1ba7a1cf596 100644
--- a/tools/regression/sockets/sendfile/Makefile
+++ b/tools/regression/sockets/sendfile/Makefile
@@ -4,7 +4,6 @@
PROG= sendfile
MAN=
-WARNS?= 6
LIBADD= md
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/shutdown/Makefile b/tools/regression/sockets/shutdown/Makefile
index 63045f5556ff..c36398c5af24 100644
--- a/tools/regression/sockets/shutdown/Makefile
+++ b/tools/regression/sockets/shutdown/Makefile
@@ -4,6 +4,5 @@
PROG= shutdown
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/sigpipe/Makefile b/tools/regression/sockets/sigpipe/Makefile
index 51167011edb6..bd7720fbcbed 100644
--- a/tools/regression/sockets/sigpipe/Makefile
+++ b/tools/regression/sockets/sigpipe/Makefile
@@ -4,6 +4,5 @@
PROG= sigpipe
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/so_setfib/Makefile b/tools/regression/sockets/so_setfib/Makefile
index 90111fb86bd5..eadb3efb1c36 100644
--- a/tools/regression/sockets/so_setfib/Makefile
+++ b/tools/regression/sockets/so_setfib/Makefile
@@ -4,7 +4,6 @@
PROG= so_setfib
MAN=
-WARNS?= 6
.if ${MK_INET} != "no"
CFLAGS+= -DINET
diff --git a/tools/regression/sockets/udp_pingpong/Makefile b/tools/regression/sockets/udp_pingpong/Makefile
index 2ec5b209ce2c..61e92ed73ce8 100644
--- a/tools/regression/sockets/udp_pingpong/Makefile
+++ b/tools/regression/sockets/udp_pingpong/Makefile
@@ -2,6 +2,5 @@
PROG= udp_pingpong
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_bindconnect/Makefile b/tools/regression/sockets/unix_bindconnect/Makefile
index 52cc8442be09..4bb4fc011ba4 100644
--- a/tools/regression/sockets/unix_bindconnect/Makefile
+++ b/tools/regression/sockets/unix_bindconnect/Makefile
@@ -2,6 +2,5 @@
PROG= unix_bindconnect
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_close_race/Makefile b/tools/regression/sockets/unix_close_race/Makefile
index 370adc469896..690929edc2bc 100644
--- a/tools/regression/sockets/unix_close_race/Makefile
+++ b/tools/regression/sockets/unix_close_race/Makefile
@@ -2,6 +2,5 @@
PROG= unix_close_race
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_gc/Makefile b/tools/regression/sockets/unix_gc/Makefile
index 184660965069..09ba07ae65ee 100644
--- a/tools/regression/sockets/unix_gc/Makefile
+++ b/tools/regression/sockets/unix_gc/Makefile
@@ -2,6 +2,5 @@
PROG= unix_gc
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_sendtorace/Makefile b/tools/regression/sockets/unix_sendtorace/Makefile
index 75e7b9f0b606..7d26fc8b1383 100644
--- a/tools/regression/sockets/unix_sendtorace/Makefile
+++ b/tools/regression/sockets/unix_sendtorace/Makefile
@@ -2,6 +2,5 @@
PROG= unix_sendtorace
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_socket/Makefile b/tools/regression/sockets/unix_socket/Makefile
index bb6045637ed1..7ebc03fc22f3 100644
--- a/tools/regression/sockets/unix_socket/Makefile
+++ b/tools/regression/sockets/unix_socket/Makefile
@@ -2,6 +2,5 @@
PROG= unix_socket
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_sorflush/Makefile b/tools/regression/sockets/unix_sorflush/Makefile
index db0aa6ade00d..879dcc8ef533 100644
--- a/tools/regression/sockets/unix_sorflush/Makefile
+++ b/tools/regression/sockets/unix_sorflush/Makefile
@@ -2,6 +2,5 @@
PROG= unix_sorflush
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/zerosend/Makefile b/tools/regression/sockets/zerosend/Makefile
index 18f7dd3e649a..9706b25ea899 100644
--- a/tools/regression/sockets/zerosend/Makefile
+++ b/tools/regression/sockets/zerosend/Makefile
@@ -2,6 +2,5 @@
PROG= zerosend
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/test/auxinfo/Makefile b/tools/test/auxinfo/Makefile
index 0e6d80992ad8..f40c81d87652 100644
--- a/tools/test/auxinfo/Makefile
+++ b/tools/test/auxinfo/Makefile
@@ -2,6 +2,5 @@
PROG= auxinfo
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/test/iconv/posix/Makefile b/tools/test/iconv/posix/Makefile
index 891142412df8..aafaadebafe7 100644
--- a/tools/test/iconv/posix/Makefile
+++ b/tools/test/iconv/posix/Makefile
@@ -3,6 +3,4 @@
PROG= posix
MAN=
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/tools/test/malloc/Makefile b/tools/test/malloc/Makefile
index 455dec39920b..ac3fdd89486b 100644
--- a/tools/test/malloc/Makefile
+++ b/tools/test/malloc/Makefile
@@ -4,7 +4,6 @@ SRCS= main.c
.PATH: ${.CURDIR}/../../../lib/libc/stdlib
MAN=
-WARNS?=6
test: malloc
@echo
diff --git a/tools/test/net/Makefile b/tools/test/net/Makefile
index e4c525920d8c..4fe5fb155cd1 100644
--- a/tools/test/net/Makefile
+++ b/tools/test/net/Makefile
@@ -2,7 +2,6 @@
PROGS= listen connect
MAN=
-WARNS?= 6
test: ${PROGS}
diff --git a/tools/test/netfibs/Makefile b/tools/test/netfibs/Makefile
index 689d613616e1..7262a21356c8 100644
--- a/tools/test/netfibs/Makefile
+++ b/tools/test/netfibs/Makefile
@@ -2,6 +2,5 @@
PROG= reflect
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/test/ptrace/Makefile b/tools/test/ptrace/Makefile
index a11b0a16a846..46e0aee6b53f 100644
--- a/tools/test/ptrace/Makefile
+++ b/tools/test/ptrace/Makefile
@@ -2,6 +2,5 @@
PROG= scescx
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/tools/aac/Makefile b/tools/tools/aac/Makefile
index 03c5dcda9ed9..9f2f4a7249cd 100644
--- a/tools/tools/aac/Makefile
+++ b/tools/tools/aac/Makefile
@@ -2,7 +2,6 @@
PROG= aac_checkq
MAN=
-WARNS?=6
BINDIR?=/usr/local/bin
.include <bsd.prog.mk>
diff --git a/tools/tools/cfi/Makefile b/tools/tools/cfi/Makefile
index 5a49f2d38438..9f4dd10a2828 100644
--- a/tools/tools/cfi/Makefile
+++ b/tools/tools/cfi/Makefile
@@ -3,6 +3,5 @@
PROG= cfi
BINDIR= /usr/local/bin
MAN=
-WARNS?=6
.include <bsd.prog.mk>
diff --git a/tools/tools/find-sb/Makefile b/tools/tools/find-sb/Makefile
index ee6c46b11aa6..428a79e29200 100644
--- a/tools/tools/find-sb/Makefile
+++ b/tools/tools/find-sb/Makefile
@@ -2,6 +2,5 @@
PROG= find-sb
MAN=
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/tools/fixwhite/Makefile b/tools/tools/fixwhite/Makefile
index dbaabc25410b..235d5c7b9e34 100644
--- a/tools/tools/fixwhite/Makefile
+++ b/tools/tools/fixwhite/Makefile
@@ -2,6 +2,5 @@
PROG= fixwhite
BINDIR= /usr/bin
-WARNS= 6
.include <bsd.prog.mk>
diff --git a/tools/tools/gensnmpdef/Makefile b/tools/tools/gensnmpdef/Makefile
index 32ac5aee743f..104c97d66f45 100644
--- a/tools/tools/gensnmpdef/Makefile
+++ b/tools/tools/gensnmpdef/Makefile
@@ -21,6 +21,4 @@ LDFLAGS+= -L${LOCALBASE}/lib
LDADD+= -lsmi
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/tools/tools/ifpifa/Makefile b/tools/tools/ifpifa/Makefile
index d38179254739..92321cad57d0 100644
--- a/tools/tools/ifpifa/Makefile
+++ b/tools/tools/ifpifa/Makefile
@@ -2,7 +2,6 @@
PROG= ifpifa
MAN=
-WARNS?=6
BINDIR?=/usr/local/bin
LIBADD=kvm
diff --git a/tools/tools/ioat/Makefile b/tools/tools/ioat/Makefile
index 7db23b941997..32a0478eb0a3 100644
--- a/tools/tools/ioat/Makefile
+++ b/tools/tools/ioat/Makefile
@@ -8,6 +8,4 @@ CFLAGS+= -I${SRCTOP}/sys/dev/ioat
LIBADD= util
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/tools/tools/iwi/Makefile b/tools/tools/iwi/Makefile
index 49eccd30a0aa..8ebdd60ebc05 100644
--- a/tools/tools/iwi/Makefile
+++ b/tools/tools/iwi/Makefile
@@ -2,6 +2,5 @@
PROG= iwistats
MAN=
-WARNS?=6
.include <bsd.prog.mk>
diff --git a/tools/tools/ncpus/Makefile b/tools/tools/ncpus/Makefile
index b2683e115272..2fea81540bc0 100644
--- a/tools/tools/ncpus/Makefile
+++ b/tools/tools/ncpus/Makefile
@@ -7,7 +7,6 @@ SRCS= ncpus.c acpi.c
SRCS+= biosmptable.c
.endif
BINDIR= /usr/local/bin
-WARNS?= 6
LIBADD= devinfo
diff --git a/tools/tools/pciroms/Makefile b/tools/tools/pciroms/Makefile
index 9e30d8510492..b317c4a72df9 100644
--- a/tools/tools/pciroms/Makefile
+++ b/tools/tools/pciroms/Makefile
@@ -5,6 +5,4 @@
PROG= pciroms
MAN=
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/tools/tools/syscall_timing/Makefile b/tools/tools/syscall_timing/Makefile
index 2b4accaa2470..1aeafb632ce6 100644
--- a/tools/tools/syscall_timing/Makefile
+++ b/tools/tools/syscall_timing/Makefile
@@ -8,6 +8,4 @@ MAN=
#LIBADD= pthread
-WARNS= 6
-
.include <bsd.prog.mk>
diff --git a/tools/tools/tscdrift/Makefile b/tools/tools/tscdrift/Makefile
index fad714d6b058..d235972fb53a 100644
--- a/tools/tools/tscdrift/Makefile
+++ b/tools/tools/tscdrift/Makefile
@@ -2,7 +2,6 @@
PROG= tscdrift
MAN=
-WARNS?= 6
LIBADD= pthread m
diff --git a/tools/tools/vt/mkkfont/Makefile b/tools/tools/vt/mkkfont/Makefile
index d963d83680d8..8e8c2fb33643 100644
--- a/tools/tools/vt/mkkfont/Makefile
+++ b/tools/tools/vt/mkkfont/Makefile
@@ -1,6 +1,6 @@
+# $FreeBSD$
+
PROG= mkkfont
MAN1=
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/usr.bin/dpv/Makefile b/usr.bin/dpv/Makefile
index bf8fa12740ec..ef4575ca24f9 100644
--- a/usr.bin/dpv/Makefile
+++ b/usr.bin/dpv/Makefile
@@ -8,6 +8,4 @@ CFLAGS+= -I${.CURDIR}
LIBADD= dpv dialog
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/usr.bin/getconf/tests/Makefile b/usr.bin/getconf/tests/Makefile
index 3b2fdafc7bd0..f61bbabf1a09 100644
--- a/usr.bin/getconf/tests/Makefile
+++ b/usr.bin/getconf/tests/Makefile
@@ -6,6 +6,4 @@ PROGS+= arch_type
BINDIR= ${TESTSDIR}
-WARNS?= 6
-
.include <bsd.test.mk>
diff --git a/usr.bin/mkimg/Makefile b/usr.bin/mkimg/Makefile
index 622ca442640c..89aeefe813b7 100644
--- a/usr.bin/mkimg/Makefile
+++ b/usr.bin/mkimg/Makefile
@@ -34,8 +34,6 @@ BINDIR?=/usr/bin
LIBADD= util
-WARNS?= 6
-
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
diff --git a/usr.bin/posixshmcontrol/Makefile b/usr.bin/posixshmcontrol/Makefile
index df8f6ce39687..c6f847e18478 100644
--- a/usr.bin/posixshmcontrol/Makefile
+++ b/usr.bin/posixshmcontrol/Makefile
@@ -2,6 +2,5 @@
PROG= posixshmcontrol
LIBADD= util
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/usr.bin/proccontrol/Makefile b/usr.bin/proccontrol/Makefile
index 61a3667481a8..94090963a0fb 100644
--- a/usr.bin/proccontrol/Makefile
+++ b/usr.bin/proccontrol/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= proccontrol
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/usr.bin/protect/Makefile b/usr.bin/protect/Makefile
index 89bbda8a1bc2..dac81b296b68 100644
--- a/usr.bin/protect/Makefile
+++ b/usr.bin/protect/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
PROG= protect
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile
index d3008f6e6271..908a60c6594a 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@@ -4,7 +4,6 @@ BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distextract
LIBADD= archive dpv figpar ncursesw dialog m
-WARNS?= 6
MAN=
.include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile
index 1620c9b880df..044b83a8a1a0 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@@ -4,7 +4,6 @@ BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distfetch
LIBADD= fetch ncursesw dialog m
-WARNS?= 6
MAN=
.include <bsd.prog.mk>
diff --git a/usr.sbin/bsnmpd/tools/Makefile.inc b/usr.sbin/bsnmpd/tools/Makefile.inc
index 9d5ac4cdb810..db12061896d2 100644
--- a/usr.sbin/bsnmpd/tools/Makefile.inc
+++ b/usr.sbin/bsnmpd/tools/Makefile.inc
@@ -5,5 +5,3 @@ BINDIR?= /usr/bin
PACKAGE= bsnmp
CFLAGS+= -I. -I${.CURDIR}
-
-WARNS?= 6
diff --git a/usr.sbin/ctld/Makefile b/usr.sbin/ctld/Makefile
index b038ebd524cc..08dcb79d0d84 100644
--- a/usr.sbin/ctld/Makefile
+++ b/usr.sbin/ctld/Makefile
@@ -20,7 +20,6 @@ LIBADD= bsdxml md sbuf util ucl m nv
YFLAGS+= -v
CLEANFILES= y.tab.c y.tab.h y.output
-WARNS?= 6
NO_WMISSING_VARIABLE_DECLARATIONS=
.if ${MK_ISCSI} != "no"
diff --git a/usr.sbin/iovctl/Makefile b/usr.sbin/iovctl/Makefile
index c9083eb6a1d1..42fca7dab71c 100644
--- a/usr.sbin/iovctl/Makefile
+++ b/usr.sbin/iovctl/Makefile
@@ -6,8 +6,6 @@ LIBADD= nv ucl m
CFLAGS+=-I${SRCTOP}/contrib/libucl/include
-WARNS?=6
-
MAN= \
iovctl.8 \
iovctl.conf.5 \
diff --git a/usr.sbin/mlx5tool/Makefile b/usr.sbin/mlx5tool/Makefile
index bf5ec0674312..43b725516d2a 100644
--- a/usr.sbin/mlx5tool/Makefile
+++ b/usr.sbin/mlx5tool/Makefile
@@ -2,6 +2,5 @@
PROG= mlx5tool
MAN= mlx5tool.8
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile
index 8c3cd36f8d0c..ecdb0fe1665d 100644
--- a/usr.sbin/pw/tests/Makefile
+++ b/usr.sbin/pw/tests/Makefile
@@ -5,7 +5,6 @@ PACKAGE= tests
BINDIR= ${TESTSDIR}
PROGS+= crypt
-WARNS?= 6
LIBADD+= crypt
ATF_TESTS_SH= pw_etcdir_test \