gnuradio-qtgui: update to 3.8.1.0

2 files changed, 33 insertions, 81 deletions

diff --git a/ham/gnuradio-qtgui/Makefile b/ham/gnuradio-qtgui/Makefile
index e513f2f74fd..e283c7bd01b 100644
--- a/ham/gnuradio-qtgui/Makefile
+++ b/ham/gnuradio-qtgui/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2020/08/18 17:58:04 leot Exp $
+# $NetBSD: Makefile,v 1.31 2020/08/30 21:04:29 tnn Exp $
 
 PKGNAME=	gnuradio-qtgui-${VERSION}
-PKGREVISION=	8
 COMMENT=	Qt GUI module of GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
@@ -11,14 +10,15 @@ COMMENT=	Qt GUI module of GNU Radio
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=OFF
 CMAKE_ARGS+=	-DENABLE_GR_QTGUI=ON
+CMAKE_ARGS+=	-DENABLE_GRC=ON
 
-# This package is currently 3.7.13.5, released 2019-04-20.  It
-# supports qt4 (and not qt5).
-# 3.8.0.0 was released on 2019-08-09, and will likely be packaged
-# soon.  It supports qt5 (and not qt4).
+PLIST_MINUS+=	companion
 
-.include	"../../x11/qt4-libs/buildlink3.mk"
-.include	"../../x11/qwt-qt4/buildlink3.mk"
-.include	"../../x11/py-qt4/buildlink3.mk"
+pre-configure: Qt5Qwt6.pc
+.PHONY: Qt5Qwt6.pc
+Qt5Qwt6.pc:
+	ln -sf ${QWT_DIR}/lib/pkgconfig/Qt5Qwt6.pc ${BUILDLINK_DIR}/lib/pkgconfig/Qt5Qwt6.pc
 
+.include	"../../x11/py-qt5/buildlink3.mk"
+.include	"../../x11/qwt6-qt5/buildlink3.mk"
 .include	"../../mk/bsd.pkg.mk"
diff --git a/ham/gnuradio-qtgui/PLIST b/ham/gnuradio-qtgui/PLIST
index e26a3a22d03..0d596f1d89b 100644
--- a/ham/gnuradio-qtgui/PLIST
+++ b/ham/gnuradio-qtgui/PLIST
@@ -1,23 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/03/15 14:07:12 mef Exp $
-bin/gr_constellation_plot
-bin/gr_psd_plot_b
-bin/gr_psd_plot_c
-bin/gr_psd_plot_f
-bin/gr_psd_plot_i
-bin/gr_psd_plot_s
-bin/gr_spectrogram_plot
-bin/gr_spectrogram_plot_b
-bin/gr_spectrogram_plot_c
-bin/gr_spectrogram_plot_f
-bin/gr_spectrogram_plot_i
-bin/gr_spectrogram_plot_s
-bin/gr_time_plot_b
-bin/gr_time_plot_c
-bin/gr_time_plot_f
-bin/gr_time_plot_i
-bin/gr_time_plot_s
-bin/gr_time_raster_b
-bin/gr_time_raster_f
+@comment $NetBSD: PLIST,v 1.10 2020/08/30 21:04:29 tnn Exp $
 include/gnuradio/qtgui/CMakeLists.txt
 include/gnuradio/qtgui/ConstellationDisplayPlot.h
 include/gnuradio/qtgui/DisplayPlot.h
@@ -66,46 +47,17 @@ include/gnuradio/qtgui/waterfall_sink_f.h
 include/gnuradio/qtgui/waterfalldisplayform.h
 include/gnuradio/swig/qtgui_swig.i
 include/gnuradio/swig/qtgui_swig_doc.i
+lib/cmake/gnuradio/gnuradio-qtguiConfig.cmake
+lib/cmake/gnuradio/gnuradio-qtguiTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-qtguiTargets.cmake
 lib/libgnuradio-qtgui.so
+lib/libgnuradio-qtgui.so.3.8.1
 lib/libgnuradio-qtgui.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-qtgui.pc
 ${PYSITELIB}/gnuradio/qtgui/__init__.py
 ${PYSITELIB}/gnuradio/qtgui/__init__.pyc
 ${PYSITELIB}/gnuradio/qtgui/__init__.pyo
 ${PYSITELIB}/gnuradio/qtgui/_qtgui_swig.so
-${PYSITELIB}/gnuradio/qtgui/plot_base.py
-${PYSITELIB}/gnuradio/qtgui/plot_base.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_base.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_constellation_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_constellation_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_constellation_form.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_form.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_psd_base.py
-${PYSITELIB}/gnuradio/qtgui/plot_psd_base.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_psd_base.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_psd_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_psd_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_psd_form.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_base.py
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_base.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_base.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_spectrogram_form.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_time_base.py
-${PYSITELIB}/gnuradio/qtgui/plot_time_base.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_time_base.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_time_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_time_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_time_form.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_base.py
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_base.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_base.pyo
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_form.py
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_form.pyc
-${PYSITELIB}/gnuradio/qtgui/plot_time_raster_form.pyo
 ${PYSITELIB}/gnuradio/qtgui/qtgui_swig.py
 ${PYSITELIB}/gnuradio/qtgui/qtgui_swig.pyc
 ${PYSITELIB}/gnuradio/qtgui/qtgui_swig.pyo
@@ -134,25 +86,25 @@ share/gnuradio/examples/qt-gui/qtgui_message_inputs.grc
 share/gnuradio/examples/qt-gui/qtgui_tags_viewing.grc
 share/gnuradio/examples/qt-gui/qtgui_vector_sink_example.grc
 share/gnuradio/examples/qt-gui/test_qtgui_msg.grc
-share/gnuradio/grc/blocks/qtgui_ber_sink_b.xml
-share/gnuradio/grc/blocks/qtgui_block_tree.xml
-share/gnuradio/grc/blocks/qtgui_check_box.xml
-share/gnuradio/grc/blocks/qtgui_chooser.xml
-share/gnuradio/grc/blocks/qtgui_const_sink_x.xml
-share/gnuradio/grc/blocks/qtgui_edit_box_msg.xml
-share/gnuradio/grc/blocks/qtgui_entry.xml
-share/gnuradio/grc/blocks/qtgui_freq_sink_x.xml
-share/gnuradio/grc/blocks/qtgui_histogram_sink_x.xml
-share/gnuradio/grc/blocks/qtgui_label.xml
-share/gnuradio/grc/blocks/qtgui_number_sink.xml
-share/gnuradio/grc/blocks/qtgui_push_button.xml
-share/gnuradio/grc/blocks/qtgui_range.xml
-share/gnuradio/grc/blocks/qtgui_sink_x.xml
-share/gnuradio/grc/blocks/qtgui_tab_widget.xml
-share/gnuradio/grc/blocks/qtgui_time_raster_x.xml
-share/gnuradio/grc/blocks/qtgui_time_sink_x.xml
-share/gnuradio/grc/blocks/qtgui_vector_sink_f.xml
-share/gnuradio/grc/blocks/qtgui_waterfall_sink_x.xml
+share/gnuradio/grc/blocks/qtgui.tree.yml
+share/gnuradio/grc/blocks/qtgui_ber_sink_b.block.yml
+share/gnuradio/grc/blocks/qtgui_check_box.block.yml
+share/gnuradio/grc/blocks/qtgui_chooser.block.yml
+share/gnuradio/grc/blocks/qtgui_const_sink_x.block.yml
+share/gnuradio/grc/blocks/qtgui_edit_box_msg.block.yml
+share/gnuradio/grc/blocks/qtgui_entry.block.yml
+share/gnuradio/grc/blocks/qtgui_freq_sink_x.block.yml
+share/gnuradio/grc/blocks/qtgui_histogram_sink_x.block.yml
+share/gnuradio/grc/blocks/qtgui_label.block.yml
+share/gnuradio/grc/blocks/qtgui_number_sink.block.yml
+share/gnuradio/grc/blocks/qtgui_push_button.block.yml
+share/gnuradio/grc/blocks/qtgui_range.block.yml
+share/gnuradio/grc/blocks/qtgui_sink_x.block.yml
+share/gnuradio/grc/blocks/qtgui_tab_widget.block.yml
+share/gnuradio/grc/blocks/qtgui_time_raster_x.block.yml
+share/gnuradio/grc/blocks/qtgui_time_sink_x.block.yml
+share/gnuradio/grc/blocks/qtgui_vector_sink_f.block.yml
+share/gnuradio/grc/blocks/qtgui_waterfall_sink_x.block.yml
 share/gnuradio/themes/alt.qss
 share/gnuradio/themes/dark.qss
 share/gnuradio/themes/plain.qss