<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/35ce6923675fd283df6bf1afc67fbe2b38282387">https://github.com/macports/macports-ports/commit/35ce6923675fd283df6bf1afc67fbe2b38282387</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 35ce692 uhd-devel: update to 8bb15ee1 (20180319).
</span>35ce692 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 35ce6923675fd283df6bf1afc67fbe2b38282387
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Mar 20 11:44:09 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> uhd-devel: update to 8bb15ee1 (20180319).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add temporary patch to disable adding Boost DIRS before internal DIRS. This will work in MacPorts, but not in general. We're working on a better solution.
</span>---
science/uhd/Portfile | 15 ++++++++++-----
science/uhd/files/patch-host_CMakeLists.txt.diff | 15 +++++++++++++++
2 files changed, 25 insertions(+), 5 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 c0a126e..f96f099 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;'>@@ -46,11 +46,11 @@ 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 13c32cefcd6ea45e20e2eca97159ca26603ca533
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180305
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 99130758e36dc7feeedd56a7ddf2621a379a993d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4f8f62a010240e094f51b5bb38f03eda774bc63075fe14b483f79caa01d93cea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9279636
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup EttusResearch uhd 8bb15ee133ea98d6755d392b8493966c785291dd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180319
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 263d0bb9e56f40b6d94c357b9467a6655080e582 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 764f016e17e2cc2305b2bf61646cba92be6284ca9ddd663e2fd4f857b6b7bdf7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9289076
</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;'>@@ -61,6 +61,11 @@ 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:#e0ffe0;'>+ # temporary patch to disable Boost DIRS before internal DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-host_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# override the github Portgroup's homepage setting
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-host_CMakeLists.txt.diff b/science/uhd/files/patch-host_CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f7c0f10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-host_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ab7f41f..06cd1af 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -324,8 +324,8 @@ SET(Boost_ADDITIONAL_VERSIONS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(STATUS "Boost include directories: ${Boost_INCLUDE_DIRS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}")
</span></pre><pre style='margin:0'>
</pre>