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/sha2.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/thread_pool.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/contrib/opensolaris/cmd/zdb/zdb.82
-rw-r--r--cddl/contrib/opensolaris/cmd/zfs/zfs.82
-rw-r--r--cddl/contrib/opensolaris/cmd/zpool/zpool.82
-rw-r--r--cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.12
-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/zlook/Makefile2
-rw-r--r--cddl/usr.bin/zstreamdump/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
87 files changed, 79 insertions, 79 deletions
diff --git a/cddl/Makefile b/cddl/Makefile
index 801d9cffa015..640697842ff7 100644
--- a/cddl/Makefile
+++ b/cddl/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/Makefile,v 1.2.10.1.8.1 2012/03/03 06:15:13 kensmith Exp $
SUBDIR= lib sbin usr.bin usr.sbin
diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc
index 4161c27a2ad6..4f0646730189 100644
--- a/cddl/Makefile.inc
+++ b/cddl/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/Makefile.inc,v 1.6.2.1.8.1 2012/03/03 06:15:13 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..c26899810f26 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/assert.h b/cddl/compat/opensolaris/include/assert.h
index 353f0c9fd819..d913463fb5e7 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*/
#undef assert
diff --git a/cddl/compat/opensolaris/include/devid.h b/cddl/compat/opensolaris/include/devid.h
index 205e461f8956..4a4e6237cf18 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.8.1 2012/03/03 06:15:13 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..289dc90e3a15 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/fcntl.h b/cddl/compat/opensolaris/include/fcntl.h
index 548918aaab3a..040094bda185 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.2.2.1 2012/03/03 06:15:13 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/fsshare.h b/cddl/compat/opensolaris/include/fsshare.h
index 11a8dbf0b04d..99527b8de657 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*/
#ifndef _OPENSOLARIS_FSSHARE_H_
diff --git a/cddl/compat/opensolaris/include/libintl.h b/cddl/compat/opensolaris/include/libintl.h
index da13f4749081..e414c51ab746 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.8.1 2012/03/03 06:15:13 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..0aa8c6bcd1a2 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/libshare.h b/cddl/compat/opensolaris/include/libshare.h
index 82aacadd93a9..042b21a55552 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*/
#ifndef _OPENSOLARIS_LIBSHARE_H_
diff --git a/cddl/compat/opensolaris/include/mnttab.h b/cddl/compat/opensolaris/include/mnttab.h
index 227196a4017f..6e65bdbd7c1b 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.3.2.1 2012/03/03 06:15:13 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 2fee5b0d40c8..d4688f74cef8 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.2.2.1 2012/03/03 06:15:13 kensmith Exp $ */
#ifndef _OPENSOLARIS_PRIV_H_
#define _OPENSOLARIS_PRIV_H_
diff --git a/cddl/compat/opensolaris/include/sha2.h b/cddl/compat/opensolaris/include/sha2.h
index 488f2dbd8b47..6136879e5cfe 100644
--- a/cddl/compat/opensolaris/include/sha2.h
+++ b/cddl/compat/opensolaris/include/sha2.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/sha2.h,v 1.1.2.2.2.1 2012/03/03 06:15:13 kensmith Exp $
*/
#ifndef _OPENSOLARIS_SHA2_H_
diff --git a/cddl/compat/opensolaris/include/solaris.h b/cddl/compat/opensolaris/include/solaris.h
index 9bead018bcec..e720fa69f69f 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.2.2.1 2012/03/03 06:15:13 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..511dc6b7d3cb 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/stdlib.h b/cddl/compat/opensolaris/include/stdlib.h
index 4e21ea6280ae..a3dd2219bbad 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/strings.h b/cddl/compat/opensolaris/include/strings.h
index a62bbc845e15..3b2bf83c4c94 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/thread_pool.h b/cddl/compat/opensolaris/include/thread_pool.h
index 25ac55dedea7..5da28f4f3966 100644
--- a/cddl/compat/opensolaris/include/thread_pool.h
+++ b/cddl/compat/opensolaris/include/thread_pool.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/thread_pool.h,v 1.1.2.2.2.1 2012/03/03 06:15:13 kensmith Exp $
*/
#ifndef _OPENSOLARIS_THREAD_POOL_H_
diff --git a/cddl/compat/opensolaris/include/unistd.h b/cddl/compat/opensolaris/include/unistd.h
index e1a1bc81e60f..054347400f75 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*
*/
diff --git a/cddl/compat/opensolaris/include/zone.h b/cddl/compat/opensolaris/include/zone.h
index 8c377cf6574d..2b63a3677572 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.8.1 2012/03/03 06:15:13 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..6337e818e7a1 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.8.1 2012/03/03 06:15:13 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..fc500eb3e086 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.8.1 2012/03/03 06:15:13 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..9d2c61bf8df6 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.8.1 2012/03/03 06:15:13 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 c3247f91fec4..63e697479d8c 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.4.2.1 2012/03/03 06:15:13 kensmith Exp $");
#include <sys/param.h>
diff --git a/cddl/compat/opensolaris/misc/mkdirp.c b/cddl/compat/opensolaris/misc/mkdirp.c
index 76a90ad0ec30..16859b6a2420 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.8.1 2012/03/03 06:15:13 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..dfe08e888625 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.4.1 2012/03/03 06:15:13 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 d46b378ea92a..ab3efc282532 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.3.2.1 2012/03/03 06:15:13 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..7068f33e8477 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*/
#include <stdlib.h>
diff --git a/cddl/contrib/dtracetoolkit/dtruss b/cddl/contrib/dtracetoolkit/dtruss
index 93b12d3b80c9..93b12d3b80c9 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/contrib/opensolaris/cmd/zdb/zdb.8 b/cddl/contrib/opensolaris/cmd/zdb/zdb.8
index f84bf9acd927..9436882b51ec 100644
--- a/cddl/contrib/opensolaris/cmd/zdb/zdb.8
+++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.8
@@ -19,7 +19,7 @@
.\"
.\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/cddl/contrib/opensolaris/cmd/zdb/zdb.8,v 1.4.2.2.2.1 2012/03/03 06:15:13 kensmith Exp $
.\"
.Dd November 26, 2011
.Dt ZDB 8
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
index d1793adca445..56ae8c23c83f 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
@@ -22,7 +22,7 @@
.\" Copyright (c) 2011 by Delphix. All rights reserved.
.\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd@FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/cddl/contrib/opensolaris/cmd/zfs/zfs.8,v 1.4.2.10.2.1 2012/03/03 06:15:13 kensmith Exp $
.\"
.Dd November 26, 2011
.Dt ZFS 8
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool.8 b/cddl/contrib/opensolaris/cmd/zpool/zpool.8
index cea41bcb5821..3b60e0b4945b 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool.8
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool.8
@@ -21,7 +21,7 @@
.\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved.
.\" Copyright (c) 2011, Justin T. Gibbs <gibbs@FreeBSD.org>
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/cddl/contrib/opensolaris/cmd/zpool/zpool.8,v 1.4.2.6.2.1 2012/03/03 06:15:13 kensmith Exp $
.\"
.Dd November 28, 2011
.Dt ZPOOL 8
diff --git a/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1 b/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
index f800a0513b93..620b75a8ebce 100644
--- a/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
+++ b/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
@@ -19,7 +19,7 @@
.\"
.\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1,v 1.1.2.3.2.1 2012/03/03 06:15:13 kensmith Exp $
.\"
.Dd November 26, 2011
.Dt ZSTREAMDUMP 8
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
index 52e97d74be99..b557b335dcf3 100644
--- a/cddl/lib/Makefile
+++ b/cddl/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/Makefile,v 1.9.2.2.4.1 2012/03/03 06:15:13 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/lib/Makefile.inc b/cddl/lib/Makefile.inc
index 8f9af1d17e9d..aebddac4e4dc 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.8.1 2012/03/03 06:15:13 kensmith Exp $
SHLIBDIR?= /lib
SHLIB_MAJOR?= 2
diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile
index faa016951a8b..747f1b154ec0 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.4.1 2012/03/03 06:15:13 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
index 8cbaff1eca82..a7b1503fec7b 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.8.1 2012/03/03 06:15:13 kensmith Exp $
.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile
index 6309ee499564..639507a28afe 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.8.1 2012/03/03 06:15:13 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index 86ec23a0dc27..e652c1b23c3e 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.4.1 2012/03/03 06:15:13 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/lib/libdtrace/errno.d b/cddl/lib/libdtrace/errno.d
index b9a25e029f10..2000a56455de 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.8.1 2012/03/03 06:15:13 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..4f5f273c3b0e 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.4.1 2012/03/03 06:15:13 kensmith Exp $
*/
/*
diff --git a/cddl/lib/libdtrace/net.d b/cddl/lib/libdtrace/net.d
index ee22c8ffb0cc..a16f2dbdd717 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*/
/*
diff --git a/cddl/lib/libdtrace/nfs.d b/cddl/lib/libdtrace/nfs.d
index 0f936c4afc2f..ea2872fae0be 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*/
/*
diff --git a/cddl/lib/libdtrace/psinfo.d b/cddl/lib/libdtrace/psinfo.d
index 437481dcff96..11e811f3f690 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.8.1 2012/03/03 06:15:13 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..60b9064720a7 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.4.1 2012/03/03 06:15:13 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..92b947d35517 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.8.1 2012/03/03 06:15:13 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..4081710e11a9 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*/
inline int SIGHUP = 1;
diff --git a/cddl/lib/libdtrace/unistd.d b/cddl/lib/libdtrace/unistd.d
index 1ceffef2b215..d73f2a84a338 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.8.1 2012/03/03 06:15:13 kensmith Exp $
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 7bf500193dc7..c02c6e20cdbf 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.8.1 2012/03/03 06:15:13 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..545dc180b718 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.8.1 2012/03/03 06:15:13 kensmith Exp $
.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 309ffd0eb76f..f5d41c5c30dd 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.8.1 2012/03/03 06:15:13 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 f89dc9941e3c..e6825bb4ffbe 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.3.2.1 2012/03/03 06:15:13 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 befe46703e0a..2600b3dc1bf1 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.3.2.1 2012/03/03 06:15:13 kensmith Exp $
.include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files"
diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile
index f74307c5fd6a..7bfaf4c0f2c1 100644
--- a/cddl/sbin/Makefile
+++ b/cddl/sbin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/sbin/Makefile,v 1.2.10.1.8.1 2012/03/03 06:15:13 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/sbin/Makefile.inc b/cddl/sbin/Makefile.inc
index c5111d5cb286..060071cf833f 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.8.1 2012/03/03 06:15:13 kensmith Exp $
BINDIR?= /sbin
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index c7afda68af9b..c307a783dcdf 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.2.2.1 2012/03/03 06:15:13 kensmith Exp $
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index cf3109ab0afa..29375b3f9fb5 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.2.2.1 2012/03/03 06:15:13 kensmith Exp $
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index 13d3a86232cb..a4240a38f2bd 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.2.2.1 2012/03/03 06:15:13 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/usr.bin/Makefile.inc b/cddl/usr.bin/Makefile.inc
index 4cec6fe01a45..212123dbcbac 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.8.1 2012/03/03 06:15:13 kensmith Exp $
BINDIR?= /usr/bin
diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
index ff9432265ff2..09c38c6e00d9 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.4.1 2012/03/03 06:15:13 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/usr.bin/ctfconvert/ctfconvert.1 b/cddl/usr.bin/ctfconvert/ctfconvert.1
index 5844632664a8..12447a5ab8d8 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.4.1 2012/03/03 06:15:13 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..0b052cf74ebc 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.4.1 2012/03/03 06:15:13 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/usr.bin/ctfdump/ctfdump.1 b/cddl/usr.bin/ctfdump/ctfdump.1
index d64a88a60548..2d8af8e8324e 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.4.1 2012/03/03 06:15:13 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..a312d5bf5cdb 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.4.1 2012/03/03 06:15:13 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/usr.bin/ctfmerge/ctfmerge.1 b/cddl/usr.bin/ctfmerge/ctfmerge.1
index 47151d6a1f04..676a24ed6be7 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.4.1 2012/03/03 06:15:13 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..bbb1ce832bd4 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.8.1 2012/03/03 06:15:13 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index c8693fe9c73c..4053f37132e5 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.8.1 2012/03/03 06:15:13 kensmith Exp $
.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zinject
diff --git a/cddl/usr.bin/zlook/Makefile b/cddl/usr.bin/zlook/Makefile
index 0251f57bca63..21b6790947ad 100644
--- a/cddl/usr.bin/zlook/Makefile
+++ b/cddl/usr.bin/zlook/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/zlook/Makefile,v 1.1.2.2.2.1 2012/03/03 06:15:13 kensmith Exp $
.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zlook
diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile
index 304ff7ce71ea..06d90c10893b 100644
--- a/cddl/usr.bin/zstreamdump/Makefile
+++ b/cddl/usr.bin/zstreamdump/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/zstreamdump/Makefile,v 1.1.2.2.2.1 2012/03/03 06:15:13 kensmith Exp $
.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/zstreamdump
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
index a7165c8e1fae..7c7bb142c1d3 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.2.2.1 2012/03/03 06:15:13 kensmith Exp $
.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index 49db06b61082..4adb8a4841fe 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.4.1 2012/03/03 06:15:13 kensmith Exp $
.include <bsd.own.mk>
diff --git a/cddl/usr.sbin/Makefile.inc b/cddl/usr.sbin/Makefile.inc
index 282198ea8d8c..3cfa75113cb1 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.8.1 2012/03/03 06:15:13 kensmith Exp $
BINDIR?= /usr/sbin
diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
index 9e8e34835f90..852ecfc984e5 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.4.1 2012/03/03 06:15:13 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/usr.sbin/dtruss/Makefile b/cddl/usr.sbin/dtruss/Makefile
index 39161ec0f8d1..8f7a86f1c30a 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.4.1 2012/03/03 06:15:13 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..c77124aa91e9 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.4.1 2012/03/03 06:15:13 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..8bd4aad7ddfc 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.4.1 2012/03/03 06:15:13 kensmith Exp $
.include "../../Makefile.inc"
diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile
index 059295898110..e7fd476cf72f 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.4.1 2012/03/03 06:15:13 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..e9f8c9dda982 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.4.1 2012/03/03 06:15:13 kensmith Exp $
.\"
.Dd September 13, 2010
.Dt PLOCKSTAT 1
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
index 487ce81cf7e6..fef05e237aab 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.2.2.1 2012/03/03 06:15:13 kensmith Exp $
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb