From owner-svn-ports-head@freebsd.org  Mon Mar 25 16:59:51 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2623A1545EA1;
 Mon, 25 Mar 2019 16:59:51 +0000 (UTC)
 (envelope-from adridg@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id C154075535;
 Mon, 25 Mar 2019 16:59:50 +0000 (UTC)
 (envelope-from adridg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9ACADAB0D;
 Mon, 25 Mar 2019 16:59:50 +0000 (UTC)
 (envelope-from adridg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2PGxoU4053901;
 Mon, 25 Mar 2019 16:59:50 GMT (envelope-from adridg@FreeBSD.org)
Received: (from adridg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2PGxoGq053900;
 Mon, 25 Mar 2019 16:59:50 GMT (envelope-from adridg@FreeBSD.org)
Message-Id: <201903251659.x2PGxoGq053900@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adridg set sender to
 adridg@FreeBSD.org using -f
From: Adriaan de Groot <adridg@FreeBSD.org>
Date: Mon, 25 Mar 2019 16:59:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r496840 - head/net-im/mtxclient/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: adridg
X-SVN-Commit-Paths: head/net-im/mtxclient/files
X-SVN-Commit-Revision: 496840
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: C154075535
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.95 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
 NEURAL_HAM_SHORT(-0.96)[-0.956,0];
 NEURAL_HAM_LONG(-1.00)[-1.000,0]
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Mar 2019 16:59:51 -0000

Author: adridg
Date: Mon Mar 25 16:59:50 2019
New Revision: 496840
URL: https://svnweb.freebsd.org/changeset/ports/496840

Log:
  Fix build of net-im/mtxclient by patching out one more "json.hpp".
  
  Pointy hat: adridg@
  
  Reported by:	antoine

Added:
  head/net-im/mtxclient/files/patch-tests_utils.cpp   (contents, props changed)

Added: head/net-im/mtxclient/files/patch-tests_utils.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/mtxclient/files/patch-tests_utils.cpp	Mon Mar 25 16:59:50 2019	(r496840)
@@ -0,0 +1,10 @@
+--- tests/utils.cpp.orig	2019-03-25 16:55:59 UTC
++++ tests/utils.cpp
+@@ -1,6 +1,6 @@
+ #include <gtest/gtest.h>
+ 
+-#include "json.hpp"
++#include "nlohmann/json.hpp"
+ #include <mtxclient/crypto/client.hpp>
+ 
+ #include <olm/olm.h>