<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/fabc422778c0b0b2a8bf7e954b8c0a77a57f3d8e">https://github.com/macports/macports-ports/commit/fabc422778c0b0b2a8bf7e954b8c0a77a57f3d8e</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 fabc422 uhd: + update devel to f86f209b (20170104); + move patch to just release, to be removed at the next release; + add +python36 variant.
</span>fabc422 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fabc422778c0b0b2a8bf7e954b8c0a77a57f3d8e
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Jan 5 09:39:35 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> uhd:
</span><span style='display:block; white-space:pre;color:#404040;'> + update devel to f86f209b (20170104);
</span><span style='display:block; white-space:pre;color:#404040;'> + move patch to just release, to be removed at the next release;
</span><span style='display:block; white-space:pre;color:#404040;'> + add +python36 variant.
</span>---
science/uhd/Portfile | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 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 6cbc26b..5b00a8b 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;'>@@ -34,6 +34,11 @@ Provides the release version, which is typically updated every month or so.
</span>
set UHD_VERSION_INFO "Release"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix building on Python 3.5; works with older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Python too; remove with next release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-host_lib_rfnoc_nocscript_gen_basic_funcs.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # overload the github livecheck regex to look for versions that
# are just numbers and '_', no letters (e.g., "3.7.3_rc2").
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,10 +53,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 2a72dd9094bea085995ba7c49d2e102403bdbc42
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20161213
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 134fc72352296c13e66d071987ac7731f9e6e966 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6f6786cdd96c7252affc3a20c52fa97e88cadeedf7c56ba5b87a220958157001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup EttusResearch uhd f86f209b3370be54ec0870186ab1b9d8988736eb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170104
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4fb701f90d07cd57e9b50f87258ec76f42e168a2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f193a50a11a445acdf8c0241ba8f033833961eccb7a499940188336ba535524f
</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;'>@@ -72,11 +77,6 @@ depends_lib-append port:boost port:ncurses
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary patch to fix building on Python 3.5;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# works with older Python too
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-host_lib_rfnoc_nocscript_gen_basic_funcs.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # do VPATH (out of source tree) build
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,20 +124,23 @@ default_variants +docs +examples +libusb +manual +test +manpages
</span>
# select Python to use; default to 2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python34 python35 description {Build using Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python27 python35 description {Build using Python 3.4} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python34 description {Build using Python 3.5 (experimental)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python34 python35 python36 description {Build using Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python34 conflicts python27 python35 python36 description {Build using Python 3.4} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python27 python34 python36 description {Build using Python 3.5} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python34 python35 description {Build using Python 3.6} {}
</span>
if {![variant_isset python27] &&
![variant_isset python34] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36]} {
</span> default_variants +python27
}
if {![variant_isset python27] &&
![variant_isset python34] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select one of the variants +python27 , +python34 , or +python35 .\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select one of the variants +python27 , +python34 , +python35, or +python35 .\n"
</span> return -code error "Invalid variant selection"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,8 +149,10 @@ if {[variant_isset python27]} {
</span> set PythonVersionNoDot "27"
} elseif {[variant_isset python34]} {
set PythonVersionNoDot "34"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset python35]} {
</span> set PythonVersionNoDot "35"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PythonVersionNoDot "36"
</span> }
set PythonVersionWithDot [join [split ${PythonVersionNoDot} ""] "."]
</pre><pre style='margin:0'>
</pre>