<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e44a5cd204d1f360f5db9ffa3afaaddf6f32c56c">https://github.com/macports/macports-ports/commit/e44a5cd204d1f360f5db9ffa3afaaddf6f32c56c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new e44a5cd  uhd-devel: update to f764f5ea (20180124), removing integrated patches.
</span>e44a5cd is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e44a5cd204d1f360f5db9ffa3afaaddf6f32c56c
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Jan 25 09:20:15 2018 -0500

<span style='display:block; white-space:pre;color:#404040;'>    uhd-devel: update to f764f5ea (20180124), removing integrated patches.
</span>---
 science/uhd/Portfile                               | 17 +++--------
 .../patch-cmake_Modules_UHDUnitTest.cmake.diff     | 20 -------------
 science/uhd/files/patch-fix-boost_asio_strand.diff | 33 ----------------------
 3 files changed, 4 insertions(+), 66 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/Portfile b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 95fa047..48f4c16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,10 +52,10 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced
</span> 
     name            uhd-devel
     conflicts       uhd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup    EttusResearch uhd 3a58a5f03c3c69fecb21d24645bf1211b531c781
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version         20180116
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums       rmd160 d51130d7047f9cb0bf797f7bc3b1eb8e521a3e8a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256 afc3b38b7dd72ad98d397b188d2974baf489c0562b31738967db56ce4df45434
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup    EttusResearch uhd f764f5ea6d19c3f26cbc00f1096b1dfcb77f359c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         20180124
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160 02a1d84660270d6bcaf6fb4abe435c14c7a0fa00 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 5be938b82a1bb78beda3fff4e0a10c1145713d34a22bebdae970f06e7f0f08e2
</span> 
     # overload the github livecheck URL with the maint branch,
     # when it is more advanced; comment out for master.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,15 +66,6 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced
</span> 
     set UHD_VERSION_INFO "git-[string range ${github.version} 0 7](${version})"
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # temporary patch to fix deprecated and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # replaced use of boost::asio::strand
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append patch-fix-boost_asio_strand.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # temporary patch to fix test library path order such that any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # local-to-build UHD library is found before any already-installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # version, when Boost is installed in the same directory as UHD.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append patch-cmake_Modules_UHDUnitTest.cmake.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
 
 # override the github Portgroup's homepage setting
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-cmake_Modules_UHDUnitTest.cmake.diff b/science/uhd/files/patch-cmake_Modules_UHDUnitTest.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 92d37bb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/files/patch-cmake_Modules_UHDUnitTest.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- host/cmake/Modules/UHDUnitTest.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ host/cmake/Modules/UHDUnitTest.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,15 +18,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         #directory itself.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             set(UHD_TEST_LIBRARY_DIRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                "${Boost_LIBRARY_DIRS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 "${CMAKE_BINARY_DIR}/lib/${CMAKE_BUILD_TYPE}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                "${Boost_LIBRARY_DIRS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             set(UHD_TEST_LIBRARY_DIRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                "${Boost_LIBRARY_DIRS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 "${CMAKE_BINARY_DIR}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 "${CMAKE_CURRENT_BINARY_DIR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                "${Boost_LIBRARY_DIRS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         endif(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-fix-boost_asio_strand.diff b/science/uhd/files/patch-fix-boost_asio_strand.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 90ac4e3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/files/patch-fix-boost_asio_strand.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- host/lib/deps/rpclib/include/rpc/detail/async_writer.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ host/lib/deps/rpclib/include/rpc/detail/async_writer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,7 +69,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- protected:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     boost::asio::ip::tcp::socket socket_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    boost::asio::strand write_strand_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    boost::asio::io_service::strand write_strand_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     std::atomic_bool exit_{false};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     bool exited_ = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     std::mutex m_exit_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- host/lib/deps/rpclib/include/rpc/detail/server_session.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ host/lib/deps/rpclib/include/rpc/detail/server_session.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +35,7 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     server* parent_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     boost::asio::io_service *io_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    boost::asio::strand read_strand_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    boost::asio::io_service::strand read_strand_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     std::shared_ptr<dispatcher> disp_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     RPCLIB_MSGPACK::unpacker pac_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     RPCLIB_MSGPACK::sbuffer output_buf_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- host/lib/deps/rpclib/lib/rpc/client.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ host/lib/deps/rpclib/lib/rpc/client.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,7 +133,7 @@ struct client::impl {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     client *parent_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     boost::asio::io_service io_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    boost::asio::strand strand_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    boost::asio::io_service::strand strand_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     std::atomic<int> call_idx_; /// The index of the last call made
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     std::unordered_map<uint32_t, call_t> ongoing_calls_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     std::string addr_;
</span></pre><pre style='margin:0'>

</pre>