<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/3991f2a1072358091c7a7a48e88adee8958908ca">https://github.com/macports/macports-ports/commit/3991f2a1072358091c7a7a48e88adee8958908ca</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3991f2a1072358091c7a7a48e88adee8958908ca
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Sat Apr 11 11:47:46 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gr-sdrplay: move to gr37-sdrplay; no support for gnuradio 3.8
</span>---
science/gr-sdrplay/Portfile | 133 +++++++++++++--------
...makelists.txt.patch => cmakelists.txt.37.patch} | 0
2 files changed, 85 insertions(+), 48 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-sdrplay/Portfile b/science/gr-sdrplay/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 238dcab9710..86a62a3fc48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-sdrplay/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-sdrplay/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,64 +10,106 @@ license GPL-3+
</span> maintainers {ra1nb0w @ra1nb0w} {michaelld @michaelld} openmaintainer
description GNU Radio block for SDRPlay boards
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://gitlab.com/HB9FXQ/gr-sdrplay
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git.url ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git.branch d28ae3d3a61d154bec51940ecc2f637ffed2e8a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20180717-[string range ${git.branch} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use C++11
</span> compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmakelists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180717-d28ae3d3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by gr37-sdrplay
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions { 2.7 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cppunit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gr37-sdrplay {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libgnuradio-runtime.dylib:gnuradio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:SDRplay
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name gr37-sdrplay
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove top-level library path, such that internal libraries are used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# instead of any already-installed ones.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-delete -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # maybe move to https://github.com/fventuri/gr-sdrplay/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # abandoned
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://gitlab.com/HB9FXQ/gr-sdrplay
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetch.type git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.url ${homepage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch d28ae3d3a61d154bec51940ecc2f637ffed2e8a4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180717-[string range ${git.branch} 0 7]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# specify the Python dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# specify that Python version to use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/2.7/Python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGR_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmakelists.txt.37.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_MODULES_DIR=share/cmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDOXYGEN_DOT_EXECUTABLE= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDOXYGEN_EXECUTABLE=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts gr37-sdrplay
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant docs description "Install ${name} documentation" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions { 2.7 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant +python27
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnuradio37 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:SDRplay
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDOXYGEN_DOT_EXECUTABLE= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDOXYGEN_EXECUTABLE=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type regexm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.version ${git.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url ${homepage}/commits/master
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {/HB9FXQ/gr-sdrplay/-/commit/([0-9a-z]*)}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDOXYGEN_DOT_EXECUTABLE=${prefix}/bin/dot \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDOXYGEN_EXECUTABLE=${prefix}/bin/doxygen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Define the available variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach py_ver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_no_dot [join [split ${py_ver} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set variant_line {variant python${py_ver_no_dot} description "Build with python ${py_ver} support"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach py_over ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${py_ver} == ${py_over} } { continue }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_over_no_dot [join [split ${py_over} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append variant_line " conflicts python${py_over_no_dot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append variant_line { { } }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval $variant_line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${py_ver_no_dot}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${default_python_variant} != "+python${py_ver_no_dot}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set default python variant if not selected
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${default_python_variant} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append "${default_python_variant}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# If a python variant is enabled, activate it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set active_python_version ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set active_python_version_no_dot ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach py_ver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_no_dot [join [split ${py_ver} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${py_ver_no_dot}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set active_python_version ${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set active_python_version_no_dot ${py_ver_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cppunit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig-python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${active_python_version_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# specify the Python version to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_framework_dir ${frameworks_dir}/Python.framework/Versions/${active_python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${python_framework_dir}/bin/python${active_python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${python_framework_dir}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${python_framework_dir}/Python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGR_PYTHON_DIR=${python_framework_dir}/lib/python${active_python_version}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOXYGEN_DOT_EXECUTABLE= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOXYGEN_EXECUTABLE= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_MODULES_DIR=share/cmake
</span>
post-destroot {
# copy GNU Radio examples
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,8 +117,3 @@ post-destroot {
</span> file copy {*}[glob ${worksrcpath}/examples/*] \
${destroot}${prefix}/share/gnuradio/examples/sdrplay
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regexm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.version ${git.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}/commits/master
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {/HB9FXQ/gr-sdrplay/-/commit/([0-9a-z]*)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-sdrplay/files/cmakelists.txt.patch b/science/gr-sdrplay/files/cmakelists.txt.37.patch
</span>similarity index 100%
rename from science/gr-sdrplay/files/cmakelists.txt.patch
rename to science/gr-sdrplay/files/cmakelists.txt.37.patch
</pre><pre style='margin:0'>
</pre>