From 696cb260785255c3d695ac1371cc62921a8b7d39 Mon Sep 17 00:00:00 2001
From: mm <mm@FreeBSD.org>
Date: Mon, 10 May 2010 15:28:44 +0000
Subject: Enable liblzma support in libarchive Adjust dependencies for programs
 using libarchive Add xz and linkage against liblzma to rescue system

Approved by:	kientzle, delphij (mentor)
MFC after:	2 weeks
---
 lib/libarchive/Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'lib/libarchive')

diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 8de8247..9470190 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -2,8 +2,8 @@
 .include <bsd.own.mk>
 
 LIB=	archive
-DPADD=	${LIBBZ2} ${LIBZ} ${LIBMD}
-LDADD=	-lbz2 -lz -lmd
+DPADD=	${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA}
+LDADD=	-lbz2 -lz -lmd -llzma
 
 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
 # It has no real relation to the libarchive version number.
@@ -11,10 +11,7 @@ SHLIB_MAJOR= 5
 
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"config_freebsd.h\"
 CFLAGS+=	-I${.OBJDIR}
-#Uncomment to build with full lzma/xz support via liblzma
-#liblzma is not (yet?) part of the FreeBSD base system
-#CFLAGS+= -I/usr/local/include -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
-#LDADD+= -L/usr/local/lib -llzma
+CFLAGS+=	-DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
 
 .if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DWITH_OPENSSL
-- 
cgit v1.1