From owner-svn-src-all@FreeBSD.ORG  Sat Apr 18 06:03:10 2009
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 4CDF1106566C;
	Sat, 18 Apr 2009 06:03:10 +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 3B3BE8FC17;
	Sat, 18 Apr 2009 06:03:10 +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 n3I63AWC057513;
	Sat, 18 Apr 2009 06:03:10 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3I63ADv057511;
	Sat, 18 Apr 2009 06:03:10 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200904180603.n3I63ADv057511@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sat, 18 Apr 2009 06:03:10 +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: r191240 - in head/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: Sat, 18 Apr 2009 06:03:10 -0000

Author: kientzle
Date: Sat Apr 18 06:03:09 2009
New Revision: 191240
URL: http://svn.freebsd.org/changeset/base/191240

Log:
  Make -lcrypto usage dependent on whether or not we're building with OpenSSL.

Modified:
  head/usr.bin/cpio/Makefile
  head/usr.bin/tar/Makefile

Modified: head/usr.bin/cpio/Makefile
==============================================================================
--- head/usr.bin/cpio/Makefile	Sat Apr 18 06:01:55 2009	(r191239)
+++ head/usr.bin/cpio/Makefile	Sat Apr 18 06:03:09 2009	(r191240)
@@ -9,7 +9,10 @@ WARNS?=	6
 DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
 CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
 CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
-LDADD+=	-larchive -lz -lbz2 -lmd -lcrypto
+LDADD+=	-larchive -lz -lbz2 -lmd
+.if ${MK_OPENSSL} != "no"
+LDADD+= -lcrypto
+.endif
 
 .if ${MK_GNU_CPIO} != "yes"
 SYMLINKS=bsdcpio ${BINDIR}/cpio

Modified: head/usr.bin/tar/Makefile
==============================================================================
--- head/usr.bin/tar/Makefile	Sat Apr 18 06:01:55 2009	(r191239)
+++ head/usr.bin/tar/Makefile	Sat Apr 18 06:03:09 2009	(r191240)
@@ -1,11 +1,15 @@
 # $FreeBSD$
+.include <bsd.own.mk>
 
 PROG=	bsdtar
 BSDTAR_VERSION_STRING=2.7.0
 SRCS=	bsdtar.c cmdline.c getdate.c matching.c read.c siginfo.c subst.c tree.c util.c write.c
 WARNS?=	5
 DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
-LDADD=	-larchive -lbz2 -lz -lmd -lcrypto
+LDADD=	-larchive -lbz2 -lz -lmd
+.if ${MK_OPENSSL} != "no"
+LDADD+= -lcrypto
+.endif
 CFLAGS+=	-DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"config_freebsd.h\"
 CFLAGS+=	-I${.CURDIR}