From owner-svn-src-head@freebsd.org  Mon Mar 20 22:33:23 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 A357DD145EB;
 Mon, 20 Mar 2017 22:33:23 +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 72B4586F;
 Mon, 20 Mar 2017 22:33:23 +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 v2KMXMHR058835;
 Mon, 20 Mar 2017 22:33:22 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2KMXM9r058834;
 Mon, 20 Mar 2017 22:33:22 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703202233.v2KMXM9r058834@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: Mon, 20 Mar 2017 22:33:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315654 - head/rescue/rescue
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Mar 2017 22:33:23 -0000

Author: ngie
Date: Mon Mar 20 22:33:22 2017
New Revision: 315654
URL: https://svnweb.freebsd.org/changeset/base/315654

Log:
  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.
  
  Reported by:	Andrzej Tobola <ato@iem.pw.edu.pl>
  Submitted by:	Scott Allendorf <scott-allendorf@uiowa.edu>
  Pointyhat to:	ngie
  MFC after:	3 days
  Sponsored by:	Dell EMC Isilon

Modified:
  head/rescue/rescue/Makefile

Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile	Mon Mar 20 22:20:17 2017	(r315653)
+++ head/rescue/rescue/Makefile	Mon Mar 20 22:33:22 2017	(r315654)
@@ -210,7 +210,7 @@ CRUNCH_LIBS+= -lcrypto
 CRUNCH_LIBS+= -lmd
 
 .if ${MK_NETCAT} != "no"
-CRUNCH_PROGS_usr.bin= nc
+CRUNCH_PROGS_usr.bin+=	nc
 .endif
 
 .if ${MK_VI} != "no"