From owner-svn-src-all@FreeBSD.ORG Sat May 30 17:26:56 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53E921065676; Sat, 30 May 2009 17:26:56 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 425528FC13; Sat, 30 May 2009 17:26:56 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UHQuDZ014131; Sat, 30 May 2009 17:26:56 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4UHQuS3014130; Sat, 30 May 2009 17:26:56 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <200905301726.n4UHQuS3014130@svn.freebsd.org> From: Tim Kientzle Date: Sat, 30 May 2009 17:26:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193101 - head/lib/libarchive X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 17:26:56 -0000 Author: kientzle Date: Sat May 30 17:26:55 2009 New Revision: 193101 URL: http://svn.freebsd.org/changeset/base/193101 Log: Include libmd and libcrypto in DPADD Modified: head/lib/libarchive/Makefile Modified: head/lib/libarchive/Makefile ============================================================================== --- head/lib/libarchive/Makefile Sat May 30 17:25:14 2009 (r193100) +++ head/lib/libarchive/Makefile Sat May 30 17:26:55 2009 (r193101) @@ -2,7 +2,7 @@ .include LIB= archive -DPADD= ${LIBBZ2} ${LIBZ} +DPADD= ${LIBBZ2} ${LIBZ} ${LIBMD} LDADD= -lbz2 -lz -lmd # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. @@ -12,15 +12,16 @@ SHLIB_MAJOR= 4 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 .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL -LDFLAGS+= -lcrypto +DPADD+= ${LIBCRYPTO} +LDADD+= -lcrypto .endif - WARNS?= 6 # Headers to be installed in /usr/include