$Id$ -> $FreeBSD$

64 files changed, 83 insertions, 67 deletions

diff --git a/include/Makefile b/include/Makefile
index c03449b..8b2e78b 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-#	$Id: Makefile,v 1.93 1999/03/11 15:12:28 phk Exp $
+# $FreeBSD$
 #
 # Doing a make install builds /usr/include
 #
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 0972285..e28b739 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -52,7 +52,7 @@
 /*
  *	@(#)inet.h	8.1 (Berkeley) 6/2/93
  *	From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
- *	$Id: inet.h,v 1.9 1997/05/07 20:00:19 eivind Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ARPA_INET_H_
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 556210e..3e09c91 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -50,7 +50,7 @@
 
 /*
  *	From: Id: nameser.h,v 8.16 1998/02/06 00:35:58 halley Exp
- *	$Id: nameser.h,v 1.12 1998/06/11 08:55:15 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ARPA_NAMESER_H_
diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h
index 2ab5b47..850fb8a 100644
--- a/include/arpa/nameser_compat.h
+++ b/include/arpa/nameser_compat.h
@@ -33,7 +33,7 @@
 /*
  *      from nameser.h	8.1 (Berkeley) 6/2/93
  *	From: Id: nameser_compat.h,v 8.9 1998/03/20 23:25:10 halley Exp
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _ARPA_NAMESER_COMPAT_
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 0f68fe6..77b2181 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dlfcn.h,v 1.2 1998/02/11 05:19:10 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DLFCN_H_
diff --git a/include/elf-hints.h b/include/elf-hints.h
index f4ee8d4..9633083 100644
--- a/include/elf-hints.h
+++ b/include/elf-hints.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf.h,v 1.1 1997/05/21 23:07:27 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_ELF_H_
diff --git a/include/elf.h b/include/elf.h
index f4ee8d4..9633083 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf.h,v 1.1 1997/05/21 23:07:27 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_ELF_H_
diff --git a/include/err.h b/include/err.h
index 96cb9de..ed8f617 100644
--- a/include/err.h
+++ b/include/err.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)err.h	8.1 (Berkeley) 6/2/93
- *	$Id: err.h,v 1.6 1998/10/29 22:18:47 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ERR_H_
diff --git a/include/histedit.h b/include/histedit.h
index 6164103..ede5c32 100644
--- a/include/histedit.h
+++ b/include/histedit.h
@@ -1,4 +1,4 @@
-/*	$Id: histedit.h,v 1.3 1997/06/25 09:47:31 msmith Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: histedit.h,v 1.5 1997/04/11 17:52:45 christos Exp $	*/
 
 /*-
diff --git a/include/iso646.h b/include/iso646.h
index 94f3de6..e397fe6 100644
--- a/include/iso646.h
+++ b/include/iso646.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iso646.h,v 1.1 1998/08/01 13:42:12 alex Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ISO646_H_
diff --git a/include/kvm.h b/include/kvm.h
index b1a1dbb..b4978be 100644
--- a/include/kvm.h
+++ b/include/kvm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kvm.h	8.1 (Berkeley) 6/2/93
- *	$Id: kvm.h,v 1.9 1999/04/09 15:06:56 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _KVM_H_
diff --git a/include/limits.h b/include/limits.h
index 2d4012f..7436432 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.2 (Berkeley) 1/4/94
- *	$Id: limits.h,v 1.8 1998/03/08 22:29:56 dufault Exp $
+ * $FreeBSD$
  */
 
 #ifndef _LIMITS_H_
diff --git a/include/link.h b/include/link.h
index 8171cb2..3acb86a 100644
--- a/include/link.h
+++ b/include/link.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: link.h,v 1.18 1998/02/06 16:46:44 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/netdb.h b/include/netdb.h
index 91048ab..987523e 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -55,7 +55,7 @@
 /*
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
  *      From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- *	$Id: netdb.h,v 1.10 1997/08/16 23:32:42 steve Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETDB_H_
diff --git a/include/nl_types.h b/include/nl_types.h
index e2e6863..7691b14 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -1,4 +1,4 @@
-/*	$Id: nl_types.h,v 1.5 1998/04/30 10:09:58 ache Exp $ */
+/* $FreeBSD$ */
 
 /***********************************************************
 Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
diff --git a/include/nlist.h b/include/nlist.h
index cd26daf..560563a 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -37,7 +37,7 @@
  *
  *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
  *
- *	$Id: nlist.h,v 1.5 1997/02/23 09:17:14 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NLIST_H_
diff --git a/include/objformat.h b/include/objformat.h
index a32c1a9..ec3443a 100644
--- a/include/objformat.h
+++ b/include/objformat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _OBJFORMAT_H_
diff --git a/include/protocols/routed.h b/include/protocols/routed.h
index eb276dc..2570d87 100644
--- a/include/protocols/routed.h
+++ b/include/protocols/routed.h
@@ -32,7 +32,7 @@
  *
  *	@(#)routed.h	8.1 (Berkeley) 6/2/93
  *
- *	$Id: routed.h,v 1.12 1999/05/02 13:20:38 markm Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ROUTED_H_
@@ -40,7 +40,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* #ident "$Revision: 1.12 $" */
+/* #ident "$Revision: 1.13 $" */
 
 /*
  * Routing Information Protocol
diff --git a/include/pthread.h b/include/pthread.h
index d3f29fe..e9e57de 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE.
  *
- * $Id: pthread.h,v 1.12 1999/07/27 03:29:01 deischen Exp $
+ * $FreeBSD$
  */
 #ifndef _PTHREAD_H_
 #define _PTHREAD_H_
diff --git a/include/resolv.h b/include/resolv.h
index 31a569f..e44e43a 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -51,7 +51,7 @@
 /*
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
  *	From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $
- *	$Id: resolv.h,v 1.16 1998/06/11 12:52:45 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _RESOLV_H_
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 510c10a..4d6c38d 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
- *	$Id: auth.h,v 1.13 1997/05/28 04:45:06 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 8bb42eb..57e075b 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth_unix.h 1.8 88/02/08 SMI
  *	from: @(#)auth_unix.h	2.2 88/07/29 4.0 RPCSRC
- *	$Id: auth_unix.h,v 1.4 1996/01/30 23:31:42 mpp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 1025468..cf2116d 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)clnt.h 1.31 88/02/08 SMI
  *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: clnt.h,v 1.5 1996/12/30 13:59:38 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 55c36ac..d4080cc 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI
  *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: pmap_clnt.h,v 1.5 1996/12/30 13:59:38 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index f4f1967..123ee15 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: pmap_prot.h,v 1.4 1996/01/30 23:32:08 mpp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index d76131e..845e815 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
  *	from: @(#)pmap_rmt.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: pmap_rmt.h,v 1.4 1996/01/30 23:32:12 mpp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 9f5eaec..5a2948d 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)rpc.h 1.9 88/02/08 SMI
  *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
- *	$Id: rpc.h,v 1.6 1996/12/30 13:59:39 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 8005dc8..98f0f79 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: rpc_msg.h,v 1.6 1996/12/30 13:59:39 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 698d8f9..b544651 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)svc.h 1.20 88/02/08 SMI
  *	from: @(#)svc.h	2.2 88/07/29 4.0 RPCSRC
- *	$Id: svc.h,v 1.13 1998/01/16 11:46:01 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index 890a63a..536d6a6 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
  *	from: @(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: svc_auth.h,v 1.10 1998/01/16 11:46:05 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/types.h b/include/rpc/types.h
index 6d7330e..e2ceec5 100644
--- a/include/rpc/types.h
+++ b/include/rpc/types.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)types.h 1.18 87/07/24 SMI
  *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
- *	$Id: types.h,v 1.5 1996/12/30 13:59:40 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 70abb5d..a82a374 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- *	$Id: xdr.h,v 1.11 1998/09/08 17:33:12 obrien Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile
index 058198e..48e78a6 100644
--- a/include/rpcsvc/Makefile
+++ b/include/rpcsvc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	2.3 88/08/11 4.0 RPCSRC
-#	$Id: Makefile,v 1.22 1998/02/13 03:10:28 bde Exp $
+# $FreeBSD$
 
 .SUFFIXES: .x
 
diff --git a/include/rpcsvc/bootparam_prot.x b/include/rpcsvc/bootparam_prot.x
index 5b0b27b..48216c9 100644
--- a/include/rpcsvc/bootparam_prot.x
+++ b/include/rpcsvc/bootparam_prot.x
@@ -48,7 +48,8 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)bootparam_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "bootparam_prot.x,v 1.1 1994/08/04 19:01:44 wollman Exp";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/crypt.x b/include/rpcsvc/crypt.x
index 906136c..abe9275 100644
--- a/include/rpcsvc/crypt.x
+++ b/include/rpcsvc/crypt.x
@@ -29,12 +29,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$Id$";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif
 #endif
 
diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x
index c514a90..72837ab 100644
--- a/include/rpcsvc/klm_prot.x
+++ b/include/rpcsvc/klm_prot.x
@@ -40,7 +40,8 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)klm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: klm_prot.x,v 1.4 1997/05/28 04:38:14 wpaul Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x
index c151647..e3731d9 100644
--- a/include/rpcsvc/mount.x
+++ b/include/rpcsvc/mount.x
@@ -35,7 +35,8 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)mount.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: mount.x,v 1.4 1997/04/18 12:31:26 dfr Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x
index c255a10..609bc53 100644
--- a/include/rpcsvc/nfs_prot.x
+++ b/include/rpcsvc/nfs_prot.x
@@ -31,7 +31,8 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)nfs_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: nfs_prot.x,v 1.5 1998/09/06 09:21:35 obrien Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x
index 92b98fe..0770d68 100644
--- a/include/rpcsvc/nis.x
+++ b/include/rpcsvc/nis.x
@@ -30,7 +30,8 @@
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$Id: nis.x,v 1.5 1996/12/05 06:13:41 wpaul Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nis_cache.x b/include/rpcsvc/nis_cache.x
index 3738fe4..8196735 100644
--- a/include/rpcsvc/nis_cache.x
+++ b/include/rpcsvc/nis_cache.x
@@ -39,7 +39,8 @@
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$Id: nis_cache.x,v 1.4 1996/07/29 14:32:44 wpaul Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x
index 03be115..fee4445 100644
--- a/include/rpcsvc/nis_callback.x
+++ b/include/rpcsvc/nis_callback.x
@@ -39,7 +39,8 @@
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$Id: nis_callback.x,v 1.3 1996/07/29 14:32:56 wpaul Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nis_db.h b/include/rpcsvc/nis_db.h
index 89c148a..784ac07 100644
--- a/include/rpcsvc/nis_db.h
+++ b/include/rpcsvc/nis_db.h
@@ -26,7 +26,7 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x
index c5d7444..4c3ea7d 100644
--- a/include/rpcsvc/nlm_prot.x
+++ b/include/rpcsvc/nlm_prot.x
@@ -14,7 +14,7 @@
 #else
 %#ifndef lint
 %static const char rcsid[] =
-%	"$Id: nlm_prot.x,v 1.6 1997/11/20 07:18:03 charnier Exp $";
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x
index 1be8b48..6dbc06b 100644
--- a/include/rpcsvc/rex.x
+++ b/include/rpcsvc/rex.x
@@ -35,7 +35,8 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rex.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: rex.x,v 1.4 1997/05/28 04:38:19 wpaul Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x
index 22986d8..6713b00 100644
--- a/include/rpcsvc/rnusers.x
+++ b/include/rpcsvc/rnusers.x
@@ -35,7 +35,8 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rnusers.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: rnusers.x,v 1.4 1997/05/28 04:38:19 wpaul Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x
index 2209339..df4e84c 100644
--- a/include/rpcsvc/rquota.x
+++ b/include/rpcsvc/rquota.x
@@ -7,7 +7,8 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rquota.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: rquota.x,v 1.4 1997/05/28 04:38:20 wpaul Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x
index a46388a..a71c236 100644
--- a/include/rpcsvc/rstat.x
+++ b/include/rpcsvc/rstat.x
@@ -47,7 +47,8 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rstat.x	2.2 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: rstat.x,v 1.4 1997/05/28 04:38:20 wpaul Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 
 #endif /* def RPC_HDR */
diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x
index 6f5a166..f5bf545 100644
--- a/include/rpcsvc/sm_inter.x
+++ b/include/rpcsvc/sm_inter.x
@@ -39,7 +39,7 @@
 #ifndef RPC_HDR
 %#ifndef lint
 %static const char rcsid[] =
-%	"$Id: sm_inter.x,v 1.6 1997/11/20 07:18:05 charnier Exp $";
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x
index a2227fd..8a110f7 100644
--- a/include/rpcsvc/spray.x
+++ b/include/rpcsvc/spray.x
@@ -36,7 +36,8 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)spray.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: spray.x,v 1.4 1997/05/28 04:38:22 wpaul Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x
index bf1d3d1..95559fe 100644
--- a/include/rpcsvc/yp.x
+++ b/include/rpcsvc/yp.x
@@ -36,7 +36,7 @@
 #ifndef RPC_HDR
 %#ifndef lint
 %static const char rcsid[] =
-%	"$Id: yp.x,v 1.10 1997/11/20 07:18:07 charnier Exp $";
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index df6ba75..4b1aa61 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: yp_prot.h,v 1.4 1996/12/30 14:01:08 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _RPCSVC_YP_PROT_H_
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index 2040459..6dae7bb 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ypclnt.h,v 1.9 1997/05/28 04:38:25 wpaul Exp $
+ * $FreeBSD$
  */
 
 #ifndef _RPCSVC_YPCLNT_H_
diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x
index 26a9e4a..1fef5d4 100644
--- a/include/rpcsvc/yppasswd.x
+++ b/include/rpcsvc/yppasswd.x
@@ -36,7 +36,8 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)yppasswd.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static const char rcsid[] = "$Id: yppasswd.x,v 1.4 1997/05/28 04:38:27 wpaul Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/ypupdate_prot.x b/include/rpcsvc/ypupdate_prot.x
index fc1c35a..5c71849 100644
--- a/include/rpcsvc/ypupdate_prot.x
+++ b/include/rpcsvc/ypupdate_prot.x
@@ -35,7 +35,8 @@
 %/* from @(#)ypupdate_prot.x	1.3 91/03/11 TIRPC 1.0 */
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$Id$";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif
 #endif
 %
diff --git a/include/rpcsvc/ypxfrd.x b/include/rpcsvc/ypxfrd.x
index f7abd31..db7205b 100644
--- a/include/rpcsvc/ypxfrd.x
+++ b/include/rpcsvc/ypxfrd.x
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ypxfrd.x,v 1.5 1997/05/28 04:38:30 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -68,7 +68,8 @@
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$Id: ypxfrd.x,v 1.5 1997/05/28 04:38:30 wpaul Exp $";
+%static const char rcsid[] =
+%  "$FreeBSD$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/stdio.h b/include/stdio.h
index 8472e4b..571705a 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- *	$Id: stdio.h,v 1.21 1998/12/14 19:23:16 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_STDIO_H_
diff --git a/include/timers.h b/include/timers.h
index 534852b..73180f9 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  * Description : Basic timers header.
  *
diff --git a/include/utmp.h b/include/utmp.h
index 9e1fb5f..557efc0 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utmp.h	8.2 (Berkeley) 1/21/94
- *	$Id: utmp.h,v 1.7 1997/05/07 20:00:13 eivind Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_UTMP_H_
diff --git a/include/vis.h b/include/vis.h
index 9cfbd79..f3722d6 100644
--- a/include/vis.h
+++ b/include/vis.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vis.h	8.1 (Berkeley) 6/2/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _VIS_H_
diff --git a/lib/libkvm/kvm.h b/lib/libkvm/kvm.h
index b1a1dbb..b4978be 100644
--- a/lib/libkvm/kvm.h
+++ b/lib/libkvm/kvm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kvm.h	8.1 (Berkeley) 6/2/93
- *	$Id: kvm.h,v 1.9 1999/04/09 15:06:56 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _KVM_H_
diff --git a/sys/rpc/types.h b/sys/rpc/types.h
index 6d7330e..e2ceec5 100644
--- a/sys/rpc/types.h
+++ b/sys/rpc/types.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)types.h 1.18 87/07/24 SMI
  *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
- *	$Id: types.h,v 1.5 1996/12/30 13:59:40 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h
index 8171cb2..3acb86a 100644
--- a/sys/sys/link_aout.h
+++ b/sys/sys/link_aout.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: link.h,v 1.18 1998/02/06 16:46:44 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index 8171cb2..3acb86a 100644
--- a/sys/sys/link_elf.h
+++ b/sys/sys/link_elf.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: link.h,v 1.18 1998/02/06 16:46:44 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/nlist_aout.h b/sys/sys/nlist_aout.h
index cd26daf..560563a 100644
--- a/sys/sys/nlist_aout.h
+++ b/sys/sys/nlist_aout.h
@@ -37,7 +37,7 @@
  *
  *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
  *
- *	$Id: nlist.h,v 1.5 1997/02/23 09:17:14 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NLIST_H_