diff --git a/usr.sbin/bootp/bootpd/Makefile b/usr.sbin/bootp/bootpd/Makefile
index c7d14741f8f6..9b02362be688 100644
--- a/usr.sbin/bootp/bootpd/Makefile
+++ b/usr.sbin/bootp/bootpd/Makefile
@@ -1,6 +1,7 @@
 # bootpd/Makefile
-# $Id: Makefile,v 1.2 1994/12/22 11:33:08 cgd Exp $
+# $NetBSD: Makefile,v 1.3 1997/10/18 04:36:50 lukem Exp $
 
+WARNS?=	0
 PROG=	bootpd
 CFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG -DVEND_CMU
 
diff --git a/usr.sbin/bootp/bootpd/bootpd.8 b/usr.sbin/bootp/bootpd/bootpd.8
index 2ab959cc05ab..0f202966dde9 100644
--- a/usr.sbin/bootp/bootpd/bootpd.8
+++ b/usr.sbin/bootp/bootpd/bootpd.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\"	$Header: /cvsroot/src/usr.sbin/bootp/bootpd/bootpd.8,v 1.5 1997/05/20 04:42:56 mikel Exp $
+.\"	$NetBSD: bootpd.8,v 1.6 1997/10/18 04:36:53 lukem Exp $
 .\"
 .TH BOOTPD 8 "November 06, 1993" "Carnegie Mellon University"
 .SH NAME
diff --git a/usr.sbin/bootp/bootpd/bootpd.c b/usr.sbin/bootp/bootpd/bootpd.c
index 159967b5b1d3..5eaca8ebf41e 100644
--- a/usr.sbin/bootp/bootpd/bootpd.c
+++ b/usr.sbin/bootp/bootpd/bootpd.c
@@ -21,7 +21,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: bootpd.c,v 1.6 1996/03/21 18:10:30 jtc Exp $";
+static char rcsid[] = "$NetBSD: bootpd.c,v 1.7 1997/10/18 04:36:55 lukem Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/bootp/bootpd/bootptab.5 b/usr.sbin/bootp/bootpd/bootptab.5
index ef37f034a904..f7c30edfe9c0 100644
--- a/usr.sbin/bootp/bootpd/bootptab.5
+++ b/usr.sbin/bootp/bootpd/bootptab.5
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\"	$Header: /cvsroot/src/usr.sbin/bootp/bootpd/bootptab.5,v 1.3 1996/06/19 16:08:34 gwr Exp $
+.\"	$NetBSD: bootptab.5,v 1.4 1997/10/18 04:37:00 lukem Exp $
 .\"
 .TH BOOTPTAB 5 "October 31, 1991" "Carnegie Mellon University"
 .UC 6
diff --git a/usr.sbin/bootp/bootpef/bootpef.c b/usr.sbin/bootp/bootpef/bootpef.c
index 4b2e3f405cde..262aa1f4d00b 100644
--- a/usr.sbin/bootp/bootpef/bootpef.c
+++ b/usr.sbin/bootp/bootpef/bootpef.c
@@ -21,7 +21,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: bootpef.c,v 1.2 1994/08/22 22:14:46 gwr Exp $";
+static char rcsid[] = "$NetBSD: bootpef.c,v 1.3 1997/10/18 04:36:56 lukem Exp $";
 #endif
 
 
diff --git a/usr.sbin/bootp/bootpgw/bootpgw.c b/usr.sbin/bootp/bootpgw/bootpgw.c
index ff252c16c1b5..f9e0e9184171 100644
--- a/usr.sbin/bootp/bootpgw/bootpgw.c
+++ b/usr.sbin/bootp/bootpgw/bootpgw.c
@@ -26,7 +26,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: bootpgw.c,v 1.5 1996/05/06 13:49:16 christos Exp $";
+static char rcsid[] = "$NetBSD: bootpgw.c,v 1.6 1997/10/18 04:36:58 lukem Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/bootp/bootptest/print-bootp.c b/usr.sbin/bootp/bootptest/print-bootp.c
index 1919e7f88660..c1ba8795cf8c 100644
--- a/usr.sbin/bootp/bootptest/print-bootp.c
+++ b/usr.sbin/bootp/bootptest/print-bootp.c
@@ -24,7 +24,7 @@
  * There is an e-mail list for tcpdump: <tcpdump@ee.lbl.gov>
  */
 #ifndef lint
-static char rcsid[] = "$Id: print-bootp.c,v 1.2 1994/08/22 22:15:01 gwr Exp $";
+static char rcsid[] = "$NetBSD: print-bootp.c,v 1.3 1997/10/18 04:37:03 lukem Exp $";
 /* 93/10/10 <gwr@mc.com> New data-driven option print routine. */
 #endif
 
diff --git a/usr.sbin/bootp/common/bootp.h b/usr.sbin/bootp/common/bootp.h
index 57fc3a90478f..0bc1de2f1196 100644
--- a/usr.sbin/bootp/common/bootp.h
+++ b/usr.sbin/bootp/common/bootp.h
@@ -23,7 +23,7 @@ SOFTWARE.
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1395.
  *
- * $Id: bootp.h,v 1.3 1994/12/23 16:52:30 cgd Exp $
+ * $NetBSD: bootp.h,v 1.4 1997/10/18 04:36:52 lukem Exp $
  *
  *
  * This file specifies the "implementation-independent" BOOTP protocol
diff --git a/usr.sbin/bootp/common/hash.c b/usr.sbin/bootp/common/hash.c
index c1d33bb85ec6..cc52f3408e4b 100644
--- a/usr.sbin/bootp/common/hash.c
+++ b/usr.sbin/bootp/common/hash.c
@@ -21,7 +21,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: hash.c,v 1.2 1994/08/22 22:14:58 gwr Exp $";
+static char rcsid[] = "$NetBSD: hash.c,v 1.3 1997/10/18 04:37:01 lukem Exp $";
 #endif
 
 
diff --git a/usr.sbin/bootp/common/readfile.c b/usr.sbin/bootp/common/readfile.c
index 6df6aa21521f..ee40174946e5 100644
--- a/usr.sbin/bootp/common/readfile.c
+++ b/usr.sbin/bootp/common/readfile.c
@@ -21,7 +21,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: readfile.c,v 1.3 1996/06/19 14:52:34 gwr Exp $";
+static char rcsid[] = "$NetBSD: readfile.c,v 1.4 1997/10/18 04:37:05 lukem Exp $";
 #endif
 
 
diff --git a/usr.sbin/bootpd/Makefile b/usr.sbin/bootpd/Makefile
index c7d14741f8f6..9b02362be688 100644
--- a/usr.sbin/bootpd/Makefile
+++ b/usr.sbin/bootpd/Makefile
@@ -1,6 +1,7 @@
 # bootpd/Makefile
-# $Id: Makefile,v 1.2 1994/12/22 11:33:08 cgd Exp $
+# $NetBSD: Makefile,v 1.3 1997/10/18 04:36:50 lukem Exp $
 
+WARNS?=	0
 PROG=	bootpd
 CFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG -DVEND_CMU
 
diff --git a/usr.sbin/bootpd/bootp.h b/usr.sbin/bootpd/bootp.h
index 57fc3a90478f..0bc1de2f1196 100644
--- a/usr.sbin/bootpd/bootp.h
+++ b/usr.sbin/bootpd/bootp.h
@@ -23,7 +23,7 @@ SOFTWARE.
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1395.
  *
- * $Id: bootp.h,v 1.3 1994/12/23 16:52:30 cgd Exp $
+ * $NetBSD: bootp.h,v 1.4 1997/10/18 04:36:52 lukem Exp $
  *
  *
  * This file specifies the "implementation-independent" BOOTP protocol
diff --git a/usr.sbin/bootpd/bootpd.8 b/usr.sbin/bootpd/bootpd.8
index 7d8bc942ee58..0f202966dde9 100644
--- a/usr.sbin/bootpd/bootpd.8
+++ b/usr.sbin/bootpd/bootpd.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\"	$Header: /cvsroot/src/usr.sbin/bootpd/Attic/bootpd.8,v 1.5 1997/05/20 04:42:56 mikel Exp $
+.\"	$NetBSD: bootpd.8,v 1.6 1997/10/18 04:36:53 lukem Exp $
 .\"
 .TH BOOTPD 8 "November 06, 1993" "Carnegie Mellon University"
 .SH NAME
diff --git a/usr.sbin/bootpd/bootpd.c b/usr.sbin/bootpd/bootpd.c
index 159967b5b1d3..5eaca8ebf41e 100644
--- a/usr.sbin/bootpd/bootpd.c
+++ b/usr.sbin/bootpd/bootpd.c
@@ -21,7 +21,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: bootpd.c,v 1.6 1996/03/21 18:10:30 jtc Exp $";
+static char rcsid[] = "$NetBSD: bootpd.c,v 1.7 1997/10/18 04:36:55 lukem Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/bootpd/bootpef.c b/usr.sbin/bootpd/bootpef.c
index 4b2e3f405cde..262aa1f4d00b 100644
--- a/usr.sbin/bootpd/bootpef.c
+++ b/usr.sbin/bootpd/bootpef.c
@@ -21,7 +21,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: bootpef.c,v 1.2 1994/08/22 22:14:46 gwr Exp $";
+static char rcsid[] = "$NetBSD: bootpef.c,v 1.3 1997/10/18 04:36:56 lukem Exp $";
 #endif
 
 
diff --git a/usr.sbin/bootpd/bootpgw.c b/usr.sbin/bootpd/bootpgw.c
index ff252c16c1b5..f9e0e9184171 100644
--- a/usr.sbin/bootpd/bootpgw.c
+++ b/usr.sbin/bootpd/bootpgw.c
@@ -26,7 +26,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: bootpgw.c,v 1.5 1996/05/06 13:49:16 christos Exp $";
+static char rcsid[] = "$NetBSD: bootpgw.c,v 1.6 1997/10/18 04:36:58 lukem Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/bootpd/bootptab.5 b/usr.sbin/bootpd/bootptab.5
index 2556a8eb9f8b..f7c30edfe9c0 100644
--- a/usr.sbin/bootpd/bootptab.5
+++ b/usr.sbin/bootpd/bootptab.5
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\"	$Header: /cvsroot/src/usr.sbin/bootpd/Attic/bootptab.5,v 1.3 1996/06/19 16:08:34 gwr Exp $
+.\"	$NetBSD: bootptab.5,v 1.4 1997/10/18 04:37:00 lukem Exp $
 .\"
 .TH BOOTPTAB 5 "October 31, 1991" "Carnegie Mellon University"
 .UC 6
diff --git a/usr.sbin/bootpd/hash.c b/usr.sbin/bootpd/hash.c
index c1d33bb85ec6..cc52f3408e4b 100644
--- a/usr.sbin/bootpd/hash.c
+++ b/usr.sbin/bootpd/hash.c
@@ -21,7 +21,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: hash.c,v 1.2 1994/08/22 22:14:58 gwr Exp $";
+static char rcsid[] = "$NetBSD: hash.c,v 1.3 1997/10/18 04:37:01 lukem Exp $";
 #endif
 
 
diff --git a/usr.sbin/bootpd/print-bootp.c b/usr.sbin/bootpd/print-bootp.c
index 1919e7f88660..c1ba8795cf8c 100644
--- a/usr.sbin/bootpd/print-bootp.c
+++ b/usr.sbin/bootpd/print-bootp.c
@@ -24,7 +24,7 @@
  * There is an e-mail list for tcpdump: <tcpdump@ee.lbl.gov>
  */
 #ifndef lint
-static char rcsid[] = "$Id: print-bootp.c,v 1.2 1994/08/22 22:15:01 gwr Exp $";
+static char rcsid[] = "$NetBSD: print-bootp.c,v 1.3 1997/10/18 04:37:03 lukem Exp $";
 /* 93/10/10 <gwr@mc.com> New data-driven option print routine. */
 #endif
 
diff --git a/usr.sbin/bootpd/readfile.c b/usr.sbin/bootpd/readfile.c
index 6df6aa21521f..ee40174946e5 100644
--- a/usr.sbin/bootpd/readfile.c
+++ b/usr.sbin/bootpd/readfile.c
@@ -21,7 +21,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: readfile.c,v 1.3 1996/06/19 14:52:34 gwr Exp $";
+static char rcsid[] = "$NetBSD: readfile.c,v 1.4 1997/10/18 04:37:05 lukem Exp $";
 #endif
 
 
diff --git a/usr.sbin/bootpef/Makefile b/usr.sbin/bootpef/Makefile
index 1e27af420528..2239b12c7698 100644
--- a/usr.sbin/bootpef/Makefile
+++ b/usr.sbin/bootpef/Makefile
@@ -1,6 +1,7 @@
 # bootpef/Makefile
-# $Id: Makefile,v 1.5 1997/05/08 21:12:10 gwr Exp $
+# $NetBSD: Makefile,v 1.6 1997/10/18 04:37:09 lukem Exp $
 
+WARNS?=	0
 PROG=	bootpef
 SRCDIR= ${.CURDIR}/../bootpd
 CFLAGS+= -DETC_ETHERS -DDEBUG -I${SRCDIR}
diff --git a/usr.sbin/bootpgw/Makefile b/usr.sbin/bootpgw/Makefile
index 4ccce87b684e..923ed58b44e9 100644
--- a/usr.sbin/bootpgw/Makefile
+++ b/usr.sbin/bootpgw/Makefile
@@ -1,6 +1,7 @@
 # bootpgw/Makefile
-# $Id: Makefile,v 1.4 1997/05/08 21:12:11 gwr Exp $
+# $NetBSD: Makefile,v 1.5 1997/10/18 04:37:11 lukem Exp $
 
+WARNS?=	0
 PROG=	bootpgw
 SRCDIR= ${.CURDIR}/../bootpd
 CFLAGS+= -DSYSLOG -DDEBUG -I${SRCDIR}
diff --git a/usr.sbin/bootptest/Makefile b/usr.sbin/bootptest/Makefile
index fed00a71d9b1..3018441135f5 100644
--- a/usr.sbin/bootptest/Makefile
+++ b/usr.sbin/bootptest/Makefile
@@ -1,6 +1,7 @@
 # bootptest/Makefile
-# $Id: Makefile,v 1.6 1997/05/08 21:12:13 gwr Exp $
+# $NetBSD: Makefile,v 1.7 1997/10/18 04:37:15 lukem Exp $
 
+WARNS?=	0
 PROG=	bootptest
 SRCDIR= ${.CURDIR}/../bootpd
 CFLAGS+= -I${SRCDIR}
diff --git a/usr.sbin/catman/Makefile b/usr.sbin/catman/Makefile
index 1f08fcb3980a..513f4aae3d23 100644
--- a/usr.sbin/catman/Makefile
+++ b/usr.sbin/catman/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1994/12/22 11:33:22 cgd Exp $
+#	$NetBSD: Makefile,v 1.4 1997/10/18 04:37:17 lukem Exp $
 
 BINDIR=		/usr/sbin
 PROG=		catman
diff --git a/usr.sbin/catman/catman.8 b/usr.sbin/catman/catman.8
index 31ec6f6976af..cbe44acacbc6 100644
--- a/usr.sbin/catman/catman.8
+++ b/usr.sbin/catman/catman.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: catman.8,v 1.7 1997/10/18 04:11:01 lukem Exp $
+.\"	$NetBSD: catman.8,v 1.8 1997/10/18 04:37:19 lukem Exp $
 .\"
 .Dd July 30, 1993
 .Dt CATMAN 8
diff --git a/usr.sbin/catman/catman.c b/usr.sbin/catman/catman.c
index ae09ecdec483..6a7edd235f1d 100644
--- a/usr.sbin/catman/catman.c
+++ b/usr.sbin/catman/catman.c
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$Id: catman.c,v 1.7 1997/10/18 04:11:02 lukem Exp $");
+__RCSID("$NetBSD: catman.c,v 1.8 1997/10/18 04:37:20 lukem Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/catman/pathnames.h b/usr.sbin/catman/pathnames.h
index 848d5f0ed794..5108a9457800 100644
--- a/usr.sbin/catman/pathnames.h
+++ b/usr.sbin/catman/pathnames.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pathnames.h,v 1.1 1994/04/27 22:37:13 cgd Exp $
+ *	$NetBSD: pathnames.h,v 1.2 1997/10/18 04:37:22 lukem Exp $
  */
 
 #define	_MAN_SECTIONS		"12345678"	/* l, n, o, and p, too? */
diff --git a/usr.sbin/dbsym/Makefile b/usr.sbin/dbsym/Makefile
index eaa1f6643bb6..e174c0ce0243 100644
--- a/usr.sbin/dbsym/Makefile
+++ b/usr.sbin/dbsym/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1997/09/24 07:22:37 jeremy Exp $
+#	$NetBSD: Makefile,v 1.7 1997/10/18 04:37:24 lukem Exp $
 
 .if ${MACHINE} == "sun3" || ${MACHINE} == "sun3x"
 PROG=dbsym
diff --git a/usr.sbin/gettable/Makefile b/usr.sbin/gettable/Makefile
index 4009b37e26ac..9bca0bbfdf44 100644
--- a/usr.sbin/gettable/Makefile
+++ b/usr.sbin/gettable/Makefile
@@ -1,5 +1,5 @@
+#	$NetBSD: Makefile,v 1.4 1997/10/18 04:37:26 lukem Exp $
 #	from: @(#)Makefile	5.3 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.3 1994/12/22 11:34:26 cgd Exp $
 
 PROG=	gettable
 MAN=	gettable.8
diff --git a/usr.sbin/gettable/gettable.8 b/usr.sbin/gettable/gettable.8
index 6fe84afe2fd9..4ba5bbc321e7 100644
--- a/usr.sbin/gettable/gettable.8
+++ b/usr.sbin/gettable/gettable.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)gettable.8	6.5 (Berkeley) 3/16/91
-.\"	$Id: gettable.8,v 1.3 1997/10/17 04:24:20 lukem Exp $
+.\"	$NetBSD: gettable.8,v 1.4 1997/10/18 04:37:27 lukem Exp $
 .\"
 .Dd March 16, 1991
 .Dt GETTABLE 8
diff --git a/usr.sbin/gettable/gettable.c b/usr.sbin/gettable/gettable.c
index 7dbf9ad00b29..9622aa3c7487 100644
--- a/usr.sbin/gettable/gettable.c
+++ b/usr.sbin/gettable/gettable.c
@@ -42,7 +42,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "from: @(#)gettable.c	5.6 (Berkeley) 3/2/91";
 #else
-__RCSID("$Id: gettable.c,v 1.6 1997/10/17 04:24:21 lukem Exp $");
+__RCSID("$NetBSD: gettable.c,v 1.7 1997/10/18 04:37:29 lukem Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.sbin/kgmon/Makefile b/usr.sbin/kgmon/Makefile
index 845b7a1c7afc..dcea299a9158 100644
--- a/usr.sbin/kgmon/Makefile
+++ b/usr.sbin/kgmon/Makefile
@@ -1,6 +1,7 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.6 1994/12/22 11:35:06 cgd Exp $
+#	$NetBSD: Makefile,v 1.7 1997/10/18 04:37:31 lukem Exp $
 
+WARNS?=	0
 PROG=	kgmon
 MAN=	kgmon.8
 DPADD=	${LIBKVM}
diff --git a/usr.sbin/kgmon/kgmon.8 b/usr.sbin/kgmon/kgmon.8
index 97b914f973c6..5c91cf255df6 100644
--- a/usr.sbin/kgmon/kgmon.8
+++ b/usr.sbin/kgmon/kgmon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)kgmon.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: kgmon.8,v 1.6 1994/06/11 08:04:24 mycroft Exp $
+.\"	$NetBSD: kgmon.8,v 1.7 1997/10/18 04:37:32 lukem Exp $
 .\"
 .Dd June 6, 1993
 .Dt KGMON 8
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index c4db51a72984..b413ec051265 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)kgmon.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: kgmon.c,v 1.6 1994/12/23 16:45:33 cgd Exp $";
+static char *rcsid = "$NetBSD: kgmon.c,v 1.7 1997/10/18 04:37:34 lukem Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/mopd/moptrace/moptrace.1 b/usr.sbin/mopd/moptrace/moptrace.1
index 7044df1e9187..f09b23778967 100644
--- a/usr.sbin/mopd/moptrace/moptrace.1
+++ b/usr.sbin/mopd/moptrace/moptrace.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: moptrace.1,v 1.3 1997/10/16 23:25:26 lukem Exp $
+.\"	$NetBSD: moptrace.1,v 1.4 1997/10/18 04:37:37 lukem Exp $
 .\"
 .\" Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $Id: moptrace.1,v 1.3 1997/10/16 23:25:26 lukem Exp $
+.\" @(#) $NetBSD: moptrace.1,v 1.4 1997/10/18 04:37:37 lukem Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPTRACE 1
diff --git a/usr.sbin/pkg_install/tkpkg b/usr.sbin/pkg_install/tkpkg
index 079981f29731..1050d3134b7f 100644
--- a/usr.sbin/pkg_install/tkpkg
+++ b/usr.sbin/pkg_install/tkpkg
@@ -1,56 +1,6 @@
 #!/usr/local/bin/wish -f
 # from FreeBSD Id: tkpkg,v 1.4 1997/02/22 16:09:13 peter Exp
 #
-#$Log: tkpkg,v $
-#Revision 1.2  1997/06/05 12:59:20  agc
-#Add NetBSD Ids
-#Un-munge pkg_install/lib/Makefile which I'd overwritten on libftpio commit.
-#Make it compile on NetBSD.
-#Install pkg_* programs in /usr/sbin
-#
-#XXX agc - Still to do XXX
-#Cleanup call to mktemp (for a tmp dir) in pkg_install/lib/pen.c
-#Create ftperr.c in the correct directory.
-#
-#Revision 1.1.1.1  1997/06/05 08:54:23  agc
-#Initial import of FreeBSD packaging tool.
-#
-#Revision 1.4  1997/02/22 16:09:13  peter
-#Revert -dollar-FreeBSD-dollar- to -dollar-Id-dollar- (changed from the obvious by agc)
-#
-#Revision 1.3  1997/01/14 07:14:23  jkh
-#Make the long-awaited change from -dollar-Id: tkpkg,v 1.4 1997/02/22 16:09:13 peter Exp -dollar- to -dollar-Id: tkpkg,v 1.4 1997/02/22 16:09:13 peter Exp -dollar- (changed from the obvious by agc)
-#
-#This will make a number of things easier in the future, as well as (finally!)
-#avoiding the Id-smashing problem which has plagued developers for so long.
-#
-#Boy, I'm glad we're not using sup anymore.  This update would have been
-#insane otherwise.
-#
-#Revision 1.2  1994/12/06 00:51:21  jkh
-#Many of John T. Kohl's patches from NetBSD.  Thanks, John!
-#Submitted by:	jkohl
-#
-# Revision 1.1  1994/01/06  08:16:20  jkh
-# Cleaning house.
-#
-# Revision 1.1  1993/09/04  17:06:09  jkh
-# Added Rich's wish front-end.
-#
-# Revision 1.6  1993/09/03  23:37:22  rich
-# warn user if no tar archives are found in the current directory.
-# removed the revision string from the lower text frame.
-#
-# Revision 1.5  1993/09/03  15:48:04  rich
-# glob for .tar.gz, .tar.z and .tar.Z looking for archives
-#
-# Revision 1.4  1993/08/28  15:53:59  rich
-# added version and date info to lower text window.
-#
-# Revision 1.3  1993/08/28  15:47:12  rich
-# filtered out ^Ls in pkg_* output.
-#
-#
 set pkgname ""
 wm title . "Package Installation"
 #--------------------------------------------------------------
diff --git a/usr.sbin/pppd/chat/chat.8 b/usr.sbin/pppd/chat/chat.8
index e09a4aa9a28e..8837411044e9 100644
--- a/usr.sbin/pppd/chat/chat.8
+++ b/usr.sbin/pppd/chat/chat.8
@@ -1,7 +1,7 @@
-.\"	$NetBSD: chat.8,v 1.7 1997/09/26 19:52:16 christos Exp $
+.\"	$NetBSD: chat.8,v 1.8 1997/10/18 04:37:41 lukem Exp $
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" $Id: chat.8,v 1.7 1997/09/26 19:52:16 christos Exp $
+.\" $NetBSD: chat.8,v 1.8 1997/10/18 04:37:41 lukem Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.sbin/pppd/pppd/pppd.8 b/usr.sbin/pppd/pppd/pppd.8
index a6b24295840c..e379440463b7 100644
--- a/usr.sbin/pppd/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd/pppd.8
@@ -1,6 +1,6 @@
-.\"	$NetBSD: pppd.8,v 1.17 1997/09/26 19:53:15 christos Exp $
+.\"	$NetBSD: pppd.8,v 1.18 1997/10/18 04:37:46 lukem Exp $
 .\" manual page [] for pppd 2.3
-.\" $Id: pppd.8,v 1.17 1997/09/26 19:53:15 christos Exp $
+.\" $NetBSD: pppd.8,v 1.18 1997/10/18 04:37:46 lukem Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index 5dd3a967a7a5..d54322d66b65 100644
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.10 1997/07/25 06:54:00 mrg Exp $
+#	$NetBSD: Makefile,v 1.11 1997/10/18 04:37:49 lukem Exp $
 
 PROG=	pwd_mkdb
 SRCS=	pwd_mkdb.c getpwent.c
diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile
index aca581b820d3..f07ec1a20b30 100644
--- a/usr.sbin/quot/Makefile
+++ b/usr.sbin/quot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1994/12/22 11:39:03 cgd Exp $
+#	$NetBSD: Makefile,v 1.4 1997/10/18 04:37:51 lukem Exp $
 
 PROG=	quot
 MAN=	quot.8
diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8
index 0e5f7fca7b80..6c477be566cf 100644
--- a/usr.sbin/quot/quot.8
+++ b/usr.sbin/quot/quot.8
@@ -27,7 +27,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: quot.8,v 1.5 1997/10/17 12:36:30 lukem Exp $
+.\"	$NetBSD: quot.8,v 1.6 1997/10/18 04:37:52 lukem Exp $
 .\"
 .Dd February 8, 1994
 .Dt QUOT 8
diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile
index 59a96da5e4d1..f141dc0e4989 100644
--- a/usr.sbin/quotaon/Makefile
+++ b/usr.sbin/quotaon/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.4 1994/12/22 11:39:18 cgd Exp $
+#	$NetBSD: Makefile,v 1.5 1997/10/18 04:37:55 lukem Exp $
 
 PROG=	quotaon
 MAN=	quotaon.8
diff --git a/usr.sbin/quotaon/quotaon.8 b/usr.sbin/quotaon/quotaon.8
index 7fa611da1c62..9eae8dbe64a4 100644
--- a/usr.sbin/quotaon/quotaon.8
+++ b/usr.sbin/quotaon/quotaon.8
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)quotaon.8	8.2 (Berkeley) 12/11/93
-.\"	$Id: quotaon.8,v 1.4 1997/10/17 12:40:03 lukem Exp $
+.\"	$NetBSD: quotaon.8,v 1.5 1997/10/18 04:37:56 lukem Exp $
 .\"
 .Dd December 11, 1993
 .Dt QUOTAON 8
diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile
index f777b2972cf5..b603bcae930f 100644
--- a/usr.sbin/repquota/Makefile
+++ b/usr.sbin/repquota/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.4 1994/12/22 11:40:19 cgd Exp $
+#	$NetBSD: Makefile,v 1.5 1997/10/18 04:37:59 lukem Exp $
 
 PROG=	repquota
 MAN=	repquota.8
diff --git a/usr.sbin/repquota/repquota.8 b/usr.sbin/repquota/repquota.8
index 610a1f5d2293..7b1ffd265fd3 100644
--- a/usr.sbin/repquota/repquota.8
+++ b/usr.sbin/repquota/repquota.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)repquota.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: repquota.8,v 1.4 1997/10/17 13:02:01 lukem Exp $
+.\"	$NetBSD: repquota.8,v 1.5 1997/10/18 04:38:01 lukem Exp $
 .\"
 .Dd June 6, 1993
 .Dt REPQUOTA 8
diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile
index d5564ddfb75c..8272f788c433 100644
--- a/usr.sbin/rwhod/Makefile
+++ b/usr.sbin/rwhod/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.3 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.7 1997/03/08 22:21:55 cgd Exp $
+#	$NetBSD: Makefile,v 1.8 1997/10/18 04:38:04 lukem Exp $
 
 PROG=	rwhod
 MAN=	rwhod.8
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index 2cc6994f21a2..1648e5805ee8 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1994/12/22 11:41:22 cgd Exp $
+#	$NetBSD: Makefile,v 1.3 1997/10/18 04:38:06 lukem Exp $
 
 PROG=	sa
 MAN=	sa.8
diff --git a/usr.sbin/sa/extern.h b/usr.sbin/sa/extern.h
index 1c464ad63fdd..9e9a2ad80410 100644
--- a/usr.sbin/sa/extern.h
+++ b/usr.sbin/sa/extern.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: extern.h,v 1.2 1997/10/18 03:57:22 lukem Exp $
+ *	$NetBSD: extern.h,v 1.3 1997/10/18 04:38:08 lukem Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/sa/pathnames.h b/usr.sbin/sa/pathnames.h
index 31721c25fcd2..f1e1bbe42cfb 100644
--- a/usr.sbin/sa/pathnames.h
+++ b/usr.sbin/sa/pathnames.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pathnames.h,v 1.1 1994/03/24 18:41:53 cgd Exp $
+ *	$NetBSD: pathnames.h,v 1.2 1997/10/18 04:38:10 lukem Exp $
  */
 
 #define	_PATH_ACCT	"/var/account/acct"
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index de3f65f4e439..0e999c12b3f9 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: sa.8,v 1.4 1997/10/18 03:57:30 lukem Exp $
+.\"	$NetBSD: sa.8,v 1.5 1997/10/18 04:38:12 lukem Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
diff --git a/usr.sbin/sendmail/cf/cf/trinity.mc b/usr.sbin/sendmail/cf/cf/trinity.mc
index 3624c0df5bb4..1b8ff6396b64 100644
--- a/usr.sbin/sendmail/cf/cf/trinity.mc
+++ b/usr.sbin/sendmail/cf/cf/trinity.mc
@@ -34,7 +34,7 @@ divert(-1)
 #
 
 include(`../m4/cf.m4')
-VERSIONID(`$Id: trinity.mc,v 1.1.1.1 1995/03/09 22:17:19 glass Exp $')
+VERSIONID(`$NetBSD: trinity.mc,v 1.2 1997/10/18 04:38:17 lukem Exp $')
 OSTYPE(bsd4.4)dnl
 define(`UUCP_RELAY', life.ai.mit.edu)dnl
 define(`BITNET_RELAY', mitvma.mit.edu)dnl