From owner-svn-src-all@FreeBSD.ORG  Thu Aug  4 07:29:09 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 190B5106566B;
	Thu,  4 Aug 2011 07:29:09 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E38118FC08;
	Thu,  4 Aug 2011 07:29:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p747T88L049646;
	Thu, 4 Aug 2011 07:29:08 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p747T8wU049643;
	Thu, 4 Aug 2011 07:29:08 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201108040729.p747T8wU049643@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Thu, 4 Aug 2011 07:29:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224646 - in stable/8/usr.bin: cpio tar
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Aug 2011 07:29:09 -0000

Author: mm
Date: Thu Aug  4 07:29:08 2011
New Revision: 224646
URL: http://svn.freebsd.org/changeset/base/224646

Log:
  MFC r224566:
  
  Correctly link bsdcpio and bsdtar against libmd and libcrpyto
  by applying the change from r221472 (libarchive).
  
  Reviewed by:	kientzle

Modified:
  stable/8/usr.bin/cpio/Makefile
  stable/8/usr.bin/tar/Makefile
Directory Properties:
  stable/8/usr.bin/cpio/   (props changed)
  stable/8/usr.bin/tar/   (props changed)

Modified: stable/8/usr.bin/cpio/Makefile
==============================================================================
--- stable/8/usr.bin/cpio/Makefile	Thu Aug  4 03:04:05 2011	(r224645)
+++ stable/8/usr.bin/cpio/Makefile	Thu Aug  4 07:29:08 2011	(r224646)
@@ -21,11 +21,14 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../..
 # statically linked, cannot use -lcrypto, and are size sensitive.
 CFLAGS+= -DSMALLER
 .endif
-DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD} ${LIBLZMA} ${LIBBSDXML}
-LDADD=	-larchive -lz -lbz2 -lmd -llzma -lbsdxml
+DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBBSDXML}
+LDADD=	-larchive -lz -lbz2 -llzma -lbsdxml
 .if ${MK_OPENSSL} != "no"
 DPADD+=	${LIBCRYPTO}
 LDADD+= -lcrypto
+.else
+DPADD+= ${LIBMD}
+LDADD+= -lmd
 .endif
 
 SYMLINKS=bsdcpio ${BINDIR}/cpio

Modified: stable/8/usr.bin/tar/Makefile
==============================================================================
--- stable/8/usr.bin/tar/Makefile	Thu Aug  4 03:04:05 2011	(r224645)
+++ stable/8/usr.bin/tar/Makefile	Thu Aug  4 07:29:08 2011	(r224646)
@@ -19,12 +19,16 @@ SRCS+=	err.c		\
 	pathmatch.c
 
 WARNS?=	6
-DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA} ${LIBBSDXML}
-LDADD=	-larchive -lbz2 -lz -lmd -llzma -lbsdxml
+DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBBSDXML}
+LDADD=	-larchive -lbz2 -lz -llzma -lbsdxml
 .if ${MK_OPENSSL} != "no"
 DPADD+=	${LIBCRYPTO}
 LDADD+= -lcrypto
+.else
+DPADD+= ${LIBMD}
+LDADD+= -lmd
 .endif
+
 CFLAGS+=	-DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"config_freebsd.h\"
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../../lib/libarchive