24 files changed, 48 insertions, 20 deletions

diff --git a/usr.bin/basename/Makefile b/usr.bin/basename/Makefile
index d74d67007e380..cebc6527034b2 100644
--- a/usr.bin/basename/Makefile
+++ b/usr.bin/basename/Makefile
@@ -1,7 +1,8 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	basename
-CFLAGS+=-Wall
+WARNS?=	2
 MLINKS=	basename.1 dirname.1
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/biff/Makefile b/usr.bin/biff/Makefile
index db26fc47fbbad..2a8f08b0d406c 100644
--- a/usr.bin/biff/Makefile
+++ b/usr.bin/biff/Makefile
@@ -1,6 +1,7 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	biff
-CFLAGS+=-Wall
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/cap_mkdb/Makefile b/usr.bin/cap_mkdb/Makefile
index 88a34d7dae450..1ad2eef931366 100644
--- a/usr.bin/cap_mkdb/Makefile
+++ b/usr.bin/cap_mkdb/Makefile
@@ -1,6 +1,7 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	cap_mkdb
-CFLAGS+=-Wall
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/colrm/Makefile b/usr.bin/colrm/Makefile
index 7413d42562eb1..bcc6edc0a5b2e 100644
--- a/usr.bin/colrm/Makefile
+++ b/usr.bin/colrm/Makefile
@@ -1,6 +1,7 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	colrm
-CFLAGS+=-Wall
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile
index 0350db6690b98..0c6b6b59e7d80 100644
--- a/usr.bin/dirname/Makefile
+++ b/usr.bin/dirname/Makefile
@@ -1,7 +1,8 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	dirname
-CFLAGS+=-Wall
+WARNS?=	2
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/env/Makefile b/usr.bin/env/Makefile
index fadfd080aa69c..dc55bc1b1b275 100644
--- a/usr.bin/env/Makefile
+++ b/usr.bin/env/Makefile
@@ -1,7 +1,8 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	env
-CFLAGS+=-Wall
+WARNS?=	2
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index e88a3bc346e5b..342443a22629b 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	file2c
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/fold/Makefile b/usr.bin/fold/Makefile
index 4d8000757754c..2032de46a34d4 100644
--- a/usr.bin/fold/Makefile
+++ b/usr.bin/fold/Makefile
@@ -1,5 +1,7 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	fold
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/from/Makefile b/usr.bin/from/Makefile
index a802dc6cb3653..4a96f79589c2c 100644
--- a/usr.bin/from/Makefile
+++ b/usr.bin/from/Makefile
@@ -1,5 +1,7 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	from
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/fsync/Makefile b/usr.bin/fsync/Makefile
index c9bc5249ee6f4..10e5e7aa9d5e6 100644
--- a/usr.bin/fsync/Makefile
+++ b/usr.bin/fsync/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	fsync
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index 45af07adf8952..7a383d8ed1de1 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	gencat
 SRCS=	gencat.c genlib.c
+WARNS?=	2
 
 CFLAGS+= -I${.CURDIR}/../../lib/libc/nls
 
diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile
index eacf6f1e021da..63ecd75320b05 100644
--- a/usr.bin/leave/Makefile
+++ b/usr.bin/leave/Makefile
@@ -2,6 +2,6 @@
 # $FreeBSD$
 
 PROG=	leave
-CFLAGS+=-Wall
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/mesg/Makefile b/usr.bin/mesg/Makefile
index 8c543561be9d8..fc664f8e71e09 100644
--- a/usr.bin/mesg/Makefile
+++ b/usr.bin/mesg/Makefile
@@ -1,5 +1,7 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	mesg
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/mkfifo/Makefile b/usr.bin/mkfifo/Makefile
index fff2939b41bfa..719c52003a5d8 100644
--- a/usr.bin/mkfifo/Makefile
+++ b/usr.bin/mkfifo/Makefile
@@ -1,5 +1,7 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	mkfifo
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/truncate/Makefile b/usr.bin/truncate/Makefile
index 4752c5cb64e25..f182f1f24fc23 100644
--- a/usr.bin/truncate/Makefile
+++ b/usr.bin/truncate/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=		truncate
+WARNS?=		2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile
index d634f96892ba8..dc127db03af0d 100644
--- a/usr.bin/unexpand/Makefile
+++ b/usr.bin/unexpand/Makefile
@@ -1,6 +1,8 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	unexpand
+WARNS?=	2
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile
index 41a3f42f32094..73f2537015c5b 100644
--- a/usr.bin/what/Makefile
+++ b/usr.bin/what/Makefile
@@ -1,5 +1,7 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+#	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	what
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile
index ea9b4f43565a8..2a24e0bbb57fd 100644
--- a/usr.sbin/accton/Makefile
+++ b/usr.sbin/accton/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	accton
+WARNS?=	2
 MAN=	accton.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dev_mkdb/Makefile b/usr.sbin/dev_mkdb/Makefile
index d0b9c299e3b23..02d2b9d5a9bbf 100644
--- a/usr.sbin/dev_mkdb/Makefile
+++ b/usr.sbin/dev_mkdb/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	dev_mkdb
+WARNS?=	2
 MAN=	dev_mkdb.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index 36dcc5b2af109..5b1df4799fd61 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	jail
+WARNS?=	2
 MAN=	jail.8
 
 .include	<bsd.prog.mk>
diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile
index e8ed16e1f227c..022cfe00e9107 100644
--- a/usr.sbin/lastlogin/Makefile
+++ b/usr.sbin/lastlogin/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	lastlogin
+WARNS?=	2
 MAN=	lastlogin.8
-CFLAGS+=-Wall
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/procctl/Makefile b/usr.sbin/procctl/Makefile
index 880b93a13fe09..66193a6e2dfce 100644
--- a/usr.sbin/procctl/Makefile
+++ b/usr.sbin/procctl/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	procctl
+WARNS?=	2
 MAN=	procctl.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
index 7abda92f18942..10cb4603ff240 100644
--- a/usr.sbin/rip6query/Makefile
+++ b/usr.sbin/rip6query/Makefile
@@ -3,6 +3,7 @@
 #	$FreeBSD$
 
 PROG=	rip6query
+WARNS?=	2
 MAN=	rip6query.8
 
 CFLAGS+=-DINET6 -I${.CURDIR}/../route6d
diff --git a/usr.sbin/usbdevs/Makefile b/usr.sbin/usbdevs/Makefile
index 3cfc8ef002d8e..2442e40c1faef 100644
--- a/usr.sbin/usbdevs/Makefile
+++ b/usr.sbin/usbdevs/Makefile
@@ -2,6 +2,7 @@
 #	FreeBSD $FreeBSD$
 
 PROG=	usbdevs
+WARNS?=	2
 MAN=	usbdevs.8
 
 .include <bsd.prog.mk>