<pre style='margin:0'>
rainbow (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c4f9548714e53f9e37840503646a152b348741db">https://github.com/macports/macports-ports/commit/c4f9548714e53f9e37840503646a152b348741db</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 c4f9548 NanoVNA-QT: refactory and creation of the libxavna library as backend
</span>c4f9548 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c4f9548714e53f9e37840503646a152b348741db
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Mon Apr 6 09:09:16 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> NanoVNA-QT: refactory and creation of the libxavna library as backend
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - create a subport to build libxavna with autoconf and make
</span><span style='display:block; white-space:pre;color:#404040;'> - now the main port only build the Qt part: an abstration/ui layer for
</span><span style='display:block; white-space:pre;color:#404040;'> libxavna and the program itself.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> thanks @ryandesign
</span>---
science/NanoVNA-QT/Portfile | 104 ++++++++++++++++++++++++--------------------
1 file changed, 56 insertions(+), 48 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/NanoVNA-QT/Portfile b/science/NanoVNA-QT/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c845eab..20db162 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/NanoVNA-QT/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/NanoVNA-QT/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,77 +2,85 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup app 1.0
</span>
categories science comms
platforms darwin macosx
license GPL-2
maintainers {ra1nb0w @ra1nb0w} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description NanoVNA-QT is a Vector Network Analyzer software for the NanoVNA V2 board
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description NanoVNA-QT is a Vector Network Analyzer software for the NanoVNA V2 hardware
</span> long_description ${description}
github.setup nanovna NanoVNA-QT 20200403
checksums rmd160 b3f8d7ec3ec59c74797d161e354c270ccb373e51 \
sha256 76d97c818d46629f56730f7b85a61131ca04d4b37d22b85f6737fd2a956f70c8 \
size 875355
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
compiler.c_standard 2011
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove with next version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform_abstraction.C.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use the same tree but built with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# autoconf and make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libxavna {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description C and C++ library for accessing the NanoVNA V2 hardware
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# build the project with one call
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nanovna.pro.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove -fno-delete-null-pointer-checks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# because it doesn't exist on macOS < 10.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} <= 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove with next version
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libxavna_Makefile.am.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform_abstraction.C.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove -fno-delete-null-pointer-checks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # because it doesn't exist on macOS < 10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} <= 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxavna_Makefile.am.patch
</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;'>+ use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build the application
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup app 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtcharts \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtsvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build the project with one call
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nanovna.pro.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:eigen3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtcharts \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtsvg
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# avoid conflict with autoconf files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and avoid renaming Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.dir ${worksrcpath}/custom
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args nanovna.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${worksrcpath}/custom
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxavna \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:eigen3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# build libxavna
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# I hope for an unified way
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "CPATH=\"${prefix}/include\" LDFLAGS=\"-L${prefix}/lib\" CFLAGS=\"-I${prefix}/include\" ./configure --prefix=${prefix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "CPATH=\"${prefix}/include\" LDFLAGS=\"-L${prefix}/lib\" CFLAGS=\"-I${prefix}/include\" make -f Makefile"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid conflict with autoconf files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and avoid renaming Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.dir ${worksrcpath}/custom
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args nanovna.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${worksrcpath}/custom
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/vna_qt/vna_qt.app/Contents/MacOS/vna_qt ${destroot}${prefix}/bin/NanoVNA-QT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/libxavna/xavna_mock_ui/libxavna_mock_ui.1.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/libxavna/.libs/libxavna.0.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/vna_qt/vna_qt.app/Contents/MacOS/vna_qt ${destroot}${prefix}/bin/NanoVNA-QT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/libxavna/xavna_mock_ui/libxavna_mock_ui.1.dylib ${destroot}${prefix}/lib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # probably use QMAKE_SONAME_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id ${prefix}/lib/libxavna_mock_ui.1.dylib ${destroot}${prefix}/lib/libxavna_mock_ui.1.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change libxavna_mock_ui.1.dylib ${prefix}/lib/libxavna_mock_ui.1.dylib ${destroot}${prefix}/bin/NanoVNA-QT"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # maybe use QMAKE_SONAME_PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${prefix}/lib/libxavna_mock_ui.1.dylib ${destroot}${prefix}/lib/libxavna_mock_ui.1.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change libxavna_mock_ui.1.dylib ${prefix}/lib/libxavna_mock_ui.1.dylib ${destroot}${prefix}/bin/NanoVNA-QT"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.create yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-app.name NanoVNA-QT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-app.executable NanoVNA-QT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-app.icon pictures/antenna.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-app.retina yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.name NanoVNA-QT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.executable NanoVNA-QT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.icon pictures/antenna.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.retina yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>