From owner-svn-ports-all@freebsd.org Fri Apr 13 07:59:51 2018 Return-Path: Delivered-To: svn-ports-all@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 2CDC9F9809D; Fri, 13 Apr 2018 07:59:51 +0000 (UTC) (envelope-from vd@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 CBC1C74414; Fri, 13 Apr 2018 07:59:50 +0000 (UTC) (envelope-from vd@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 C58731706F; Fri, 13 Apr 2018 07:59:50 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3D7xojP074323; Fri, 13 Apr 2018 07:59:50 GMT (envelope-from vd@FreeBSD.org) Received: (from vd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3D7xoxa074319; Fri, 13 Apr 2018 07:59:50 GMT (envelope-from vd@FreeBSD.org) Message-Id: <201804130759.w3D7xoxa074319@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vd set sender to vd@FreeBSD.org using -f From: Vasil Dimov Date: Fri, 13 Apr 2018 07:59:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467214 - head/net-p2p/monero-cli/files X-SVN-Group: ports-head X-SVN-Commit-Author: vd X-SVN-Commit-Paths: head/net-p2p/monero-cli/files X-SVN-Commit-Revision: 467214 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2018 07:59:51 -0000 Author: vd Date: Fri Apr 13 07:59:50 2018 New Revision: 467214 URL: https://svnweb.freebsd.org/changeset/ports/467214 Log: net-p2p/monero-cli: Fix build on FreeBSD10/clang34 Added: head/net-p2p/monero-cli/files/patch-src_blockchain__utilities_blockchain__blackball.cpp (contents, props changed) head/net-p2p/monero-cli/files/patch-src_cryptonote__core_cryptonote__core.cpp (contents, props changed) head/net-p2p/monero-cli/files/patch-src_daemon_command__line__args.h (contents, props changed) head/net-p2p/monero-cli/files/patch-src_wallet_wallet2.cpp (contents, props changed) Added: head/net-p2p/monero-cli/files/patch-src_blockchain__utilities_blockchain__blackball.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/monero-cli/files/patch-src_blockchain__utilities_blockchain__blackball.cpp Fri Apr 13 07:59:50 2018 (r467214) @@ -0,0 +1,11 @@ +--- src/blockchain_utilities/blockchain_blackball.cpp.orig 2018-04-12 18:35:24 UTC ++++ src/blockchain_utilities/blockchain_blackball.cpp +@@ -165,7 +165,7 @@ int main(int argc, char* argv[]) + "blackball-db-dir", "Specify blackball database directory", + get_default_db_path(), + {{ &arg_testnet_on, &arg_stagenet_on }}, +- [](std::array testnet_stagenet, bool defaulted, std::string val) { ++ [](std::array testnet_stagenet, bool defaulted, std::string val) -> std::string { + if (testnet_stagenet[0]) + return (boost::filesystem::path(val) / "testnet").string(); + else if (testnet_stagenet[1]) Added: head/net-p2p/monero-cli/files/patch-src_cryptonote__core_cryptonote__core.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/monero-cli/files/patch-src_cryptonote__core_cryptonote__core.cpp Fri Apr 13 07:59:50 2018 (r467214) @@ -0,0 +1,11 @@ +--- src/cryptonote_core/cryptonote_core.cpp.orig 2018-04-12 18:30:36 UTC ++++ src/cryptonote_core/cryptonote_core.cpp +@@ -81,7 +81,7 @@ namespace cryptonote + , "Specify data directory" + , tools::get_default_data_dir() + , {{ &arg_testnet_on, &arg_stagenet_on }} +- , [](std::array testnet_stagenet, bool defaulted, std::string val) { ++ , [](std::array testnet_stagenet, bool defaulted, std::string val) -> std::string { + if (testnet_stagenet[0]) + return (boost::filesystem::path(val) / "testnet").string(); + else if (testnet_stagenet[1]) Added: head/net-p2p/monero-cli/files/patch-src_daemon_command__line__args.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/monero-cli/files/patch-src_daemon_command__line__args.h Fri Apr 13 07:59:50 2018 (r467214) @@ -0,0 +1,20 @@ +--- src/daemon/command_line_args.h.orig 2018-04-12 18:39:37 UTC ++++ src/daemon/command_line_args.h +@@ -42,7 +42,7 @@ namespace daemon_args + , "Specify configuration file" + , (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".conf")).string() + , {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }} +- , [](std::array testnet_stagenet, bool defaulted, std::string val) { ++ , [](std::array testnet_stagenet, bool defaulted, std::string val) -> std::string { + if (testnet_stagenet[0] && defaulted) + return (daemonizer::get_default_data_dir() / "testnet" / + std::string(CRYPTONOTE_NAME ".conf")).string(); +@@ -57,7 +57,7 @@ namespace daemon_args + , "Specify log file" + , (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".log")).string() + , {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }} +- , [](std::array testnet_stagenet, bool defaulted, std::string val) { ++ , [](std::array testnet_stagenet, bool defaulted, std::string val) -> std::string { + if (testnet_stagenet[0] && defaulted) + return (daemonizer::get_default_data_dir() / "testnet" / + std::string(CRYPTONOTE_NAME ".log")).string(); Added: head/net-p2p/monero-cli/files/patch-src_wallet_wallet2.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/monero-cli/files/patch-src_wallet_wallet2.cpp Fri Apr 13 07:59:50 2018 (r467214) @@ -0,0 +1,11 @@ +--- src/wallet/wallet2.cpp.orig 2018-03-24 15:56:14 UTC ++++ src/wallet/wallet2.cpp +@@ -145,7 +145,7 @@ struct options { + "shared-ringdb-dir", tools::wallet2::tr("Set shared ring database path"), + get_default_ringdb_path(), + testnet, +- [](bool testnet, bool defaulted, std::string val) { ++ [](bool testnet, bool defaulted, std::string val) -> std::string { + if (testnet) + return (boost::filesystem::path(val) / "testnet").string(); + return val;