Tue Nov 2 19:14:54 2010 UTC ()
Enable direct XZ support


(joerg)
diff -r1.2 -r1.3 src/external/bsd/libarchive/bin/Makefile.inc
diff -r1.4 -r1.5 src/external/bsd/libarchive/include/config_netbsd.h
diff -r1.2 -r1.3 src/external/bsd/libarchive/lib/libarchive/Makefile

cvs diff -r1.2 -r1.3 src/external/bsd/libarchive/bin/Makefile.inc (expand / switch to unified diff)

--- src/external/bsd/libarchive/bin/Makefile.inc 2010/02/20 02:55:53 1.2
+++ src/external/bsd/libarchive/bin/Makefile.inc 2010/11/02 19:14:53 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: Makefile.inc,v 1.2 2010/02/20 02:55:53 joerg Exp $ 1# $NetBSD: Makefile.inc,v 1.3 2010/11/02 19:14:53 joerg Exp $
2 2
3.include "../Makefile.inc" 3.include "../Makefile.inc"
4 4
5BINDIR= /bin 5BINDIR= /bin
6 6
7.if (${MKDYNAMICROOT} == "no") 7.if (${MKDYNAMICROOT} == "no")
8LDSTATIC?= -static 8LDSTATIC?= -static
9.endif 9.endif
10 10
11DPADD= ${LIBARCHIVE_FE} ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} 11DPADD= ${LIBARCHIVE_FE} ${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBZ}
12LDADD= -L${LIBARCHIVE_FE_DIR} -larchive_fe -larchive -lbz2 -lz 12LDADD= -L${LIBARCHIVE_FE_DIR} -larchive_fe -larchive -lbz2 -llzma -lz
13CPPFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe 13CPPFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe

cvs diff -r1.4 -r1.5 src/external/bsd/libarchive/include/config_netbsd.h (expand / switch to unified diff)

--- src/external/bsd/libarchive/include/config_netbsd.h 2010/07/14 22:14:17 1.4
+++ src/external/bsd/libarchive/include/config_netbsd.h 2010/11/02 19:14:54 1.5
@@ -295,27 +295,27 @@ @@ -295,27 +295,27 @@
295/* Define to 1 if you have the `acl' library (-lacl). */ 295/* Define to 1 if you have the `acl' library (-lacl). */
296/* #undef HAVE_LIBACL */ 296/* #undef HAVE_LIBACL */
297 297
298/* Define to 1 if you have the `attr' library (-lattr). */ 298/* Define to 1 if you have the `attr' library (-lattr). */
299/* #undef HAVE_LIBATTR */ 299/* #undef HAVE_LIBATTR */
300 300
301/* Define to 1 if you have the `bz2' library (-lbz2). */ 301/* Define to 1 if you have the `bz2' library (-lbz2). */
302#define HAVE_LIBBZ2 1 302#define HAVE_LIBBZ2 1
303 303
304/* Define to 1 if you have the `expat' library (-lexpat). */ 304/* Define to 1 if you have the `expat' library (-lexpat). */
305/* #undef HAVE_LIBEXPAT */ 305/* #undef HAVE_LIBEXPAT */
306 306
307/* Define to 1 if you have the `lzma' library (-llzma). */ 307/* Define to 1 if you have the `lzma' library (-llzma). */
308/* #undef HAVE_LIBLZMA */ 308#define HAVE_LIBLZMA 1
309 309
310/* Define to 1 if you have the `lzmadec' library (-llzmadec). */ 310/* Define to 1 if you have the `lzmadec' library (-llzmadec). */
311/* #undef HAVE_LIBLZMADEC */ 311/* #undef HAVE_LIBLZMADEC */
312 312
313/* Define to 1 if you have the `xml2' library (-lxml2). */ 313/* Define to 1 if you have the `xml2' library (-lxml2). */
314/* #undef HAVE_LIBXML2 */ 314/* #undef HAVE_LIBXML2 */
315 315
316/* Define to 1 if you have the <libxml/xmlreader.h> header file. */ 316/* Define to 1 if you have the <libxml/xmlreader.h> header file. */
317/* #undef HAVE_LIBXML_XMLREADER_H */ 317/* #undef HAVE_LIBXML_XMLREADER_H */
318 318
319/* Define to 1 if you have the `z' library (-lz). */ 319/* Define to 1 if you have the `z' library (-lz). */
320#define HAVE_LIBZ 1 320#define HAVE_LIBZ 1
321 321
@@ -347,27 +347,27 @@ @@ -347,27 +347,27 @@
347#define HAVE_LSTAT 1 347#define HAVE_LSTAT 1
348 348
349/* Define to 1 if `lstat' has the bug that it succeeds when given the 349/* Define to 1 if `lstat' has the bug that it succeeds when given the
350 zero-length file name argument. */ 350 zero-length file name argument. */
351/* #undef HAVE_LSTAT_EMPTY_STRING_BUG */ 351/* #undef HAVE_LSTAT_EMPTY_STRING_BUG */
352 352
353/* Define to 1 if you have the `lutimes' function. */ 353/* Define to 1 if you have the `lutimes' function. */
354#define HAVE_LUTIMES 1 354#define HAVE_LUTIMES 1
355 355
356/* Define to 1 if you have the <lzmadec.h> header file. */ 356/* Define to 1 if you have the <lzmadec.h> header file. */
357/* #undef HAVE_LZMADEC_H */ 357/* #undef HAVE_LZMADEC_H */
358 358
359/* Define to 1 if you have the <lzma.h> header file. */ 359/* Define to 1 if you have the <lzma.h> header file. */
360/* #undef HAVE_LZMA_H */ 360#define HAVE_LZMA_H 1
361 361
362/* Define to 1 if you have the `memmove' function. */ 362/* Define to 1 if you have the `memmove' function. */
363#define HAVE_MEMMOVE 1 363#define HAVE_MEMMOVE 1
364 364
365/* Define to 1 if you have the <memory.h> header file. */ 365/* Define to 1 if you have the <memory.h> header file. */
366#define HAVE_MEMORY_H 1 366#define HAVE_MEMORY_H 1
367 367
368/* Define to 1 if you have the `memset' function. */ 368/* Define to 1 if you have the `memset' function. */
369#define HAVE_MEMSET 1 369#define HAVE_MEMSET 1
370 370
371/* Define to 1 if you have the `mkdir' function. */ 371/* Define to 1 if you have the `mkdir' function. */
372#define HAVE_MKDIR 1 372#define HAVE_MKDIR 1
373 373

cvs diff -r1.2 -r1.3 src/external/bsd/libarchive/lib/libarchive/Makefile (expand / switch to unified diff)

--- src/external/bsd/libarchive/lib/libarchive/Makefile 2010/02/20 22:49:22 1.2
+++ src/external/bsd/libarchive/lib/libarchive/Makefile 2010/11/02 19:14:54 1.3
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: Makefile,v 1.2 2010/02/20 22:49:22 joerg Exp $ 1# $NetBSD: Makefile,v 1.3 2010/11/02 19:14:54 joerg Exp $
2 2
3.include <bsd.init.mk> 3.include <bsd.init.mk>
4 4
5.PATH: ${LIBARCHIVEDIR}/libarchive 5.PATH: ${LIBARCHIVEDIR}/libarchive
6 6
7LIB= archive 7LIB= archive
8 8
9LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2 \ 9LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2 \
 10 lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib \
10 z ${NETBSDSRCDIR}/lib/libz 11 z ${NETBSDSRCDIR}/lib/libz
11 12
12SRCS= archive_check_magic.c \ 13SRCS= archive_check_magic.c \
13 archive_entry.c \ 14 archive_entry.c \
14 archive_entry_copy_stat.c \ 15 archive_entry_copy_stat.c \
15 archive_entry_link_resolver.c \ 16 archive_entry_link_resolver.c \
16 archive_entry_stat.c \ 17 archive_entry_stat.c \
17 archive_entry_strmode.c \ 18 archive_entry_strmode.c \
18 archive_entry_xattr.c \ 19 archive_entry_xattr.c \
19 archive_read.c \ 20 archive_read.c \
20 archive_read_data_into_fd.c \ 21 archive_read_data_into_fd.c \
21 archive_read_disk.c \ 22 archive_read_disk.c \
22 archive_read_disk_entry_from_file.c \ 23 archive_read_disk_entry_from_file.c \