release/7.3.0_cvs

61 files changed, 60 insertions, 60 deletions

diff --git a/cddl/Makefile b/cddl/Makefile
index 801d9cffa015..6102f74a9923 100644
--- a/cddl/Makefile
+++ b/cddl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/Makefile,v 1.2.12.1 2010/02/10 00:26:20 kensmith Exp $
 
 SUBDIR=	lib sbin usr.bin usr.sbin
 
diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc
index 4161c27a2ad6..d8a8e887d3b2 100644
--- a/cddl/Makefile.inc
+++ b/cddl/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/Makefile.inc,v 1.2.2.3.2.1 2010/02/10 00:26:20 kensmith Exp $
 
 OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris
 OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
diff --git a/cddl/compat/opensolaris/include/alloca.h b/cddl/compat/opensolaris/include/alloca.h
index b8433c100dc2..f969d722a12b 100644
--- a/cddl/compat/opensolaris/include/alloca.h
+++ b/cddl/compat/opensolaris/include/alloca.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/include/alloca.h,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  *
  */
 
diff --git a/cddl/compat/opensolaris/include/devid.h b/cddl/compat/opensolaris/include/devid.h
index 205e461f8956..edcc1c063eaf 100644
--- a/cddl/compat/opensolaris/include/devid.h
+++ b/cddl/compat/opensolaris/include/devid.h
@@ -19,7 +19,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/include/devid.h,v 1.3.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
diff --git a/cddl/compat/opensolaris/include/dtrace.h b/cddl/compat/opensolaris/include/dtrace.h
index 9630f9e74f58..a5e96b7d7a96 100644
--- a/cddl/compat/opensolaris/include/dtrace.h
+++ b/cddl/compat/opensolaris/include/dtrace.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/include/dtrace.h,v 1.1.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  *
  */
 
diff --git a/cddl/compat/opensolaris/include/fcntl.h b/cddl/compat/opensolaris/include/fcntl.h
index 9b6c3f9ee62d..dbf0f7ef922b 100644
--- a/cddl/compat/opensolaris/include/fcntl.h
+++ b/cddl/compat/opensolaris/include/fcntl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  *
  */
 
diff --git a/cddl/compat/opensolaris/include/fsshare.h b/cddl/compat/opensolaris/include/fsshare.h
index 11a8dbf0b04d..60a2a3a364aa 100644
--- a/cddl/compat/opensolaris/include/fsshare.h
+++ b/cddl/compat/opensolaris/include/fsshare.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/include/fsshare.h,v 1.2.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 
 #ifndef _OPENSOLARIS_FSSHARE_H_
diff --git a/cddl/compat/opensolaris/include/libintl.h b/cddl/compat/opensolaris/include/libintl.h
index da13f4749081..01c6edddcf15 100644
--- a/cddl/compat/opensolaris/include/libintl.h
+++ b/cddl/compat/opensolaris/include/libintl.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/libintl.h,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $ */
 
 #ifndef	_LIBINTL_H_
 #define	_LIBINTL_H_
diff --git a/cddl/compat/opensolaris/include/libproc.h b/cddl/compat/opensolaris/include/libproc.h
index 565b0a43dd72..10b2eef8f3e2 100644
--- a/cddl/compat/opensolaris/include/libproc.h
+++ b/cddl/compat/opensolaris/include/libproc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/include/libproc.h,v 1.1.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  *
  */
 
diff --git a/cddl/compat/opensolaris/include/libshare.h b/cddl/compat/opensolaris/include/libshare.h
index 82aacadd93a9..7ed49e444282 100644
--- a/cddl/compat/opensolaris/include/libshare.h
+++ b/cddl/compat/opensolaris/include/libshare.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/include/libshare.h,v 1.1.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $
  */
 
 #ifndef _OPENSOLARIS_LIBSHARE_H_
diff --git a/cddl/compat/opensolaris/include/mnttab.h b/cddl/compat/opensolaris/include/mnttab.h
index abd2f9dcc70c..e8e39ef80ff2 100644
--- a/cddl/compat/opensolaris/include/mnttab.h
+++ b/cddl/compat/opensolaris/include/mnttab.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.2.2.3.2.1 2010/02/10 00:26:20 kensmith Exp $ */
 
 #ifndef	_OPENSOLARIS_MNTTAB_H_
 #define	_OPENSOLARIS_MNTTAB_H_
diff --git a/cddl/compat/opensolaris/include/priv.h b/cddl/compat/opensolaris/include/priv.h
index 32696ae5668b..80f4123c9a69 100644
--- a/cddl/compat/opensolaris/include/priv.h
+++ b/cddl/compat/opensolaris/include/priv.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $ */
 
 #ifndef	_OPENSOLARIS_PRIV_H_
 #define	_OPENSOLARIS_PRIV_H_
diff --git a/cddl/compat/opensolaris/include/solaris.h b/cddl/compat/opensolaris/include/solaris.h
index 01f9d4776abc..1047f4234a0e 100644
--- a/cddl/compat/opensolaris/include/solaris.h
+++ b/cddl/compat/opensolaris/include/solaris.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $ */
 
 #ifndef	_SOLARIS_H_
 #define	_SOLARIS_H_
diff --git a/cddl/compat/opensolaris/include/stdio.h b/cddl/compat/opensolaris/include/stdio.h
index eba348744475..74707cd108cb 100644
--- a/cddl/compat/opensolaris/include/stdio.h
+++ b/cddl/compat/opensolaris/include/stdio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/include/stdio.h,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  *
  */
 
diff --git a/cddl/compat/opensolaris/include/stdlib.h b/cddl/compat/opensolaris/include/stdlib.h
index 4e21ea6280ae..62d71050d09b 100644
--- a/cddl/compat/opensolaris/include/stdlib.h
+++ b/cddl/compat/opensolaris/include/stdlib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/include/stdlib.h,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  *
  */
 
diff --git a/cddl/compat/opensolaris/include/strings.h b/cddl/compat/opensolaris/include/strings.h
index a62bbc845e15..4fafc1637e59 100644
--- a/cddl/compat/opensolaris/include/strings.h
+++ b/cddl/compat/opensolaris/include/strings.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/include/strings.h,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  *
  */
 
diff --git a/cddl/compat/opensolaris/include/unistd.h b/cddl/compat/opensolaris/include/unistd.h
index e1a1bc81e60f..07b292bbe809 100644
--- a/cddl/compat/opensolaris/include/unistd.h
+++ b/cddl/compat/opensolaris/include/unistd.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/include/unistd.h,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  *
  */
 
diff --git a/cddl/compat/opensolaris/include/zone.h b/cddl/compat/opensolaris/include/zone.h
index 8c377cf6574d..5baabfdb0b86 100644
--- a/cddl/compat/opensolaris/include/zone.h
+++ b/cddl/compat/opensolaris/include/zone.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/zone.h,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $ */
 
 #ifndef	_ZONE_H_
 #define	_ZONE_H_
diff --git a/cddl/compat/opensolaris/lib/libumem/umem.c b/cddl/compat/opensolaris/lib/libumem/umem.c
index 9dc101f2e65f..b0800d494e50 100644
--- a/cddl/compat/opensolaris/lib/libumem/umem.c
+++ b/cddl/compat/opensolaris/lib/libumem/umem.c
@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.c,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 /*
  * Copyright 2006 Ricardo Correia.  All rights reserved.
diff --git a/cddl/compat/opensolaris/lib/libumem/umem.h b/cddl/compat/opensolaris/lib/libumem/umem.h
index da4b32fa551e..c9d0e1424c64 100644
--- a/cddl/compat/opensolaris/lib/libumem/umem.h
+++ b/cddl/compat/opensolaris/lib/libumem/umem.h
@@ -19,7 +19,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.h,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
diff --git a/cddl/compat/opensolaris/misc/deviceid.c b/cddl/compat/opensolaris/misc/deviceid.c
index e67d94aad506..f42aacdcbb3e 100644
--- a/cddl/compat/opensolaris/misc/deviceid.c
+++ b/cddl/compat/opensolaris/misc/deviceid.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/deviceid.c,v 1.2.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/cddl/compat/opensolaris/misc/fsshare.c b/cddl/compat/opensolaris/misc/fsshare.c
index ca82710a3411..18c5f3db1ba4 100644
--- a/cddl/compat/opensolaris/misc/fsshare.c
+++ b/cddl/compat/opensolaris/misc/fsshare.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.3.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $");
 
 #include <sys/param.h>
 #include <stdio.h>
diff --git a/cddl/compat/opensolaris/misc/mkdirp.c b/cddl/compat/opensolaris/misc/mkdirp.c
index 76a90ad0ec30..8dcd1be42adb 100644
--- a/cddl/compat/opensolaris/misc/mkdirp.c
+++ b/cddl/compat/opensolaris/misc/mkdirp.c
@@ -19,7 +19,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/misc/mkdirp.c,v 1.2.2.2.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 
 /*	Copyright (c) 1988 AT&T	*/
diff --git a/cddl/compat/opensolaris/misc/mnttab.c b/cddl/compat/opensolaris/misc/mnttab.c
index 8c1c2d6dba8c..6e11c1f41096 100644
--- a/cddl/compat/opensolaris/misc/mnttab.c
+++ b/cddl/compat/opensolaris/misc/mnttab.c
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.2.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/cddl/compat/opensolaris/misc/zmount.c b/cddl/compat/opensolaris/misc/zmount.c
index 493a4fc4ef12..99774464273d 100644
--- a/cddl/compat/opensolaris/misc/zmount.c
+++ b/cddl/compat/opensolaris/misc/zmount.c
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.2.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/cddl/compat/opensolaris/misc/zone.c b/cddl/compat/opensolaris/misc/zone.c
index 9d48e6d970c1..9833f5611490 100644
--- a/cddl/compat/opensolaris/misc/zone.c
+++ b/cddl/compat/opensolaris/misc/zone.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/compat/opensolaris/misc/zone.c,v 1.2.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $
  */
 
 #include <stdlib.h>
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
index 2e6d88fa004a..2e6d88fa004a 100755..100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
index 5e995f4b60f4..9bd40cb481d7 100644
--- a/cddl/lib/Makefile
+++ b/cddl/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/Makefile,v 1.7.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/cddl/lib/Makefile.inc b/cddl/lib/Makefile.inc
index d97f1abf584c..7607e11db788 100644
--- a/cddl/lib/Makefile.inc
+++ b/cddl/lib/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.2.10.1 2010/02/10 00:26:20 kensmith Exp $
 
 SHLIBDIR?= /lib
 SHLIB_MAJOR?= 1
diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile
index 4be57a54b2c4..2fbdc5da19a1 100644
--- a/cddl/lib/drti/Makefile
+++ b/cddl/lib/drti/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/drti/Makefile,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include	"../../Makefile.inc"
 
diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
index 8cbaff1eca82..d1e37af7ae3a 100644
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
 
diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile
index b3d3b039ddda..062ca05c4da2 100644
--- a/cddl/lib/libctf/Makefile
+++ b/cddl/lib/libctf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libctf/Makefile,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include	"../../Makefile.inc"
 
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index 9ffdaed124b7..dda44c3683d5 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include	"../../Makefile.inc"
 
diff --git a/cddl/lib/libdtrace/errno.d b/cddl/lib/libdtrace/errno.d
index b9a25e029f10..0d507546b6a5 100644
--- a/cddl/lib/libdtrace/errno.d
+++ b/cddl/lib/libdtrace/errno.d
@@ -21,7 +21,7 @@
  *
  * Portions Copyright 2006-2008 John Birrell jb@freebsd.org
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/errno.d,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
diff --git a/cddl/lib/libdtrace/net.d b/cddl/lib/libdtrace/net.d
index ee22c8ffb0cc..7d16ebfb7d44 100644
--- a/cddl/lib/libdtrace/net.d
+++ b/cddl/lib/libdtrace/net.d
@@ -20,7 +20,7 @@
  *
  * Portions Copyright 2006-2008 John Birrell jb@freebsd.org
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/net.d,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 
 /*
diff --git a/cddl/lib/libdtrace/nfs.d b/cddl/lib/libdtrace/nfs.d
index 0f936c4afc2f..a9b16e7e0902 100644
--- a/cddl/lib/libdtrace/nfs.d
+++ b/cddl/lib/libdtrace/nfs.d
@@ -20,7 +20,7 @@
  *
  * Portions Copyright 2006-2008 John Birrell jb@freebsd.org
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/nfs.d,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 
 /*
diff --git a/cddl/lib/libdtrace/psinfo.d b/cddl/lib/libdtrace/psinfo.d
index 437481dcff96..447e970d8844 100644
--- a/cddl/lib/libdtrace/psinfo.d
+++ b/cddl/lib/libdtrace/psinfo.d
@@ -21,7 +21,7 @@
  *
  * Portions Copyright 2006 John Birrell jb@freebsd.org
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/psinfo.d,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
diff --git a/cddl/lib/libdtrace/sched.d b/cddl/lib/libdtrace/sched.d
index d91d3c5318f0..8323e8395b2e 100644
--- a/cddl/lib/libdtrace/sched.d
+++ b/cddl/lib/libdtrace/sched.d
@@ -20,7 +20,7 @@
  *
  * Portions Copyright 2006-2008 John Birrell jb@freebsd.org
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/sched.d,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
diff --git a/cddl/lib/libdtrace/signal.d b/cddl/lib/libdtrace/signal.d
index 5a4c2f6b5dc5..62ffdc77cd0e 100644
--- a/cddl/lib/libdtrace/signal.d
+++ b/cddl/lib/libdtrace/signal.d
@@ -21,7 +21,7 @@
  *
  * Portions Copyright 2008 John Birrell jb@freebsd.org
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/signal.d,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 
 inline int SIGHUP = 1;
diff --git a/cddl/lib/libdtrace/unistd.d b/cddl/lib/libdtrace/unistd.d
index 1ceffef2b215..18af393611fe 100644
--- a/cddl/lib/libdtrace/unistd.d
+++ b/cddl/lib/libdtrace/unistd.d
@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/unistd.d,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
  */
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 120339002ce4..039ffe744202 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair
diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile
index 6b6881e327a9..c39b3a02a7b5 100644
--- a/cddl/lib/libumem/Makefile
+++ b/cddl/lib/libumem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 309ffd0eb76f..679530817278 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index 30c516bd9548..a8b52fb021c7 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index fec99d92f1d8..35905aa618b0 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.5.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files"
 
diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile
index f74307c5fd6a..90656aadfa82 100644
--- a/cddl/sbin/Makefile
+++ b/cddl/sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/Makefile,v 1.2.12.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/cddl/sbin/Makefile.inc b/cddl/sbin/Makefile.inc
index c5111d5cb286..feb916abf6d9 100644
--- a/cddl/sbin/Makefile.inc
+++ b/cddl/sbin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/Makefile.inc,v 1.1.12.1 2010/02/10 00:26:20 kensmith Exp $
 
 BINDIR?=	/sbin
 
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index 4a9274ef9fa3..ed1be53a7ae9 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
 
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index 4b24dfba3429..b0969c9c2db8 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool \
 	${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index c6b1341041d0..0b6b0179a61b 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.7.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/cddl/usr.bin/Makefile.inc b/cddl/usr.bin/Makefile.inc
index 4cec6fe01a45..0d6ff62fb695 100644
--- a/cddl/usr.bin/Makefile.inc
+++ b/cddl/usr.bin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1.12.1 2010/02/10 00:26:20 kensmith Exp $
 
 BINDIR?=	/usr/bin
 
diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
index 57a08dd04c6d..8bc21180a5ef 100644
--- a/cddl/usr.bin/ctfconvert/Makefile
+++ b/cddl/usr.bin/ctfconvert/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/ctfconvert/Makefile,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile
index 9a65c15efd31..e7aef192fabf 100644
--- a/cddl/usr.bin/ctfdump/Makefile
+++ b/cddl/usr.bin/ctfdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/ctfdump/Makefile,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include	"../../Makefile.inc"
 
diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
index 051fa0b434d3..680c0e19721d 100644
--- a/cddl/usr.bin/ctfmerge/Makefile
+++ b/cddl/usr.bin/ctfmerge/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/ctfmerge/Makefile,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/cddl/usr.bin/sgsmsg/Makefile b/cddl/usr.bin/sgsmsg/Makefile
index 541441481dda..3d1939efa0ae 100644
--- a/cddl/usr.bin/sgsmsg/Makefile
+++ b/cddl/usr.bin/sgsmsg/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/sgsmsg/Makefile,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include	"../../Makefile.inc"
 
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index c8693fe9c73c..91a3d7049902 100644
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/zinject/Makefile,v 1.1.2.1.2.1 2010/02/10 00:26:20 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zinject
 
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
index 67ade45ad021..1e7892b4c723 100644
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $
 
 .PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest
 
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index 06c68941ef17..1184dc9c2c19 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.7.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include <bsd.own.mk>
 
diff --git a/cddl/usr.sbin/Makefile.inc b/cddl/usr.sbin/Makefile.inc
index 282198ea8d8c..82bda500510d 100644
--- a/cddl/usr.sbin/Makefile.inc
+++ b/cddl/usr.sbin/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/Makefile.inc,v 1.1.12.1 2010/02/10 00:26:20 kensmith Exp $
 
 BINDIR?=	/usr/sbin
 
diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
index 44116fcbc4ef..e351e991d6bc 100644
--- a/cddl/usr.sbin/dtrace/Makefile
+++ b/cddl/usr.sbin/dtrace/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/dtrace/Makefile,v 1.1.2.1.6.1 2010/02/10 00:26:20 kensmith Exp $
 
 .include	"../../Makefile.inc"
 
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
index 35ad2a141d2a..f71ebfbd5cef 100644
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4.2.2.2.1 2010/02/10 00:26:20 kensmith Exp $
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb