From owner-svn-src-projects@freebsd.org  Mon Jan  4 22:32:38 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 E07A0A617B0
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon,  4 Jan 2016 22:32:38 +0000 (UTC) (envelope-from gjb@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 B3B1B1278;
 Mon,  4 Jan 2016 22:32:38 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u04MWb1j071334;
 Mon, 4 Jan 2016 22:32:37 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u04MWbBf071333;
 Mon, 4 Jan 2016 22:32:37 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201601042232.u04MWbBf071333@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 4 Jan 2016 22:32:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r293184 - projects/release-pkg/lib
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jan 2016 22:32:39 -0000

Author: gjb
Date: Mon Jan  4 22:32:37 2016
New Revision: 293184
URL: https://svnweb.freebsd.org/changeset/base/293184

Log:
  Fix svn:mergeinfo, and MFH a commit that was previously missed.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/lib/Makefile
Directory Properties:
  projects/release-pkg/   (props changed)
  projects/release-pkg/tools/tools/ioat/   (props changed)

Modified: projects/release-pkg/lib/Makefile
==============================================================================
--- projects/release-pkg/lib/Makefile	Mon Jan  4 21:41:02 2016	(r293183)
+++ projects/release-pkg/lib/Makefile	Mon Jan  4 22:32:37 2016	(r293184)
@@ -131,7 +131,7 @@ SUBDIR_DEPEND_libarchive= libz libbz2 li
 SUBDIR_DEPEND_libatm= libmd
 SUBDIR_DEPEND_libauditdm= libbsm
 SUBDIR_DEPEND_libbsnmp= ${_libnetgraph}
-SUBDIR_DEPEND_libc++= libcxxrt
+SUBDIR_DEPEND_libc++:= libcxxrt
 SUBDIR_DEPEND_libc= libcompiler_rt
 SUBDIR_DEPEND_libcam= libsbuf
 SUBDIR_DEPEND_libcapsicum= libnv