From owner-svn-ports-head@freebsd.org  Thu Apr 19 07:28:27 2018
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 C895DF89409;
 Thu, 19 Apr 2018 07:28:27 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 798E586E30;
 Thu, 19 Apr 2018 07:28:27 +0000 (UTC)
 (envelope-from jbeich@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 57451268EC;
 Thu, 19 Apr 2018 07:28:27 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3J7SRPU018451;
 Thu, 19 Apr 2018 07:28:27 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3J7SRvp018450;
 Thu, 19 Apr 2018 07:28:27 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201804190728.w3J7SRvp018450@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 19 Apr 2018 07:28:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r467752 - head/net-p2p/monero-cli/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: head/net-p2p/monero-cli/files
X-SVN-Commit-Revision: 467752
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
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: Thu, 19 Apr 2018 07:28:28 -0000

Author: jbeich
Date: Thu Apr 19 07:28:27 2018
New Revision: 467752
URL: https://svnweb.freebsd.org/changeset/ports/467752

Log:
  net-p2p/monero-cli: switch to upstream patch

Modified:
  head/net-p2p/monero-cli/files/patch-boost-1.67   (contents, props changed)

Modified: head/net-p2p/monero-cli/files/patch-boost-1.67
==============================================================================
--- head/net-p2p/monero-cli/files/patch-boost-1.67	Thu Apr 19 07:08:45 2018	(r467751)
+++ head/net-p2p/monero-cli/files/patch-boost-1.67	Thu Apr 19 07:28:27 2018	(r467752)
@@ -1,50 +1,27 @@
-Regressed by https://github.com/boostorg/thread/commit/fea3e33128aa
+https://github.com/monero-project/monero/pull/3667
 
-In file included from src/cryptonote_basic/hardfork.cpp:33:
-In file included from src/blockchain_db/blockchain_db.h:42:
-In file included from src/cryptonote_basic/hardfork.h:31:
-contrib/epee/include/syncobj.h:37:10: fatal error: 'boost/thread/v2/thread.hpp' file not found
-#include <boost/thread/v2/thread.hpp>
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In file included from src/rpc/daemon_handler.cpp:29:
-In file included from src/rpc/daemon_handler.h:36:
-In file included from src/p2p/net_node.h:41:
-In file included from contrib/epee/include/net/levin_server_cp2.h:32:
-In file included from contrib/epee/include/net/abstract_tcp_server2.h:324:
-contrib/epee/include/net/abstract_tcp_server2.inl:44:10: fatal error: 'boost/thread/v2/thread.hpp' file not found
-#include <boost/thread/v2/thread.hpp> // TODO
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
---- contrib/epee/include/syncobj.h.orig	2018-03-24 15:56:14 UTC
-+++ contrib/epee/include/syncobj.h
-@@ -34,7 +34,13 @@
- #include <boost/thread/locks.hpp>
- #include <boost/thread/mutex.hpp>
- #include <boost/thread/recursive_mutex.hpp>
-+
-+#include <boost/version.hpp>
-+#if BOOST_VERSION < 106700
- #include <boost/thread/v2/thread.hpp>
-+#else
-+#include <boost/thread/condition_variable.hpp>
-+#endif
- 
- namespace epee
- {
 --- contrib/epee/include/net/abstract_tcp_server2.inl.orig	2018-03-24 15:56:14 UTC
 +++ contrib/epee/include/net/abstract_tcp_server2.inl
-@@ -41,7 +41,14 @@
+@@ -41,7 +41,7 @@
  #include <boost/utility/value_init.hpp>
  #include <boost/asio/deadline_timer.hpp>
  #include <boost/date_time/posix_time/posix_time.hpp> // TODO
-+
-+#include <boost/version.hpp>
-+#if BOOST_VERSION < 106700
- #include <boost/thread/v2/thread.hpp> // TODO
-+#else
+-#include <boost/thread/v2/thread.hpp> // TODO
 +#include <boost/thread/condition_variable.hpp> // TODO
-+#endif
-+
  #include "misc_language.h"
  #include "pragma_comp_defs.h"
  
+--- contrib/epee/include/syncobj.h.orig	2018-03-24 15:56:14 UTC
++++ contrib/epee/include/syncobj.h
+@@ -31,10 +31,10 @@
+ #define __WINH_OBJ_H__
+ 
+ #include <boost/chrono/duration.hpp>
++#include <boost/thread/condition_variable.hpp>
+ #include <boost/thread/locks.hpp>
+ #include <boost/thread/mutex.hpp>
+ #include <boost/thread/recursive_mutex.hpp>
+-#include <boost/thread/v2/thread.hpp>
+ 
+ namespace epee
+ {