Update for libarchive-2.5.0b.

lib/libarchive/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2008/02/26 15:42:29 joerg Exp $
+#	$NetBSD: Makefile,v 1.5 2008/03/30 05:32:16 joerg Exp $
 
 USE_FORT?=	yes # complex string handling
 
@@ -54,6 +54,7 @@ SRCS=		archive_check_magic.c \
 		archive_write_open_filename.c \
 		archive_write_open_memory.c \
 		archive_write_set_compression_bzip2.c \
+		archive_write_set_compression_compress.c \
 		archive_write_set_compression_gzip.c \
 		archive_write_set_compression_none.c \
 		archive_write_set_compression_program.c \
@@ -222,7 +223,8 @@ MLINKS+=	archive_write_disk.3 archive_write_disk_set_standard_lookup.3
 MLINKS+=	archive_write_disk.3 archive_write_disk_set_user_lookup.3
 MLINKS+=	libarchive.3 archive.3
 
-ARCHIVE_VERSION= 		2.4.13
+ARCHIVE_VERSION= 		2.5.0
+ARCHIVE_VERSION_POST=		b
 ARCHIVE_API_MAJOR=	${ARCHIVE_VERSION:C/([0-9]*).*/\1/}
 ARCHIVE_API_MINOR=	${ARCHIVE_VERSION:C/[0-9]*\.([0-9]*).*/\1/}
 ARCHIVE_API_REV=	${ARCHIVE_VERSION:C/[0-9]*\.[0-9]*\.([0-9]*).*/\1/}
@@ -247,10 +249,8 @@ ARCHIVE_VERSION_STAMP=	\
 # Build archive.h from archive.h.in by substituting version information.
 # Note: NetBSD has inttypes.h, so enable that include in archive.h.in
 archive.h:	archive.h.in
-	sed -e 's/@ARCHIVE_VERSION@/${ARCHIVE_VERSION}/g' \
-	    -e 's/@LIBARCHIVE_VERSION_STRING@/${ARCHIVE_VERSION}/g' \
-	    -e 's/@SHLIB_MAJOR@/${ARCHIVE_API_MAJOR}/g' \
-	    -e 's/@LIBARCHIVE_VERSION@/${ARCHIVE_VERSION_STAMP}/g' \
+	sed -e 's/@LIBARCHIVE_VERSION_NUMBER@/${ARCHIVE_VERSION_STAMP}/g' \
+	    -e 's/@LIBARCHIVE_VERSION_STRING@/${ARCHIVE_VERSION}${ARCHIVE_VERSION_POST}/g' \
 	    -e 's|@ARCHIVE_H_INCLUDE_INTTYPES_H@|#include <inttypes.h>  /* For int64_t */|g' \
 		< ${LIBARCHIVEDIR}/libarchive/archive.h.in > ${.TARGET}
 

lib/libarchive/config_netbsd.h

@@ -2,10 +2,10 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Version number of bsdcpio */
-#define BSDCPIO_VERSION_STRING "0.9.0"
+#define BSDCPIO_VERSION_STRING "0.9.9a"
 
 /* Version number of bsdtar */
-#define BSDTAR_VERSION_STRING "2.4.13"
+#define BSDTAR_VERSION_STRING "2.5.0b"
 
 /* Define to 1 if you have the `acl_create_entry' function. */
 /* #undef HAVE_ACL_CREATE_ENTRY */
@@ -145,6 +145,9 @@
 /* Define to 1 if you have the `getopt_long' function. */
 #define HAVE_GETOPT_LONG 1
 
+/* Define to 1 if you have the `getpid' function. */
+#define HAVE_GETPID 1
+
 /* Define to 1 if you have the `getxattr' function. */
 /* #undef HAVE_GETXATTR */
 
@@ -402,10 +405,10 @@
 #define HAVE_ZLIB_H 1
 
 /* Version number of libarchive as a single integer */
-#define LIBARCHIVE_VERSION "2004013"
+#define LIBARCHIVE_VERSION_NUMBER "2005000"
 
 /* Version number of libarchive */
-#define LIBARCHIVE_VERSION_STRING "2.4.13"
+#define LIBARCHIVE_VERSION_STRING "2.5.0b"
 
 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    slash. */
@@ -432,13 +435,13 @@
 #define PACKAGE_NAME "libarchive"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libarchive 2.4.13"
+#define PACKAGE_STRING "libarchive 2.5.0b"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libarchive"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.4.13"
+#define PACKAGE_VERSION "2.5.0b"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -450,7 +453,7 @@
 #define TIME_WITH_SYS_TIME 1
 
 /* Version number of package */
-#define VERSION "2.4.13"
+#define VERSION "2.5.0b"
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */

lib/libarchive/shlib_version

@@ -1,6 +1,6 @@
-#	$NetBSD: shlib_version,v 1.1 2007/07/29 17:06:02 joerg Exp $
+#	$NetBSD: shlib_version,v 1.2 2008/03/30 05:32:16 joerg Exp $
 #	Remember to update distrib/sets/lists/base/shl.* when changing
 #
 
 major=2
-minor=0
+minor=1