From owner-svn-src-all@FreeBSD.ORG  Mon Nov  5 12:42:25 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5C727115;
 Mon,  5 Nov 2012 12:42:25 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 41D778FC17;
 Mon,  5 Nov 2012 12:42:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA5CgPXk001291;
 Mon, 5 Nov 2012 12:42:25 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA5CgPF3001289;
 Mon, 5 Nov 2012 12:42:25 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201211051242.qA5CgPF3001289@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Mon, 5 Nov 2012 12:42:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r242611 - stable/7/usr.bin/fetch
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 05 Nov 2012 12:42:25 -0000

Author: des
Date: Mon Nov  5 12:42:24 2012
New Revision: 242611
URL: http://svnweb.freebsd.org/changeset/base/242611

Log:
  MFH r240496: use libmd if and only if OpenSSL is not available

Modified:
  stable/7/usr.bin/fetch/Makefile
Directory Properties:
  stable/7/usr.bin/fetch/   (props changed)

Modified: stable/7/usr.bin/fetch/Makefile
==============================================================================
--- stable/7/usr.bin/fetch/Makefile	Mon Nov  5 12:42:02 2012	(r242610)
+++ stable/7/usr.bin/fetch/Makefile	Mon Nov  5 12:42:24 2012	(r242611)
@@ -5,11 +5,13 @@
 PROG=		fetch
 CSTD?=		c99
 WARNS?=		6
+
+.if ${MK_OPENSSL} != "no"
+DPADD=		${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
+LDADD=		-lfetch -lssl -lcrypto
+.else
 DPADD=		${LIBFETCH} ${LIBMD}
 LDADD=		-lfetch -lmd
-.if ${MK_OPENSSL} != "no"
-DPADD+=		${LIBSSL} ${LIBCRYPTO}
-LDADD+=		-lssl -lcrypto
 .endif
 
 .include <bsd.prog.mk>