49 files changed, 119 insertions, 90 deletions

diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 4daaac43730a..e38368f215de 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ac.c,v 1.4.2.1 1997/08/29 05:14:56 imp Exp $";
+	"$Id: ac.c,v 1.4.2.2 1997/09/02 06:28:56 charnier Exp $";
 #endif
 
 #include <sys/types.h>
@@ -28,8 +28,8 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <utmp.h>
 #include <unistd.h>
+#include <utmp.h>
 
 /*
  * this is for our list of currently logged in sessions
@@ -230,7 +230,7 @@ main(argc, argv)
 	(void) setlocale(LC_TIME, "");
 
 	fp = NULL;
-	while ((c = getopt(argc, argv, "Dc:dpt:w:")) !=  -1) {
+	while ((c = getopt(argc, argv, "Dc:dpt:w:")) != -1) {
 		switch (c) {
 #ifdef DEBUG
 		case 'D':
diff --git a/usr.sbin/accton/accton.8 b/usr.sbin/accton/accton.8
index f4855e1220f6..1b5ad28a33a6 100644
--- a/usr.sbin/accton/accton.8
+++ b/usr.sbin/accton/accton.8
@@ -1,4 +1,4 @@
-.Dd "May 21, 1993"
+.Dd May 21, 1993
 .Dt ACCTON 8
 .Os
 .Sh NAME
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index 6445123e0943..3eca0cc8f0fb 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)accton.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: accton.c,v 1.2.6.2 1997/09/02 06:29:45 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -61,7 +61,7 @@ main(argc, argv)
 {
 	int ch;
 
-	while ((ch = getopt(argc, argv, "")) !=  -1)
+	while ((ch = getopt(argc, argv, "")) != -1)
 		switch(ch) {
 		case '?':
 		default:
diff --git a/usr.sbin/bad144/bad144.c b/usr.sbin/bad144/bad144.c
index 590b44f159a6..c918c22477bc 100644
--- a/usr.sbin/bad144/bad144.c
+++ b/usr.sbin/bad144/bad144.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1993, 198019861988
+ * Copyright (c) 1980, 1986, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,16 +33,16 @@
 
 #ifndef lint
 static const char copyright[] =
-"@(#) Copyright (c) 1993, 198019861988\n\
+"@(#) Copyright (c) 1980, 1986, 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
 #if 0
-static const char sccsid[] = "@(#)bad144.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)bad144.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-	"$Id: bad144.c,v 1.12.2.3 1997/12/11 09:17:20 bde Exp $";
+	"$Id: bad144.c,v 1.12.2.4 1997/12/11 09:32:35 bde Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.8 b/usr.sbin/bootparamd/bootparamd/bootparamd.8
index a0e5dcd6c2a9..3573137f0a92 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.8
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.8
@@ -1,5 +1,5 @@
 .\" @(#)bootparamd.8
-.Dd "November 8, 1989"
+.Dd November 8, 1989
 .Dt BOOTPARAMD 8
 .Os
 .Sh NAME
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c
index 0022484fefea..92e0df4b1594 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.c
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c
@@ -9,7 +9,7 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: bootparamd.c,v 1.3.2.1 1997/09/15 06:26:15 charnier Exp $";
+	"$Id: bootparamd.c,v 1.3.2.2 1997/10/19 10:44:28 joerg Exp $";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
@@ -20,7 +20,9 @@ static const char rcsid[] =
 #include <err.h>
 #include <netdb.h>
 #include <stdio.h>
+#include <string.h>
 #include <syslog.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 extern int debug, dolog;
diff --git a/usr.sbin/bootparamd/bootparamd/bootparams.5 b/usr.sbin/bootparamd/bootparamd/bootparams.5
index ebd4f8df2172..910e7c1d28ad 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparams.5
+++ b/usr.sbin/bootparamd/bootparamd/bootparams.5
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	from: Id: bootparams.5,v 1.2 1994/10/03 19:26:13 gwr Exp
-.\"	$Id: bootparams.5,v 1.2.2.3 1997/03/06 07:59:21 mpp Exp $
+.\"	$Id: bootparams.5,v 1.2.2.4 1997/09/15 06:26:16 charnier Exp $
 .\"
 .Dd October 2, 1994
 .Dt BOOTPARAMS 5
@@ -75,4 +75,5 @@ request.  The "host:" component must be supplied.
 default configuration file
 .El
 .Sh SEE ALSO
-.Xr bootparamd 8
+.Xr bootparamd 8 ,
+.Xr diskless 8
diff --git a/usr.sbin/bootparamd/bootparamd/main.c b/usr.sbin/bootparamd/bootparamd/main.c
index e4942816bcd2..f7b73696bb10 100644
--- a/usr.sbin/bootparamd/bootparamd/main.c
+++ b/usr.sbin/bootparamd/bootparamd/main.c
@@ -5,12 +5,11 @@ use and modify. Please send modifications and/or suggestions + bug fixes to
 
         Klas Heggemann <klas@nada.kth.se>
 
-
 */
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: main.c,v 1.3.2.2 1997/09/15 06:26:16 charnier Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -49,7 +48,7 @@ char **argv;
 	struct stat buf;
 	char c;
 
-	while ((c = getopt(argc, argv,"dsr:f:")) !=  -1)
+	while ((c = getopt(argc, argv,"dsr:f:")) != -1)
 	  switch (c) {
 	  case 'd':
 	    debug = 1;
diff --git a/usr.sbin/cdcontrol/cdcontrol.1 b/usr.sbin/cdcontrol/cdcontrol.1
index 44519b691a43..baeea86a6be4 100644
--- a/usr.sbin/cdcontrol/cdcontrol.1
+++ b/usr.sbin/cdcontrol/cdcontrol.1
@@ -1,4 +1,4 @@
-.\"	$Id: cdcontrol.1,v 1.8.2.2 1997/12/23 07:15:39 charnier Exp $
+.\"	$Id: cdcontrol.1,v 1.8.2.3 1998/02/01 04:55:48 jmz Exp $
 .\"
 .Dd July 3, 1995
 .Dt CDCONTROL 1
@@ -49,16 +49,16 @@ The available commands are listed below.  Only as many
 characters as are required to uniquely identify a command
 need be specified. Word
 .Em play
-can be ommitted.
+can be omitted.
 .Bl -tag -width Cm
 
 .It Cm play Ar first_track Op Ar last_track
 Play from track 
 .Ar first_track
 to track
-.Ar last_track . 
+.Ar last_track .
 The first track has number 1.
-Can be ommited in all cases.
+Can be omitted in all cases.
 
 .It Cm play Ar start_m:start_s.start_f Op Ar end_m:end_s.end_f
 Play from the absolute address
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index 56f192700168..d250e445eaa0 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)chroot.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: chroot.c,v 1.1.1.1.8.2 1997/09/16 06:46:12 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -64,7 +64,7 @@ main(argc, argv)
 	int ch;
 	char *shell;
 
-	while ((ch = getopt(argc, argv, "")) !=  -1)
+	while ((ch = getopt(argc, argv, "")) != -1)
 		switch(ch) {
 		case '?':
 		default:
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.1 b/usr.sbin/crunch/crunchgen/crunchgen.1
index 65cc7ab01aab..47243b7e04d7 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.1
+++ b/usr.sbin/crunch/crunchgen/crunchgen.1
@@ -248,7 +248,7 @@ The crunched binary ``kcopy'' can be built as follows:
 .Pp
 .nf
 	% crunchgen -m Makefile kcopy.conf    # gen Makefile and kcopy.c
-	% make objs             # build the component progams' .o files
+	% make objs             # build the component programs' .o files
 	% make                  # build the crunched binary kcopy
 	% kcopy sh              # test that this invokes a sh shell
 	$			# it works!
@@ -265,7 +265,7 @@ takes care to eliminate link conflicts between the component programs
 of a crunched binary, conflicts are still possible between the
 libraries that are linked in.  Some shuffling in the order of
 libraries may be required, and in some rare cases two libraries may
-have an unresolveable conflict and thus cannot be crunched together.
+have an unresolvable conflict and thus cannot be crunched together.
 .Pp
 Some versions of the BSD build environment do not by default build the
 intermediate object file for single-source file programs.  The ``make
diff --git a/usr.sbin/crunch/crunchide/crunchide.c b/usr.sbin/crunch/crunchide/crunchide.c
index e1aeb508b996..2edc0826e84e 100644
--- a/usr.sbin/crunch/crunchide/crunchide.c
+++ b/usr.sbin/crunch/crunchide/crunchide.c
@@ -81,7 +81,7 @@ char **argv;
 {
     int ch;
 
-    while ((ch = getopt(argc, argv, "k:f:")) !=  -1)
+    while ((ch = getopt(argc, argv, "k:f:")) != -1)
 	switch(ch) {
 	case 'k':
 	    add_to_keep_list(optarg);
diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8
index d4dc63233e74..5909425a00c9 100644
--- a/usr.sbin/edquota/edquota.8
+++ b/usr.sbin/edquota/edquota.8
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)edquota.8	8.1 (Berkeley) 6/6/93
 .\"
-.Dd "June 6, 1993"
+.Dd June 6, 1993
 .Dt EDQUOTA 8
 .Os
 .Sh NAME
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 067a7623e143..fdeb220b5399 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)edquota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: edquota.c,v 1.4.2.3 1997/09/18 06:28:23 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -116,7 +116,7 @@ main(argc, argv)
 	if (getuid())
 		errx(1, "permission denied");
 	quotatype = USRQUOTA;
-	while ((ch = getopt(argc, argv, "ugtp:")) !=  -1) {
+	while ((ch = getopt(argc, argv, "ugtp:")) != -1) {
 		switch(ch) {
 		case 'p':
 			protoname = optarg;
diff --git a/usr.sbin/fdcontrol/fdcontrol.c b/usr.sbin/fdcontrol/fdcontrol.c
index fd24802ecced..5fe9f364af0d 100644
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: fdcontrol.c,v 1.2.6.2 1997/09/18 06:29:16 charnier Exp $";
 #endif /* not lint */
 
 #include <err.h>
@@ -68,7 +68,7 @@ main(int argc, char **argv)
   int fd, i;
   int debug = -1, settype = 1;
 
-  while((i = getopt(argc, argv, "d:s")) !=  -1)
+  while((i = getopt(argc, argv, "d:s")) != -1)
     switch(i)
       {
       case 'd':
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index 0285797c3fbb..99c030c7a903 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)iostat.c	8.2 (Berkeley) 1/26/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: iostat.c,v 1.5.2.3 1997/09/22 06:25:38 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -150,7 +150,7 @@ main(argc, argv)
 
 	interval = reps = 0;
 	nlistf = memf = NULL;
-	while ((ch = getopt(argc, argv, "c:M:N:w:")) !=  -1)
+	while ((ch = getopt(argc, argv, "c:M:N:w:")) != -1)
 		switch(ch) {
 		case 'c':
 			if ((reps = atoi(optarg)) <= 0)
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 65d5b5325559..603d6e4aa840 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -12,7 +12,7 @@
 .\"
 .\"     @(#)kbdcontrol.1
 .\"
-.Dd "May 22, 1994"
+.Dd May 22, 1994
 .Dt kbdcontrol 1
 .Os FreeBSD
 .Sh NAME
diff --git a/usr.sbin/keyadmin/keyadmin.8 b/usr.sbin/keyadmin/keyadmin.8
index c6921e45b710..eedb8cbaf134 100644
--- a/usr.sbin/keyadmin/keyadmin.8
+++ b/usr.sbin/keyadmin/keyadmin.8
@@ -166,7 +166,7 @@ Erase all entries in the kernel security association table.
 The following values for
 .Ar command
 are only available by using
-.Nm key
+.Nm
 in its interactive mode of operation:
 .Bl -inset
 .It Nm add Ar type spi source destination transform key
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 075146b74790..6838a991f40d 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)kgmon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: kgmon.c,v 1.6.2.2 1997/09/24 06:34:04 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -96,7 +96,7 @@ main(int argc, char **argv)
 	seteuid(getuid());
 	kmemf = NULL;
 	system = NULL;
-	while ((ch = getopt(argc, argv, "M:N:Bbhpr")) !=  -1) {
+	while ((ch = getopt(argc, argv, "M:N:Bbhpr")) != -1) {
 		switch((char)ch) {
 
 		case 'M':
diff --git a/usr.sbin/manctl/manctl.8 b/usr.sbin/manctl/manctl.8
index c244428db99f..551ee8f11137 100644
--- a/usr.sbin/manctl/manctl.8
+++ b/usr.sbin/manctl/manctl.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: manctl.8,v 1.3.2.1 1997/03/06 07:59:43 mpp Exp $
+.\" $Id: manctl.8,v 1.3.2.2 1997/09/29 06:32:23 charnier Exp $
 
 .Dd January 1, 1996
 .Dt MANCTL 8
@@ -39,13 +39,10 @@
 .Op Fl purge
 .Op Fl help
 .Ar path ...
-
 .Sh DESCRIPTION
 .Nm Manctl
 compress or uncompress manual pages in directory path. 
 If possible, .so's are replaced with hard links.
-
-
 .Sh OPTIONS
 .Bl -tag -width -indent
 .It Fl help
@@ -56,7 +53,6 @@ Compress uncompressed man pages (eliminating .so's).
 Uncompress compressed man pages.
 .It Fl purge
 Purge old formatted man pages (not implemented yet).
-
 .Sh SEE ALSO
 .Xr catman 1 ,
 .Xr man 1
diff --git a/usr.sbin/mkdosfs/mkdosfs.c b/usr.sbin/mkdosfs/mkdosfs.c
index e32a0048f7d3..8a2a104e56b4 100644
--- a/usr.sbin/mkdosfs/mkdosfs.c
+++ b/usr.sbin/mkdosfs/mkdosfs.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: mkdosfs.c,v 1.2.2.2 1997/09/29 06:34:38 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -209,7 +209,7 @@ main(int argc, char **argv)
   int c, i, fd, format = 0, rootdirsize;
   const char *label = 0;
   
-  while((c = getopt(argc, argv, "f:L:")) !=  -1)
+  while((c = getopt(argc, argv, "f:L:")) != -1)
     switch(c)
       {
       case 'f':
diff --git a/usr.sbin/natd/icmp.c b/usr.sbin/natd/icmp.c
index 413c34f7a734..d85727a9e24d 100644
--- a/usr.sbin/natd/icmp.c
+++ b/usr.sbin/natd/icmp.c
@@ -7,7 +7,19 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- * $Id: icmp.c,v 1.4 1997/12/30 00:38:56 alex Exp $
+ * $Id: icmp.c,v 1.2.2.2 1998/02/20 15:42:04 brian Exp $
+ */
+
+/*
+ * This software is provided free of charge, with no 
+ * warranty of any kind, either expressed or implied.
+ * Use at your own risk.
+ * 
+ * You may copy, modify and distribute this software freely.
+ *
+ * Ari Suutari <suutari@iki.fi>
+ *
+ * $Id$
  */
 
 #include <stdlib.h>
diff --git a/usr.sbin/pcvt/cursor/cursor.c b/usr.sbin/pcvt/cursor/cursor.c
index 7a34633216a9..1c7c140f2b52 100644
--- a/usr.sbin/pcvt/cursor/cursor.c
+++ b/usr.sbin/pcvt/cursor/cursor.c
@@ -68,7 +68,7 @@ char *argv[];
 	int dflag = -1;
 	char *device;
 
-	while( (c = getopt(argc, argv, "d:n:s:e:")) !=  -1)
+	while( (c = getopt(argc, argv, "d:n:s:e:")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/pcvt/demo/Makefile b/usr.sbin/pcvt/demo/Makefile
index 79f7397e6dd9..313b6ef63787 100644
--- a/usr.sbin/pcvt/demo/Makefile
+++ b/usr.sbin/pcvt/demo/Makefile
@@ -9,7 +9,7 @@ all: $(DEMOS) $(PROG)
 install: ${DEMOS}
 	@${ECHO} "to look at the demos, execute:"
 	@${ECHO} "        \"cat <filename>.vt\""
-	@${ECHO} "if it is an animation an it runs too fast, try out:"
+	@${ECHO} "if it is an animation and it runs too fast, try out:"
 	@${ECHO} "        \"playvt -f <filename>.vt -d<some-delay-val>\""
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/demo/playvt.c b/usr.sbin/pcvt/demo/playvt.c
index 3ee291f0a3f3..b34d798c1067 100644
--- a/usr.sbin/pcvt/demo/playvt.c
+++ b/usr.sbin/pcvt/demo/playvt.c
@@ -59,7 +59,7 @@ char *argv[];
 	int fflag = -1;
 	char *filename;
 
-	while( (c = getopt(argc, argv, "d:f:")) !=  -1)
+	while( (c = getopt(argc, argv, "d:f:")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/pcvt/ispcvt/ispcvt.c b/usr.sbin/pcvt/ispcvt/ispcvt.c
index 4b24711f53ae..813e9dd60644 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.c
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.c
@@ -76,7 +76,7 @@ char *argv[];
 	int fd;
 	char *device;
 
-	while( (c = getopt(argc, argv, "vcd:")) !=  -1)
+	while( (c = getopt(argc, argv, "vcd:")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/pcvt/kcon/kcon.c b/usr.sbin/pcvt/kcon/kcon.c
index 75b91b2327e8..1f9cdedd3708 100644
--- a/usr.sbin/pcvt/kcon/kcon.c
+++ b/usr.sbin/pcvt/kcon/kcon.c
@@ -95,7 +95,7 @@ char *argv[];
 	char *map;
 	int kbfd;
 
-	while((c = getopt(argc, argv, "Rd:lm:opr:st:x")) !=  -1)
+	while((c = getopt(argc, argv, "Rd:lm:opr:st:x")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/pcvt/keycap/Makefile b/usr.sbin/pcvt/keycap/Makefile
index a39ee678ba39..cc6767d5a9f0 100644
--- a/usr.sbin/pcvt/keycap/Makefile
+++ b/usr.sbin/pcvt/keycap/Makefile
@@ -1,4 +1,3 @@
-
 .if !exists(${.CURDIR}/../Makefile.inc)
 error:
 	@echo
@@ -25,8 +24,8 @@ MAN5	=	man5/keycap.${MAN5EXT}
 #CLEANFILES+=	keycap.0 man5/keycap.0
 
 beforeinstall:
-	${INSTALL} -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \
-	${.CURDIR}/${KEYCAPSRC} ${DESTDIR}${CAPPATH}
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+	    ${.CURDIR}/${KEYCAPSRC} ${DESTDIR}${CAPPATH}
 
 .include <bsd.lib.mk>
 
diff --git a/usr.sbin/pcvt/keycap/keycap.3 b/usr.sbin/pcvt/keycap/keycap.3
index 6e8fb6c79090..b62b427b681a 100644
--- a/usr.sbin/pcvt/keycap/keycap.3
+++ b/usr.sbin/pcvt/keycap/keycap.3
@@ -44,8 +44,11 @@
 .Nm kgetstr
 .Nd routines for accessing the keycap database
 .Sh SYNOPSIS
+.Ft int
 .Fn kgetent "char *bp" "char *name"
+.Ft int
 .Fn kgetnum "char *id"
+.Ft int
 .Fn kgetflag "char *id"
 .Ft char *
 .Fn kgetstr "char *id" "char *area"
diff --git a/usr.sbin/pcvt/loadfont/loadfont.c b/usr.sbin/pcvt/loadfont/loadfont.c
index 2ef94080032e..ce4abc333815 100644
--- a/usr.sbin/pcvt/loadfont/loadfont.c
+++ b/usr.sbin/pcvt/loadfont/loadfont.c
@@ -97,7 +97,7 @@ char *argv[];
 	int dflag = 0;
 	char *device;
 
-	while( (c = getopt(argc, argv, "c:d:f:i")) !=  -1)
+	while( (c = getopt(argc, argv, "c:d:f:i")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/pcvt/mcon/mcon.c b/usr.sbin/pcvt/mcon/mcon.c
index f35b7da6a06f..4df1affcd975 100644
--- a/usr.sbin/pcvt/mcon/mcon.c
+++ b/usr.sbin/pcvt/mcon/mcon.c
@@ -88,7 +88,7 @@ int main(int argc, char **argv) {
 	int left = 0, mid = 0, right = 0, accel = 0, sticky = -1;
 	struct mousedefs mdef;
 
-	while((c = getopt(argc, argv, "l:m:r:a:s:")) !=  -1)
+	while((c = getopt(argc, argv, "l:m:r:a:s:")) != -1)
 		switch(c) {
 		case 'l':
 			left = nametoscan(optarg);
diff --git a/usr.sbin/pcvt/scon/scon.c b/usr.sbin/pcvt/scon/scon.c
index c32c6b22827a..d42d5c46e7af 100644
--- a/usr.sbin/pcvt/scon/scon.c
+++ b/usr.sbin/pcvt/scon/scon.c
@@ -196,7 +196,7 @@ char *argv[];
 	int c;
 	int fd;
 
-	while( (c = getopt(argc, argv, "ac:d:f:HVlms:t:vp:18")) !=  -1)
+	while( (c = getopt(argc, argv, "ac:d:f:HVlms:t:vp:18")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/pcvt/set2061/main.c b/usr.sbin/pcvt/set2061/main.c
index 1ceae2cb7373..49862fabaf92 100644
--- a/usr.sbin/pcvt/set2061/main.c
+++ b/usr.sbin/pcvt/set2061/main.c
@@ -63,7 +63,7 @@ char *argv[];
 	long freq = -1;
 	int no = -1;
 
-	while( (c = getopt(argc, argv, "f:n:")) !=  -1)
+	while( (c = getopt(argc, argv, "f:n:")) != -1)
 	{
 		switch(c)
 		{
diff --git a/usr.sbin/pcvt/userkeys/vt220keys.c b/usr.sbin/pcvt/userkeys/vt220keys.c
index a3411d6e6f00..55664c5e9a71 100644
--- a/usr.sbin/pcvt/userkeys/vt220keys.c
+++ b/usr.sbin/pcvt/userkeys/vt220keys.c
@@ -88,7 +88,7 @@ main(argc,argv)
         if(argc == 1) usage();  /* program requires options              */
 
         /* get options */
-        while ((option = getopt(argc, argv, "cli")) !=  -1)
+        while ((option = getopt(argc, argv, "cli")) != -1)
         switch(option)
         {
                 case 'c' :
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c
index 8a861167c159..6107a56e1357 100644
--- a/usr.sbin/portmap/portmap.c
+++ b/usr.sbin/portmap/portmap.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)portmap.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: portmap.c,v 1.4.2.2 1997/10/10 06:16:58 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -120,7 +120,7 @@ main(argc, argv)
 	int len = sizeof(struct sockaddr_in);
 	register struct pmaplist *pml;
 
-	while ((c = getopt(argc, argv, "dv")) !=  -1) {
+	while ((c = getopt(argc, argv, "dv")) != -1) {
 		switch (c) {
 
 		case 'd':
diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c
index 221e2f1438a5..e2ddbbb827ae 100644
--- a/usr.sbin/ppp/defs.c
+++ b/usr.sbin/ppp/defs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: defs.c,v 1.11.2.1 1998/01/26 20:04:34 brian Exp $
  */
 
 #include <sys/param.h>
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "defs.h"
@@ -70,7 +69,16 @@ GetLabel()
 void
 randinit()
 {
+#ifdef __FreeBSD__
+  static int initdone;
+
+  if (!initdone) {
+    initdone = 1;
+    srandomdev();
+  }
+#else
   srandom(time(NULL)^getpid());
+#endif
 }
 
 
diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8
index f70a5cc0b539..c570497b1272 100644
--- a/usr.sbin/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp.8
@@ -1,4 +1,4 @@
-." $Id: ppp.8,v 1.19.2.33 1998/01/26 20:05:12 brian Exp $
+.\" $Id$
 .Dd 20 September 1995
 .Os FreeBSD
 .Dt PPP 8
diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c
index 584ab740e634..85f953c2644c 100644
--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: pppctl.c,v 1.1.2.3 1998/01/26 20:00:50 brian Exp $
  */
 
 #include <sys/types.h>
@@ -272,7 +272,7 @@ main(int argc, char **argv)
 
         memset(&ifsin, '\0', sizeof ifsin);
         if (strspn(host, "0123456789.") == hlen) {
-            if (!inet_aton(host, (struct in_addr *)&ifsin.sin_addr.s_addr)) {
+            if (!inet_aton(host, &ifsin.sin_addr)) {
                 fprintf(stderr, "Cannot translate %s\n", host);
                 return 1;
             }
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 73664eea2cf6..d049ebdde11d 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)quotaon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: quotaon.c,v 1.3 1997/10/13 11:01:33 charnier Exp $";
+	"$Id: quotaon.c,v 1.1.1.1.8.2 1997/11/04 07:24:32 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -93,7 +93,7 @@ main(argc, argv)
 		offmode++;
 	else if (strcmp(whoami, "quotaon") != 0)
 		errx(1, "name must be quotaon or quotaoff");
-	while ((ch = getopt(argc, argv, "avug")) !=  -1) {
+	while ((ch = getopt(argc, argv, "avug")) != -1) {
 		switch(ch) {
 		case 'a':
 			aflag++;
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index ad7cd772af4e..16e4cbd6ae3f 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -27,7 +27,7 @@ The Regents of the University of California.  All rights reserved.\n";
 
 #ifndef lint
 static const char rcsid[] =
-    "$Id$";
+    "$Id: rarpd.c,v 1.7.2.4 1997/11/05 07:27:19 charnier Exp $";
 #endif
 
 /*
@@ -197,7 +197,7 @@ main(argc, argv)
 	openlog(name, LOG_PID | LOG_CONS, LOG_DAEMON);
 
 	opterr = 0;
-	while ((op = getopt(argc, argv, "afsv")) !=  -1) {
+	while ((op = getopt(argc, argv, "afsv")) != -1) {
 		switch (op) {
 		case 'a':
 			++aflag;
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index ae5eeed29745..0d5019e14906 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)repquota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: repquota.c,v 1.5 1997/10/13 11:05:07 charnier Exp $";
+	"$Id: repquota.c,v 1.3.6.2 1997/11/05 07:29:16 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -101,7 +101,7 @@ main(argc, argv)
 	long i, argnum, done = 0;
 	char ch, *qfnp;
 
-	while ((ch = getopt(argc, argv, "aguv")) !=  -1) {
+	while ((ch = getopt(argc, argv, "aguv")) != -1) {
 		switch(ch) {
 		case 'a':
 			aflag++;
diff --git a/usr.sbin/rmt/rmt.8 b/usr.sbin/rmt/rmt.8
index dfa1b2bd1051..8f9d0df7d25a 100644
--- a/usr.sbin/rmt/rmt.8
+++ b/usr.sbin/rmt/rmt.8
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)rmt.8	8.2 (Berkeley) 12/11/93
+.\"     @(#)rmt.8	8.3 (Berkeley) 6/1/94
 .\"
-.Dd December 11, 1993
+.Dd June 1, 1994
 .Dt RMT 8
 .Os BSD 4.2
 .Sh NAME
@@ -184,6 +184,7 @@ fields of the structure used in the
 call.  The return value is the
 .Ar count
 parameter when the operation is successful.
+.ne 1i
 .It Sy S
 Return the status of the open device, as
 obtained with a
diff --git a/usr.sbin/rndcontrol/rndcontrol.c b/usr.sbin/rndcontrol/rndcontrol.c
index d50873c7f4e2..fe3d64bf4950 100644
--- a/usr.sbin/rndcontrol/rndcontrol.c
+++ b/usr.sbin/rndcontrol/rndcontrol.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: rndcontrol.c,v 1.4.4.2 1997/11/05 07:31:59 charnier Exp $";
 #endif /* not lint */
 
 #include <err.h>
@@ -64,7 +64,7 @@ main(int argc, char *argv[])
 		return (1);
 	}
 	else {
-		while ((ch = getopt(argc, argv, "qs:c:")) !=  -1)
+		while ((ch = getopt(argc, argv, "qs:c:")) != -1)
 			switch (ch) {
 			case 'q':
 				verbose = 0;
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index d50614df9b57..46462650dad7 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: lockd.c,v 1.2.2.1 1997/11/05 07:33:36 charnier Exp $";
 #endif /* not lint */
 
 /* main() function for NFS lock daemon.  Most of the code in this	*/
@@ -47,8 +47,8 @@ static const char rcsid[] =
 #include <rpc/pmap_clnt.h>
 #include "lockd.h"
 
-extern void nlm_prog_1 __P((struct svc_req, register SVCXPRT));
-extern void nlm_prog_3 __P((struct svc_req, register SVCXPRT));
+void nlm_prog_1 __P((struct svc_req *, SVCXPRT *));
+void nlm_prog_3 __P((struct svc_req *, SVCXPRT *));
 static void usage __P((void));
 
 int debug_level = 0;	/* Zero means no debugging syslog() calls	*/
diff --git a/usr.sbin/rpc.statd/file.c b/usr.sbin/rpc.statd/file.c
index f5438380a3d0..b8fc5cc9c1ba 100644
--- a/usr.sbin/rpc.statd/file.c
+++ b/usr.sbin/rpc.statd/file.c
@@ -155,7 +155,7 @@ void init_file(char *filename)
   status_info = (FileLayout *)
     mmap(NULL, 0x10000000, PROT_READ | PROT_WRITE, MAP_SHARED, status_fd, 0);
 
-  if (status_info == (FileLayout *) -1)
+  if (status_info == (FileLayout *) MAP_FAILED)
     warn("unable to mmap() status file");
 
   status_file_len = lseek(status_fd, 0L, SEEK_END);
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
index 8ce8731b35c6..44d5e5e89cb6 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ypxfrd_main.c,v 1.1.1.1.2.2 1997/11/06 07:32:21 charnier Exp $";
+	"$Id: ypxfrd_main.c,v 1.1.1.1.2.3 1997/11/07 03:16:22 wpaul Exp $";
 #endif /* not lint */
 
 #include "ypxfrd.h"
@@ -193,7 +193,7 @@ main(argc, argv)
 	int asize = sizeof (saddr);
 	int ch;
 
-	while ((ch = getopt(argc, argv, "p:h")) !=  -1) {
+	while ((ch = getopt(argc, argv, "p:h")) != -1) {
 		switch(ch) {
 		case 'p':
 			yp_dir = optarg;
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index fd6df4bd374f..9f19c5c414aa 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rtprio.1,v 1.6.2.2 1997/03/07 07:45:39 mpp Exp $
+.\"	$Id: rtprio.1,v 1.6.2.3 1997/10/14 06:40:09 charnier Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
@@ -36,7 +36,7 @@
 .Sh NAME
 .Nm rtprio ,
 .Nm idprio
-.Nd execute, examine or modify a utilitys or process realtime 
+.Nd execute, examine or modify a utility's or process's realtime 
 or idletime scheduling priority
 .Sh SYNOPSIS
 .Nm [id|rt]prio
@@ -70,7 +70,7 @@ degradation, and will only be preempted by another process of equal or
 higher realtime priority.
 .Pp
 A process with an idle priority will run only when no other
-process is runnable and then only if it's idle priority is equal or
+process is runnable and then only if its idle priority is equal or
 greater than all other runnable idle priority processes.
 .Pp
 .Nm Rtprio 
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index ebe491eea103..a777f8398c60 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -33,7 +33,7 @@ static char copright[] =
 "@(#) Copyright (c) 1994 Christopher G. Demetriou\n\
  All rights reserved.\n";
 
-static char rcsid[] = "$Id: main.c,v 1.2 1995/05/30 03:51:39 rgrimes Exp $";
+static char rcsid[] = "$Id: main.c,v 1.3 1996/01/22 09:02:01 mpp Exp $";
 #endif
 
 /*
@@ -63,6 +63,7 @@ static int	cmp_avgdkio	__P((const DBT *, const DBT *));
 static int	cmp_cpumem	__P((const DBT *, const DBT *));
 static int	cmp_avgcpumem	__P((const DBT *, const DBT *));
 static int	cmp_calls	__P((const DBT *, const DBT *));
+static void	usage		__P((void));
 
 int aflag, bflag, cflag, dflag, Dflag, fflag, iflag, jflag, kflag;
 int Kflag, lflag, mflag, qflag, rflag, sflag, tflag, uflag, vflag;
@@ -168,9 +169,7 @@ main(argc, argv)
 				break;
 			case '?':
 	                default:
-				(void)fprintf(stderr,
-				    "usage: sa [-abcdDfijkKlmnqrstu] [-v cutoff] [file ...]\n");
-				exit(1);
+				usage();
 		}
 
 	argc -= optind;
@@ -224,7 +223,7 @@ main(argc, argv)
 			}
 			if (unmask &&
 			    (sigprocmask(SIG_BLOCK, &nmask, &omask) == -1)) {
-				warn("couldn't set signal mask ");
+				warn("couldn't set signal mask");
 				unmask = 0;
 				error = 1;
 			}
@@ -288,6 +287,14 @@ main(argc, argv)
 	exit(error);
 }
 
+static void
+usage()
+{
+	(void)fprintf(stderr,
+		"usage: sa [-abcdDfijkKlmnqrstu] [-v cutoff] [file ...]\n");
+	exit(1);
+}
+
 static int
 acct_load(pn, wr)
 	char *pn;
diff --git a/usr.sbin/sgsc/sgsc.1 b/usr.sbin/sgsc/sgsc.1
index 862b07674e91..5078c0b01827 100644
--- a/usr.sbin/sgsc/sgsc.1
+++ b/usr.sbin/sgsc/sgsc.1
@@ -58,7 +58,7 @@ The following options are available:
 .It Fl s Ar [GSC_SRESSW]
 Set the scanner with the values of the resolution selector switch.
 .It Fl q
-Operate in quiet mode, i.e. do not report any of the current setings.
+Operate in quiet mode, i.e. do not report any of the current settings.
 Normally the parameters are shown after the modifications have been
 performed.
 .It Fl f Ar file
@@ -79,6 +79,7 @@ Set the internal dma buffer to be
 lines in size.
 .It Fl t Ar timeout [GSC_SBTIME]
 Set the timeout time for reading one dma buffer.
+.El
 .Sh FILES
 .Bl -tag -width /dev/gsc0p -compact
 .It Pa /dev/gsc0