From owner-svn-src-stable@freebsd.org  Thu Mar 23 04:47:44 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E13A7D19F76;
 Thu, 23 Mar 2017 04:47:44 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B09E910BD;
 Thu, 23 Mar 2017 04:47:44 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2N4lhlQ005938;
 Thu, 23 Mar 2017 04:47:43 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2N4lhDI005937;
 Thu, 23 Mar 2017 04:47:43 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703230447.v2N4lhDI005937@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Thu, 23 Mar 2017 04:47:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r315781 - stable/10/rescue/rescue
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Mar 2017 04:47:45 -0000

Author: ngie
Date: Thu Mar 23 04:47:43 2017
New Revision: 315781
URL: https://svnweb.freebsd.org/changeset/base/315781

Log:
  MFC r315654:
  
  Fix linking /rescue/rescue to multiple programs in usr.bin after r315113
  
  I meant for the line that conditionally added in /usr/bin/nc support to
  be `+=', not `=`. This restores hardlinks for all programs in usr.bin
  specified before nc(1), e.g., bunzip2 and tar.
  
  Pointyhat to:	ngie

Modified:
  stable/10/rescue/rescue/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/rescue/rescue/Makefile
==============================================================================
--- stable/10/rescue/rescue/Makefile	Thu Mar 23 04:43:04 2017	(r315780)
+++ stable/10/rescue/rescue/Makefile	Thu Mar 23 04:47:43 2017	(r315781)
@@ -220,7 +220,7 @@ CRUNCH_LIBS+= -lcrypto
 CRUNCH_LIBS+= -lmd
 
 .if ${MK_NETCAT} != "no"
-CRUNCH_PROGS_usr.bin= nc
+CRUNCH_PROGS_usr.bin+=	nc
 .endif
 
 CRUNCH_PROGS_usr.bin+= vi