<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/fc9839cb9c085dfaa791a5c1876359d366c08bfc">https://github.com/macports/macports-ports/commit/fc9839cb9c085dfaa791a5c1876359d366c08bfc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fc9839cb9c085dfaa791a5c1876359d366c08bfc
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Mon Apr 13 10:22:40 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gr-air-modes: support gnuradio 3.8 and create subport for GR 3.7
</span>---
science/gr-air-modes/Portfile | 162 +++++++++++++++++++++++++++---------------
1 file changed, 104 insertions(+), 58 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-air-modes/Portfile b/science/gr-air-modes/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 167e8155f3f..211376368c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-air-modes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-air-modes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup bistromath gr-air-modes 0b6c3835062fc371d79fcb3cf3a6076d4a5ee36d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20170928
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1ebd3db9ceb68d6d12a0f84c944ad4c9ace14d31 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 83faacb86e42033773f333d1c488efb9d0cd0e4a26217c93b2f45a828363fc7f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# allow gr-air-modes to work with both gnuradio and gnuradio-devel ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ... but not with gnuradio-next
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gnuradio-next is installed; this version of gr-air-modes does not work with gnuradio-next
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid port dependency: gnuradio-next"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name gr-air-modes
</span> categories science comms
maintainers {michaelld @michaelld} openmaintainer
description Provides augmented functionality (blocks, GRC definitions, apps, etc) for GNU Radio.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,66 +12,131 @@ long_description ${description}
</span> license GPL-3
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# disable parallel build for now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup bistromath gr-air-modes a2f2627c5421368b8af1b57ca9818e1c79d4f4f0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191015-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c217e9a5da47bf639f94fed4d2490d88717ca40a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ec716122fd2c7e6e3f66a1d5c887b4433990c1036d2bdd4d7424808cca5a5a4e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 186306
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# can use cppzmq or cppzmq-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:include/zmq.hpp:cppzmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE: py3*-pyqwt is not available
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Requires qwt >= 5.2, so not the "qwt" port. Also requires
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# py*-pyqwt which does not compile with qwt >= 6.0; so -have- to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# use qwt52 for now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libgnuradio-runtime.dylib:gnuradio
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:qwt52
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:py27-pyqwt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts gr37-air-modes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# do VPATH (out of source tree) build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions { 3.6 3.7 3.8 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant +python37
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary patch to fix CMake stuff on OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gr37-air-modes {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name gr37-air-modes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary patch to fix Python handling
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup bistromath gr-air-modes 0b6c3835062fc371d79fcb3cf3a6076d4a5ee36d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170928
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1ebd3db9ceb68d6d12a0f84c944ad4c9ace14d31 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 83faacb86e42033773f333d1c488efb9d0cd0e4a26217c93b2f45a828363fc7f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cmake_Modules_GrPython.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix CMake stuff on OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CMakeLists.txt.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary patch to fix use of pyuic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix Python handling
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake_Modules_GrPython.cmake.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cmake_Modules_FindPyQt4.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix use of pyuic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake_Modules_FindPyQt4.cmake.diff
</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:#e0ffe0;'>+ conflicts gr-air-modes
</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;'>+ 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;'>-# specify the Python dependencies
</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:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qwt52 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-pyqwt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-pyqt4
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# pyzmq is not checked for at configure, but is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# required for runtime; so use depends_run.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck none
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-zmq
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# pyqt4 is checked for at configure, then required for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# runtime; so use depends_lib to get both.
</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:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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: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;'>+ port:cppunit
</span>
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-pyqt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libvolk.dylib:volk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/zmq.hpp:cppzmq \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${active_python_version_no_dot}
</span>
# specify the Python version to use
<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;'>+if {${subport} eq "gr37-air-modes"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYUIC4_EXECUTABLE=${python_framework_dir}/bin/pyuic4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYUIC4_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/2.7/bin/pyuic4 \
</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;'>+ -DDOXYGEN_DOT_EXECUTABLE=${prefix}/bin/dot \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -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;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${active_python_version_no_dot}-zmq
</span></pre><pre style='margin:0'>
</pre>