aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
Diffstat (limited to 'cddl')
-rw-r--r--cddl/Makefile2
-rw-r--r--cddl/Makefile.inc2
-rw-r--r--cddl/compat/opensolaris/include/alloca.h2
-rw-r--r--cddl/compat/opensolaris/include/assert.h2
-rw-r--r--cddl/compat/opensolaris/include/devid.h2
-rw-r--r--cddl/compat/opensolaris/include/dtrace.h2
-rw-r--r--cddl/compat/opensolaris/include/fcntl.h2
-rw-r--r--cddl/compat/opensolaris/include/fsshare.h2
-rw-r--r--cddl/compat/opensolaris/include/libintl.h2
-rw-r--r--cddl/compat/opensolaris/include/libproc.h2
-rw-r--r--cddl/compat/opensolaris/include/libshare.h2
-rw-r--r--cddl/compat/opensolaris/include/mnttab.h2
-rw-r--r--cddl/compat/opensolaris/include/priv.h2
-rw-r--r--cddl/compat/opensolaris/include/solaris.h2
-rw-r--r--cddl/compat/opensolaris/include/stdio.h2
-rw-r--r--cddl/compat/opensolaris/include/stdlib.h2
-rw-r--r--cddl/compat/opensolaris/include/strings.h2
-rw-r--r--cddl/compat/opensolaris/include/unistd.h2
-rw-r--r--cddl/compat/opensolaris/include/zone.h2
-rw-r--r--cddl/compat/opensolaris/lib/libumem/umem.c2
-rw-r--r--cddl/compat/opensolaris/lib/libumem/umem.h2
-rw-r--r--cddl/compat/opensolaris/misc/deviceid.c2
-rw-r--r--cddl/compat/opensolaris/misc/fsshare.c2
-rw-r--r--cddl/compat/opensolaris/misc/mkdirp.c2
-rw-r--r--cddl/compat/opensolaris/misc/mnttab.c2
-rw-r--r--cddl/compat/opensolaris/misc/zmount.c2
-rw-r--r--cddl/compat/opensolaris/misc/zone.c2
-rw-r--r--[-rwxr-xr-x]cddl/contrib/dtracetoolkit/dtruss0
-rw-r--r--[-rwxr-xr-x]cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl0
-rw-r--r--[-rwxr-xr-x]cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl0
-rw-r--r--[-rwxr-xr-x]cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.basic.ksh0
-rw-r--r--[-rwxr-xr-x]cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.hvmenable.ksh0
-rw-r--r--[-rwxr-xr-x]cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.memenable.ksh0
-rw-r--r--[-rwxr-xr-x]cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedargs.ksh0
-rw-r--r--[-rwxr-xr-x]cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedenable.ksh0
-rw-r--r--cddl/lib/Makefile2
-rw-r--r--cddl/lib/Makefile.inc2
-rw-r--r--cddl/lib/drti/Makefile2
-rw-r--r--cddl/lib/libavl/Makefile2
-rw-r--r--cddl/lib/libctf/Makefile2
-rw-r--r--cddl/lib/libdtrace/Makefile2
-rw-r--r--cddl/lib/libdtrace/errno.d2
-rw-r--r--cddl/lib/libdtrace/libproc_compat.h2
-rw-r--r--cddl/lib/libdtrace/net.d2
-rw-r--r--cddl/lib/libdtrace/nfs.d2
-rw-r--r--cddl/lib/libdtrace/psinfo.d2
-rw-r--r--cddl/lib/libdtrace/regs_x86.d2
-rw-r--r--cddl/lib/libdtrace/sched.d2
-rw-r--r--cddl/lib/libdtrace/signal.d2
-rw-r--r--cddl/lib/libdtrace/unistd.d2
-rw-r--r--cddl/lib/libnvpair/Makefile2
-rw-r--r--cddl/lib/libumem/Makefile2
-rw-r--r--cddl/lib/libuutil/Makefile2
-rw-r--r--cddl/lib/libzfs/Makefile2
-rw-r--r--cddl/lib/libzpool/Makefile2
-rw-r--r--cddl/sbin/Makefile2
-rw-r--r--cddl/sbin/Makefile.inc2
-rw-r--r--cddl/sbin/zfs/Makefile2
-rw-r--r--cddl/sbin/zpool/Makefile2
-rw-r--r--cddl/usr.bin/Makefile2
-rw-r--r--cddl/usr.bin/Makefile.inc2
-rw-r--r--cddl/usr.bin/ctfconvert/Makefile2
-rw-r--r--cddl/usr.bin/ctfconvert/ctfconvert.12
-rw-r--r--cddl/usr.bin/ctfdump/Makefile2
-rw-r--r--cddl/usr.bin/ctfdump/ctfdump.12
-rw-r--r--cddl/usr.bin/ctfmerge/Makefile2
-rw-r--r--cddl/usr.bin/ctfmerge/ctfmerge.12
-rw-r--r--cddl/usr.bin/sgsmsg/Makefile2
-rw-r--r--cddl/usr.bin/zinject/Makefile2
-rw-r--r--cddl/usr.bin/ztest/Makefile2
-rw-r--r--cddl/usr.sbin/Makefile2
-rw-r--r--cddl/usr.sbin/Makefile.inc2
-rw-r--r--cddl/usr.sbin/dtrace/Makefile2
-rw-r--r--cddl/usr.sbin/dtruss/Makefile2
-rw-r--r--cddl/usr.sbin/dtruss/dtruss.12
-rw-r--r--cddl/usr.sbin/lockstat/Makefile2
-rw-r--r--cddl/usr.sbin/plockstat/Makefile2
-rw-r--r--cddl/usr.sbin/plockstat/plockstat.12
-rw-r--r--cddl/usr.sbin/zdb/Makefile2
79 files changed, 71 insertions, 71 deletions
diff --git a/cddl/Makefile b/cddl/Makefile
index 801d9cffa015..4b93c3a4dfbb 100644
--- a/cddl/Makefile
+++ b/cddl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/Makefile,v 1.2.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
SUBDIR= lib sbin usr.bin usr.sbin
diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc
index 4161c27a2ad6..6bedcc8fe6b7 100644
--- a/cddl/Makefile.inc
+++ b/cddl/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/Makefile.inc,v 1.6.2.1.6.1 2010/12/21 17:09:25 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..919da91d57c4 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/assert.h b/cddl/compat/opensolaris/include/assert.h
index 353f0c9fd819..d30da9c0655a 100644
--- a/cddl/compat/opensolaris/include/assert.h
+++ b/cddl/compat/opensolaris/include/assert.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/assert.h,v 1.1.2.2.6.1 2010/12/21 17:09:25 kensmith Exp $
*/
#undef assert
diff --git a/cddl/compat/opensolaris/include/devid.h b/cddl/compat/opensolaris/include/devid.h
index 205e461f8956..1f0b042619f5 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.4.2.1.6.1 2010/12/21 17:09:25 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..783787760a9e 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/fcntl.h b/cddl/compat/opensolaris/include/fcntl.h
index 9b6c3f9ee62d..fdbecdfca09e 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/fsshare.h b/cddl/compat/opensolaris/include/fsshare.h
index 11a8dbf0b04d..f7a6156b7f29 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*/
#ifndef _OPENSOLARIS_FSSHARE_H_
diff --git a/cddl/compat/opensolaris/include/libintl.h b/cddl/compat/opensolaris/include/libintl.h
index da13f4749081..f756d1ab0a5b 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.3.2.1.6.1 2010/12/21 17:09:25 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..018b89edd2b1 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/libshare.h b/cddl/compat/opensolaris/include/libshare.h
index 82aacadd93a9..8dbf81bc0a00 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*/
#ifndef _OPENSOLARIS_LIBSHARE_H_
diff --git a/cddl/compat/opensolaris/include/mnttab.h b/cddl/compat/opensolaris/include/mnttab.h
index a18dd8d1893b..de05be16f4d7 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.4.2.2.2.1 2010/12/21 17:09:25 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..8299b7e0c6d8 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.3.2.1.6.1 2010/12/21 17:09:25 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..dbd7d30be692 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.3.2.1.6.1 2010/12/21 17:09:25 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..c476432ed56d 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/stdlib.h b/cddl/compat/opensolaris/include/stdlib.h
index 4e21ea6280ae..476fcd8c164b 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/strings.h b/cddl/compat/opensolaris/include/strings.h
index a62bbc845e15..84fdea8fcff9 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/unistd.h b/cddl/compat/opensolaris/include/unistd.h
index e1a1bc81e60f..acf8de412b64 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/zone.h b/cddl/compat/opensolaris/include/zone.h
index 8c377cf6574d..1ac2d9dd3b94 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.3.2.1.6.1 2010/12/21 17:09:25 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..57a7facbb219 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.3.2.1.6.1 2010/12/21 17:09:25 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..37414be0fc93 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.3.2.1.6.1 2010/12/21 17:09:25 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..112fdac74a2e 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.3.2.1.6.1 2010/12/21 17:09:25 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 10ed591d5bca..0b122d56eb20 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.4.2.2.1 2010/12/21 17:09:25 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..7f24a19d34db 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.3.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*/
/* Copyright (c) 1988 AT&T */
diff --git a/cddl/compat/opensolaris/misc/mnttab.c b/cddl/compat/opensolaris/misc/mnttab.c
index 8f56d90f6232..3a00a1c0a55e 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.3.2.2.2.1 2010/12/21 17:09:25 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..9c1291d3093c 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.3.2.1.6.1 2010/12/21 17:09:25 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..f3b308d9122b 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.3.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*/
#include <stdlib.h>
diff --git a/cddl/contrib/dtracetoolkit/dtruss b/cddl/contrib/dtracetoolkit/dtruss
index f4b5e45a30df..f4b5e45a30df 100755..100644
--- a/cddl/contrib/dtracetoolkit/dtruss
+++ b/cddl/contrib/dtracetoolkit/dtruss
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl
index 3c3e180a0e75..3c3e180a0e75 100755..100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl
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 7b47580ddf62..7b47580ddf62 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/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.basic.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.basic.ksh
index 3a5ce6f0d064..3a5ce6f0d064 100755..100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.basic.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.basic.ksh
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.hvmenable.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.hvmenable.ksh
index 3719c2026545..3719c2026545 100755..100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.hvmenable.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.hvmenable.ksh
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.memenable.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.memenable.ksh
index 25d39cbfbc86..25d39cbfbc86 100755..100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.memenable.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.memenable.ksh
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedargs.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedargs.ksh
index 5b14fc989138..5b14fc989138 100755..100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedargs.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedargs.ksh
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedenable.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedenable.ksh
index 54c3352ea525..54c3352ea525 100755..100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedenable.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedenable.ksh
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
index 52e97d74be99..4c6982fff757 100644
--- a/cddl/lib/Makefile
+++ b/cddl/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/Makefile,v 1.9.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/lib/Makefile.inc b/cddl/lib/Makefile.inc
index 8f9af1d17e9d..3d779fe56518 100644
--- a/cddl/lib/Makefile.inc
+++ b/cddl/lib/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.3.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
SHLIBDIR?= /lib
SHLIB_MAJOR?= 2
diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile
index faa016951a8b..c3c473773db4 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.4.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
index 8cbaff1eca82..81c29e462786 100644
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.3.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile
index 6309ee499564..070adc85b154 100644
--- a/cddl/lib/libctf/Makefile
+++ b/cddl/lib/libctf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libctf/Makefile,v 1.2.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index 86ec23a0dc27..f449ec08e3ae 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libdtrace/Makefile,v 1.2.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/lib/libdtrace/errno.d b/cddl/lib/libdtrace/errno.d
index b9a25e029f10..b6f565336adf 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
diff --git a/cddl/lib/libdtrace/libproc_compat.h b/cddl/lib/libdtrace/libproc_compat.h
index a561157c0ba2..6844f62b1503 100644
--- a/cddl/lib/libdtrace/libproc_compat.h
+++ b/cddl/lib/libdtrace/libproc_compat.h
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/libproc_compat.h,v 1.1.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
*/
/*
diff --git a/cddl/lib/libdtrace/net.d b/cddl/lib/libdtrace/net.d
index ee22c8ffb0cc..0a22b33ebdae 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*/
/*
diff --git a/cddl/lib/libdtrace/nfs.d b/cddl/lib/libdtrace/nfs.d
index 0f936c4afc2f..37cc65db7427 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*/
/*
diff --git a/cddl/lib/libdtrace/psinfo.d b/cddl/lib/libdtrace/psinfo.d
index 437481dcff96..4d7d8cadc6ad 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
diff --git a/cddl/lib/libdtrace/regs_x86.d b/cddl/lib/libdtrace/regs_x86.d
index 7dce19717642..dbe1e0b2700a 100644
--- a/cddl/lib/libdtrace/regs_x86.d
+++ b/cddl/lib/libdtrace/regs_x86.d
@@ -21,7 +21,7 @@
*
* Portions Copyright 2009 Stacey Son sson@FreeBSD.org
*
- * $FreeBSD$
+ * $FreeBSD: src/cddl/lib/libdtrace/regs_x86.d,v 1.1.2.2.2.1 2010/12/21 17:09:25 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..989db6e9fd70 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.4.1.6.1 2010/12/21 17:09:25 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..c0da5e5e7971 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*/
inline int SIGHUP = 1;
diff --git a/cddl/lib/libdtrace/unistd.d b/cddl/lib/libdtrace/unistd.d
index 1ceffef2b215..4aa9a2d7de66 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 7bf500193dc7..b2d25c69ca84 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.4.2.2.6.1 2010/12/21 17:09:25 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..12fa0aa3c861 100644
--- a/cddl/lib/libumem/Makefile
+++ b/cddl/lib/libumem/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.3.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 309ffd0eb76f..3f1324efd022 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.3.2.1.6.1 2010/12/21 17:09:25 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..e997a9e73d83 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.5.2.1.6.1 2010/12/21 17:09:25 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 760dc08bf60f..06f3cf8c33a8 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.9.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files"
diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile
index f74307c5fd6a..0c4df1e4b748 100644
--- a/cddl/sbin/Makefile
+++ b/cddl/sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/Makefile,v 1.2.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/sbin/Makefile.inc b/cddl/sbin/Makefile.inc
index c5111d5cb286..d79073f7775b 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.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
BINDIR?= /sbin
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index 4a9274ef9fa3..5ab1e5d73002 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.4.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index 4b24dfba3429..0515db2bc45c 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.5.2.1.6.1 2010/12/21 17:09:25 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..855bc732a532 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.10.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/usr.bin/Makefile.inc b/cddl/usr.bin/Makefile.inc
index 4cec6fe01a45..4ef62882b140 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.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
BINDIR?= /usr/bin
diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
index ff9432265ff2..85e41bee0c36 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.4.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/usr.bin/ctfconvert/ctfconvert.1 b/cddl/usr.bin/ctfconvert/ctfconvert.1
index 5844632664a8..0681a474bb4d 100644
--- a/cddl/usr.bin/ctfconvert/ctfconvert.1
+++ b/cddl/usr.bin/ctfconvert/ctfconvert.1
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/cddl/usr.bin/ctfconvert/ctfconvert.1,v 1.1.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.\"
.Dd July 7, 2010
.Dt CTFCONVERT 1
diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile
index 5231d9499f05..fc0d3e45faa0 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.4.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/usr.bin/ctfdump/ctfdump.1 b/cddl/usr.bin/ctfdump/ctfdump.1
index d64a88a60548..c13f6187614b 100644
--- a/cddl/usr.bin/ctfdump/ctfdump.1
+++ b/cddl/usr.bin/ctfdump/ctfdump.1
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/cddl/usr.bin/ctfdump/ctfdump.1,v 1.1.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.\"
.Dd July 7, 2010
.Dt CTFDUMP 1
diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
index 35b1d06073f2..956e00d08ac8 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.4.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/usr.bin/ctfmerge/ctfmerge.1 b/cddl/usr.bin/ctfmerge/ctfmerge.1
index 47151d6a1f04..67030ce815c7 100644
--- a/cddl/usr.bin/ctfmerge/ctfmerge.1
+++ b/cddl/usr.bin/ctfmerge/ctfmerge.1
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/cddl/usr.bin/ctfmerge/ctfmerge.1,v 1.1.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.\"
.Dd July 7, 2010
.Dt CTFMERGE 1
diff --git a/cddl/usr.bin/sgsmsg/Makefile b/cddl/usr.bin/sgsmsg/Makefile
index 541441481dda..829d040fb865 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index c8693fe9c73c..ac22c1de9e2f 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.4.1.6.1 2010/12/21 17:09:25 kensmith Exp $
.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zinject
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
index 67ade45ad021..45f4507471db 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.7.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index 49db06b61082..cf3e356ba76b 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.10.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/usr.sbin/Makefile.inc b/cddl/usr.sbin/Makefile.inc
index 282198ea8d8c..91d4045b149c 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.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
BINDIR?= /usr/sbin
diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
index 9e8e34835f90..1f197b3bd618 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.4.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/usr.sbin/dtruss/Makefile b/cddl/usr.sbin/dtruss/Makefile
index 39161ec0f8d1..28cf537f3991 100644
--- a/cddl/usr.sbin/dtruss/Makefile
+++ b/cddl/usr.sbin/dtruss/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/dtruss/Makefile,v 1.2.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.PATH: ${.CURDIR}/../../../cddl/contrib/dtracetoolkit
diff --git a/cddl/usr.sbin/dtruss/dtruss.1 b/cddl/usr.sbin/dtruss/dtruss.1
index d408e81bd80d..663fb3b85acb 100644
--- a/cddl/usr.sbin/dtruss/dtruss.1
+++ b/cddl/usr.sbin/dtruss/dtruss.1
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/cddl/usr.sbin/dtruss/dtruss.1,v 1.1.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.\"
.Dd August 26, 2010
.Dt DTRUSS 1
diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile
index 98732934fe97..a9e271c5a403 100644
--- a/cddl/usr.sbin/lockstat/Makefile
+++ b/cddl/usr.sbin/lockstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/lockstat/Makefile,v 1.1.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile
index 059295898110..65c5918e3a79 100644
--- a/cddl/usr.sbin/plockstat/Makefile
+++ b/cddl/usr.sbin/plockstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/plockstat/Makefile,v 1.2.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/plockstat
diff --git a/cddl/usr.sbin/plockstat/plockstat.1 b/cddl/usr.sbin/plockstat/plockstat.1
index ca97f39a6db7..61fa0009e275 100644
--- a/cddl/usr.sbin/plockstat/plockstat.1
+++ b/cddl/usr.sbin/plockstat/plockstat.1
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/cddl/usr.sbin/plockstat/plockstat.1,v 1.2.2.2.2.1 2010/12/21 17:09:25 kensmith Exp $
.\"
.Dd September 13, 2010
.Dt PLOCKSTAT 1
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
index 35ad2a141d2a..5b992337020f 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.7.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb