<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/c9593d4ff3611239b56b29a4972ebfc3e3f014df">https://github.com/macports/macports-ports/commit/c9593d4ff3611239b56b29a4972ebfc3e3f014df</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 c9593d4ff36 gnuradio: tweak and fix dependencies, remove license conflicts
</span>c9593d4ff36 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c9593d4ff3611239b56b29a4972ebfc3e3f014df
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Aug 14 11:30:01 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio: tweak and fix dependencies, remove license conflicts
</span>---
science/gnuradio/Portfile | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/Portfile b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4bb2111a289..73829bc9b6e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ if {${subport} eq ${name}} {
</span> checksums rmd160 4c4a4eb71cf4ed7f3782167a17e979059103d99a \
sha256 97763da635063d472eae7cbb7680f36c69359ea5b88348d26f8fa7f8b5e7289a \
size 3377964
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
long_description ${description}: \
This port is kept up with the GNU Radio release, \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +76,7 @@ subport gnuradio37 {
</span> checksums rmd160 0165a52a4770a02b4843544e4ba6bc59d84fa7d1 \
sha256 3d895e29417efd4ef8ab4053bed2ea9117b4476c0ae729f065088242f0f61f9f \
size 4460817
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
long_description ${description}: \
This port is kept up with the GNU Radio 3.7 release, \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,7 +126,7 @@ subport gnuradio-next {
</span> checksums rmd160 0a9e1294036e786116c96d68f9116e3f2798d325 \
sha256 bb2dab14e159a4b58ccf317ece3b4132959739f4b5b217d8e0add3c5ce581f5f \
size 3950832
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
long_description ${description}: \
This port is kept up with the GNU Radio GIT 'master' \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,6 +201,9 @@ foreach py_ver ${python_versions} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/macports/macports-ports/pull/7805
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict-append openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -315,14 +318,17 @@ app.create no
</span> variant docs description "Install GNU Radio documentation" {
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/dot:graphviz \
</span> port:xmlto
depends_build-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/dot:graphviz \
</span> port:py${active_python_version_no_dot}-sphinx \
port:texlive-latex
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/pull/7805
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license_noconflict-append graphviz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-delete \
-DENABLE_DOXYGEN=OFF \
-DENABLE_SPHINX=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -556,6 +562,15 @@ variant sdl description "Install GNU Radio with support for SDL-based video" {
</span>
variant ctrlport description {Install GNU Radio with support for control port (CTRLPORT) enhancements (EXPERIMENTAL)} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # A ctrlport utility uses graphviz for display purposes. This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # dependency is not checked for during configuration nor used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # during building or testing. It is just a runtime dependency.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/dot:graphviz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/macports/macports-ports/pull/7805
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license_noconflict-append graphviz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # enable configuration arguments for ctrlport
configure.args-replace \
-DENABLE_GR_CTRLPORT=OFF \
</pre><pre style='margin:0'>
</pre>