From 99f62aecd35e19b7b92e6ebe88e65903b9891e36 Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Tue, 10 Jul 2012 21:53:25 -0700
Subject: [PATCH] Update files for libarchive-3.0.4 import.

---
 lib/libarchive/Makefile |  6 +++++-
 lib/libarchive/config.h | 17 ++++++++++-------
 usr.bin/cpio/Makefile   |  5 ++---
 usr.bin/tar/Makefile    |  7 ++-----
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 4b42db5e60..d3153ddddc 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -25,7 +25,10 @@ SRCS=	archive_acl.c					\
 	archive_entry_stat.c				\
 	archive_entry_strmode.c				\
 	archive_entry_xattr.c				\
+	archive_getdate.c				\
+	archive_match.c					\
 	archive_options.c				\
+	archive_pathmatch.c				\
 	archive_ppmd7.c					\
 	archive_rb.c					\
 	archive_read.c					\
@@ -74,6 +77,7 @@ SRCS=	archive_acl.c					\
 	archive_write_open_file.c			\
 	archive_write_open_filename.c			\
 	archive_write_open_memory.c			\
+	archive_write_add_filter.c			\
 	archive_write_add_filter_bzip2.c		\
 	archive_write_add_filter_compress.c		\
 	archive_write_add_filter_gzip.c			\
@@ -112,9 +116,9 @@ MAN=	archive_entry.3					\
 	archive_write_disk.3				\
 	archive_write_set_options.3			\
 	cpio.5						\
-	libarchive-formats.5				\
 	libarchive.3					\
 	libarchive_internals.3				\
+	libarchive-formats.5				\
 	mtree.5						\
 	tar.5
 
diff --git a/lib/libarchive/config.h b/lib/libarchive/config.h
index 3796dafe35..aabe0e0a4c 100644
--- a/lib/libarchive/config.h
+++ b/lib/libarchive/config.h
@@ -400,6 +400,9 @@
 /* Define to 1 if you have the `lzmadec' library (-llzmadec). */
 /* #undef HAVE_LIBLZMADEC */
 
+/* Define to 1 if you have the `regex' library (-lregex). */
+/* #undef HAVE_LIBREGEX */
+
 /* Define to 1 if you have the `xml2' library (-lxml2). */
 /* #undef HAVE_LIBXML2 */
 
@@ -427,6 +430,9 @@
 /* Define to 1 if you have the <linux/magic.h> header file. */
 /* #undef HAVE_LINUX_MAGIC_H */
 
+/* Define to 1 if you have the <linux/types.h> header file. */
+/* #undef HAVE_LINUX_TYPES_H */
+
 /* Define to 1 if you have the `listea' function. */
 /* #undef HAVE_LISTEA */
 
@@ -479,9 +485,6 @@
 /* Define to 1 if you have the `mbrtowc' function. */
 #define HAVE_MBRTOWC 1
 
-/* Define to 1 if you have the `mbsnrtowcs' function. */
-/* #undef HAVE_MBSNRTOWCS */
-
 /* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
 
@@ -603,6 +606,9 @@
 /* Define to 1 if `f_namemax' is a member of `struct statfs'. */
 /* #undef HAVE_STRUCT_STATFS_F_NAMEMAX */
 
+/* Define to 1 if `f_iosize' is a member of `struct statvfs'. */
+/* #undef HAVE_STRUCT_STATVFS_F_IOSIZE */
+
 /* Define to 1 if `st_birthtime' is a member of `struct stat'. */
 /* #undef HAVE_STRUCT_STAT_ST_BIRTHTIME */
 
@@ -767,9 +773,6 @@
 /* Define to 1 if you have the `wcslen' function. */
 #define HAVE_WCSLEN 1
 
-/* Define to 1 if you have the `wcsnrtombs' function. */
-/* #undef HAVE_WCSNRTOMBS */
-
 /* Define to 1 if you have the `wctomb' function. */
 #define HAVE_WCTOMB 1
 
@@ -844,7 +847,7 @@
 #define PACKAGE "libarchive"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "kientzle@FreeBSD.org"
+#define PACKAGE_BUGREPORT "libarchive-discuss@googlegroups.com"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "libarchive"
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index 9d92bb8ed9..4effcdd3c8 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -1,7 +1,6 @@
-# $DragonFly: src/usr.bin/cpio/Makefile,v 1.2 2008/07/26 16:25:31 pavalos Exp $
-
 PROG=	bsdcpio
-SRCS=	cmdline.c cpio.c err.c line_reader.c matching.c pathmatch.c
+SRCS=	cmdline.c cpio.c
+SRCS+=	err.c line_reader.c
 DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBMD} ${LIBZ}
 LDADD=	-larchive -lbz2 -llzma -lmd -lz
 
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index f5a946d8b1..89a812df95 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -1,9 +1,6 @@
-# $DragonFly: src/usr.bin/tar/Makefile,v 1.16 2008/07/12 14:57:33 pavalos Exp $
-
 PROG=	bsdtar
-SRCS=	bsdtar.c cmdline.c err.c getdate.c line_reader.c matching.c \
-	pathmatch.c read.c subst.c \
-	tree.c util.c write.c
+SRCS=	bsdtar.c cmdline.c read.c subst.c util.c write.c
+SRCS+=	err.c line_reader.c
 DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBMD} ${LIBZ}
 LDADD=	-larchive -lbz2 -llzma -lmd -lz
 
-- 
2.41.0