Lock down with WFORMAT=1 except those directories with unfixed warnings.

Tested on i386 and alpha.

10 files changed, 16 insertions, 1 deletions

diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 61c3471..8d699d3 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -5,3 +5,4 @@ BINDIR?=	/bin
 CFLAGS+=	-Wall -Wformat
 NOSHARED?=	YES
 WARNS?=		2
+WFORMAT?=	1
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 555cf58..0a218e1 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -14,6 +14,7 @@ SUBDIR= nls
 DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"'
 CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS}
 WARNS=	0
+WFORMAT=0
 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 0a57e97..dfd3fb4 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -4,6 +4,7 @@
 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 165362a..7edf221 100644
--- a/bin/dd/Makefile
+++ b/bin/dd/Makefile
@@ -4,6 +4,7 @@
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
 WARNS=	0
+WFORMAT=0
 
 MAINTAINER=	green@FreeBSD.org
 
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 484137e..098b7ae 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -11,5 +11,7 @@ CFLAGS+= -DCOLORLS
 DPADD+=	${LIBTERMCAP}
 LDADD+=	-ltermcap
 .endif
+WFORMAT=0
+NO_WERROR=1
 
 .include <bsd.prog.mk>
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index 02673fd..3c4abaf 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -34,4 +34,6 @@ WARNS=	0
 #MAN=	pax.1 tar.1 cpio.1
 #LINKS=	${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
 
+WFORMAT?=	0
+
 .include <bsd.prog.mk>
diff --git a/bin/ps/Makefile b/bin/ps/Makefile
index 936cfe9..321180b 100644
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -16,4 +16,6 @@ LDADD=	-lm -lkvm
 #BINGRP=	kmem
 #BINMODE=2555
 
+WFORMAT?=	0
+
 .include <bsd.prog.mk>
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index b266813..1f4f0c6 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -6,10 +6,12 @@ SRCS=	rcp.c util.c
 CFLAGS+=-DBINDIR=${BINDIR}
 WARNS=	0
 
+WFORMAT?=	0
+
 .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
 SRCS+=	krcmd.c kcmd.c rcmd_util.c
 DPADD=	${LIBUTIL} ${LIBKRB} ${LIBCRYPTO}
-CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
+CFLAGS+=-DCRYPT -DHAVE_CONFIG_H \
 	-I${.CURDIR}/../../kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index 9de213c..bea11ef 100644
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@@ -12,6 +12,8 @@ MAN=	rmail.8
 CFLAGS+=-I${SENDMAIL_DIR}/include
 WARNS=	0
 
+WFORMAT?=	0
+
 .if exists(${.OBJDIR}/../../lib/libsmutil)
 LIBSMUTILDIR:=	${.OBJDIR}/../../lib/libsmutil
 .else
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 33ca205..b707917 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -22,6 +22,7 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR}
 # for debug:
 # CFLAGS+= -g -DDEBUG=2
 WARNS=	0
+WFORMAT=0
 
 .PATH:	${.CURDIR}/bltin \
 	${.CURDIR}/../../bin/test