Sync up with Makefile in FreeBSD-CURRENT tree.

SVN-Revision: 1067

diff --git a/libarchive/Makefile b/libarchive/Makefile
index cf89a86dbdd919babe003a258bc4fdd5580e0d17..913cbc4ae3db4791d0b41cf7e00d549c362ae984 100644 (file)
--- a/libarchive/Makefile
+++ b/libarchive/Makefile
@@ -1,4 +1,5 @@
 # $FreeBSD: src/lib/libarchive/Makefile,v 1.88 2008/08/31 07:21:46 kientzle Exp $
+.include <bsd.own.mk>
 
 LIB=   archive
 DPADD= ${LIBBZ2} ${LIBZ}
@@ -10,6 +11,14 @@ SHLIB_MAJOR= 4
 
 CFLAGS+=       -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
 CFLAGS+=       -I${.OBJDIR}
+#Uncomment to build with full lzma/xz support via liblzma
+#CFLAGS+= -I/usr/local/include -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
+#LDADD+= -L/usr/local/lib -llzma
+
+.if ${MK_OPENSSL} != "no"
+CFLAGS+=       -DWITH_OPENSSL
+.endif
+
 
 WARNS?=        6
 
@@ -78,9 +87,6 @@ SRCS= archive_check_magic.c                           \
        archive_write_set_format_zip.c                  \
        filter_fork.c
 
-CLEANFILES += *.o *.lo *~ .dirstamp
-CLEANDIRS += .deps .libs
-
 # Man pages to be installed.
 MAN=   archive_entry.3                                 \
        archive_read.3                                  \
@@ -176,6 +182,7 @@ MLINKS+=    archive_read.3 archive_read_extract_set_skip_file.3
 MLINKS+=       archive_read.3 archive_read_finish.3
 MLINKS+=       archive_read.3 archive_read_new.3
 MLINKS+=       archive_read.3 archive_read_next_header.3
+MLINKS+=       archive_read.3 archive_read_next_header2.3
 MLINKS+=       archive_read.3 archive_read_open.3
 MLINKS+=       archive_read.3 archive_read_open2.3
 MLINKS+=       archive_read.3 archive_read_open_FILE.3
@@ -187,11 +194,17 @@ MLINKS+=  archive_read.3 archive_read_support_compression_all.3
 MLINKS+=       archive_read.3 archive_read_support_compression_bzip2.3
 MLINKS+=       archive_read.3 archive_read_support_compression_compress.3
 MLINKS+=       archive_read.3 archive_read_support_compression_gzip.3
+MLINKS+=       archive_read.3 archive_read_support_compression_lzma.3
 MLINKS+=       archive_read.3 archive_read_support_compression_none.3
 MLINKS+=       archive_read.3 archive_read_support_compression_program.3
+MLINKS+=       archive_read.3 archive_read_support_compression_program_signature.3
+MLINKS+=       archive_read.3 archive_read_support_compression_xz.3
 MLINKS+=       archive_read.3 archive_read_support_format_all.3
+MLINKS+=       archive_read.3 archive_read_support_format_ar.3
 MLINKS+=       archive_read.3 archive_read_support_format_cpio.3
+MLINKS+=       archive_read.3 archive_read_support_format_empty.3
 MLINKS+=       archive_read.3 archive_read_support_format_iso9660.3
+MLINKS+=       archive_read.3 archive_read_support_format_raw.3
 MLINKS+=       archive_read.3 archive_read_support_format_tar.3
 MLINKS+=       archive_read.3 archive_read_support_format_zip.3
 MLINKS+=       archive_read_disk.3 archive_read_disk_entry_from_file.3