aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2009-10-19 16:00:24 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2009-10-19 16:00:24 +0000
commit106d839190bf604806e084ce5e7dd8ee8142c1d9 (patch)
treee4ddc2d8bac2fea0bfd2aabd8451289e9adf00ae /sbin
parent605c493e9080946e0ab6a361fdfb091a6b7fb5ca (diff)
downloadsrc-106d839190bf604806e084ce5e7dd8ee8142c1d9.tar.gz
src-106d839190bf604806e084ce5e7dd8ee8142c1d9.zip
Switch the default WARNS level for sbin/ to 6.
Submitted by: Ulrich Spörlein
Notes
Notes: svn path=/head/; revision=198236
Diffstat (limited to 'sbin')
-rw-r--r--sbin/Makefile.inc2
-rw-r--r--sbin/adjkerntz/Makefile1
-rw-r--r--sbin/atacontrol/Makefile1
-rw-r--r--sbin/atm/atmconfig/Makefile2
-rw-r--r--sbin/badsect/Makefile1
-rw-r--r--sbin/bsdlabel/Makefile1
-rw-r--r--sbin/camcontrol/Makefile2
-rw-r--r--sbin/ccdconfig/Makefile1
-rw-r--r--sbin/clri/Makefile1
-rw-r--r--sbin/comcontrol/Makefile1
-rw-r--r--sbin/conscontrol/Makefile1
-rw-r--r--sbin/dhclient/Makefile2
-rw-r--r--sbin/dmesg/Makefile2
-rw-r--r--sbin/dump/Makefile1
-rw-r--r--sbin/dumpfs/Makefile1
-rw-r--r--sbin/dumpon/Makefile1
-rw-r--r--sbin/geom/Makefile1
-rw-r--r--sbin/geom/Makefile.inc1
-rw-r--r--sbin/ggate/Makefile.inc2
-rw-r--r--sbin/growfs/Makefile2
-rw-r--r--sbin/gvinum/Makefile1
-rw-r--r--sbin/init/Makefile1
-rw-r--r--sbin/ipf/Makefile.inc2
-rw-r--r--sbin/iscontrol/Makefile1
-rw-r--r--sbin/kldunload/Makefile1
-rw-r--r--sbin/ldconfig/Makefile1
-rw-r--r--sbin/md5/Makefile1
-rw-r--r--sbin/mdconfig/Makefile1
-rw-r--r--sbin/mdmfs/Makefile1
-rw-r--r--sbin/mksnap_ffs/Makefile1
-rw-r--r--sbin/mount/Makefile1
-rw-r--r--sbin/mount_autofs/Makefile1
-rw-r--r--sbin/mount_cd9660/Makefile1
-rw-r--r--sbin/mount_ext2fs/Makefile1
-rw-r--r--sbin/mount_msdosfs/Makefile1
-rw-r--r--sbin/mount_nullfs/Makefile1
-rw-r--r--sbin/mount_reiserfs/Makefile1
-rw-r--r--sbin/mount_unionfs/Makefile1
-rw-r--r--sbin/newfs_msdos/Makefile2
-rw-r--r--sbin/nfsiod/Makefile1
-rw-r--r--sbin/pfctl/Makefile1
-rw-r--r--sbin/rcorder/Makefile1
-rw-r--r--sbin/reboot/Makefile1
-rw-r--r--sbin/recoverdisk/Makefile1
-rw-r--r--sbin/routed/Makefile4
-rw-r--r--sbin/savecore/Makefile1
-rw-r--r--sbin/sconfig/Makefile1
-rw-r--r--sbin/shutdown/Makefile2
-rw-r--r--sbin/spppcontrol/Makefile1
-rw-r--r--sbin/swapon/Makefile1
-rw-r--r--sbin/tunefs/Makefile1
51 files changed, 25 insertions, 39 deletions
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index 70d658416ea9..e506f9c56cee 100644
--- a/sbin/Makefile.inc
+++ b/sbin/Makefile.inc
@@ -4,7 +4,7 @@
.include <bsd.own.mk>
BINDIR?= /sbin
-WARNS?= 2
+WARNS?= 6
.if ${MK_DYNAMICROOT} == "no"
NO_SHARED?= YES
diff --git a/sbin/adjkerntz/Makefile b/sbin/adjkerntz/Makefile
index 27c128916f9b..8e504e916eb3 100644
--- a/sbin/adjkerntz/Makefile
+++ b/sbin/adjkerntz/Makefile
@@ -2,5 +2,6 @@
PROG= adjkerntz
MAN= adjkerntz.8
+WARNS?= 2
.include <bsd.prog.mk>
diff --git a/sbin/atacontrol/Makefile b/sbin/atacontrol/Makefile
index 73b916080d42..9881273c2117 100644
--- a/sbin/atacontrol/Makefile
+++ b/sbin/atacontrol/Makefile
@@ -2,6 +2,5 @@
PROG= atacontrol
MAN= atacontrol.8
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/sbin/atm/atmconfig/Makefile b/sbin/atm/atmconfig/Makefile
index 1db0fa46dc00..8564d355efbb 100644
--- a/sbin/atm/atmconfig/Makefile
+++ b/sbin/atm/atmconfig/Makefile
@@ -29,8 +29,6 @@ CLEANFILES+= oid.h
.if ${MACHINE_ARCH} == "arm"
WARNS?= 3
-.else
-WARNS?= 6
.endif
FILES= atmconfig.help atmconfig_device.help
diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile
index a39227716b77..b6cb545e09f5 100644
--- a/sbin/badsect/Makefile
+++ b/sbin/badsect/Makefile
@@ -5,5 +5,6 @@ PROG= badsect
DPADD= ${LIBUFS}
LDADD= -lufs
MAN= badsect.8
+WARNS?= 2
.include <bsd.prog.mk>
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
index 562b0f38c1a4..b60bbd03addb 100644
--- a/sbin/bsdlabel/Makefile
+++ b/sbin/bsdlabel/Makefile
@@ -13,6 +13,7 @@ LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel
MLINKS= bsdlabel.8 disklabel.8
.endif
+WARNS?= 2
DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
LDADD= -lgeom -lbsdxml -lsbuf
diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile
index 7a3d4213cbac..31bbd46f4a52 100644
--- a/sbin/camcontrol/Makefile
+++ b/sbin/camcontrol/Makefile
@@ -9,8 +9,6 @@ CFLAGS+= -DMINIMALISTIC
.endif
.if ${MACHINE_ARCH} == "arm"
WARNS?= 3
-.else
-WARNS?= 6
.endif
DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL}
LDADD= -lcam -lsbuf -lutil
diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile
index ac7558409ed6..0feca5426dec 100644
--- a/sbin/ccdconfig/Makefile
+++ b/sbin/ccdconfig/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
PROG= ccdconfig
-WARNS?= 6
MAN= ccdconfig.8
DPADD= ${LIBGEOM}
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
index c68c312f269b..1ae0cf45e731 100644
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@@ -3,5 +3,6 @@
PROG= clri
MAN= clri.8
+WARNS?= 2
.include <bsd.prog.mk>
diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile
index a7720d81b41e..d8757565b1a0 100644
--- a/sbin/comcontrol/Makefile
+++ b/sbin/comcontrol/Makefile
@@ -3,6 +3,5 @@
PROG= comcontrol
MAN= comcontrol.8
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/sbin/conscontrol/Makefile b/sbin/conscontrol/Makefile
index ddd2434e6cc5..9014d80ad556 100644
--- a/sbin/conscontrol/Makefile
+++ b/sbin/conscontrol/Makefile
@@ -2,5 +2,6 @@
PROG= conscontrol
MAN= conscontrol.8
+WARNS?= 2
.include <bsd.prog.mk>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 7e32326ff00a..434335b5a070 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -40,4 +40,6 @@ SCRIPTS=dhclient-script
MAN= dhclient.8 dhclient.conf.5 dhclient.leases.5 dhcp-options.5 \
dhclient-script.8
+WARNS?= 2
+
.include <bsd.prog.mk>
diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile
index 8472f56c461f..266551be5765 100644
--- a/sbin/dmesg/Makefile
+++ b/sbin/dmesg/Makefile
@@ -4,8 +4,6 @@
PROG= dmesg
MAN= dmesg.8
-WARNS?= 6
-
LDADD= -lkvm
DPADD= ${LIBKVM}
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 608162aa570e..e3d9aef61518 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -19,5 +19,6 @@ CFLAGS+=-DRDUMP
SRCS= itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c cache.c
MAN= dump.8
MLINKS= dump.8 rdump.8
+WARNS?= 2
.include <bsd.prog.mk>
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
index 99faa77ad725..fe464e03f7be 100644
--- a/sbin/dumpfs/Makefile
+++ b/sbin/dumpfs/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PROG= dumpfs
+WARNS?= 2
DPADD= ${LIBUFS}
LDADD= -lufs
MAN= dumpfs.8
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index c273f93470a2..d11ccc761127 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
PROG= dumpon
-WARNS?= 6
MAN= dumpon.8
.include <bsd.prog.mk>
diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile
index fffb889bc2cf..88b82404e107 100644
--- a/sbin/geom/Makefile
+++ b/sbin/geom/Makefile
@@ -11,6 +11,7 @@ PROG= geom
SRCS= geom.c geom_label.c geom_part.c subr.c
NO_MAN=
+WARNS?= 2
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES
DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
diff --git a/sbin/geom/Makefile.inc b/sbin/geom/Makefile.inc
index 94ca09f3889c..bf9f05ed66af 100644
--- a/sbin/geom/Makefile.inc
+++ b/sbin/geom/Makefile.inc
@@ -1,6 +1,5 @@
# $FreeBSD$
-WARNS?= 6
CLASS_DIR?=/lib/geom
.include "../Makefile.inc"
diff --git a/sbin/ggate/Makefile.inc b/sbin/ggate/Makefile.inc
index e55271f7ddc5..265f86d1ed55 100644
--- a/sbin/ggate/Makefile.inc
+++ b/sbin/ggate/Makefile.inc
@@ -1,5 +1,3 @@
# $FreeBSD$
-WARNS?= 6
-
.include "../Makefile.inc"
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index a5e9937e8f16..a875ce554c12 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -10,8 +10,6 @@ PROG= growfs
SRCS= growfs.c
MAN= growfs.8
-WARNS?= 6
-
.if defined(GFSDBG)
SRCS+= debug.c
.endif
diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile
index 6d414974dba1..e4bf4a714490 100644
--- a/sbin/gvinum/Makefile
+++ b/sbin/gvinum/Makefile
@@ -4,6 +4,7 @@ PROG= gvinum
SRCS= gvinum.c gvinum.h geom_vinum_share.c
MAN= gvinum.8
+WARNS?= 2
CFLAGS+= -I${.CURDIR}/../../sys
DPADD= ${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM}
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 58a9e0ad0d2e..7497a4b54fd7 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -5,7 +5,6 @@ PROG= init
MAN= init.8
PRECIOUSPROG=
INSTALLFLAGS=-b -B.bak
-WARNS?= 6
CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT
DPADD= ${LIBUTIL} ${LIBCRYPT}
LDADD= -lutil -lcrypt
diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc
index 3373b557bd8c..0065ce7550c4 100644
--- a/sbin/ipf/Makefile.inc
+++ b/sbin/ipf/Makefile.inc
@@ -1,5 +1,7 @@
# $FreeBSD$
+WARNS?= 2
+
CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter
CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter/tools
CFLAGS+= -I${.CURDIR}/../../../sys
diff --git a/sbin/iscontrol/Makefile b/sbin/iscontrol/Makefile
index 2b09fa9aa371..446a5f48ab54 100644
--- a/sbin/iscontrol/Makefile
+++ b/sbin/iscontrol/Makefile
@@ -5,6 +5,7 @@ PROG= iscontrol
DPADD= ${LIBCAM} ${LIBMD}
LDADD= -lcam -lmd
+WARNS?= 2
CFLAGS += -I${.CURDIR}/../../sys/dev/iscsi/initiator
#CFLAGS += -g -DDEBUG
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index 48e5c035ccdc..1a25a02351be 100644
--- a/sbin/kldunload/Makefile
+++ b/sbin/kldunload/Makefile
@@ -28,6 +28,5 @@
PROG= kldunload
MAN= kldunload.8
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 442ae6350713..15c3808520ba 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -3,7 +3,6 @@
PROG= ldconfig
SRCS= elfhints.c ldconfig.c shlib.c support.c
LDDIR?= ${.CURDIR}/../../libexec/rtld-aout
-WARNS?= 6
CFLAGS+=-I${LDDIR} -DFREEBSD_AOUT
MAN= ldconfig.8
diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile
index 07c4109e0d79..7df4d859c93b 100644
--- a/sbin/md5/Makefile
+++ b/sbin/md5/Makefile
@@ -11,7 +11,6 @@ MLINKS= md5.1 rmd160.1 \
md5.1 sha1.1 \
md5.1 sha256.1
-WARNS?= 6
WFORMAT?= 1
DPADD= ${LIBMD}
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index f4d8adcfde8d..11223f228398 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -4,6 +4,7 @@ PROG= mdconfig
MAN= mdconfig.8
MLINKS= mdconfig.8 vnconfig.8
+WARNS?= 2
DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
LDADD= -lutil -lgeom -lbsdxml -lsbuf
diff --git a/sbin/mdmfs/Makefile b/sbin/mdmfs/Makefile
index 1ef708454267..999793f0e103 100644
--- a/sbin/mdmfs/Makefile
+++ b/sbin/mdmfs/Makefile
@@ -4,6 +4,5 @@ PROG= mdmfs
LINKS= ${BINDIR}/${PROG} ${BINDIR}/mount_mfs
MAN= mdmfs.8
MLINKS+= mdmfs.8 mount_mfs.8
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile
index 40b56b445da2..9247cb278edb 100644
--- a/sbin/mksnap_ffs/Makefile
+++ b/sbin/mksnap_ffs/Makefile
@@ -6,6 +6,7 @@ PROG= mksnap_ffs
SRCS= mksnap_ffs.c getmntopts.c
MAN= mksnap_ffs.8
+WARNS?= 2
CFLAGS+=-I${.CURDIR}/../mount
.if defined(NOSUID)
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index 4186f00f6fd1..8f6299af3ff5 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -3,7 +3,6 @@
PROG= mount
SRCS= mount.c mount_fs.c getmntopts.c vfslist.c
-WARNS?= 6
MAN= mount.8
# We do NOT install the getmntopts.3 man page.
diff --git a/sbin/mount_autofs/Makefile b/sbin/mount_autofs/Makefile
index e7d040d4d08c..b05d9613df71 100644
--- a/sbin/mount_autofs/Makefile
+++ b/sbin/mount_autofs/Makefile
@@ -4,5 +4,6 @@
PROG=mount_autofs
MAN=mount_autofs.8
BINDIR?=/sbin
+WARNS?= 2
.include <bsd.prog.mk>
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 0602d9bbd29c..b889174ffa05 100644
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@@ -9,7 +9,6 @@ LDADD= -lkiconv
MOUNT= ${.CURDIR}/../mount
CFLAGS+= -I${MOUNT}
-WARNS?= 6
# Needs to be dynamically linked for optional dlopen() access to
# userland libiconv
diff --git a/sbin/mount_ext2fs/Makefile b/sbin/mount_ext2fs/Makefile
index 3eefb92eb8c0..08a0c3c7e5a5 100644
--- a/sbin/mount_ext2fs/Makefile
+++ b/sbin/mount_ext2fs/Makefile
@@ -5,6 +5,7 @@ PROG= mount_ext2fs
SRCS= mount_ext2fs.c getmntopts.c
MAN= mount_ext2fs.8
+WARNS?= 2
MOUNT= ${.CURDIR}/../mount
CFLAGS+= -I${MOUNT}
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index 8752f0d848a8..c3e416af21fc 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -10,7 +10,6 @@ LDADD= -lkiconv
MOUNT= ${.CURDIR}/../mount
CFLAGS+= -I${MOUNT}
-WARNS?= 6
# Needs to be dynamically linked for optional dlopen() access to
# userland libiconv
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index 5e92c5b5c264..0b2ecc5834c0 100644
--- a/sbin/mount_nullfs/Makefile
+++ b/sbin/mount_nullfs/Makefile
@@ -7,7 +7,6 @@ MAN= mount_nullfs.8
MOUNT= ${.CURDIR}/../mount
CFLAGS+=-I${MOUNT}
-WARNS?= 6
.PATH: ${MOUNT}
diff --git a/sbin/mount_reiserfs/Makefile b/sbin/mount_reiserfs/Makefile
index bd11a4b8ac64..686629fe1843 100644
--- a/sbin/mount_reiserfs/Makefile
+++ b/sbin/mount_reiserfs/Makefile
@@ -7,7 +7,6 @@ MAN = mount_reiserfs.8
# mount_reiserfs needs mntopts.h and getmntopts.c from src/sbin/mount/
MOUNT ?= ${.CURDIR}/../mount
CFLAGS += -I${MOUNT}
-WARNS ?= 6
.PATH: ${MOUNT}
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index 35158ab92378..276fc7467d13 100644
--- a/sbin/mount_unionfs/Makefile
+++ b/sbin/mount_unionfs/Makefile
@@ -7,7 +7,6 @@ MAN= mount_unionfs.8
MOUNT= ${.CURDIR}/../mount
CFLAGS+=-I${MOUNT}
-WARNS?= 6
.PATH: ${MOUNT}
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
index 5ee8277d42a9..558f673edea4 100644
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -5,8 +5,6 @@ MAN= newfs_msdos.8
.if ${MACHINE_ARCH} == "arm"
WARNS?= 3
-.else
-WARNS?= 6
.endif
.include <bsd.prog.mk>
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index 22717c576f42..47cd290ec78e 100644
--- a/sbin/nfsiod/Makefile
+++ b/sbin/nfsiod/Makefile
@@ -2,7 +2,6 @@
# $FreeBSD$
PROG= nfsiod
-WARNS?= 6
MAN= nfsiod.8
.include <bsd.prog.mk>
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
index ee5705197e56..2475baf94818 100644
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
@@ -12,6 +12,7 @@ SRCS+= pfctl_osfp.c pfctl_radix.c pfctl_table.c pfctl_qstats.c
SRCS+= pfctl_optimize.c
SRCS+= pf_ruleset.c
+WARNS?= 2
CFLAGS+= -Wall -Wmissing-prototypes -Wno-uninitialized
CFLAGS+= -Wstrict-prototypes -I${.CURDIR}/../../contrib/pf/pfctl
diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index 2ca64cc90b5f..b71aa4b83d37 100644
--- a/sbin/rcorder/Makefile
+++ b/sbin/rcorder/Makefile
@@ -8,7 +8,6 @@ MAN= rcorder.8
LDADD= -lutil
DPADD= ${LIBUTIL}
-WARNS?= 6
# XXX hack for make's hash.[ch]
CFLAGS+= -DORDER -I.
diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile
index 42f086887eb7..fe02f26add04 100644
--- a/sbin/reboot/Makefile
+++ b/sbin/reboot/Makefile
@@ -2,7 +2,6 @@
# $FreeBSD$
PROG= reboot
-WARNS?= 6
DPADD= ${LIBUTIL}
LDADD= -lutil
MAN= reboot.8 nextboot.8
diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile
index 6733a4f8fa20..136e570eb5a3 100644
--- a/sbin/recoverdisk/Makefile
+++ b/sbin/recoverdisk/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
PROG= recoverdisk
-WARNS?= 6
.include <bsd.prog.mk>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 99b07f595674..8c7559ffeb89 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -7,9 +7,7 @@ MAN= routed.8
SUBDIR= rtquery
LDADD= -lmd
DPADD= ${LIBMD}
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-WARNS?= 6
-.else
+.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64"
WARNS?= 0
.endif
diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile
index 525f281b598c..f25745826029 100644
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
PROG= savecore
-WARNS?= 6
DPADD= ${LIBZ}
LDADD= -lz
MAN= savecore.8
diff --git a/sbin/sconfig/Makefile b/sbin/sconfig/Makefile
index 5923692aad47..9698c04ddbad 100644
--- a/sbin/sconfig/Makefile
+++ b/sbin/sconfig/Makefile
@@ -4,5 +4,6 @@
PROG= sconfig
MAN= sconfig.8
MANSUBDIR= /i386
+WARNS?= 2
.include <bsd.prog.mk>
diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index b7f232d090b5..09b0b3ebf01d 100644
--- a/sbin/shutdown/Makefile
+++ b/sbin/shutdown/Makefile
@@ -4,8 +4,6 @@
PROG= shutdown
MAN= shutdown.8
-WARNS?= 6
-
BINOWN= root
BINGRP= operator
BINMODE=4550
diff --git a/sbin/spppcontrol/Makefile b/sbin/spppcontrol/Makefile
index b394c39a4e83..3287fcf24126 100644
--- a/sbin/spppcontrol/Makefile
+++ b/sbin/spppcontrol/Makefile
@@ -2,5 +2,6 @@
PROG= spppcontrol
MAN= spppcontrol.8
+WARNS?= 2
.include <bsd.prog.mk>
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
index 6f8e8df2e5a6..09f54b7c581c 100644
--- a/sbin/swapon/Makefile
+++ b/sbin/swapon/Makefile
@@ -8,6 +8,7 @@ LINKS+= ${BINDIR}/swapon ${BINDIR}/swapctl
MLINKS= swapon.8 swapoff.8
MLINKS+=swapon.8 swapctl.8
+WARNS?= 2
DPADD= ${LIBUTIL}
LDADD= -lutil
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index d501d104b4b7..dc9fac6f5616 100644
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -5,5 +5,6 @@ PROG= tunefs
DPADD= ${LIBUFS}
LDADD= -lufs
MAN= tunefs.8
+WARNS?= 2
.include <bsd.prog.mk>