Create release/8.0.0 for the 8.0-RELEASE.release/8.0.0_cvs

Approved by:	re (implicit)

This commit was manufactured to restore the state of the 8.0-RELEASE image.

205 files changed, 204 insertions, 214 deletions

diff --git a/lib/libarchive/COPYING b/lib/libarchive/COPYING
index 5fea0f65d1ba..bcb1327d4e4e 100644
--- a/lib/libarchive/COPYING
+++ b/lib/libarchive/COPYING
@@ -32,5 +32,5 @@ contain Makefiles and/or shell scripts that are generated
 automatically by GNU autoconf and GNU automake.  Those generated files
 are controlled by the relevant licenses.
 
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/COPYING,v 1.3.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index c377f9b2d477..49a1ea8ce4b5 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.98.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .include <bsd.own.mk>
 
 LIB=	archive
diff --git a/lib/libarchive/README b/lib/libarchive/README
index 3157108728b5..0ea504007559 100644
--- a/lib/libarchive/README
+++ b/lib/libarchive/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/README,v 1.5.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 
 libarchive: a library for reading and writing streaming archives
 
diff --git a/lib/libarchive/archive.h b/lib/libarchive/archive.h
index f438f22b3135..d4f75e7ebdbc 100644
--- a/lib/libarchive/archive.h
+++ b/lib/libarchive/archive.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive.h,v 1.32.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 #ifndef ARCHIVE_H_INCLUDED
diff --git a/lib/libarchive/archive_check_magic.c b/lib/libarchive/archive_check_magic.c
index 8f1fa2f00adb..b3f8379d2960 100644
--- a/lib/libarchive/archive_check_magic.c
+++ b/lib/libarchive/archive_check_magic.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_endian.h b/lib/libarchive/archive_endian.h
index 47739c0d2464..91c9a755e17a 100644
--- a/lib/libarchive/archive_endian.h
+++ b/lib/libarchive/archive_endian.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  *
  * Borrowed from FreeBSD's <sys/endian.h>
  */
diff --git a/lib/libarchive/archive_entry.3 b/lib/libarchive/archive_entry.3
index 21a6d2a5c615..dd22bada26c7 100644
--- a/lib/libarchive/archive_entry.3
+++ b/lib/libarchive/archive_entry.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.18.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .\"
 .Dd May 12, 2008
 .Dt archive_entry 3
diff --git a/lib/libarchive/archive_entry.c b/lib/libarchive/archive_entry.c
index 16166aa85ae4..2aef1420ccc7 100644
--- a/lib/libarchive/archive_entry.c
+++ b/lib/libarchive/archive_entry.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.61.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_entry.h b/lib/libarchive/archive_entry.h
index a2748fdff67a..2172f5acb920 100644
--- a/lib/libarchive/archive_entry.h
+++ b/lib/libarchive/archive_entry.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.32.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 #ifndef ARCHIVE_ENTRY_H_INCLUDED
diff --git a/lib/libarchive/archive_entry_copy_stat.c b/lib/libarchive/archive_entry_copy_stat.c
index 615d3b0b168b..f9c09a0c7ba9 100644
--- a/lib/libarchive/archive_entry_copy_stat.c
+++ b/lib/libarchive/archive_entry_copy_stat.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_copy_stat.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_entry_link_resolver.c b/lib/libarchive/archive_entry_link_resolver.c
index e7758d66d909..79c4f9980d70 100644
--- a/lib/libarchive/archive_entry_link_resolver.c
+++ b/lib/libarchive/archive_entry_link_resolver.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_entry_private.h b/lib/libarchive/archive_entry_private.h
index 4614a4f8e2d0..5ffdf275e17a 100644
--- a/lib/libarchive/archive_entry_private.h
+++ b/lib/libarchive/archive_entry_private.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_entry_private.h,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 #ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_entry_stat.c b/lib/libarchive/archive_entry_stat.c
index 8b58658017de..b12001804df2 100644
--- a/lib/libarchive/archive_entry_stat.c
+++ b/lib/libarchive/archive_entry_stat.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_stat.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_entry_strmode.c b/lib/libarchive/archive_entry_strmode.c
index 8d7006a054fb..1049e95d3b7b 100644
--- a/lib/libarchive/archive_entry_strmode.c
+++ b/lib/libarchive/archive_entry_strmode.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.4.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_platform.h b/lib/libarchive/archive_platform.h
index dbf51145a0bc..4a41773ec995 100644
--- a/lib/libarchive/archive_platform.h
+++ b/lib/libarchive/archive_platform.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.34.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 /*
diff --git a/lib/libarchive/archive_private.h b/lib/libarchive/archive_private.h
index 1b031332c7a4..5de4bdbe5c93 100644
--- a/lib/libarchive/archive_private.h
+++ b/lib/libarchive/archive_private.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.36.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 #ifndef ARCHIVE_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_read.3 b/lib/libarchive/archive_read.3
index 9f37695f99f8..529a42b976c2 100644
--- a/lib/libarchive/archive_read.3
+++ b/lib/libarchive/archive_read.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.39.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .\"
 .Dd April 13, 2009
 .Dt archive_read 3
diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c
index fd4f888867bd..3fa776035195 100644
--- a/lib/libarchive/archive_read.c
+++ b/lib/libarchive/archive_read.c
@@ -32,7 +32,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.50.2.2.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_data_into_fd.c b/lib/libarchive/archive_read_data_into_fd.c
index b2421bbc827d..b7e4206ead6e 100644
--- a/lib/libarchive/archive_read_data_into_fd.c
+++ b/lib/libarchive/archive_read_data_into_fd.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.16.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_read_disk.3 b/lib/libarchive/archive_read_disk.3
index fd5309535815..9a44e318c2ec 100644
--- a/lib/libarchive/archive_read_disk.3
+++ b/lib/libarchive/archive_read_disk.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_read_disk.3,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .\"
 .Dd March 10, 2009
 .Dt archive_read_disk 3
diff --git a/lib/libarchive/archive_read_disk.c b/lib/libarchive/archive_read_disk.c
index 3c0b815af53b..1e6268dc6a84 100644
--- a/lib/libarchive/archive_read_disk.c
+++ b/lib/libarchive/archive_read_disk.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_disk.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include "archive.h"
 #include "archive_string.h"
diff --git a/lib/libarchive/archive_read_disk_entry_from_file.c b/lib/libarchive/archive_read_disk_entry_from_file.c
index 8f90191352aa..15a82c842863 100644
--- a/lib/libarchive/archive_read_disk_entry_from_file.c
+++ b/lib/libarchive/archive_read_disk_entry_from_file.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_disk_entry_from_file.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 /* Mac OSX requires sys/types.h before sys/acl.h. */
diff --git a/lib/libarchive/archive_read_disk_private.h b/lib/libarchive/archive_read_disk_private.h
index fd385a6b77e6..32c887019c98 100644
--- a/lib/libarchive/archive_read_disk_private.h
+++ b/lib/libarchive/archive_read_disk_private.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_read_disk_private.h,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 #ifndef ARCHIVE_READ_DISK_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_read_disk_set_standard_lookup.c b/lib/libarchive/archive_read_disk_set_standard_lookup.c
index 60054f918f0f..39a13f45e362 100644
--- a/lib/libarchive/archive_read_disk_set_standard_lookup.c
+++ b/lib/libarchive/archive_read_disk_set_standard_lookup.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_disk_set_standard_lookup.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_read_extract.c b/lib/libarchive/archive_read_extract.c
index 5ba8d22432b9..131a3fb61239 100644
--- a/lib/libarchive/archive_read_extract.c
+++ b/lib/libarchive/archive_read_extract.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.61.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_read_open_fd.c b/lib/libarchive/archive_read_open_fd.c
index 259ddc28be59..aec0f556bffe 100644
--- a/lib/libarchive/archive_read_open_fd.c
+++ b/lib/libarchive/archive_read_open_fd.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_read_open_file.c b/lib/libarchive/archive_read_open_file.c
index 37039e95a111..28de855b6c2c 100644
--- a/lib/libarchive/archive_read_open_file.c
+++ b/lib/libarchive/archive_read_open_file.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.22.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_read_open_filename.c b/lib/libarchive/archive_read_open_filename.c
index 64a89b52b3c9..634f90cfb34f 100644
--- a/lib/libarchive/archive_read_open_filename.c
+++ b/lib/libarchive/archive_read_open_filename.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.25.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_read_open_memory.c b/lib/libarchive/archive_read_open_memory.c
index 7f521173ca27..9412d60e25e7 100644
--- a/lib/libarchive/archive_read_open_memory.c
+++ b/lib/libarchive/archive_read_open_memory.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.6.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_read_private.h b/lib/libarchive/archive_read_private.h
index 394d6afc9d3b..fdae469f7bfe 100644
--- a/lib/libarchive/archive_read_private.h
+++ b/lib/libarchive/archive_read_private.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_read_support_compression_all.c b/lib/libarchive/archive_read_support_compression_all.c
index 284eab5cb98d..2940304f4aad 100644
--- a/lib/libarchive/archive_read_support_compression_all.c
+++ b/lib/libarchive/archive_read_support_compression_all.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_all.c,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include "archive.h"
 
diff --git a/lib/libarchive/archive_read_support_compression_bzip2.c b/lib/libarchive/archive_read_support_compression_bzip2.c
index 693bdd63b707..0fc5fbab95fb 100644
--- a/lib/libarchive/archive_read_support_compression_bzip2.c
+++ b/lib/libarchive/archive_read_support_compression_bzip2.c
@@ -25,7 +25,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_bzip2.c,v 1.24.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_compression_compress.c b/lib/libarchive/archive_read_support_compression_compress.c
index e115d25a2426..0fe52532d8e2 100644
--- a/lib/libarchive/archive_read_support_compression_compress.c
+++ b/lib/libarchive/archive_read_support_compression_compress.c
@@ -64,7 +64,7 @@
 
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_compress.c,v 1.16.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_compression_gzip.c b/lib/libarchive/archive_read_support_compression_gzip.c
index b20c7697b14d..902a771ee05f 100644
--- a/lib/libarchive/archive_read_support_compression_gzip.c
+++ b/lib/libarchive/archive_read_support_compression_gzip.c
@@ -25,7 +25,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_gzip.c,v 1.24.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 
 #ifdef HAVE_ERRNO_H
diff --git a/lib/libarchive/archive_read_support_compression_none.c b/lib/libarchive/archive_read_support_compression_none.c
index e05614f9699c..2dcf9c2fb540 100644
--- a/lib/libarchive/archive_read_support_compression_none.c
+++ b/lib/libarchive/archive_read_support_compression_none.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.20.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include "archive.h"
 
diff --git a/lib/libarchive/archive_read_support_compression_program.c b/lib/libarchive/archive_read_support_compression_program.c
index 21c2377b53f3..cefe317629cb 100644
--- a/lib/libarchive/archive_read_support_compression_program.c
+++ b/lib/libarchive/archive_read_support_compression_program.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_program.c,v 1.12.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_WAIT_H
 #  include <sys/wait.h>
diff --git a/lib/libarchive/archive_read_support_compression_xz.c b/lib/libarchive/archive_read_support_compression_xz.c
index d3f429786790..2fb19f7ff974 100644
--- a/lib/libarchive/archive_read_support_compression_xz.c
+++ b/lib/libarchive/archive_read_support_compression_xz.c
@@ -26,7 +26,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_xz.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_format_all.c b/lib/libarchive/archive_read_support_format_all.c
index 753a105e2592..bd0ff2e5f4b0 100644
--- a/lib/libarchive/archive_read_support_format_all.c
+++ b/lib/libarchive/archive_read_support_format_all.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_all.c,v 1.10.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include "archive.h"
 
diff --git a/lib/libarchive/archive_read_support_format_ar.c b/lib/libarchive/archive_read_support_format_ar.c
index 0992b277e72b..0abaf5c57748 100644
--- a/lib/libarchive/archive_read_support_format_ar.c
+++ b/lib/libarchive/archive_read_support_format_ar.c
@@ -26,7 +26,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_read_support_format_cpio.c b/lib/libarchive/archive_read_support_format_cpio.c
index 3bf05ce977e3..9998b2f8d60d 100644
--- a/lib/libarchive/archive_read_support_format_cpio.c
+++ b/lib/libarchive/archive_read_support_format_cpio.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.30.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_format_empty.c b/lib/libarchive/archive_read_support_format_empty.c
index 05c495829305..7f207b35cbf0 100644
--- a/lib/libarchive/archive_read_support_format_empty.c
+++ b/lib/libarchive/archive_read_support_format_empty.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_empty.c,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include "archive.h"
 #include "archive_entry.h"
diff --git a/lib/libarchive/archive_read_support_format_iso9660.c b/lib/libarchive/archive_read_support_format_iso9660.c
index eaa0f897c7bc..719f166351fb 100644
--- a/lib/libarchive/archive_read_support_format_iso9660.c
+++ b/lib/libarchive/archive_read_support_format_iso9660.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_iso9660.c,v 1.37.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_format_mtree.c b/lib/libarchive/archive_read_support_format_mtree.c
index 95094aea8756..ea071de9b7b3 100644
--- a/lib/libarchive/archive_read_support_format_mtree.c
+++ b/lib/libarchive/archive_read_support_format_mtree.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.16.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_read_support_format_raw.c b/lib/libarchive/archive_read_support_format_raw.c
index 7fcfcc1984bd..4ccaa41f58e6 100644
--- a/lib/libarchive/archive_read_support_format_raw.c
+++ b/lib/libarchive/archive_read_support_format_raw.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  */

 #include "archive_platform.h"

-__FBSDID("$FreeBSD$");

+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_raw.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");

 

 #ifdef HAVE_ERRNO_H

 #include <errno.h>

diff --git a/lib/libarchive/archive_read_support_format_tar.c b/lib/libarchive/archive_read_support_format_tar.c
index 57f420f86c20..b457415b8b3b 100644
--- a/lib/libarchive/archive_read_support_format_tar.c
+++ b/lib/libarchive/archive_read_support_format_tar.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.74.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_read_support_format_zip.c b/lib/libarchive/archive_read_support_format_zip.c
index ccb675d36749..9b4921ca2714 100644
--- a/lib/libarchive/archive_read_support_format_zip.c
+++ b/lib/libarchive/archive_read_support_format_zip.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.31.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_string.c b/lib/libarchive/archive_string.c
index 111dcb1291de..85f2cd525853 100644
--- a/lib/libarchive/archive_string.c
+++ b/lib/libarchive/archive_string.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_string.c,v 1.21.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Basic resizable string support, to simplify manipulating arbitrary-sized
diff --git a/lib/libarchive/archive_string.h b/lib/libarchive/archive_string.h
index 56ca7ca31805..a375e8818841 100644
--- a/lib/libarchive/archive_string.h
+++ b/lib/libarchive/archive_string.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  *
  */
 
diff --git a/lib/libarchive/archive_string_sprintf.c b/lib/libarchive/archive_string_sprintf.c
index 9199106b21fd..f435c1d2a533 100644
--- a/lib/libarchive/archive_string_sprintf.c
+++ b/lib/libarchive/archive_string_sprintf.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_string_sprintf.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * The use of printf()-family functions can be troublesome
diff --git a/lib/libarchive/archive_util.3 b/lib/libarchive/archive_util.3
index 831355d8dcfe..3147e0670a27 100644
--- a/lib/libarchive/archive_util.3
+++ b/lib/libarchive/archive_util.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_util.3,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .\"
 .Dd January 8, 2005
 .Dt archive_util 3
diff --git a/lib/libarchive/archive_util.c b/lib/libarchive/archive_util.c
index 1c171b903792..75e993a19dd4 100644
--- a/lib/libarchive/archive_util.c
+++ b/lib/libarchive/archive_util.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.21.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_virtual.c b/lib/libarchive/archive_virtual.c
index 214e381710c6..aac8c10b071a 100644
--- a/lib/libarchive/archive_virtual.c
+++ b/lib/libarchive/archive_virtual.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_virtual.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include "archive.h"
 #include "archive_entry.h"
diff --git a/lib/libarchive/archive_write.3 b/lib/libarchive/archive_write.3
index 8228903dc176..515aeb81ece6 100644
--- a/lib/libarchive/archive_write.3
+++ b/lib/libarchive/archive_write.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.26.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .\"
 .Dd May 11, 2008
 .Dt archive_write 3
diff --git a/lib/libarchive/archive_write.c b/lib/libarchive/archive_write.c
index ef3492918486..b6fc1b210faf 100644
--- a/lib/libarchive/archive_write.c
+++ b/lib/libarchive/archive_write.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.30.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * This file contains the "essential" portions of the write API, that
diff --git a/lib/libarchive/archive_write_disk.3 b/lib/libarchive/archive_write_disk.3
index 4a395923c33b..70d2d7a8ab7c 100644
--- a/lib/libarchive/archive_write_disk.3
+++ b/lib/libarchive/archive_write_disk.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .\"
 .Dd August 5, 2008
 .Dt archive_write_disk 3
diff --git a/lib/libarchive/archive_write_disk.c b/lib/libarchive/archive_write_disk.c
index 80b1b6a69e66..0008570b4b71 100644
--- a/lib/libarchive/archive_write_disk.c
+++ b/lib/libarchive/archive_write_disk.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.56.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_write_disk_private.h b/lib/libarchive/archive_write_disk_private.h
index 562229b2e53d..d7b9fee15d1f 100644
--- a/lib/libarchive/archive_write_disk_private.h
+++ b/lib/libarchive/archive_write_disk_private.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_write_disk_private.h,v 1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 #ifndef ARCHIVE_WRITE_DISK_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_write_disk_set_standard_lookup.c b/lib/libarchive/archive_write_disk_set_standard_lookup.c
index 59f6e172e7fe..5622a82f32fc 100644
--- a/lib/libarchive/archive_write_disk_set_standard_lookup.c
+++ b/lib/libarchive/archive_write_disk_set_standard_lookup.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk_set_standard_lookup.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_write_open_fd.c b/lib/libarchive/archive_write_open_fd.c
index f4cc6ac1c54e..6fa85c923d2b 100644
--- a/lib/libarchive/archive_write_open_fd.c
+++ b/lib/libarchive/archive_write_open_fd.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_fd.c,v 1.9.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_write_open_file.c b/lib/libarchive/archive_write_open_file.c
index c99414fd1e5a..56500e95949b 100644
--- a/lib/libarchive/archive_write_open_file.c
+++ b/lib/libarchive/archive_write_open_file.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.19.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_write_open_filename.c b/lib/libarchive/archive_write_open_filename.c
index 1db11f9e52d2..c35c23c49482 100644
--- a/lib/libarchive/archive_write_open_filename.c
+++ b/lib/libarchive/archive_write_open_filename.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_filename.c,v 1.21.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/lib/libarchive/archive_write_open_memory.c b/lib/libarchive/archive_write_open_memory.c
index 02c00227e3cb..75abafebc8c5 100644
--- a/lib/libarchive/archive_write_open_memory.c
+++ b/lib/libarchive/archive_write_open_memory.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_memory.c,v 1.3.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/archive_write_private.h b/lib/libarchive/archive_write_private.h
index 0f7215f9219e..43e2afb2b1b1 100644
--- a/lib/libarchive/archive_write_private.h
+++ b/lib/libarchive/archive_write_private.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/archive_write_private.h,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 #ifndef ARCHIVE_WRITE_PRIVATE_H_INCLUDED
diff --git a/lib/libarchive/archive_write_set_compression_bzip2.c b/lib/libarchive/archive_write_set_compression_bzip2.c
index ccf2229d6d97..5362073ff0e5 100644
--- a/lib/libarchive/archive_write_set_compression_bzip2.c
+++ b/lib/libarchive/archive_write_set_compression_bzip2.c
@@ -25,7 +25,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_bzip2.c,v 1.15.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_compression_compress.c b/lib/libarchive/archive_write_set_compression_compress.c
index fe6b905ee4a5..3b1947f85394 100644
--- a/lib/libarchive/archive_write_set_compression_compress.c
+++ b/lib/libarchive/archive_write_set_compression_compress.c
@@ -58,7 +58,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_compress.c,v 1.1.6.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_compression_gzip.c b/lib/libarchive/archive_write_set_compression_gzip.c
index 701d6a8d9dae..d3fe98512c28 100644
--- a/lib/libarchive/archive_write_set_compression_gzip.c
+++ b/lib/libarchive/archive_write_set_compression_gzip.c
@@ -25,7 +25,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_gzip.c,v 1.19.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_compression_none.c b/lib/libarchive/archive_write_set_compression_none.c
index 36828c28fa5e..2fb4c4e61bd1 100644
--- a/lib/libarchive/archive_write_set_compression_none.c
+++ b/lib/libarchive/archive_write_set_compression_none.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_none.c,v 1.16.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_compression_program.c b/lib/libarchive/archive_write_set_compression_program.c
index e612f3be9225..82a712816bcc 100644
--- a/lib/libarchive/archive_write_set_compression_program.c
+++ b/lib/libarchive/archive_write_set_compression_program.c
@@ -25,7 +25,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_program.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /* This capability is only available on POSIX systems. */
 #if (!defined(HAVE_PIPE) || !defined(HAVE_FCNTL) || \
diff --git a/lib/libarchive/archive_write_set_compression_xz.c b/lib/libarchive/archive_write_set_compression_xz.c
index 8396252527cf..143789a5bf4e 100644
--- a/lib/libarchive/archive_write_set_compression_xz.c
+++ b/lib/libarchive/archive_write_set_compression_xz.c
@@ -26,7 +26,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_xz.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format.c b/lib/libarchive/archive_write_set_format.c
index 369f2c9399e3..4aa5b71543b4 100644
--- a/lib/libarchive/archive_write_set_format.c
+++ b/lib/libarchive/archive_write_set_format.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_write_set_format_ar.c b/lib/libarchive/archive_write_set_format_ar.c
index f9dd546592f2..1281ac0e382e 100644
--- a/lib/libarchive/archive_write_set_format_ar.c
+++ b/lib/libarchive/archive_write_set_format_ar.c
@@ -26,7 +26,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ar.c,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_by_name.c b/lib/libarchive/archive_write_set_format_by_name.c
index d5be6c0d961a..d03bbfc9f8ca 100644
--- a/lib/libarchive/archive_write_set_format_by_name.c
+++ b/lib/libarchive/archive_write_set_format_by_name.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_write_set_format_cpio.c b/lib/libarchive/archive_write_set_format_cpio.c
index fd7e8a9a2dc6..250f1ddcaf0c 100644
--- a/lib/libarchive/archive_write_set_format_cpio.c
+++ b/lib/libarchive/archive_write_set_format_cpio.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.16.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_cpio_newc.c b/lib/libarchive/archive_write_set_format_cpio_newc.c
index 9df79e7ca006..c1018195148f 100644
--- a/lib/libarchive/archive_write_set_format_cpio_newc.c
+++ b/lib/libarchive/archive_write_set_format_cpio_newc.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio_newc.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_mtree.c b/lib/libarchive/archive_write_set_format_mtree.c
index 377fa606f387..22cba124615d 100644
--- a/lib/libarchive/archive_write_set_format_mtree.c
+++ b/lib/libarchive/archive_write_set_format_mtree.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_mtree.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/libarchive/archive_write_set_format_pax.c b/lib/libarchive/archive_write_set_format_pax.c
index e768a7dc3a81..124ba1ffe4dd 100644
--- a/lib/libarchive/archive_write_set_format_pax.c
+++ b/lib/libarchive/archive_write_set_format_pax.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.52.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_shar.c b/lib/libarchive/archive_write_set_format_shar.c
index 6cb58e863771..2cff68177fc6 100644
--- a/lib/libarchive/archive_write_set_format_shar.c
+++ b/lib/libarchive/archive_write_set_format_shar.c
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.21.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/lib/libarchive/archive_write_set_format_ustar.c b/lib/libarchive/archive_write_set_format_ustar.c
index 2de0cf1db2ba..06bc20b498ed 100644
--- a/lib/libarchive/archive_write_set_format_ustar.c
+++ b/lib/libarchive/archive_write_set_format_ustar.c
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.29.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 
 #ifdef HAVE_ERRNO_H
diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h
index 484b8662ea23..5f8302fc3ebf 100644
--- a/lib/libarchive/config_freebsd.h
+++ b/lib/libarchive/config_freebsd.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/config_freebsd.h,v 1.24.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 /* FreeBSD 5.0 and later have ACL and extattr support. */
diff --git a/lib/libarchive/cpio.5 b/lib/libarchive/cpio.5
index 02077d65120d..e1e3431f50dc 100644
--- a/lib/libarchive/cpio.5
+++ b/lib/libarchive/cpio.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/cpio.5,v 1.2.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .\"
 .Dd October 5, 2007
 .Dt CPIO 5
diff --git a/lib/libarchive/filter_fork.c b/lib/libarchive/filter_fork.c
index a4d1a9819fc6..dbc1d44e84bc 100644
--- a/lib/libarchive/filter_fork.c
+++ b/lib/libarchive/filter_fork.c
@@ -29,7 +29,7 @@
 #if defined(HAVE_PIPE) && defined(HAVE_FCNTL) && \
     (defined(HAVE_FORK) || defined(HAVE_VFORK))
 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/filter_fork.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #if defined(HAVE_POLL)
 #  if defined(HAVE_POLL_H)
diff --git a/lib/libarchive/filter_fork.h b/lib/libarchive/filter_fork.h
index d34ae22c36c1..8173632aabbb 100644
--- a/lib/libarchive/filter_fork.h
+++ b/lib/libarchive/filter_fork.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/filter_fork.h,v 1.1.12.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 #ifndef FILTER_FORK_H
diff --git a/lib/libarchive/libarchive-formats.5 b/lib/libarchive/libarchive-formats.5
index d76515fe0e5e..fa0a022fe65b 100644
--- a/lib/libarchive/libarchive-formats.5
+++ b/lib/libarchive/libarchive-formats.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/libarchive-formats.5,v 1.17.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .\"
 .Dd April 17, 2009
 .Dt libarchive-formats 5
diff --git a/lib/libarchive/libarchive.3 b/lib/libarchive/libarchive.3
index 5552eec0b835..dcc0921efc45 100644
--- a/lib/libarchive/libarchive.3
+++ b/lib/libarchive/libarchive.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/libarchive.3,v 1.11.10.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .\"
 .Dd August 19, 2006
 .Dt LIBARCHIVE 3
diff --git a/lib/libarchive/libarchive_internals.3 b/lib/libarchive/libarchive_internals.3
index f050bfb5fdc7..53693243a3a3 100644
--- a/lib/libarchive/libarchive_internals.3
+++ b/lib/libarchive/libarchive_internals.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/libarchive_internals.3,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .\"
 .Dd April 16, 2007
 .Dt LIBARCHIVE 3
diff --git a/lib/libarchive/tar.5 b/lib/libarchive/tar.5
index 7927b04f3314..11a484683531 100644
--- a/lib/libarchive/tar.5
+++ b/lib/libarchive/tar.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.19.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 .\"
 .Dd April 19, 2009
 .Dt tar 5
diff --git a/lib/libarchive/test/.cvsignore b/lib/libarchive/test/.cvsignore
deleted file mode 100644
index b71f5a0dbd62..000000000000
--- a/lib/libarchive/test/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*.tar
-*.tar.gz
-*.tgz
-*.zip
-.depend
-.deps
-.dirstamp
-archive.h
-libarchive_test
-list.h
diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile
index dec95fdb151d..81583db13225 100644
--- a/lib/libarchive/test/Makefile
+++ b/lib/libarchive/test/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.38.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 
 # Where to find the libarchive sources
 LA_SRCDIR=${.CURDIR}/..
diff --git a/lib/libarchive/test/README b/lib/libarchive/test/README
index 0190b7c490ba..fcf3f430159e 100644
--- a/lib/libarchive/test/README
+++ b/lib/libarchive/test/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/README,v 1.3.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 
 This is the test harness for libarchive.
 
diff --git a/lib/libarchive/test/main.c b/lib/libarchive/test/main.c
index 0d16c81edd10..adfbe0deeb4a 100644
--- a/lib/libarchive/test/main.c
+++ b/lib/libarchive/test/main.c
@@ -50,7 +50,7 @@
 #define	EXTRA_DUMP(x)	archive_error_string((struct archive *)(x))
 #define	EXTRA_VERSION	archive_version()
 #define KNOWNREF	"test_compat_gtar_1.tar.uu"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.27.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * "list.h" is simply created by "grep DEFINE_TEST"; it has
diff --git a/lib/libarchive/test/read_open_memory.c b/lib/libarchive/test/read_open_memory.c
index 17e7f75615fc..e7e5a3333fbf 100644
--- a/lib/libarchive/test/read_open_memory.c
+++ b/lib/libarchive/test/read_open_memory.c
@@ -24,7 +24,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/read_open_memory.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/test/test.h b/lib/libarchive/test/test.h
index 94c66e8d3bca..4b36c7c9e132 100644
--- a/lib/libarchive/test/test.h
+++ b/lib/libarchive/test/test.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libarchive/test/test.h,v 1.19.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
  */
 
 /* Every test program should #include "test.h" as the first thing. */
diff --git a/lib/libarchive/test/test_acl_basic.c b/lib/libarchive/test/test_acl_basic.c
index 8fbd3a014371..9efe00caf813 100644
--- a/lib/libarchive/test/test_acl_basic.c
+++ b/lib/libarchive/test/test_acl_basic.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Exercise the system-independent portion of the ACL support.
diff --git a/lib/libarchive/test/test_acl_freebsd.c b/lib/libarchive/test/test_acl_freebsd.c
index 88efb191c48f..904452598686 100644
--- a/lib/libarchive/test/test_acl_freebsd.c
+++ b/lib/libarchive/test/test_acl_freebsd.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_freebsd.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #if defined(__FreeBSD__) && __FreeBSD__ > 4
 #include <sys/acl.h>
diff --git a/lib/libarchive/test/test_acl_pax.c b/lib/libarchive/test/test_acl_pax.c
index 5898a6626d73..fc059c47e961 100644
--- a/lib/libarchive/test/test_acl_pax.c
+++ b/lib/libarchive/test/test_acl_pax.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_pax.c,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Exercise the system-independent portion of the ACL support.
diff --git a/lib/libarchive/test/test_archive_api_feature.c b/lib/libarchive/test/test_archive_api_feature.c
index 3324aad58def..9537e0b283a4 100644
--- a/lib/libarchive/test/test_archive_api_feature.c
+++ b/lib/libarchive/test/test_archive_api_feature.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.5.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 DEFINE_TEST(test_archive_api_feature)
 {
diff --git a/lib/libarchive/test/test_bad_fd.c b/lib/libarchive/test/test_bad_fd.c
index a0f9ae1ec799..0d8fc75a722a 100644
--- a/lib/libarchive/test/test_bad_fd.c
+++ b/lib/libarchive/test/test_bad_fd.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_bad_fd.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /* Verify that attempting to open an invalid fd returns correct error. */
 DEFINE_TEST(test_bad_fd)
diff --git a/lib/libarchive/test/test_compat_bzip2.c b/lib/libarchive/test/test_compat_bzip2.c
index cbd113b0153a..d88acf9d107b 100644
--- a/lib/libarchive/test/test_compat_bzip2.c
+++ b/lib/libarchive/test/test_compat_bzip2.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_bzip2.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Verify our ability to read sample files compatibly with bunzip2.
diff --git a/lib/libarchive/test/test_compat_bzip2_1.tbz.uu b/lib/libarchive/test/test_compat_bzip2_1.tbz.uu
index 8c944140b039..43ef11be6a15 100644
--- a/lib/libarchive/test/test_compat_bzip2_1.tbz.uu
+++ b/lib/libarchive/test/test_compat_bzip2_1.tbz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_bzip2_1.tbz.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 
 begin 644 test_compat_bzip2_1.tbz
 M0EIH.3%!62936;12^)(``#-;D=$00`!_@``!8RT>$`0`$```""``5#5/*'J>
diff --git a/lib/libarchive/test/test_compat_bzip2_2.tbz.uu b/lib/libarchive/test/test_compat_bzip2_2.tbz.uu
index 286b3673b602..869af6a222ca 100644
--- a/lib/libarchive/test/test_compat_bzip2_2.tbz.uu
+++ b/lib/libarchive/test/test_compat_bzip2_2.tbz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_bzip2_2.tbz.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 
 begin 644 test_compat_bzip2_2.tbz
 M0EIH.3%!629361HI1P<``4#;D-$00`#_@``)9RT>$`0``!@P`/@#&$Q,F`F`
diff --git a/lib/libarchive/test/test_compat_gtar.c b/lib/libarchive/test/test_compat_gtar.c
index 41fc2f23a24e..41ecea97c056 100644
--- a/lib/libarchive/test/test_compat_gtar.c
+++ b/lib/libarchive/test/test_compat_gtar.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_gtar.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Verify our ability to read sample files created by GNU tar.
diff --git a/lib/libarchive/test/test_compat_gtar_1.tar.uu b/lib/libarchive/test/test_compat_gtar_1.tar.uu
index 1e8d25be8bfc..8ab355777b34 100644
--- a/lib/libarchive/test/test_compat_gtar_1.tar.uu
+++ b/lib/libarchive/test/test_compat_gtar_1.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_gtar_1.tar.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_compat_gtar_1.tar
 M+B\N+T!,;VYG3&EN:P``````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_compat_gzip.c b/lib/libarchive/test/test_compat_gzip.c
index eb9981d02fe9..34c066681242 100644
--- a/lib/libarchive/test/test_compat_gzip.c
+++ b/lib/libarchive/test/test_compat_gzip.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_gzip.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Verify our ability to read sample files compatibly with gunzip.
diff --git a/lib/libarchive/test/test_compat_gzip_1.tgz.uu b/lib/libarchive/test/test_compat_gzip_1.tgz.uu
index 814ef67c09d7..b9c7cac5daf6 100644
--- a/lib/libarchive/test/test_compat_gzip_1.tgz.uu
+++ b/lib/libarchive/test/test_compat_gzip_1.tgz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_gzip_1.tgz.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 
 begin 644 test_compat_gzip_1.tgz
 M'XL(")B^(DD``W1E<W0M<W!L:70N=&%R86$`2S-DH#DP,#`P,S%1`-*&YJ:&
diff --git a/lib/libarchive/test/test_compat_gzip_2.tgz.uu b/lib/libarchive/test/test_compat_gzip_2.tgz.uu
index bbc62fec8b96..445421786440 100644
--- a/lib/libarchive/test/test_compat_gzip_2.tgz.uu
+++ b/lib/libarchive/test/test_compat_gzip_2.tgz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_gzip_2.tgz.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 
 begin 644 test_compat_gzip_2.tgz
 M'XL(`&76(DD``^W800["(!"%8=:>@ALXPP`]CXF=Q&A<:-UX>EN)C5M,AL;P
diff --git a/lib/libarchive/test/test_compat_solaris_tar_acl.c b/lib/libarchive/test/test_compat_solaris_tar_acl.c
index ec3955ecd7fe..033ac0494fd9 100644
--- a/lib/libarchive/test/test_compat_solaris_tar_acl.c
+++ b/lib/libarchive/test/test_compat_solaris_tar_acl.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_solaris_tar_acl.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Exercise support for reading Solaris-style ACL data
diff --git a/lib/libarchive/test/test_compat_solaris_tar_acl.tar.uu b/lib/libarchive/test/test_compat_solaris_tar_acl.tar.uu
index 229b335679aa..f6f967f0a549 100644
--- a/lib/libarchive/test/test_compat_solaris_tar_acl.tar.uu
+++ b/lib/libarchive/test/test_compat_solaris_tar_acl.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_solaris_tar_acl.tar.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_acl_solaris.tar
 M9FEL92UW:71H+7!O<VEX+6%C;',`````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_compat_tar_hardlink.c b/lib/libarchive/test/test_compat_tar_hardlink.c
index c1021ef584b2..530a6905fca2 100644
--- a/lib/libarchive/test/test_compat_tar_hardlink.c
+++ b/lib/libarchive/test/test_compat_tar_hardlink.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Background:  There are two written standards for the tar file format.
diff --git a/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu b/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu
index f1658a27514a..766156325a19 100644
--- a/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu
+++ b/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu,v 1.1.6.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_compat_tar_hardlink_1.tar
 M>&UC9"TS+C,N,B]D;V-S7V0O4D5!1$UF````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_compat_xz.c b/lib/libarchive/test/test_compat_xz.c
index 9041427f8780..972acf62cb53 100644
--- a/lib/libarchive/test/test_compat_xz.c
+++ b/lib/libarchive/test/test_compat_xz.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_xz.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Verify our ability to read sample files compatibly with unxz.
diff --git a/lib/libarchive/test/test_compat_xz_1.txz.uu b/lib/libarchive/test/test_compat_xz_1.txz.uu
index 82794fd8c278..41c56a84f7e8 100644
--- a/lib/libarchive/test/test_compat_xz_1.txz.uu
+++ b/lib/libarchive/test/test_compat_xz_1.txz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_xz_1.txz.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_compat_gzip_1.txz
 M_3=Z6%H```3FUK1&`@`A`18```!T+^6CX`^?`(-=`#,,/!NGC#0&C6L"2_R2
 M/O9*^(7KX=WM^(=KA(RH"\09$$)!Q_+JUHQ*`]R;ITL_F3/I6:^Q0550A&)B
diff --git a/lib/libarchive/test/test_compat_zip.c b/lib/libarchive/test/test_compat_zip.c
index fefc6fefabdf..1b0257811af7 100644
--- a/lib/libarchive/test/test_compat_zip.c
+++ b/lib/libarchive/test/test_compat_zip.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_zip.c,v 1.5.2.2.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /* Copy this function for each test file and adjust it accordingly. */
 static void
diff --git a/lib/libarchive/test/test_compat_zip_1.zip.uu b/lib/libarchive/test/test_compat_zip_1.zip.uu
index 1ed2d69966bf..bb3890bc0592 100644
--- a/lib/libarchive/test/test_compat_zip_1.zip.uu
+++ b/lib/libarchive/test/test_compat_zip_1.zip.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_compat_zip_1.zip.uu,v 1.2.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_compat_zip_1.zip
 M4$L#!!0`"``(``B$@S<````````````````4````345402U)3D8O34%.249%
 M4U0N34;S3<S+3$LM+M$-2RTJSLS/LU(PU#/@Y7+,0Q)Q+$A,SDA5`(H!)<U!
diff --git a/lib/libarchive/test/test_empty_write.c b/lib/libarchive/test/test_empty_write.c
index 9980e3aa8497..fa15a90e36f8 100644
--- a/lib/libarchive/test/test_empty_write.c
+++ b/lib/libarchive/test/test_empty_write.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_empty_write.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 DEFINE_TEST(test_empty_write)
 {
diff --git a/lib/libarchive/test/test_entry.c b/lib/libarchive/test/test_entry.c
index b79e822cc723..5e4f0ee202bd 100644
--- a/lib/libarchive/test/test_entry.c
+++ b/lib/libarchive/test/test_entry.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.12.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include <locale.h>
 
diff --git a/lib/libarchive/test/test_entry_strmode.c b/lib/libarchive/test/test_entry_strmode.c
index 5ede8b6f2172..262c286f2c1e 100644
--- a/lib/libarchive/test/test_entry_strmode.c
+++ b/lib/libarchive/test/test_entry_strmode.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry_strmode.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 DEFINE_TEST(test_entry_strmode)
 {
diff --git a/lib/libarchive/test/test_extattr_freebsd.c b/lib/libarchive/test/test_extattr_freebsd.c
index 19881c2ece59..a2a89369351e 100644
--- a/lib/libarchive/test/test_extattr_freebsd.c
+++ b/lib/libarchive/test/test_extattr_freebsd.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_extattr_freebsd.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #if defined(__FreeBSD__) && __FreeBSD__ > 4
 #include <sys/extattr.h>
diff --git a/lib/libarchive/test/test_fuzz.c b/lib/libarchive/test/test_fuzz.c
index 9c5a05615903..b02c8a1b6f66 100644
--- a/lib/libarchive/test/test_fuzz.c
+++ b/lib/libarchive/test/test_fuzz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_fuzz.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * This was inspired by an ISO fuzz tester written by Michal Zalewski
diff --git a/lib/libarchive/test/test_fuzz_1.iso.uu b/lib/libarchive/test/test_fuzz_1.iso.uu
index 42e9300d5932..98ba9220fbb4 100644
--- a/lib/libarchive/test/test_fuzz_1.iso.uu
+++ b/lib/libarchive/test/test_fuzz_1.iso.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_fuzz_1.iso.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_fuzz_1.iso
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_link_resolver.c b/lib/libarchive/test/test_link_resolver.c
index 032c05951078..10ddd496c076 100644
--- a/lib/libarchive/test/test_link_resolver.c
+++ b/lib/libarchive/test/test_link_resolver.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_link_resolver.c,v 1.2.6.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static void test_linkify_tar(void)
 {
diff --git a/lib/libarchive/test/test_open_fd.c b/lib/libarchive/test/test_open_fd.c
index 0aec1d5e9fcf..526af6fd8e4c 100644
--- a/lib/libarchive/test/test_open_fd.c
+++ b/lib/libarchive/test/test_open_fd.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_open_fd.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 
 DEFINE_TEST(test_open_fd)
diff --git a/lib/libarchive/test/test_open_file.c b/lib/libarchive/test/test_open_file.c
index e931163de21a..7a2bbe6d9454 100644
--- a/lib/libarchive/test/test_open_file.c
+++ b/lib/libarchive/test/test_open_file.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_open_file.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 DEFINE_TEST(test_open_file)
 {
diff --git a/lib/libarchive/test/test_open_filename.c b/lib/libarchive/test/test_open_filename.c
index b096afcb4ed0..74a9556a7647 100644
--- a/lib/libarchive/test/test_open_filename.c
+++ b/lib/libarchive/test/test_open_filename.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_open_filename.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 DEFINE_TEST(test_open_filename)
 {
diff --git a/lib/libarchive/test/test_pax_filename_encoding.c b/lib/libarchive/test/test_pax_filename_encoding.c
index 45f984839caf..5ee64e408347 100644
--- a/lib/libarchive/test/test_pax_filename_encoding.c
+++ b/lib/libarchive/test/test_pax_filename_encoding.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include <locale.h>
 
diff --git a/lib/libarchive/test/test_pax_filename_encoding.tar.uu b/lib/libarchive/test/test_pax_filename_encoding.tar.uu
index e7773fdedd91..dbc1f496f629 100644
--- a/lib/libarchive/test/test_pax_filename_encoding.tar.uu
+++ b/lib/libarchive/test/test_pax_filename_encoding.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.tar.uu,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_pax_filename_encoding.tar
 M4&%X2&5A9&5R+V%B8\R,;6YO6'AY>@``````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_read_compress_program.c b/lib/libarchive/test/test_read_compress_program.c
index 042c6159c486..1cadd44372ae 100644
--- a/lib/libarchive/test/test_read_compress_program.c
+++ b/lib/libarchive/test/test_read_compress_program.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_compress_program.c,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,222,'C','p','C',0,3,211,'c',160,'=','0','0','0','0','7','5','U',
diff --git a/lib/libarchive/test/test_read_data_large.c b/lib/libarchive/test/test_read_data_large.c
index 76b9e1283783..cb0ca4300f73 100644
--- a/lib/libarchive/test/test_read_data_large.c
+++ b/lib/libarchive/test/test_read_data_large.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_data_large.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Test read/write of a 10M block of data in a single operation.
diff --git a/lib/libarchive/test/test_read_disk.c b/lib/libarchive/test/test_read_disk.c
index cd87c5ba39cd..5a16f721f888 100644
--- a/lib/libarchive/test/test_read_disk.c
+++ b/lib/libarchive/test/test_read_disk.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_disk.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static void
 gname_cleanup(void *d)
diff --git a/lib/libarchive/test/test_read_disk_entry_from_file.c b/lib/libarchive/test/test_read_disk_entry_from_file.c
index 8b3b6d79c560..985bb2e35228 100644
--- a/lib/libarchive/test/test_read_disk_entry_from_file.c
+++ b/lib/libarchive/test/test_read_disk_entry_from_file.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_disk_entry_from_file.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static const char *
 gname_lookup(void *d, gid_t g)
diff --git a/lib/libarchive/test/test_read_extract.c b/lib/libarchive/test/test_read_extract.c
index 887ddfde6852..6858af7c6445 100644
--- a/lib/libarchive/test/test_read_extract.c
+++ b/lib/libarchive/test/test_read_extract.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_extract.c,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #define BUFF_SIZE 1000000
 #define FILE_BUFF_SIZE 100000
diff --git a/lib/libarchive/test/test_read_file_nonexistent.c b/lib/libarchive/test/test_read_file_nonexistent.c
index d8e5293eb1c4..40b30b1647f6 100644
--- a/lib/libarchive/test/test_read_file_nonexistent.c
+++ b/lib/libarchive/test/test_read_file_nonexistent.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_file_nonexistent.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 DEFINE_TEST(test_read_file_nonexistent)
 {
diff --git a/lib/libarchive/test/test_read_format_ar.c b/lib/libarchive/test/test_read_format_ar.c
index f4b31de06e57..fa600458fdf6 100644
--- a/lib/libarchive/test/test_read_format_ar.c
+++ b/lib/libarchive/test/test_read_format_ar.c
@@ -26,7 +26,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_ar.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #if ARCHIVE_VERSION_NUMBER >= 1009000
 /*
diff --git a/lib/libarchive/test/test_read_format_cpio_bin.c b/lib/libarchive/test/test_read_format_cpio_bin.c
index 4c81d902e957..eff14282e900 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 199,'q',21,4,177,'y',237,'A',232,3,232,3,2,0,0,0,'p','C',244,'M',2,0,0,0,
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_Z.c b/lib/libarchive/test/test_read_format_cpio_bin_Z.c
index 097292508afb..dd88bdb8a2db 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_Z.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_Z.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_Z.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,157,144,199,226,'T',' ',16,'+','O',187,' ',232,6,'$',20,0,160,'!',156,
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_be.c b/lib/libarchive/test/test_read_format_cpio_bin_be.c
index 72852fccd23d..aaf28fa656a1 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_be.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_be.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_be.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 DEFINE_TEST(test_read_format_cpio_bin_be)
 {
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_be.cpio.uu b/lib/libarchive/test/test_read_format_cpio_bin_be.cpio.uu
index 999f1e0d961f..cf26f5955659 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_be.cpio.uu
+++ b/lib/libarchive/test/test_read_format_cpio_bin_be.cpio.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_be.cpio.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_cpio_bin_be.cpio
 M<<<`"#P\@:0#Z`````$``$GS"&\`%0````5F:6QE,3$Q,3(R,C(S,S,S-#0T
 M-```86)C9&4`<<<```````````````$`````````"P````!44D%)3$52(2$A
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_bz2.c b/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
index 90270c8f53bd..4d37436a06f3 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 'B','Z','h','9','1','A','Y','&','S','Y',134,'J',208,'4',0,0,30,246,141,253,
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_gz.c b/lib/libarchive/test/test_read_format_cpio_bin_gz.c
index a57e2f14e1fd..202592d14c2d 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_gz.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_gz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_gz.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,244,'M','p','C',0,3,';','^','(',202,178,177,242,173,227,11,230,
diff --git a/lib/libarchive/test/test_read_format_cpio_bin_xz.c b/lib/libarchive/test/test_read_format_cpio_bin_xz.c
index e864e5a662ce..4b345353a4ca 100644
--- a/lib/libarchive/test/test_read_format_cpio_bin_xz.c
+++ b/lib/libarchive/test/test_read_format_cpio_bin_xz.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin_xz.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
  0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00, 0x00, 0x04,
diff --git a/lib/libarchive/test/test_read_format_cpio_odc.c b/lib/libarchive/test/test_read_format_cpio_odc.c
index cc0b79b6c547..f1766d41498d 100644
--- a/lib/libarchive/test/test_read_format_cpio_odc.c
+++ b/lib/libarchive/test/test_read_format_cpio_odc.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_odc.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 '0','7','0','7','0','7','0','0','2','0','2','5','0','7','4','6','6','1','0',
diff --git a/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c b/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
index 63a51c4e2837..6dd34c377d84 100644
--- a/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
+++ b/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,236,'c',217,'D',0,3,'3','0','7','0','7','0','4','0','0',181,'0',
diff --git a/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c b/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c
index 11ac091aed1e..908d608f3fe4 100644
--- a/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c
+++ b/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,157,144,'0','n',4,132,'!',3,6,140,26,'8','n',228,16,19,195,160,'A',26,
diff --git a/lib/libarchive/test/test_read_format_empty.c b/lib/libarchive/test/test_read_format_empty.c
index e0fa9a5830dc..96e4b711a7f3 100644
--- a/lib/libarchive/test/test_read_format_empty.c
+++ b/lib/libarchive/test/test_read_format_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_empty.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = { 0 };
 
diff --git a/lib/libarchive/test/test_read_format_gtar_gz.c b/lib/libarchive/test/test_read_format_gtar_gz.c
index 8f12a6553984..4da1fa12ec9e 100644
--- a/lib/libarchive/test/test_read_format_gtar_gz.c
+++ b/lib/libarchive/test/test_read_format_gtar_gz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_gz.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,'+','e',217,'D',0,3,211,211,'g',160,'9','0',0,2,'s','S','S',16,
diff --git a/lib/libarchive/test/test_read_format_gtar_lzma.c b/lib/libarchive/test/test_read_format_gtar_lzma.c
index f19d0b85f884..4a4f620a94d1 100644
--- a/lib/libarchive/test/test_read_format_gtar_lzma.c
+++ b/lib/libarchive/test/test_read_format_gtar_lzma.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_lzma.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 0x5d, 0x0, 0x0, 0x80, 0x0, 0x0, 0x28, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse.c b/lib/libarchive/test/test_read_format_gtar_sparse.c
index f6c9d42311e1..4c42ec66fb2d 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse.c
+++ b/lib/libarchive/test/test_read_format_gtar_sparse.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse.c,v 1.12.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 
 struct contents {
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu
index 7b19d671ac5c..ee4766fd9d26 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_13.tar
 M<W!A<G-E````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu
index f8985b077b94..99f0b4378337 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_17.tar
 M<W!A<G-E````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu
index d19dead5f909..275bb2da9c14 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix00.tar
 M+B]087A(96%D97)S+C,X-C4Y+W-P87)S90``````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu
index 7fa0af9cc702..7693ebe059d9 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix01.tar
 M+B]087A(96%D97)S+C,X-C8Q+W-P87)S90``````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu
index ca1f12b4b910..7da8700a6b5c 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix10.tar
 M+B]087A(96%D97)S+C,X-C8S+W-P87)S90``````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
index a0673de19d35..7bcfa14c74f3 100644
--- a/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
+++ b/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu,v 1.2.4.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_gtar_sparse_1_17_posix10_modified.tar
 M+B]087A(96%D97)S+C,X-C8S+W-P87)S90``````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_read_format_iso_gz.c b/lib/libarchive/test/test_read_format_iso_gz.c
index 73c841588c54..4f2b1d1525be 100644
--- a/lib/libarchive/test/test_read_format_iso_gz.c
+++ b/lib/libarchive/test/test_read_format_iso_gz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_iso_gz.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 DEFINE_TEST(test_read_format_iso_gz)
 {
diff --git a/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu b/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu
index 759e5b64adfb..b9dff17a7d4d 100644
--- a/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu
+++ b/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 755 test_read_format_iso_gz.iso.gz
 M'XL(",E2<$,``W1E<W0M<F5A9%]F;W)M870N:7-O`.W;WVO30!P`\-072WT4
 MJ8^'#Z+@VK1=5[JWK4FWSOZ09!/V)`4[&#(+Z_#OW7^BZ681'=L8#"?S\R&Y
diff --git a/lib/libarchive/test/test_read_format_isojoliet_bz2.c b/lib/libarchive/test/test_read_format_isojoliet_bz2.c
index 7b11bbbfceec..8c6980fcfba4 100644
--- a/lib/libarchive/test/test_read_format_isojoliet_bz2.c
+++ b/lib/libarchive/test/test_read_format_isojoliet_bz2.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_isojoliet_bz2.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
 Execute the following to rebuild the data for this program:
diff --git a/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu b/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu
index 0cf1de8b8ab4..60b889ec63eb 100644
--- a/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu
+++ b/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_isojoliet_bz2.iso.bz2
 M0EIH.3%!62936??^FX(``/9_^__?1_?^8__L/__?8:?_W&8@Z@$`9``008"`
 M``+)"-`$/@=NN!W8[`8#23*GY-3U$](,0:`:`&"`9``9``T-'J::>B/4``#0
diff --git a/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu b/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu
index 9258c186595e..caeb512250ec 100644
--- a/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu
+++ b/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_isojolietrr_bz2.iso.bz2
 M0EIH.3%!6293695"/:0``/9_^__?1??^8_WL/__?8:?_W&8@Z@$`9``008"`
 M``+)"-`$/@36`T;`8#*3*GY3U-$R`T::`&F@`!HQ`T9&FC0T!Z@8C0``-"-$
diff --git a/lib/libarchive/test/test_read_format_isorr_bz2.c b/lib/libarchive/test/test_read_format_isorr_bz2.c
index cd53c7c7aa17..dee3114a171f 100644
--- a/lib/libarchive/test/test_read_format_isorr_bz2.c
+++ b/lib/libarchive/test/test_read_format_isorr_bz2.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_isorr_bz2.c,v 1.9.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
 Execute the following command to rebuild the data for this program:
diff --git a/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu b/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
index f675794de00f..959c9f361185 100644
--- a/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
+++ b/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_isorr_bz2.iso.bz2
 M0EIH.3%!629363S[0-4``,?_W?__R_158__Z/__?8*?OWB8AZB2```4@`,0"
 M@0C0`SX`6UH$P:F@32FCU-D1Z@#U'J!HT>H#0`!H`T9`#U-#33(-`-3TFA#1
diff --git a/lib/libarchive/test/test_read_format_mtree.c b/lib/libarchive/test/test_read_format_mtree.c
index b13034fbf4d3..c8592d52de7a 100644
--- a/lib/libarchive/test/test_read_format_mtree.c
+++ b/lib/libarchive/test/test_read_format_mtree.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_mtree.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /* Single entry with a hardlink. */
 static unsigned char archive[] = {
diff --git a/lib/libarchive/test/test_read_format_pax_bz2.c b/lib/libarchive/test/test_read_format_pax_bz2.c
index a0b74e1863df..d6f7a44525fa 100644
--- a/lib/libarchive/test/test_read_format_pax_bz2.c
+++ b/lib/libarchive/test/test_read_format_pax_bz2.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_pax_bz2.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 'B','Z','h','9','1','A','Y','&','S','Y',152,180,30,185,0,0,140,127,176,212,
diff --git a/lib/libarchive/test/test_read_format_raw.c b/lib/libarchive/test/test_read_format_raw.c
index f036d0c190bb..be2ec53e4836 100644
--- a/lib/libarchive/test/test_read_format_raw.c
+++ b/lib/libarchive/test/test_read_format_raw.c
@@ -26,7 +26,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_raw.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 DEFINE_TEST(test_read_format_raw)
 {
diff --git a/lib/libarchive/test/test_read_format_raw.data.Z.uu b/lib/libarchive/test/test_read_format_raw.data.Z.uu
index 82add2ff1aca..fd67685db1b4 100644
--- a/lib/libarchive/test/test_read_format_raw.data.Z.uu
+++ b/lib/libarchive/test/test_read_format_raw.data.Z.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_raw.data.Z.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_raw.data.Z
 ('YV09MZ\40``
 `
diff --git a/lib/libarchive/test/test_read_format_raw.data.uu b/lib/libarchive/test/test_read_format_raw.data.uu
index 1a3002a56d8a..0be47ac515dc 100644
--- a/lib/libarchive/test/test_read_format_raw.data.uu
+++ b/lib/libarchive/test/test_read_format_raw.data.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_raw.data.uu,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_raw.data
 $9F]O"@``
 `
diff --git a/lib/libarchive/test/test_read_format_tar.c b/lib/libarchive/test/test_read_format_tar.c
index e34da1bb1cda..7ed5eb231c15 100644
--- a/lib/libarchive/test/test_read_format_tar.c
+++ b/lib/libarchive/test/test_read_format_tar.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tar.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Each of these archives is a short archive with a single entry.  The
diff --git a/lib/libarchive/test/test_read_format_tar_empty_filename.c b/lib/libarchive/test/test_read_format_tar_empty_filename.c
index 4eb249e7c0c2..bfc5aa99ce56 100644
--- a/lib/libarchive/test/test_read_format_tar_empty_filename.c
+++ b/lib/libarchive/test/test_read_format_tar_empty_filename.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tar_empty_filename.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Tar entries with empty filenames are unusual, but shouldn't crash us.
diff --git a/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu b/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu
index 08aaf2870719..b54476aca58e 100644
--- a/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu
+++ b/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu,v 1.2.6.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_compat_tar_1.tar
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/lib/libarchive/test/test_read_format_tbz.c b/lib/libarchive/test/test_read_format_tbz.c
index 00d4094b9dfc..94a532cf6f1c 100644
--- a/lib/libarchive/test/test_read_format_tbz.c
+++ b/lib/libarchive/test/test_read_format_tbz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tbz.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 'B','Z','h','9','1','A','Y','&','S','Y',237,7,140,'W',0,0,27,251,144,208,
diff --git a/lib/libarchive/test/test_read_format_tgz.c b/lib/libarchive/test/test_read_format_tgz.c
index 6b27d3cad080..08d78b1020ad 100644
--- a/lib/libarchive/test/test_read_format_tgz.c
+++ b/lib/libarchive/test/test_read_format_tgz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tgz.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,139,8,0,222,'C','p','C',0,3,211,'c',160,'=','0','0','0','0','7','5','U',
diff --git a/lib/libarchive/test/test_read_format_txz.c b/lib/libarchive/test/test_read_format_txz.c
index 4d088b2e9e5a..1fba05ac2fc2 100644
--- a/lib/libarchive/test/test_read_format_txz.c
+++ b/lib/libarchive/test/test_read_format_txz.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_txz.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 253, 55,122, 88, 90,  0,  0,  4,230,214,180, 70,  2,  0, 33,  1,
diff --git a/lib/libarchive/test/test_read_format_tz.c b/lib/libarchive/test/test_read_format_tz.c
index 3dd001f2f953..b601610e4f0d 100644
--- a/lib/libarchive/test/test_read_format_tz.c
+++ b/lib/libarchive/test/test_read_format_tz.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tz.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char archive[] = {
 31,157,144,'.',0,8,28,'H',176,160,193,131,8,19,'*','\\',200,176,'!','B',24,
diff --git a/lib/libarchive/test/test_read_format_zip.c b/lib/libarchive/test/test_read_format_zip.c
index 8c7059dec8c1..14229845bb0e 100644
--- a/lib/libarchive/test/test_read_format_zip.c
+++ b/lib/libarchive/test/test_read_format_zip.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.10.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * The reference file for this has been manually tweaked so that:
diff --git a/lib/libarchive/test/test_read_format_zip.zip.uu b/lib/libarchive/test/test_read_format_zip.zip.uu
index 1e0cb221e956..50ecb2409067 100644
--- a/lib/libarchive/test/test_read_format_zip.zip.uu
+++ b/lib/libarchive/test/test_read_format_zip.zip.uu
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/lib/libarchive/test/test_read_format_zip.zip.uu,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
 begin 644 test_read_format_zip.zip
 M4$L#!`H`"````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1M19
 M_4A5>`0`Z`/H`U!+!P@```````````````!02P,$%`````@`;V:S-CHW9CT*
diff --git a/lib/libarchive/test/test_read_large.c b/lib/libarchive/test/test_read_large.c
index c524ae8a85a6..72961ca7ea86 100644
--- a/lib/libarchive/test/test_read_large.c
+++ b/lib/libarchive/test/test_read_large.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_large.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char testdata[10 * 1024 * 1024];
 static unsigned char testdatacopy[10 * 1024 * 1024];
diff --git a/lib/libarchive/test/test_read_pax_truncated.c b/lib/libarchive/test/test_read_pax_truncated.c
index 393fd9fca556..0bc649c75edd 100644
--- a/lib/libarchive/test/test_read_pax_truncated.c
+++ b/lib/libarchive/test/test_read_pax_truncated.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_pax_truncated.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 DEFINE_TEST(test_read_pax_truncated)
 {
diff --git a/lib/libarchive/test/test_read_position.c b/lib/libarchive/test/test_read_position.c
index bc7b53b85755..7b265862fa72 100644
--- a/lib/libarchive/test/test_read_position.c
+++ b/lib/libarchive/test/test_read_position.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_position.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static unsigned char nulls[10000];
 static unsigned char  buff[10000000];
diff --git a/lib/libarchive/test/test_read_truncated.c b/lib/libarchive/test/test_read_truncated.c
index 4c1fec3c8aa6..e086affd7b0b 100644
--- a/lib/libarchive/test/test_read_truncated.c
+++ b/lib/libarchive/test/test_read_truncated.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_truncated.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 char buff[1000000];
 char buff2[100000];
diff --git a/lib/libarchive/test/test_tar_filenames.c b/lib/libarchive/test/test_tar_filenames.c
index ac6df3e21c6c..b5d06f3b1f0e 100644
--- a/lib/libarchive/test/test_tar_filenames.c
+++ b/lib/libarchive/test/test_tar_filenames.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_filenames.c,v 1.10.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Exercise various lengths of filenames in tar archives,
diff --git a/lib/libarchive/test/test_tar_large.c b/lib/libarchive/test/test_tar_large.c
index b2b8e5dbfdc7..3562972c96ca 100644
--- a/lib/libarchive/test/test_tar_large.c
+++ b/lib/libarchive/test/test_tar_large.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libarchive/test/test_ustar_filenames.c b/lib/libarchive/test/test_ustar_filenames.c
index 09cb85744bef..aaa03521ec83 100644
--- a/lib/libarchive/test/test_ustar_filenames.c
+++ b/lib/libarchive/test/test_ustar_filenames.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_ustar_filenames.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Exercise various lengths of filenames in ustar archives.
diff --git a/lib/libarchive/test/test_write_compress.c b/lib/libarchive/test/test_write_compress.c
index e1b8f3c86371..e0fc88c629bd 100644
--- a/lib/libarchive/test/test_write_compress.c
+++ b/lib/libarchive/test/test_write_compress.c
@@ -25,7 +25,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * A basic exercise of compress reading and writing.
diff --git a/lib/libarchive/test/test_write_compress_bzip2.c b/lib/libarchive/test/test_write_compress_bzip2.c
index 54c8a50965c1..f6dd75ba30f2 100644
--- a/lib/libarchive/test/test_write_compress_bzip2.c
+++ b/lib/libarchive/test/test_write_compress_bzip2.c
@@ -25,7 +25,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress_bzip2.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * A basic exercise of bzip2 reading and writing.
diff --git a/lib/libarchive/test/test_write_compress_gzip.c b/lib/libarchive/test/test_write_compress_gzip.c
index 9e42b137a04c..bab21ed08687 100644
--- a/lib/libarchive/test/test_write_compress_gzip.c
+++ b/lib/libarchive/test/test_write_compress_gzip.c
@@ -25,7 +25,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress_gzip.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * A basic exercise of gzip reading and writing.
diff --git a/lib/libarchive/test/test_write_compress_lzma.c b/lib/libarchive/test/test_write_compress_lzma.c
index 639e58f6c1d4..e584d8992527 100644
--- a/lib/libarchive/test/test_write_compress_lzma.c
+++ b/lib/libarchive/test/test_write_compress_lzma.c
@@ -25,7 +25,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress_lzma.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * A basic exercise of lzma reading and writing.
diff --git a/lib/libarchive/test/test_write_compress_program.c b/lib/libarchive/test/test_write_compress_program.c
index 713638e7eb69..f33e0c41d2ba 100644
--- a/lib/libarchive/test/test_write_compress_program.c
+++ b/lib/libarchive/test/test_write_compress_program.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress_program.c,v 1.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 char buff[1000000];
 char buff2[64];
diff --git a/lib/libarchive/test/test_write_compress_xz.c b/lib/libarchive/test/test_write_compress_xz.c
index 988fb6e879df..b5d0c41e6b41 100644
--- a/lib/libarchive/test/test_write_compress_xz.c
+++ b/lib/libarchive/test/test_write_compress_xz.c
@@ -25,7 +25,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress_xz.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * A basic exercise of xz reading and writing.
diff --git a/lib/libarchive/test/test_write_disk.c b/lib/libarchive/test/test_write_disk.c
index c0b22e58a125..b13cd020b050 100644
--- a/lib/libarchive/test/test_write_disk.c
+++ b/lib/libarchive/test/test_write_disk.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.18.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #if ARCHIVE_VERSION_NUMBER >= 1009000
 
diff --git a/lib/libarchive/test/test_write_disk_failures.c b/lib/libarchive/test/test_write_disk_failures.c
index 1befbac61d85..918ae62cb743 100644
--- a/lib/libarchive/test/test_write_disk_failures.c
+++ b/lib/libarchive/test/test_write_disk_failures.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_failures.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #if ARCHIVE_VERSION_NUMBER >= 1009000
 
diff --git a/lib/libarchive/test/test_write_disk_hardlink.c b/lib/libarchive/test/test_write_disk_hardlink.c
index 2ab242093a61..0b1b7f759ecf 100644
--- a/lib/libarchive/test/test_write_disk_hardlink.c
+++ b/lib/libarchive/test/test_write_disk_hardlink.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.7.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
 /* Execution bits, Group members bits and others bits do not work. */
diff --git a/lib/libarchive/test/test_write_disk_perms.c b/lib/libarchive/test/test_write_disk_perms.c
index 3d9be27e5964..494b99dbe3c0 100644
--- a/lib/libarchive/test/test_write_disk_perms.c
+++ b/lib/libarchive/test/test_write_disk_perms.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_perms.c,v 1.13.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #if ARCHIVE_VERSION_NUMBER >= 1009000 && (!defined(_WIN32) || defined(__CYGWIN__))
 
diff --git a/lib/libarchive/test/test_write_disk_secure.c b/lib/libarchive/test/test_write_disk_secure.c
index d41748907b8f..97cdf9e00007 100644
--- a/lib/libarchive/test/test_write_disk_secure.c
+++ b/lib/libarchive/test/test_write_disk_secure.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_secure.c,v 1.11.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 #define UMASK 022
 
diff --git a/lib/libarchive/test/test_write_disk_sparse.c b/lib/libarchive/test/test_write_disk_sparse.c
index c9c00d3d1e61..a6b5747070d5 100644
--- a/lib/libarchive/test/test_write_disk_sparse.c
+++ b/lib/libarchive/test/test_write_disk_sparse.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_sparse.c,v 1.2.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Write a file using archive_write_data call, read the file
diff --git a/lib/libarchive/test/test_write_disk_times.c b/lib/libarchive/test/test_write_disk_times.c
index 2891e3612aff..26d0448318d7 100644
--- a/lib/libarchive/test/test_write_disk_times.c
+++ b/lib/libarchive/test/test_write_disk_times.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_times.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Exercise time restores in archive_write_disk(), including
diff --git a/lib/libarchive/test/test_write_format_ar.c b/lib/libarchive/test/test_write_format_ar.c
index 81224b37f428..1021ea0eff41 100644
--- a/lib/libarchive/test/test_write_format_ar.c
+++ b/lib/libarchive/test/test_write_format_ar.c
@@ -26,7 +26,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_ar.c,v 1.10.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 char buff[4096];
 char buff2[64];
diff --git a/lib/libarchive/test/test_write_format_cpio.c b/lib/libarchive/test/test_write_format_cpio.c
index ffc1d7a06d58..55febe05d402 100644
--- a/lib/libarchive/test/test_write_format_cpio.c
+++ b/lib/libarchive/test/test_write_format_cpio.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_cpio.c,v 1.6.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /* The version stamp macro was introduced after cpio write support. */
 #if ARCHIVE_VERSION_NUMBER >= 1009000
diff --git a/lib/libarchive/test/test_write_format_cpio_empty.c b/lib/libarchive/test/test_write_format_cpio_empty.c
index 81f17a415acf..d24db97929d6 100644
--- a/lib/libarchive/test/test_write_format_cpio_empty.c
+++ b/lib/libarchive/test/test_write_format_cpio_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_cpio_empty.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Check that an "empty" cpio archive is correctly created.
diff --git a/lib/libarchive/test/test_write_format_cpio_newc.c b/lib/libarchive/test/test_write_format_cpio_newc.c
index 512df7422912..3b4f4dfa8489 100644
--- a/lib/libarchive/test/test_write_format_cpio_newc.c
+++ b/lib/libarchive/test/test_write_format_cpio_newc.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_cpio_newc.c,v 1.4.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 
 static int
diff --git a/lib/libarchive/test/test_write_format_cpio_odc.c b/lib/libarchive/test/test_write_format_cpio_odc.c
index 73cc3e6218c5..5920dd71ec5d 100644
--- a/lib/libarchive/test/test_write_format_cpio_odc.c
+++ b/lib/libarchive/test/test_write_format_cpio_odc.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_cpio_odc.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 
 static int
diff --git a/lib/libarchive/test/test_write_format_mtree.c b/lib/libarchive/test/test_write_format_mtree.c
index b9de42261f8b..bfe3ccf2dd02 100644
--- a/lib/libarchive/test/test_write_format_mtree.c
+++ b/lib/libarchive/test/test_write_format_mtree.c
@@ -25,7 +25,7 @@
  */
 
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_mtree.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static char buff[4096];
 static struct {
diff --git a/lib/libarchive/test/test_write_format_pax.c b/lib/libarchive/test/test_write_format_pax.c
index 06cfca6fe992..8af84c658bae 100644
--- a/lib/libarchive/test/test_write_format_pax.c
+++ b/lib/libarchive/test/test_write_format_pax.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_pax.c,v 1.1.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 char buff2[64];
 
diff --git a/lib/libarchive/test/test_write_format_shar_empty.c b/lib/libarchive/test/test_write_format_shar_empty.c
index 173791be4f71..a3363e3e7b0a 100644
--- a/lib/libarchive/test/test_write_format_shar_empty.c
+++ b/lib/libarchive/test/test_write_format_shar_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_shar_empty.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Check that an "empty" shar archive is correctly created as an empty file.
diff --git a/lib/libarchive/test/test_write_format_tar.c b/lib/libarchive/test/test_write_format_tar.c
index ef210e63ff21..bafa3aded909 100644
--- a/lib/libarchive/test/test_write_format_tar.c
+++ b/lib/libarchive/test/test_write_format_tar.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 char buff[1000000];
 char buff2[64];
diff --git a/lib/libarchive/test/test_write_format_tar_empty.c b/lib/libarchive/test/test_write_format_tar_empty.c
index 570325379556..f797d2873b16 100644
--- a/lib/libarchive/test/test_write_format_tar_empty.c
+++ b/lib/libarchive/test/test_write_format_tar_empty.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_empty.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /*
  * Check that an "empty" tar archive is correctly created.
diff --git a/lib/libarchive/test/test_write_format_tar_ustar.c b/lib/libarchive/test/test_write_format_tar_ustar.c
index 3adacb4e90d1..0b497e381dd7 100644
--- a/lib/libarchive/test/test_write_format_tar_ustar.c
+++ b/lib/libarchive/test/test_write_format_tar_ustar.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_ustar.c,v 1.3.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 static int
 is_null(const char *p, size_t l)
diff --git a/lib/libarchive/test/test_write_open_memory.c b/lib/libarchive/test/test_write_open_memory.c
index 14ce6e972fb0..b08d6ecde59d 100644
--- a/lib/libarchive/test/test_write_open_memory.c
+++ b/lib/libarchive/test/test_write_open_memory.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_open_memory.c,v 1.5.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $");
 
 /* Try to force archive_write_open_memory.c to write past the end of an array. */
 static unsigned char buff[16384];