From eac4bdcca45c5d9ed3b70b8feae2bf7167b20fc6 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Fri, 13 Jun 2003 07:04:02 +0000
Subject: [PATCH] Get this area compiling with the highest WARNS= that it works
 with. Obsolete WFORMAT= junk also removed where possible.

OK'ed by:	obrien
Tested on:	sparc64, alpha, i386
---
 bin/Makefile.inc  | 3 +--
 bin/csh/Makefile  | 2 +-
 bin/date/Makefile | 2 --
 bin/dd/Makefile   | 1 -
 bin/df/Makefile   | 7 +++----
 bin/ed/Makefile   | 1 +
 bin/expr/Makefile | 2 --
 bin/kenv/Makefile | 1 -
 bin/ls/Makefile   | 2 --
 bin/pax/Makefile  | 1 -
 bin/ps/Makefile   | 3 +--
 11 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 9c1ad775a5a8..e84330e6b184 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -3,5 +3,4 @@
 
 BINDIR?=	/bin
 NOSHARED?=	YES
-WARNS?=		2
-WFORMAT?=	1
+WARNS?=		6
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index ffd511d14711..228125df409b 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -12,7 +12,7 @@ TCSHDIR= ${.CURDIR}/../../contrib/tcsh
 PROG=	csh
 DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"'
 CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS}
-WARNS=	1
+WARNS=	2
 SRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
 	sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \
 	sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \
diff --git a/bin/date/Makefile b/bin/date/Makefile
index dfd3fb40ffa7..8a1dc8579330 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -3,8 +3,6 @@
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
-WARNS=	0
-WFORMAT=0
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
index 892ca8d68352..0cbd23895879 100644
--- a/bin/dd/Makefile
+++ b/bin/dd/Makefile
@@ -3,7 +3,6 @@
 
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
-WARNS?=	4
 
 MAINTAINER=	green@FreeBSD.org
 
diff --git a/bin/df/Makefile b/bin/df/Makefile
index 3ee9b89724ea..80c031c428cf 100644
--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@@ -1,16 +1,15 @@
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95
 # $FreeBSD$
 
+MOUNT=	${.CURDIR}/../../sbin/mount
+.PATH:	${MOUNT}
+
 PROG=	df
 SRCS=	df.c vfslist.c
 
-MOUNT=	${.CURDIR}/../../sbin/mount
 CFLAGS+= -I${MOUNT}
-.PATH:	${MOUNT}
 
 DPADD=	${LIBM}
 LDADD=	-lm
 
-WARNS?=	5
-
 .include <bsd.prog.mk>
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 5409cc0c5a18..dd05eace35d6 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -8,6 +8,7 @@ MLINKS=	ed.1 red.1
 .if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL)
 DISTRIBUTION=crypto
 CFLAGS+=-DDES
+WARNS=	2
 DPADD=	${LIBCRYPTO}
 LDADD=	-lcrypto
 .endif
diff --git a/bin/expr/Makefile b/bin/expr/Makefile
index 739ffce93da3..544853e10a25 100644
--- a/bin/expr/Makefile
+++ b/bin/expr/Makefile
@@ -4,6 +4,4 @@ PROG=	expr
 SRCS=	expr.y
 YFLAGS=
 
-NO_WERROR=	"GCC can't handle C99 printf formats."
-
 .include <bsd.prog.mk>
diff --git a/bin/kenv/Makefile b/bin/kenv/Makefile
index 0dffae599847..33a6dfc3bff5 100644
--- a/bin/kenv/Makefile
+++ b/bin/kenv/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 PROG=	kenv
-WARNS?=	4
 
 .include <bsd.prog.mk>
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 60b9dc786f17..12a130daee0d 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -3,8 +3,6 @@
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
-NO_WERROR=1
-WFORMAT=0
 DPADD=	${LIBM}
 LDADD=	-lm
 
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index 270fc1f6e482..f142bfcc05a2 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -29,7 +29,6 @@ PROG=   pax
 SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
 	tables.c tar.c tty_subs.c
-WFORMAT=0
 #XXX NOTYET
 #MAN=	pax.1 tar.1 cpio.1
 #LINKS=	${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
diff --git a/bin/ps/Makefile b/bin/ps/Makefile
index bcbba9b4a507..ca6d51af2581 100644
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -3,14 +3,13 @@
 
 PROG=	ps
 SRCS=	fmt.c keyword.c nlist.c print.c ps.c
+WARNS=	5
 #
 # To support "lazy" ps for non root/wheel users
 # add -DLAZY_PS to the cflags.  This helps
 # keep ps from being an unnecessary load
 # on large systems.
 #
-WARNS=	1
-WFORMAT=0
 CFLAGS+=-DLAZY_PS
 DPADD=	${LIBM} ${LIBKVM}
 LDADD=	-lm -lkvm