Build usr.bin/ with WARNS=6 by default.

Also add some missing $FreeBSD$ to keep svn happy.
2010-01-02 10:27:05 +00:00 · 2010-01-02 10:27:05 +00:00 · b7946da96b
commit b7946da96b
parent 01cc221b4c
133 changed files with 138 additions and 79 deletions
--- a/usr.bin/Makefile.inc
+++ b/usr.bin/Makefile.inc
@ -3,6 +3,4 @@

 BINDIR?=	/usr/bin

-# Commented out for the time being.
-# I intend to make this default at some stage.
-#WARNS?=		2
+WARNS?=		6
--- a/usr.bin/apply/Makefile
+++ b/usr.bin/apply/Makefile
@ -2,6 +2,5 @@
 # $FreeBSD$

 PROG=	apply
-WARNS?=	4

 .include <bsd.prog.mk>
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@ -3,8 +3,6 @@
 PROG=	ar
 SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h

-WARNS?=	5
-
 DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBELF}
 LDADD=	-larchive -lbz2 -lz -lelf

--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@ -11,6 +11,8 @@ MLINKS=	at.1 batch.1 \
 	at.1 atq.1 \
 	at.1 atrm.1

+WARNS?=	1
+
 BINOWN=	root
 BINMODE= 4555
 CLEANFILES+= at.1
--- a/usr.bin/atm/sscop/Makefile
+++ b/usr.bin/atm/sscop/Makefile
@ -6,7 +6,6 @@ CONTRIB= ${.CURDIR}/../../../contrib/ngatm/sscop

 PROG=	sscop
 SRCS=	common.c sscop_main.c
-WARNS?=	6
 CFLAGS+= -I${CONTRIB} -DUSE_LIBBEGEMOT

 DPADD=	${LIBBEGEMOT} ${LIBNETGRAPH} ${LIBNGATM}
--- a/usr.bin/awk/Makefile
+++ b/usr.bin/awk/Makefile
@ -8,6 +8,8 @@ SRCS=	awkgram.y b.c lex.c lib.c main.c parse.c proctab.c run.c tran.c ytab.h

 CFLAGS+= -DHAS_ISBLANK -I. -I${AWKSRC} -DFOPEN_MAX=64

+WARNS?=	1
+
 DPADD=	${LIBM}
 LDADD=	-lm

--- a/usr.bin/bluetooth/bthost/Makefile
+++ b/usr.bin/bluetooth/bthost/Makefile
@ -2,7 +2,6 @@
 # $FreeBSD$

 PROG=		bthost
-WARNS?=		2

 DPADD=		${LIBBLUETOOTH}
 LDADD=		-lbluetooth 
--- a/usr.bin/bsdiff/Makefile.inc
+++ b/usr.bin/bsdiff/Makefile.inc
@ -1,6 +1,3 @@
 # $FreeBSD$

-WARNS?=	6
-
 .include "../Makefile.inc"
-
--- a/usr.bin/bzip2/Makefile
+++ b/usr.bin/bzip2/Makefile
@ -6,6 +6,8 @@ BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 PROG=	bzip2
 CFLAGS+= -D_FILE_OFFSET_BITS=64

+WARNS?=	3
+
 DPADD=	${LIBBZ2}
 LDADD=	-lbz2

--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@ -9,6 +9,8 @@ DE_LINKS=       de_DE.ISO8859-15
 FR_LINKS=       fr_FR.ISO8859-15
 TEXTMODE?=	444

+WARNS?=		3
+
 beforeinstall:
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
--- a/usr.bin/catman/Makefile
+++ b/usr.bin/catman/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

 PROG=	catman
-WARNS?=	6

 .include <bsd.prog.mk>
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@ -13,6 +13,4 @@ CFLAGS+= -DYP
 DPADD=	${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO}
 LDADD=	-lrpcsvc -lmp -lcrypto

-WARNS?=	6
-
 .include <bsd.prog.mk>
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@ -9,7 +9,6 @@ PROG=	chpass
 SRCS=	chpass.c edit.c field.c pw_scan.c table.c util.c
 BINOWN=	root
 BINMODE=4555
-WARNS?=	5
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
--- a/usr.bin/colldef/Makefile
+++ b/usr.bin/colldef/Makefile
@ -8,4 +8,6 @@ CFLAGS+=-DCOLLATE_DEBUG -DYY_NO_UNPUT
 LDADD=	-ll
 DPADD=	${LIBL}

+WARNS?=	2
+
 .include <bsd.prog.mk>
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@ -6,4 +6,6 @@ PROG=	compile_et
 SRCS=	compile_et.c parse.y lex.l getarg.c
 CFLAGS+=-I. -I${.CURDIR}/../../contrib/com_err

+WARNS?=	0
+
 .include <bsd.prog.mk>
--- a/usr.bin/compress/Makefile
+++ b/usr.bin/compress/Makefile
@ -5,7 +5,6 @@ PROG=	compress
 SRCS=	compress.c zopen.c
 LINKS=	${BINDIR}/compress ${BINDIR}/uncompress
 MLINKS=	compress.1 uncompress.1
-WARNS?=	6

 # XXX zopen is not part of libc
 # MAN=zopen.3
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@ -5,7 +5,6 @@
 PROG=	bsdcpio
 BSDCPIO_VERSION_STRING=2.7.0
 SRCS=	cpio.c cmdline.c err.c matching.c pathmatch.c
-WARNS?=	6
 DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
 CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
 CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
--- a/usr.bin/cpio/test/Makefile
+++ b/usr.bin/cpio/test/Makefile
@ -53,7 +53,6 @@ CFLAGS+= -I${CPIO_SRCDIR}
 # Uncomment to link against dmalloc
 #LDADD+= -L/usr/local/lib -ldmalloc
 #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
-WARNS=6

 check test:	bsdcpio_test
 	${.OBJDIR}/bsdcpio_test -p ${.OBJDIR}/../bsdcpio -r ${.CURDIR}
--- a/usr.bin/cpuset/Makefile
+++ b/usr.bin/cpuset/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

 PROG=   cpuset
-WARNS?=	6

 .include <bsd.prog.mk>
--- a/usr.bin/ctags/Makefile
+++ b/usr.bin/ctags/Makefile
@ -5,4 +5,6 @@ PROG=	ctags
 SRCS=	C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c
 CFLAGS+=-I${.CURDIR}

+WARNS?=	1
+
 .include <bsd.prog.mk>
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@ -20,6 +20,8 @@ CFLAGS+=	-DWITH_IDN -I/usr/local/include
 CFLAGS+=	-L/usr/local/lib -lidnkit -R/usr/local/lib -liconv
 .endif

+WARNS?=		1
+
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}

--- a/usr.bin/du/Makefile
+++ b/usr.bin/du/Makefile
@ -2,7 +2,6 @@
 # $FreeBSD$

 PROG=	du
-WARNS?=	6
 DPADD=	${LIBUTIL}
 LDADD=	-lutil

--- a/usr.bin/elf2aout/Makefile
+++ b/usr.bin/elf2aout/Makefile
@ -3,6 +3,5 @@
 PROG=	elf2aout

 NO_WERROR=
-WARNS?=	5

 .include <bsd.prog.mk>
--- a/usr.bin/elfdump/Makefile
+++ b/usr.bin/elfdump/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

 PROG=	elfdump
-WARNS?=	5

 .include <bsd.prog.mk>
--- a/usr.bin/env/Makefile
+++ b/usr.bin/env/Makefile
@ -3,6 +3,5 @@

 PROG=	env
 SRCS=	env.c envopts.c
-WARNS?=	6

 .include <bsd.prog.mk>
--- a/usr.bin/fetch/Makefile
+++ b/usr.bin/fetch/Makefile
@ -4,7 +4,6 @@

 PROG=		fetch
 CSTD?=		c99
-WARNS?=		6
 DPADD=		${LIBFETCH}
 LDADD=		-lfetch
 .if ${MK_OPENSSL} != "no"
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@ -1,5 +1,4 @@
 # $FreeBSD$

 PROG=	file2c
-WARNS?=	6
 .include <bsd.prog.mk>
--- a/usr.bin/find/Makefile
+++ b/usr.bin/find/Makefile
@ -4,7 +4,6 @@
 PROG=	find
 SRCS=	find.c function.c ls.c main.c misc.c operator.c option.c \
 	getdate.y
-WARNS?=6
 CFLAGS+= -DHAVE_SYS_TIMEB_H -I${.CURDIR}
 YFLAGS=

--- a/usr.bin/finger/Makefile
+++ b/usr.bin/finger/Makefile
@ -5,6 +5,8 @@ PROG=	finger
 SRCS=	finger.c lprint.c net.c sprint.c util.c
 MAN=	finger.1 finger.conf.5

+WARNS?=	2
+
 DPADD=	${LIBULOG}
 LDADD=	-lulog

--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@ -9,7 +9,6 @@ DPADD=	${LIBKVM}
 LDADD=	-lkvm
 BINGRP=	kmem
 BINMODE=2555
-WARNS?=	6

 CFLAGS+=-D_KVM_VNODE

--- a/usr.bin/fsync/Makefile
+++ b/usr.bin/fsync/Makefile
@ -2,5 +2,4 @@

 PROG=	fsync

-WARNS?=	6
 .include <bsd.prog.mk>
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@ -23,6 +23,8 @@ CFLAGS+= -I${.CURDIR} -I${LUKEMFTP}
 LDADD=	-ledit -ltermcap -lutil
 DPADD=	${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL}

+WARNS?=	2
+
 LINKS=	${BINDIR}/ftp ${BINDIR}/pftp \
 	${BINDIR}/ftp ${BINDIR}/gate-ftp
 MLINKS=	ftp.1 pftp.1 \
--- a/usr.bin/gcore/Makefile
+++ b/usr.bin/gcore/Makefile
@ -5,4 +5,6 @@ LDADD+=	-lutil
 PROG=	gcore
 SRCS=	elfcore.c gcore.c

+WARNS?=	1
+
 .include <bsd.prog.mk>
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

 PROG=	gencat
-WARNS?=	6

 .include <bsd.prog.mk>
--- a/usr.bin/getent/Makefile
+++ b/usr.bin/getent/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

 PROG=	getent
-WARNS?=	3

 .include <bsd.prog.mk>
--- a/usr.bin/gprof/Makefile
+++ b/usr.bin/gprof/Makefile
@ -7,4 +7,6 @@ SRCS=	gprof.c aout.c arcs.c dfn.c elf.c lookup.c hertz.c \
 FILES=	gprof.flat gprof.callg
 FILESDIR=	${SHAREDIR}/misc

+WARNS?=	1
+
 .include <bsd.prog.mk>
--- a/usr.bin/gzip/Makefile
+++ b/usr.bin/gzip/Makefile
@ -8,7 +8,6 @@ MAN=		gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1

 DPADD=		${LIBZ}
 LDADD=		-lz
-WARNS?=		6

 .if ${MK_BZIP2_SUPPORT} != "no"
 DPADD+=		${LIBBZ2}
--- a/usr.bin/head/Makefile
+++ b/usr.bin/head/Makefile
@ -2,6 +2,5 @@
 # $FreeBSD$

 PROG=	head
-WARNS=	6

 .include <bsd.prog.mk>
--- a/usr.bin/hexdump/Makefile
+++ b/usr.bin/hexdump/Makefile
@ -7,6 +7,5 @@ MAN=	hexdump.1 od.1
 MLINKS=	hexdump.1 hd.1
 LINKS=	${BINDIR}/hexdump ${BINDIR}/od
 LINKS+=	${BINDIR}/hexdump ${BINDIR}/hd
-WARNS?=	6

 .include <bsd.prog.mk>
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@ -15,6 +15,8 @@ SRCS+=		dighost.c host.c
 CFLAGS+=	-I${SRCDIR}/include
 CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include

+WARNS?=		1
+
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}

--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@ -4,7 +4,6 @@
 .include <bsd.own.mk>

 PROG=	id
-WARNS?=	6
 LINKS=	${BINDIR}/id ${BINDIR}/groups
 LINKS+=	${BINDIR}/id ${BINDIR}/whoami
 MAN=	id.1 groups.1 whoami.1
--- a/usr.bin/ipcrm/Makefile
+++ b/usr.bin/ipcrm/Makefile
@ -7,4 +7,6 @@ LDADD=	-lkvm
 CFLAGS+=-I${.CURDIR}/../ipcs
 .PATH:  ${.CURDIR}/../ipcs

+WARNS?=	0
+
 .include <bsd.prog.mk>
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@ -5,4 +5,6 @@ SRCS=	ipcs.c ipc.c
 DPADD=	${LIBKVM}
 LDADD=	-lkvm

+WARNS?=	1
+
 .include <bsd.prog.mk>
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@ -7,6 +7,8 @@ PROG=		kdump
 SRCS=		kdump.c ioctl.c kdump_subr.c subr.c
 CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../..

+WARNS?=		0
+
 CLEANFILES=	ioctl.c kdump_subr.c

 ioctl.c: mkioctls
--- a/usr.bin/keylogin/Makefile
+++ b/usr.bin/keylogin/Makefile
@ -5,4 +5,6 @@ PROG=	keylogin
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc

+WARNS?=	0
+
 .include <bsd.prog.mk>
--- a/usr.bin/ktrace/Makefile
+++ b/usr.bin/ktrace/Makefile
@ -5,4 +5,6 @@ PROG=	ktrace
 SRCS=	ktrace.c subr.c
 MLINKS= ktrace.1 trace.1 

+WARNS?=	4
+
 .include <bsd.prog.mk>
--- a/usr.bin/ktrdump/Makefile
+++ b/usr.bin/ktrdump/Makefile
@ -5,4 +5,6 @@ DPADD=	${LIBKVM}
 LDADD=	-lkvm
 MAN=	ktrdump.8

+WARNS?=	2
+
 .include <bsd.prog.mk>
--- a/usr.bin/last/Makefile
+++ b/usr.bin/last/Makefile
@ -3,4 +3,6 @@

 PROG=	last

+WARNS?=	1
+
 .include <bsd.prog.mk>
--- a/usr.bin/lastcomm/Makefile
+++ b/usr.bin/lastcomm/Makefile
@ -3,6 +3,5 @@

 PROG=	lastcomm
 SRCS=	lastcomm.c readrec.c
-WARNS?= 6

 .include <bsd.prog.mk>
--- a/usr.bin/ldd/Makefile
+++ b/usr.bin/ldd/Makefile
@ -5,6 +5,5 @@ SRCS=		ldd.c
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=		sods.c
 .endif
-WARNS?=		6

 .include <bsd.prog.mk>
--- a/usr.bin/leave/Makefile
+++ b/usr.bin/leave/Makefile
@ -3,4 +3,6 @@

 PROG=	leave

+WARNS?=	1
+
 .include <bsd.prog.mk>
--- a/usr.bin/less/Makefile.common
+++ b/usr.bin/less/Makefile.common
@ -4,6 +4,7 @@ LSDIR=	${.CURDIR}/../../contrib/less
 .PATH:	${LSDIR}

 CFLAGS+=-I${.CURDIR}/../less -I${LSDIR}
+WARNS?=	1

 .SUFFIXES: .nro .1

--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@ -24,6 +24,8 @@ MLINKS+=	lex.1 flex.1
 MLINKS+=	lex.1 flex++.1
 MLINKS+=	lex.1 lex++.1

+WARNS?=		2
+
 CLEANFILES=	scan.c skel.c

 SUBDIR=		lib
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@ -6,6 +6,8 @@ LIB=    ln
 SRCS=   libmain.c libyywrap.c
 NO_PIC=

+WARNS?=	2
+
 .if ${MK_INSTALLLIB} != "no"
 LINKS=  ${LIBDIR}/libln.a ${LIBDIR}/libl.a
 LINKS+=	${LIBDIR}/libln.a ${LIBDIR}/libfl.a
--- a/usr.bin/limits/Makefile
+++ b/usr.bin/limits/Makefile
@ -3,6 +3,5 @@
 PROG=	limits
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
-WARNS?=	6

 .include <bsd.prog.mk>
--- a/usr.bin/locate/Makefile.inc
+++ b/usr.bin/locate/Makefile.inc
@ -1,3 +1,5 @@
 # $FreeBSD$

 LIBEXECDIR?=	/usr/libexec
+
+WARNS?=		0
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@ -7,6 +7,8 @@ CFLAGS+= -I${.CURDIR} -DMMAP # -DDEBUG (print time) -O2 (10% faster)
 SCRIPTS=updatedb.sh mklocatedb.sh concatdb.sh
 MAN=	locate.1 locate.updatedb.8

+WARNS?=	2
+
 SCRIPTSDIR=	${LIBEXECDIR}
 .for script in ${SCRIPTS}
 SCRIPTSNAME_${script}=	locate.${script:R}
--- a/usr.bin/lock/Makefile
+++ b/usr.bin/lock/Makefile
@ -7,4 +7,6 @@ BINMODE=4555
 DPADD=	${LIBCRYPT}
 LDADD=	-lcrypt

+WARNS?=	1
+
 .include <bsd.prog.mk>
--- a/usr.bin/logger/Makefile
+++ b/usr.bin/logger/Makefile
@ -4,7 +4,6 @@
 .include <bsd.own.mk>

 PROG=	logger
-WARNS?=	6

 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@ -9,6 +9,8 @@ CFLAGS+=-DLOGALL
 DPADD=	${LIBUTIL} ${LIBPAM}
 LDADD=	-lutil ${MINUSLPAM}

+WARNS?=	5
+
 .if ${MK_AUDIT} != "no"
 SRCS+=	login_audit.c
 CFLAGS+= -DUSE_BSM_AUDIT
--- a/usr.bin/logins/Makefile
+++ b/usr.bin/logins/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

 PROG=	logins
-WARNS?=	6

 .include <bsd.prog.mk>
--- a/usr.bin/logname/Makefile
+++ b/usr.bin/logname/Makefile
@ -2,6 +2,5 @@
 # $FreeBSD$

 PROG=	logname
-WARNS?= 6

 .include <bsd.prog.mk>
--- a/usr.bin/look/Makefile
+++ b/usr.bin/look/Makefile
@ -1,5 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
+# $FreeBSD$

 PROG=	look

+WARNS?=	2
+
 .include <bsd.prog.mk>
--- a/usr.bin/lsvfs/Makefile
+++ b/usr.bin/lsvfs/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

 PROG=	lsvfs
-WARNS?=	6

 .include <bsd.prog.mk>
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@ -9,4 +9,6 @@ CFLAGS+=-DEXTENDED

 SRCS=	eval.c expr.c look.c main.c misc.c gnum4.c trace.c

+WARNS?=	0
+
 .include <bsd.prog.mk>
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@ -11,6 +11,8 @@ EFILES=	mail.rc
 LINKS=	${BINDIR}/mail ${BINDIR}/Mail ${BINDIR}/mail ${BINDIR}/mailx
 MLINKS=	mail.1 Mail.1 mail.1 mailx.1

+WARNS?=	1
+
 .PATH: ${.CURDIR}/misc

 etc-mailrc:
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@ -8,7 +8,6 @@ SRCS=	arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c	\
 	lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c	\
 	util.c var.c

-WARNS?=	6
 NO_SHARED?=	YES

 CFLAGS+=-DMAKE_VERSION=\"5200408120\"
--- a/usr.bin/minigzip/Makefile
+++ b/usr.bin/minigzip/Makefile
@ -5,4 +5,6 @@ LDADD=	-lz
 DPADD=	${LIBZ}
 .PATH:	${.CURDIR}/../../lib/libz

+WARNS?=	5
+
 .include <bsd.prog.mk>
--- a/usr.bin/mkfifo/Makefile
+++ b/usr.bin/mkfifo/Makefile
@ -2,6 +2,5 @@
 # $FreeBSD$

 PROG=	mkfifo
-WARNS?=	6

 .include <bsd.prog.mk>
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@ -2,7 +2,6 @@
 # $FreeBSD$

 PROG=	mklocale
-WARNS?=	6
 SRCS=	yacc.y lex.l y.tab.h
 CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale

--- a/usr.bin/mkstr/Makefile
+++ b/usr.bin/mkstr/Makefile
@ -3,4 +3,6 @@

 PROG=	mkstr

+WARNS?=	2
+
 .include <bsd.prog.mk>
--- a/usr.bin/mkuzip/Makefile
+++ b/usr.bin/mkuzip/Makefile
@ -6,6 +6,5 @@ MAN=	mkuzip.8
 DPADD=	${LIBZ}
 LDADD=	-lz

-WARNS?=	6

 .include <bsd.prog.mk>
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@ -2,7 +2,6 @@
 # $FreeBSD$

 PROG=	msgs
-WARNS?=	6
 DPADD=	${LIBTERMCAP}
 LDADD=	-ltermcap

--- a/usr.bin/nc/Makefile
+++ b/usr.bin/nc/Makefile
@ -9,4 +9,6 @@ CFLAGS+=-DIPSEC
 LDADD=	-lipsec
 DPADD=	${LIBIPSEC}

+WARNS?=	1
+
 .include <bsd.prog.mk>
--- a/usr.bin/ncplist/Makefile
+++ b/usr.bin/ncplist/Makefile
@ -2,6 +2,8 @@

 PROG=	ncplist

+WARNS?=	0
+
 DPADD=	${LIBNCP} ${LIBIPX}
 LDADD=	-lncp -lipx

--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@ -11,6 +11,4 @@ MAN=	newkey.8
 DPADD=	${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO}
 LDADD=	-lrpcsvc -lmp -lcrypto

-WARNS?=	6
-
 .include <bsd.prog.mk>
--- a/usr.bin/nfsstat/Makefile
+++ b/usr.bin/nfsstat/Makefile
@ -6,4 +6,6 @@ CFLAGS+=-DNFS
 DPADD=  ${LIBKVM}
 LDADD= -lkvm

+WARNS?=	3
+
 .include <bsd.prog.mk>
--- a/usr.bin/nl/Makefile
+++ b/usr.bin/nl/Makefile
@ -2,4 +2,6 @@

 PROG=	nl

+WARNS?=	2
+
 .include <bsd.prog.mk>
--- a/usr.bin/nohup/Makefile
+++ b/usr.bin/nohup/Makefile
@ -2,6 +2,5 @@
 # $FreeBSD$

 PROG=	nohup
-WARNS?=	4

 .include <bsd.prog.mk>
--- a/usr.bin/nslookup/Makefile
+++ b/usr.bin/nslookup/Makefile
@ -18,6 +18,8 @@ CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}

+WARNS?=		1
+
 MANFILTER=	sed -e "s@^host \[server\]@\\\fBhost\\\fR \\\fI[server]\\\fR@"

 .include <bsd.prog.mk>
--- a/usr.bin/nsupdate/Makefile
+++ b/usr.bin/nsupdate/Makefile
@ -18,6 +18,8 @@ CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}

+WARNS?=		1
+
 MAN=		nsupdate.1

 MANFILTER=	sed -e "s@/etc/named\.conf@/etc/namedb/named.conf@g" \
--- a/usr.bin/opieinfo/Makefile
+++ b/usr.bin/opieinfo/Makefile
@ -8,6 +8,8 @@ CFLAGS+=-I${.CURDIR}/../../lib/libopie
 CFLAGS+=-I${OPIE_DIST}
 CFLAGS+=-DINSECURE_OVERRIDE

+WARNS?=	0
+
 DPADD=	${LIBOPIE} ${LIBMD}
 LDADD=	-lopie -lmd

--- a/usr.bin/opiekey/Makefile
+++ b/usr.bin/opiekey/Makefile
@ -8,6 +8,8 @@ CFLAGS+=-I${.CURDIR}/../../lib/libopie
 CFLAGS+=-I${OPIE_DIST}
 CFLAGS+=-DINSECURE_OVERRIDE

+WARNS?=	0
+
 DPADD=	${LIBOPIE} ${LIBMD}
 LDADD=	-lopie -lmd

--- a/usr.bin/opiepasswd/Makefile
+++ b/usr.bin/opiepasswd/Makefile
@ -8,6 +8,8 @@ CFLAGS+=-I${.CURDIR}/../../lib/libopie
 CFLAGS+=-I${OPIE_DIST}
 CFLAGS+=-DINSECURE_OVERRIDE

+WARNS?=	0
+
 DPADD=	${LIBOPIE} ${LIBMD}
 LDADD=	-lopie -lmd

--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@ -12,7 +12,6 @@ LDADD	 = ${MINUSLPAM}
 LINKS	 = ${BINDIR}/passwd ${BINDIR}/yppasswd
 MLINKS	 = passwd.1 yppasswd.1
 .endif
-WARNS	?= 4

 beforeinstall:
 .for i in passwd yppasswd
--- a/usr.bin/pr/Makefile
+++ b/usr.bin/pr/Makefile
@ -1,6 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$

 PROG=	pr
 SRCS=	pr.c egetopt.c

+WARNS?=	2
+
 .include <bsd.prog.mk>
--- a/usr.bin/printf/Makefile
+++ b/usr.bin/printf/Makefile
@ -2,6 +2,5 @@
 # $FreeBSD$

 PROG=	printf
-WARNS?=	6

 .include <bsd.prog.mk>
--- a/usr.bin/procstat/Makefile
+++ b/usr.bin/procstat/Makefile
@ -14,6 +14,5 @@ SRCS=	procstat.c		\

 LDADD+=	-lutil
 DPADD+=	${LIBUTIL}
-WARNS?=	4

 .include <bsd.prog.mk>
--- a/usr.bin/revoke/Makefile
+++ b/usr.bin/revoke/Makefile
@ -2,6 +2,4 @@

 PROG=	revoke

-WARNS?=	6
-
 .include <bsd.prog.mk>
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@ -7,4 +7,6 @@ BINOWN=	root
 BINMODE=4555
 PRECIOUSPROG=

+WARNS?=	3
+
 .include <bsd.prog.mk>
--- a/usr.bin/rpcgen/Makefile
+++ b/usr.bin/rpcgen/Makefile
@ -4,6 +4,4 @@ PROG=	rpcgen
 SRCS=	rpc_main.c  rpc_clntout.c rpc_cout.c rpc_hout.c rpc_parse.c \
 	rpc_sample.c rpc_scan.c rpc_svcout.c rpc_tblout.c rpc_util.c

-WARNS?=	2
-
 .include <bsd.prog.mk>
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@ -7,4 +7,6 @@ MAN=	rpcinfo.8

 CFLAGS+= -DPORTMAP

+WARNS?=	2
+
 .include <bsd.prog.mk>
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@ -4,6 +4,8 @@
 PROG=	rsh
 CFLAGS+=-I${.CURDIR}/../../libexec/rlogind

+WARNS?=	2
+
 BINOWN=	root
 BINMODE=4555
 PRECIOUSPROG=
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@ -2,6 +2,8 @@

 PROG=	rup

+WARNS?=	1
+
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc

--- a/usr.bin/ruptime/Makefile
+++ b/usr.bin/ruptime/Makefile
@ -1,5 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$

 PROG=	ruptime

+WARNS?=	3
+
 .include <bsd.prog.mk>
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@ -1,7 +1,6 @@
 # $FreeBSD$

 PROG = rusers
-WARNS?=	6

 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
--- a/usr.bin/rwho/Makefile
+++ b/usr.bin/rwho/Makefile
@ -1,5 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$

 PROG=	rwho

+WARNS?=	1
+
 .include <bsd.prog.mk>
--- a/usr.bin/sed/Makefile
+++ b/usr.bin/sed/Makefile
@ -4,4 +4,6 @@
 PROG=	sed
 SRCS=	compile.c main.c misc.c process.c

+WARNS?=	2
+
 .include <bsd.prog.mk>
--- a/usr.bin/smbutil/Makefile
+++ b/usr.bin/smbutil/Makefile
@ -9,6 +9,8 @@ LDADD=	-lsmb -lkiconv
 CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
 CFLAGS+=	-I${CONTRIBDIR}/include

+WARNS?=	0
+
 .PATH:	${CONTRIBDIR}/smbutil

 .include <bsd.prog.mk>
--- a/usr.bin/sockstat/Makefile
+++ b/usr.bin/sockstat/Makefile
@ -1,6 +1,5 @@
 # $FreeBSD$

 PROG=		sockstat
-WARNS?=		4

 .include <bsd.prog.mk>
--- a/Show More
+++ b/Show More