21 files changed, 99 insertions, 45 deletions
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 8a5445f..1b4aacf 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -28,7 +28,7 @@
 .\"     @(#)colcrt.1	8.1 (Berkeley) 6/30/93
 .\" $FreeBSD$
 .\"
-.Dd July 31, 2004
+.Dd June 6, 2015
 .Dt COLCRT 1
 .Os
 .Sh NAME
@@ -93,8 +93,8 @@ tbl exum2.n \&| nroff \-ms \&| colcrt \- \&| more
 .Sh HISTORY
 The
 .Nm
-command appeared in
-.Bx 3.0 .
+utility first appeared in
+.Bx 1 .
 .Sh BUGS
 Should fold underlines onto blanks even with the
 .Sq Fl
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index db365f8..9454ed5 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -28,7 +28,7 @@
 .\"     @(#)colrm.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd August 4, 2004
+.Dd June 6, 2015
 .Dt COLRM 1
 .Os
 .Sh NAME
@@ -83,5 +83,10 @@ as described in
 .Sh HISTORY
 The
 .Nm
-command appeared in
-.Bx 3.0 .
+utility first appeared in
+.Bx 1 .
+.Sh AUTHORS
+.An Jeff Schriebman
+wrote the original version of
+.Nm
+in November 1974.
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 6be9995..2a5cb91 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -28,7 +28,7 @@
 .\"	@(#)expand.1	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD$
 .\"
-.Dd October 13, 2006
+.Dd June 6, 2015
 .Dt EXPAND 1
 .Os
 .Sh NAME
@@ -110,5 +110,5 @@ utilities conform to
 .Sh HISTORY
 The
 .Nm
-command appeared in
-.Bx 3.0 .
+utility first appeared in
+.Bx 1 .
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index 94372ba..b23e838 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -28,7 +28,7 @@
 .\"	@(#)fold.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd December 15, 2006
+.Dd June 6, 2015
 .Dt FOLD 1
 .Os
 .Sh NAME
@@ -84,6 +84,33 @@ The
 .Nm
 utility conforms to
 .St -p1003.1-2001 .
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Bx 1 .
+It was rewritten for
+.Bx 4.3 Reno
+to improve speed and modernize style.
+The
+.Fl b
+and
+.Fl s
+options were added to
+.Nx 1.0
+for
+.St -p1003.2
+compliance.
+.Sh AUTHORS
+.An -nosplit
+.An Bill Joy
+wrote the original version of
+.Nm
+on June 28, 1977.
+.An Kevin Ruddy
+rewrote the command in 1990, and
+.An J. T. Conklin
+added the missing options in 1993.
 .Sh BUGS
 If underlining (see
 .Xr ul 1 )
diff --git a/usr.bin/keylogin/Makefile b/usr.bin/keylogin/Makefile
index 2dab249..786efae 100644
--- a/usr.bin/keylogin/Makefile
+++ b/usr.bin/keylogin/Makefile
@@ -4,6 +4,4 @@ PROG=	keylogin
 
 LIBADD=	rpcsvc
 
-WARNS?=	0
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index e552dd6..19e0f0b 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -28,7 +28,7 @@
 .\"     @(#)last.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd January 21, 2010
+.Dd June 6, 2015
 .Dt LAST 1
 .Os
 .Sh NAME
@@ -202,10 +202,15 @@ login data base
 .Xr ac 8 ,
 .Xr lastlogin 8
 .Sh HISTORY
-A
 .Nm
-utility appeared in
-.Bx 3.0 .
+utility first appeared in
+.Bx 1 .
+.Sh AUTHORS
+.An -nosplit
+The original version was written by
+.An Howard P. Katseff ;
+.An Keith Bostic
+rewrote it in 1986/87 to add functionality and to improve code quality.
 .Sh BUGS
 If a login shell should terminate abnormally for some reason, it is likely
 that a logout record will not be written to the
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index da3e433..ea2338b 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -11,7 +11,7 @@ EFILES=	mail.rc
 LINKS=	${BINDIR}/mail ${BINDIR}/Mail ${BINDIR}/mail ${BINDIR}/mailx
 MLINKS=	mail.1 Mail.1 mail.1 mailx.1
 
-WARNS?=	1
+WARNS?=	2
 
 .PATH: ${.CURDIR}/misc
 
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index 31372d0..0699a55 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -28,7 +28,7 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index e2c59cf..faa46ed 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -84,6 +84,6 @@ WARNS?=	2
 CFLAGS+= -DHAVE_CONFIG_H \
 	 -I${.CURDIR}/../../lib/libohash/ \
 	 -I${.CURDIR}/../../contrib/sqlite3
-LIBADD=	ohash sqlite3
+LIBADD=	ohash sqlite3 z
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index bc5f7115..09a277e 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -28,7 +28,7 @@
 .\"     @(#)mkstr.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd November 1, 2002
+.Dd June 6, 2015
 .Dt MKSTR 1
 .Os
 .Sh NAME
@@ -118,10 +118,16 @@ error(a1, a2, a3, a4)
 .Xr xstr 1 ,
 .Xr lseek 2
 .Sh HISTORY
-An
+The
 .Nm
-utility appeared in
-.Bx 3.0 .
+utility first appeared in
+.Bx 1 .
+.Sh AUTHORS
+.An -nosplit
+.An Bill Joy
+and
+.An Chuck Haley ,
+1977.
 .Sh BUGS
 The
 .Nm
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 9f64d0cc..2025eff 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -76,8 +76,8 @@ __FBSDID("$FreeBSD$");
  * existing error message file for recompilation of single routines.
  */
 
-FILE	*mesgread, *mesgwrite;
-char	name[100], *np;
+static FILE	*mesgread, *mesgwrite;
+static char	name[100], *np;
 
 void copystr(void);
 int fgetNUL(char *, int, FILE *);
@@ -267,7 +267,7 @@ inithash(void)
 
 #define	NBUCKETS	511
 
-struct	hash {
+static struct	hash {
 	long	hval;
 	unsigned hpt;
 	struct	hash *hnext;
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index d7c26a5..2005f23 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -4,8 +4,6 @@
 PROG=	rsh
 CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
 
-WARNS?=	2
-
 BINOWN=	root
 BINMODE=4555
 
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index a19539a..5fa33e2 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -77,10 +77,10 @@ __FBSDID("$FreeBSD$");
 /*
  * rsh - remote shell
  */
-int	rfd2;
+static int	rfd2;
 
-int family = PF_UNSPEC;
-char rlogin[] = "rlogin";
+static int family = PF_UNSPEC;
+static char rlogin[] = "rlogin";
 
 void	connect_timeout(int);
 char   *copyargs(char * const *);
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index 4b5131e..54e114e 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -2,8 +2,7 @@
 
 PROG=	rup
 
-WARNS?=	1
-
+WARNS?=	3
 LIBADD=	rpcsvc
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 672aadc..bb279d5 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -14,7 +14,7 @@ SRCS+=	icmp6.c ip6.c
 CFLAGS+= -DINET6
 .endif
 
-WARNS?=	0
+WARNS?=	1
 
 LIBADD=	ncursesw m devstat kvm
 
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index e0e627a..fd93830 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -138,7 +138,6 @@ main(int argc, char **argv)
 {
 	char errbuf[_POSIX2_LINE_MAX], dummy;
 	size_t	size;
-	double t;
 	struct cmdentry *cmd = NULL;
 
 	(void) setlocale(LC_ALL, "");
diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile
index 67ab20d..e7ace68 100644
--- a/usr.bin/top/Makefile
+++ b/usr.bin/top/Makefile
@@ -30,8 +30,8 @@ sigdesc.h: ${SIGCONV_AWK} ${SIGNAL_H}
 	awk -f ${SIGCONV_AWK} < ${SIGNAL_H} > ${.TARGET}
 
 CLEANFILES+= top.local.h top.x
-.SUFFIXES: .X .x .H .h
-.X.x .H.h:
+.SUFFIXES: .xs .x .hs .h
+.xs.x .hs.h:
 	@${ECHO} Making ${.TARGET} from ${.IMPSRC}
 	@sed -e's,%LoadMax%,5.0,g' \
 	-e's,%TableSize%,20011,g' \
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index f0935b7..5f2641f 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -28,7 +28,7 @@
 .\"	@(#)tset.1	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD$
 .\"
-.Dd June 9, 1993
+.Dd June 6, 2015
 .Dt TSET 1
 .Os
 .Sh NAME
@@ -400,5 +400,22 @@ older terminal interfaces.
 .Sh HISTORY
 The
 .Nm
-command appeared in
-.Bx 3.0 .
+and
+.Nm reset
+utilities first appeared in
+.Bx 1 .
+.Sh AUTHORS
+.An -nosplit
+The original version of
+.Nm tset
+was written by
+.An Eric P. Allman
+in October 1977, and
+.Nm reset
+was originally written by
+.An Kurt Shoens .
+The current version also contains code by
+.An Zeyd M. Ben-Halim ,
+.An Eric S. Raymond ,
+and
+.An Thomas E. Dickey .
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index cd57835..8390cf1 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -91,7 +91,7 @@ STRNCMP(register char *s1, register char *s2, register int len)
  *	internal format.
  *
  *	Either meta symbols (\a \d or \p) or character strings or
- *	operations ( alternation or perenthesizing ) can be
+ *	operations ( alternation or parenthesizing ) can be
  *	specified.  Each starts with a descriptor byte.  The descriptor
  *	byte has STR set for strings, META set for meta symbols
  *	and OPER set for operations.
@@ -110,7 +110,7 @@ STRNCMP(register char *s1, register char *s2, register int len)
  *				character count
  *				the string
  *
- *		operatins :=	descriptor
+ *		operations :=	descriptor
  *				symbol
  *				character count
  */
diff --git a/usr.bin/vgrind/vgrindefs.c b/usr.bin/vgrind/vgrindefs.c
index c48a048..3c310a9 100644
--- a/usr.bin/vgrind/vgrindefs.c
+++ b/usr.bin/vgrind/vgrindefs.c
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
 #define MAXHOP	32	/* max number of tc= indirections */
 
 #include <ctype.h>
+#include <fcntl.h>
+#include <string.h>
 #include <unistd.h>
 
 /*
@@ -308,7 +310,7 @@ tdecode(register char *str, char **area)
 	register int c;
 
 	cp = *area;
-	while (c = *str++) {
+	while ((c = *str++)) {
 	    if (c == ':' && *(cp-1) != '\\')
 		break;
 	    *cp++ = c;
diff --git a/usr.bin/vtfontcvt/Makefile b/usr.bin/vtfontcvt/Makefile
index a9802f7..cfb271b 100644
--- a/usr.bin/vtfontcvt/Makefile
+++ b/usr.bin/vtfontcvt/Makefile
@@ -3,6 +3,4 @@
 PROG=	vtfontcvt
 MAN8=	vtfontcvt.8
 
-WARNS?=	6
-
 .include <bsd.prog.mk>