gnuradio-core: update to 3.8.1.0

Here is a very high level list of changes: ## Changed ### Project Scope - C++11 - merged the wholeness of the `next` branch - Dependency version bumps: CMake, GCC, MSVC, Swig, Boost - New dependencies: MPIR/GMP, Qt5, gsm, codec2 - Removed dependencies: libusb, Qt4, CppUnit - Python: Python 2 & Python 3 compatible. 3.8 will be the last Py2k-compatible release series - gengen was replaced by templates (if you don't know gengen, don't do any research; save yourself that sorrow) - Modern CMake (as far as feasible at this point) - VOLK version updated to v2.0.0 - .clang-format file now dictates coding style - clang-format'ed the whole tree. - installed CMake files now tell about configuration ### gnuradio-runtime - reworked fractional tag time handling, especially in the context of resamplers ### GRC - C++ generation as option - YAML instead of XML - removed `blks2` - much better canvas tooling - consistent gobject usage - ROUNDED ARROWS ### gr-qtgui - moving from Qt4 to Qt5 ### gr-utils - `gr_modtool` now vastly improved ### gr-vocoder - improved versatility - removed in-tree libgsm, libcodec2, use system-wide libs ## Removed ### Project Scope - Modules `gr-comedi`, `gr-fcd` and `gr-wxgui` are gone ### gr-comedi - nobody could remember who used this, or for what. It has seen 0 active code contributions in the 3.7 lifecycle ### gr-digital - python-based `packet_encoder` and related tools: Bugs that were sporadic and never fixed, so after long deprecation, we're removing it ### gr-fcd - since it's currently untestable by the CI, it's being removed, as there was no code contributions. Generally, we strive to include all batteries with GNU Radio. Re-integration within a more general SDR interface would be desirable. ### gr-utils - removed PyQwt (dead) based tools ### gr-wxgui - Unmaintained, breaks on increasingly many systems, always was slower than Qtgui. We've been starting to tell people to migrate to Qt since at least 2015. Now, we're finally removing it.
author: tnn <tnn@pkgsrc.org> 2020-08-30 20:43:46 +0000
committer: tnn <tnn@pkgsrc.org> 2020-08-30 20:43:46 +0000
commit: 15cc2507d4bbef58f7a47a576856457c8425e3c8 (patch)
tree: a38407151311b6623bea67eb4d8727cd9fd1a89d
parent: 6622c378a1444322428b92e88ce7dcabf1c846d1 (diff)
download: pkgsrc-15cc2507d4bbef58f7a47a576856457c8425e3c8.tar.gz
63 files changed, 188 insertions, 1344 deletions
diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile
index cc908a637d7..5d8722d9283 100644
--- a/ham/gnuradio-core/Makefile
+++ b/ham/gnuradio-core/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2020/08/18 17:58:03 leot Exp $
+# $NetBSD: Makefile,v 1.74 2020/08/30 20:43:46 tnn Exp $
 
 PKGNAME=	gnuradio-core-${VERSION}
-PKGREVISION=	7
 COMMENT=	Core part of GNU Radio, all others need this
 
 PLIST_MINUS=	# empty
@@ -19,7 +18,7 @@ PLIST_SRC=	${PKGDIR}/PLIST ${PKGDIR}/PLIST.oss
 .endif
 
 # set default as minimum
-CMAKE_ARGS+=	-DENABLE_DEFAULT=False
+CMAKE_ARGS+=	-DENABLE_DEFAULT=OFF
 
 # Take care CONF_FILES stuff (The same code in Nocore.mk)
 #post-install:
diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common
index 6e9323d039c..f60bde70e1e 100644
--- a/ham/gnuradio-core/Makefile.common
+++ b/ham/gnuradio-core/Makefile.common
@@ -1,35 +1,35 @@
-# $NetBSD: Makefile.common,v 1.26 2020/08/18 04:35:39 tnn Exp $
+# $NetBSD: Makefile.common,v 1.27 2020/08/30 20:43:46 tnn Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
+
 # used by ham/gnuradio-channels/Makefile
 # used by ham/gnuradio-companion/Makefile
 # used by ham/gnuradio-core/Makefile
 # used by ham/gnuradio-ctrlport/Makefile
-
 # used by ham/gnuradio-digital/Makefile
 # used by ham/gnuradio-doxygen/Makefile
 # used by ham/gnuradio-dtv/Makefile
-# used by ham/gnuradio-fec/Makefile
-
 # used by ham/gnuradio-fcd/Makefile
+# used by ham/gnuradio-fec/Makefile
 # used by ham/gnuradio-qtgui/Makefile
 # used by ham/gnuradio-trellis/Makefile
-
 # used by ham/gnuradio-uhd/Makefile
 # used by ham/gnuradio-utils/Makefile
 # used by ham/gnuradio-video-sdl/Makefile
 # used by ham/gnuradio-vocoder/Makefile
 # used by ham/gnuradio-wavelet/Makefile
-
 # used by ham/gnuradio-zeromq/Makefile
 
-.include	"../../ham/gnuradio-core/Makefile.version"
+.include	"../../ham/gnuradio-core/version.mk"
 
 DISTNAME?=	gnuradio-${VERSION}
 CATEGORIES+=	ham
-MASTER_SITES=	http://s3-dist.gnuradio.org/
-MASTER_SITES=	http://gnuradio.org/releases/gnuradio/
+#MASTER_SITES=	http://s3-dist.gnuradio.org/
+#MASTER_SITES+=	http://gnuradio.org/releases/gnuradio/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=gnuradio/}
+GITHUB_PROJECT=	gnuradio
+GITHUB_RELEASE=	v${VERSION}
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE?=	https://www.gnu.org/software/gnuradio/
@@ -40,16 +40,20 @@ USE_TOOLS=		perl gmake cmake pkg-config
 USE_CMAKE=		yes
 LDFLAGS.NetBSD+=	-lrt
 
-
-DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
+DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah3
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 # gr_filter_design in gnuradio-core ask for:
-DEPENDS+=	${PYPKGPREFIX}-qwt-qt4-[0-9]*:../../x11/py-qwt-qt4
+DEPENDS+=	${PYPKGPREFIX}-qwt-qt5-[0-9]*:../../x11/py-qwt-qt5
+DEPENDS+=	${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
+DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 DISTINFO_FILE=		${.CURDIR}/../../ham/gnuradio-core/distinfo
 PATCHDIR=		${.CURDIR}/../../ham/gnuradio-core/patches
 
-PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 3.3.0
+PYTHON_VERSIONS_ACCEPTED= 37
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 PY_PATCHPLIST=	yes
@@ -60,6 +64,7 @@ EGDIR=			share/gnuradio/examples
 PKG_SYSCONFSUBDIR=	gnuradio/conf.d
 
 CXXFLAGS+=		-pthread
+CFLAGS+=		-pthread
 LDFLAGS.DragonFly+=	-lboost_system
 LDFLAGS.SunOS+=		-lboost_system
 CXXFLAGS.SunOS+=	-pthreads
@@ -97,13 +102,20 @@ CMAKE_ARGS+=	-DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
 
 # adhoc setup not to pick non default version (say python3.6)
 # at configure
-CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PREFIX}/bin/python${PYVERSSUFFIX}
+#MAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PREFIX}/bin/python${PYVERSSUFFIX}
 
 CMAKE_ARGS+=	-DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
 CMAKE_ARG_PATH=	../
 
 .include "options.mk"
 
+# Fixes build errors w/ clang
+SUBST_CLASSES+=		boost
+SUBST_MESSAGE.boost=	prepend boost placeholders with namespace
+SUBST_FILES.boost=	*/lib/*.cc
+SUBST_SED.boost=	-e 's, _1), boost::placeholders::_1),'
+SUBST_STAGE.boost=	pre-configure
+
 # disable/enable ALSA, see also patches/patch-gr-audio_lib_CMakeLists.txt
 SUBST_CLASSES+=		alsa
 SUBST_MESSAGE.alsa=	Arrange the patched line depepending on alsa is in PKG_OPTIONS or not
@@ -118,7 +130,7 @@ SUBST_MESSAGE.pyvers=	Fix SPHINX_EXECUTABLE NAMES(sphinx-build)
 SUBST_VARS.pyvers+=	PYVERSSUFFIX
 SUBST_STAGE.pyvers=	pre-configure
 
-REPLACE_PYTHON = 	*/*.py */*/*.py */*/*/*.py */*/*/*/*.py */*/*/*/*/*.py \
+REPLACE_PYTHON=		*/*.py */*/*.py */*/*/*.py */*/*/*/*.py */*/*/*/*/*.py \
 			*/*/*/*/*/*/*.py */*/*/*/*/*/*/*.py */*/*/*/*/*/*/*/*.py
 
 pre-configure:
@@ -134,9 +146,15 @@ do-install:
 .include	"../../devel/boost-headers/buildlink3.mk"
 .include	"../../devel/boost-libs/buildlink3.mk"
 .include	"../../devel/cppunit/buildlink3.mk"
-.include	"../../devel/swig2/buildlink3.mk"
+.include	"../../devel/gmp/buildlink3.mk"
+.include	"../../devel/swig3/buildlink3.mk"
 
 .include	"../../lang/python/application.mk"
 .include	"../../math/fftwf/buildlink3.mk"
 .include	"../../math/gsl/buildlink3.mk"
 .include	"../../math/volk/buildlink3.mk"
+.include	"../../textproc/log4cpp/buildlink3.mk"
+.include	"../../textproc/icu/buildlink3.mk"
+.include	"../../graphics/cairo/buildlink3.mk"
+.include	"../../graphics/cairo-gobject/buildlink3.mk"
+.include	"../../x11/gtk3/buildlink3.mk"
diff --git a/ham/gnuradio-core/Makefile.version b/ham/gnuradio-core/Makefile.version
deleted file mode 100644
index b4de9e17866..00000000000
--- a/ham/gnuradio-core/Makefile.version
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.version,v 1.14 2019/11/03 19:32:07 rillig Exp $
-
-VERSION=	3.7.13.5
diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST
index fdd32b0707f..2cac57996b6 100644
--- a/ham/gnuradio-core/PLIST
+++ b/ham/gnuradio-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2020/08/01 07:49:26 tnn Exp $
+@comment $NetBSD: PLIST,v 1.30 2020/08/30 20:43:46 tnn Exp $
 bin/gnuradio-config-info
 bin/gr_filter_design
 include/gnuradio/analog/agc.h
@@ -13,17 +13,11 @@ include/gnuradio/analog/cpfsk_bc.h
 include/gnuradio/analog/cpm.h
 include/gnuradio/analog/ctcss_squelch_ff.h
 include/gnuradio/analog/dpll_bb.h
-include/gnuradio/analog/fastnoise_source_c.h
-include/gnuradio/analog/fastnoise_source_f.h
-include/gnuradio/analog/fastnoise_source_i.h
-include/gnuradio/analog/fastnoise_source_s.h
+include/gnuradio/analog/fastnoise_source.h
 include/gnuradio/analog/feedforward_agc_cc.h
 include/gnuradio/analog/fmdet_cf.h
 include/gnuradio/analog/frequency_modulator_fc.h
-include/gnuradio/analog/noise_source_c.h
-include/gnuradio/analog/noise_source_f.h
-include/gnuradio/analog/noise_source_i.h
-include/gnuradio/analog/noise_source_s.h
+include/gnuradio/analog/noise_source.h
 include/gnuradio/analog/noise_type.h
 include/gnuradio/analog/phase_modulator_fc.h
 include/gnuradio/analog/pll_carriertracking_cc.h
@@ -36,13 +30,8 @@ include/gnuradio/analog/pwr_squelch_cc.h
 include/gnuradio/analog/pwr_squelch_ff.h
 include/gnuradio/analog/quadrature_demod_cf.h
 include/gnuradio/analog/rail_ff.h
-include/gnuradio/analog/random_uniform_source_b.h
-include/gnuradio/analog/random_uniform_source_i.h
-include/gnuradio/analog/random_uniform_source_s.h
-include/gnuradio/analog/sig_source_c.h
-include/gnuradio/analog/sig_source_f.h
-include/gnuradio/analog/sig_source_i.h
-include/gnuradio/analog/sig_source_s.h
+include/gnuradio/analog/random_uniform_source.h
+include/gnuradio/analog/sig_source.h
 include/gnuradio/analog/sig_source_waveform.h
 include/gnuradio/analog/simple_squelch_cc.h
 include/gnuradio/analog/squelch_base_cc.h
@@ -57,36 +46,21 @@ include/gnuradio/block.h
 include/gnuradio/block_detail.h
 include/gnuradio/block_gateway.h
 include/gnuradio/block_registry.h
-include/gnuradio/blocks/abs_ff.h
-include/gnuradio/blocks/abs_ii.h
-include/gnuradio/blocks/abs_ss.h
-include/gnuradio/blocks/add_cc.h
+include/gnuradio/blocks/abs_blk.h
+include/gnuradio/blocks/add_blk.h
 include/gnuradio/blocks/add_const_bb.h
 include/gnuradio/blocks/add_const_cc.h
 include/gnuradio/blocks/add_const_ff.h
 include/gnuradio/blocks/add_const_ii.h
 include/gnuradio/blocks/add_const_ss.h
-include/gnuradio/blocks/add_const_vbb.h
-include/gnuradio/blocks/add_const_vcc.h
-include/gnuradio/blocks/add_const_vff.h
-include/gnuradio/blocks/add_const_vii.h
-include/gnuradio/blocks/add_const_vss.h
-include/gnuradio/blocks/add_ff.h
-include/gnuradio/blocks/add_ii.h
-include/gnuradio/blocks/add_ss.h
-include/gnuradio/blocks/and_bb.h
-include/gnuradio/blocks/and_const_bb.h
-include/gnuradio/blocks/and_const_ii.h
-include/gnuradio/blocks/and_const_ss.h
-include/gnuradio/blocks/and_ii.h
-include/gnuradio/blocks/and_ss.h
+include/gnuradio/blocks/add_const_v.h
+include/gnuradio/blocks/and_blk.h
+include/gnuradio/blocks/and_const.h
 include/gnuradio/blocks/annotator_1to1.h
 include/gnuradio/blocks/annotator_alltoall.h
 include/gnuradio/blocks/annotator_raw.h
 include/gnuradio/blocks/api.h
-include/gnuradio/blocks/argmax_fs.h
-include/gnuradio/blocks/argmax_is.h
-include/gnuradio/blocks/argmax_ss.h
+include/gnuradio/blocks/argmax.h
 include/gnuradio/blocks/bin_statistics_f.h
 include/gnuradio/blocks/burst_tagger.h
 include/gnuradio/blocks/char_to_float.h
@@ -95,6 +69,7 @@ include/gnuradio/blocks/check_lfsr_32k_s.h
 include/gnuradio/blocks/complex_to_arg.h
 include/gnuradio/blocks/complex_to_float.h
 include/gnuradio/blocks/complex_to_imag.h
+include/gnuradio/blocks/complex_to_interleaved_char.h
 include/gnuradio/blocks/complex_to_interleaved_short.h
 include/gnuradio/blocks/complex_to_mag.h
 include/gnuradio/blocks/complex_to_mag_squared.h
@@ -106,10 +81,7 @@ include/gnuradio/blocks/copy.h
 include/gnuradio/blocks/count_bits.h
 include/gnuradio/blocks/deinterleave.h
 include/gnuradio/blocks/delay.h
-include/gnuradio/blocks/divide_cc.h
-include/gnuradio/blocks/divide_ff.h
-include/gnuradio/blocks/divide_ii.h
-include/gnuradio/blocks/divide_ss.h
+include/gnuradio/blocks/divide.h
 include/gnuradio/blocks/endian_swap.h
 include/gnuradio/blocks/exponentiate_const_cci.h
 include/gnuradio/blocks/file_descriptor_sink.h
@@ -126,10 +98,7 @@ include/gnuradio/blocks/float_to_short.h
 include/gnuradio/blocks/float_to_uchar.h
 include/gnuradio/blocks/head.h
 include/gnuradio/blocks/int_to_float.h
-include/gnuradio/blocks/integrate_cc.h
-include/gnuradio/blocks/integrate_ff.h
-include/gnuradio/blocks/integrate_ii.h
-include/gnuradio/blocks/integrate_ss.h
+include/gnuradio/blocks/integrate.h
 include/gnuradio/blocks/interleave.h
 include/gnuradio/blocks/interleaved_char_to_complex.h
 include/gnuradio/blocks/interleaved_short_to_complex.h
@@ -140,79 +109,40 @@ include/gnuradio/blocks/lfsr_32k.h
 include/gnuradio/blocks/lfsr_32k_source_s.h
 include/gnuradio/blocks/log2_const.h
 include/gnuradio/blocks/magphase_to_complex.h
-include/gnuradio/blocks/max_ff.h
-include/gnuradio/blocks/max_ii.h
-include/gnuradio/blocks/max_ss.h
-include/gnuradio/blocks/message_burst_source.h
+include/gnuradio/blocks/max_blk.h
 include/gnuradio/blocks/message_debug.h
-include/gnuradio/blocks/message_sink.h
-include/gnuradio/blocks/message_source.h
 include/gnuradio/blocks/message_strobe.h
 include/gnuradio/blocks/message_strobe_random.h
-include/gnuradio/blocks/min_ff.h
-include/gnuradio/blocks/min_ii.h
-include/gnuradio/blocks/min_ss.h
-include/gnuradio/blocks/moving_average_cc.h
-include/gnuradio/blocks/moving_average_ff.h
-include/gnuradio/blocks/moving_average_ii.h
-include/gnuradio/blocks/moving_average_ss.h
+include/gnuradio/blocks/min_blk.h
+include/gnuradio/blocks/moving_average.h
+include/gnuradio/blocks/multiply.h
 include/gnuradio/blocks/multiply_by_tag_value_cc.h
-include/gnuradio/blocks/multiply_cc.h
 include/gnuradio/blocks/multiply_conjugate_cc.h
-include/gnuradio/blocks/multiply_const_cc.h
-include/gnuradio/blocks/multiply_const_ff.h
-include/gnuradio/blocks/multiply_const_ii.h
-include/gnuradio/blocks/multiply_const_ss.h
-include/gnuradio/blocks/multiply_const_vcc.h
-include/gnuradio/blocks/multiply_const_vff.h
-include/gnuradio/blocks/multiply_const_vii.h
-include/gnuradio/blocks/multiply_const_vss.h
-include/gnuradio/blocks/multiply_ff.h
-include/gnuradio/blocks/multiply_ii.h
-include/gnuradio/blocks/multiply_matrix_cc.h
-include/gnuradio/blocks/multiply_matrix_ff.h
-include/gnuradio/blocks/multiply_ss.h
-include/gnuradio/blocks/mute_cc.h
-include/gnuradio/blocks/mute_ff.h
-include/gnuradio/blocks/mute_ii.h
-include/gnuradio/blocks/mute_ss.h
+include/gnuradio/blocks/multiply_const.h
+include/gnuradio/blocks/multiply_const_v.h
+include/gnuradio/blocks/multiply_matrix.h
+include/gnuradio/blocks/mute.h
 include/gnuradio/blocks/nlog10_ff.h
 include/gnuradio/blocks/nop.h
-include/gnuradio/blocks/not_bb.h
-include/gnuradio/blocks/not_ii.h
-include/gnuradio/blocks/not_ss.h
+include/gnuradio/blocks/not_blk.h
 include/gnuradio/blocks/null_sink.h
 include/gnuradio/blocks/null_source.h
-include/gnuradio/blocks/or_bb.h
-include/gnuradio/blocks/or_ii.h
-include/gnuradio/blocks/or_ss.h
+include/gnuradio/blocks/or_blk.h
 include/gnuradio/blocks/pack_k_bits.h
 include/gnuradio/blocks/pack_k_bits_bb.h
-include/gnuradio/blocks/packed_to_unpacked_bb.h
-include/gnuradio/blocks/packed_to_unpacked_ii.h
-include/gnuradio/blocks/packed_to_unpacked_ss.h
+include/gnuradio/blocks/packed_to_unpacked.h
 include/gnuradio/blocks/patterned_interleaver.h
 include/gnuradio/blocks/pdu.h
 include/gnuradio/blocks/pdu_filter.h
 include/gnuradio/blocks/pdu_remove.h
 include/gnuradio/blocks/pdu_set.h
 include/gnuradio/blocks/pdu_to_tagged_stream.h
+include/gnuradio/blocks/peak_detector.h
 include/gnuradio/blocks/peak_detector2_fb.h
-include/gnuradio/blocks/peak_detector_fb.h
-include/gnuradio/blocks/peak_detector_ib.h
-include/gnuradio/blocks/peak_detector_sb.h
 include/gnuradio/blocks/plateau_detector_fb.h
 include/gnuradio/blocks/probe_rate.h
-include/gnuradio/blocks/probe_signal_b.h
-include/gnuradio/blocks/probe_signal_c.h
-include/gnuradio/blocks/probe_signal_f.h
-include/gnuradio/blocks/probe_signal_i.h
-include/gnuradio/blocks/probe_signal_s.h
-include/gnuradio/blocks/probe_signal_vb.h
-include/gnuradio/blocks/probe_signal_vc.h
-include/gnuradio/blocks/probe_signal_vf.h
-include/gnuradio/blocks/probe_signal_vi.h
-include/gnuradio/blocks/probe_signal_vs.h
+include/gnuradio/blocks/probe_signal.h
+include/gnuradio/blocks/probe_signal_v.h
 include/gnuradio/blocks/random_pdu.h
 include/gnuradio/blocks/regenerate_bb.h
 include/gnuradio/blocks/repack_bits_bb.h
@@ -221,10 +151,8 @@ include/gnuradio/blocks/rms_cf.h
 include/gnuradio/blocks/rms_ff.h
 include/gnuradio/blocks/rotator.h
 include/gnuradio/blocks/rotator_cc.h
-include/gnuradio/blocks/sample_and_hold_bb.h
-include/gnuradio/blocks/sample_and_hold_ff.h
-include/gnuradio/blocks/sample_and_hold_ii.h
-include/gnuradio/blocks/sample_and_hold_ss.h
+include/gnuradio/blocks/sample_and_hold.h
+include/gnuradio/blocks/selector.h
 include/gnuradio/blocks/short_to_char.h
 include/gnuradio/blocks/short_to_float.h
 include/gnuradio/blocks/skiphead.h
@@ -236,10 +164,7 @@ include/gnuradio/blocks/stream_to_vector.h
 include/gnuradio/blocks/streams_to_stream.h
 include/gnuradio/blocks/streams_to_vector.h
 include/gnuradio/blocks/stretch_ff.h
-include/gnuradio/blocks/sub_cc.h
-include/gnuradio/blocks/sub_ff.h
-include/gnuradio/blocks/sub_ii.h
-include/gnuradio/blocks/sub_ss.h
+include/gnuradio/blocks/sub.h
 include/gnuradio/blocks/tag_debug.h
 include/gnuradio/blocks/tag_gate.h
 include/gnuradio/blocks/tag_share.h
@@ -254,46 +179,26 @@ include/gnuradio/blocks/test_tag_variable_rate_ff.h
 include/gnuradio/blocks/threshold_ff.h
 include/gnuradio/blocks/throttle.h
 include/gnuradio/blocks/transcendental.h
-include/gnuradio/blocks/tsb_vector_sink_b.h
-include/gnuradio/blocks/tsb_vector_sink_c.h
-include/gnuradio/blocks/tsb_vector_sink_f.h
-include/gnuradio/blocks/tsb_vector_sink_i.h
-include/gnuradio/blocks/tsb_vector_sink_s.h
+include/gnuradio/blocks/tsb_vector_sink.h
 include/gnuradio/blocks/tuntap_pdu.h
 include/gnuradio/blocks/uchar_to_float.h
 include/gnuradio/blocks/udp_sink.h
 include/gnuradio/blocks/udp_source.h
 include/gnuradio/blocks/unpack_k_bits.h
 include/gnuradio/blocks/unpack_k_bits_bb.h
-include/gnuradio/blocks/unpacked_to_packed_bb.h
-include/gnuradio/blocks/unpacked_to_packed_ii.h
-include/gnuradio/blocks/unpacked_to_packed_ss.h
+include/gnuradio/blocks/unpacked_to_packed.h
 include/gnuradio/blocks/vco_c.h
 include/gnuradio/blocks/vco_f.h
-include/gnuradio/blocks/vector_insert_b.h
-include/gnuradio/blocks/vector_insert_c.h
-include/gnuradio/blocks/vector_insert_f.h
-include/gnuradio/blocks/vector_insert_i.h
-include/gnuradio/blocks/vector_insert_s.h
+include/gnuradio/blocks/vector_insert.h
 include/gnuradio/blocks/vector_map.h
-include/gnuradio/blocks/vector_sink_b.h
-include/gnuradio/blocks/vector_sink_c.h
-include/gnuradio/blocks/vector_sink_f.h
-include/gnuradio/blocks/vector_sink_i.h
-include/gnuradio/blocks/vector_sink_s.h
-include/gnuradio/blocks/vector_source_b.h
-include/gnuradio/blocks/vector_source_c.h
-include/gnuradio/blocks/vector_source_f.h
-include/gnuradio/blocks/vector_source_i.h
-include/gnuradio/blocks/vector_source_s.h
+include/gnuradio/blocks/vector_sink.h
+include/gnuradio/blocks/vector_source.h
 include/gnuradio/blocks/vector_to_stream.h
 include/gnuradio/blocks/vector_to_streams.h
 include/gnuradio/blocks/wavfile.h
 include/gnuradio/blocks/wavfile_sink.h
 include/gnuradio/blocks/wavfile_source.h
-include/gnuradio/blocks/xor_bb.h
-include/gnuradio/blocks/xor_ii.h
-include/gnuradio/blocks/xor_ss.h
+include/gnuradio/blocks/xor_blk.h
 include/gnuradio/buffer.h
 include/gnuradio/config.h
 include/gnuradio/constants.h
@@ -302,6 +207,7 @@ include/gnuradio/expj.h
 include/gnuradio/feval.h
 include/gnuradio/fft/api.h
 include/gnuradio/fft/fft.h
+include/gnuradio/fft/fft_shift.h
 include/gnuradio/fft/fft_vcc.h
 include/gnuradio/fft/fft_vfc.h
 include/gnuradio/fft/goertzel.h
@@ -318,24 +224,10 @@ include/gnuradio/filter/filter_delay_fc.h
 include/gnuradio/filter/filterbank.h
 include/gnuradio/filter/filterbank_vcvcf.h
 include/gnuradio/filter/fir_filter.h
-include/gnuradio/filter/fir_filter_ccc.h
-include/gnuradio/filter/fir_filter_ccf.h
-include/gnuradio/filter/fir_filter_fcc.h
-include/gnuradio/filter/fir_filter_fff.h
-include/gnuradio/filter/fir_filter_fsf.h
-include/gnuradio/filter/fir_filter_scc.h
+include/gnuradio/filter/fir_filter_blk.h
 include/gnuradio/filter/fir_filter_with_buffer.h
 include/gnuradio/filter/firdes.h
-include/gnuradio/filter/fractional_interpolator_cc.h
-include/gnuradio/filter/fractional_interpolator_ff.h
-include/gnuradio/filter/fractional_resampler_cc.h
-include/gnuradio/filter/fractional_resampler_ff.h
-include/gnuradio/filter/freq_xlating_fir_filter_ccc.h
-include/gnuradio/filter/freq_xlating_fir_filter_ccf.h
-include/gnuradio/filter/freq_xlating_fir_filter_fcc.h
-include/gnuradio/filter/freq_xlating_fir_filter_fcf.h
-include/gnuradio/filter/freq_xlating_fir_filter_scc.h
-include/gnuradio/filter/freq_xlating_fir_filter_scf.h
+include/gnuradio/filter/freq_xlating_fir_filter.h
 include/gnuradio/filter/hilbert_fc.h
 include/gnuradio/filter/iir_filter.h
 include/gnuradio/filter/iir_filter_ccc.h
@@ -343,17 +235,16 @@ include/gnuradio/filter/iir_filter_ccd.h
 include/gnuradio/filter/iir_filter_ccf.h
 include/gnuradio/filter/iir_filter_ccz.h
 include/gnuradio/filter/iir_filter_ffd.h
-include/gnuradio/filter/interp_fir_filter_ccc.h
-include/gnuradio/filter/interp_fir_filter_ccf.h
-include/gnuradio/filter/interp_fir_filter_fcc.h
-include/gnuradio/filter/interp_fir_filter_fff.h
-include/gnuradio/filter/interp_fir_filter_fsf.h
-include/gnuradio/filter/interp_fir_filter_scc.h
+include/gnuradio/filter/interp_fir_filter.h
 include/gnuradio/filter/interpolator_taps.h
 include/gnuradio/filter/mmse_fir_interpolator_cc.h
 include/gnuradio/filter/mmse_fir_interpolator_ff.h
 include/gnuradio/filter/mmse_interp_differentiator_cc.h
 include/gnuradio/filter/mmse_interp_differentiator_ff.h
+include/gnuradio/filter/mmse_interpolator_cc.h
+include/gnuradio/filter/mmse_interpolator_ff.h
+include/gnuradio/filter/mmse_resampler_cc.h
+include/gnuradio/filter/mmse_resampler_ff.h
 include/gnuradio/filter/pfb_arb_resampler.h
 include/gnuradio/filter/pfb_arb_resampler_ccc.h
 include/gnuradio/filter/pfb_arb_resampler_ccf.h
@@ -364,12 +255,7 @@ include/gnuradio/filter/pfb_interpolator_ccf.h
 include/gnuradio/filter/pfb_synthesizer_ccf.h
 include/gnuradio/filter/pm_remez.h
 include/gnuradio/filter/polyphase_filterbank.h
-include/gnuradio/filter/rational_resampler_base_ccc.h
-include/gnuradio/filter/rational_resampler_base_ccf.h
-include/gnuradio/filter/rational_resampler_base_fcc.h
-include/gnuradio/filter/rational_resampler_base_fff.h
-include/gnuradio/filter/rational_resampler_base_fsf.h
-include/gnuradio/filter/rational_resampler_base_scc.h
+include/gnuradio/filter/rational_resampler_base.h
 include/gnuradio/filter/single_pole_iir.h
 include/gnuradio/filter/single_pole_iir_filter_cc.h
 include/gnuradio/filter/single_pole_iir_filter_ff.h
@@ -443,18 +329,15 @@ include/gnuradio/swig/blocks_swig8_doc.i
 include/gnuradio/swig/blocks_swig9.i
 include/gnuradio/swig/blocks_swig9_doc.i
 include/gnuradio/swig/buffer.i
-include/gnuradio/swig/complex_vec_test.i
 include/gnuradio/swig/constants.i
 include/gnuradio/swig/feval.i
 include/gnuradio/swig/fft_swig.i
 include/gnuradio/swig/fft_swig_doc.i
 include/gnuradio/swig/filter_swig.i
 include/gnuradio/swig/gnuradio.i
-include/gnuradio/swig/gnuradio_swig_bug_workaround.h
 include/gnuradio/swig/gr_ctrlport.i
 include/gnuradio/swig/gr_extras.i
 include/gnuradio/swig/gr_filter_swig_doc.i
-include/gnuradio/swig/gr_intrusive_ptr.i
 include/gnuradio/swig/gr_logger.i
 include/gnuradio/swig/gr_shared_ptr.i
 include/gnuradio/swig/gr_swig_block_magic.i
@@ -467,10 +350,10 @@ include/gnuradio/swig/msg_queue.i
 include/gnuradio/swig/pmt_swig.i
 include/gnuradio/swig/pmt_swig_doc.i
 include/gnuradio/swig/prefs.i
+include/gnuradio/swig/py3compat.i
 include/gnuradio/swig/realtime.i
 include/gnuradio/swig/runtime_swig.i
 include/gnuradio/swig/runtime_swig_doc.i
-include/gnuradio/swig/single_threaded_scheduler.i
 include/gnuradio/swig/sync_block.i
 include/gnuradio/swig/sync_decimator.i
 include/gnuradio/swig/sync_interpolator.i
@@ -481,7 +364,6 @@ include/gnuradio/sync_block.h
 include/gnuradio/sync_decimator.h
 include/gnuradio/sync_interpolator.h
 include/gnuradio/sys_paths.h
-include/gnuradio/sys_pri.h
 include/gnuradio/tag_checker.h
 include/gnuradio/tagged_stream_block.h
 include/gnuradio/tags.h
@@ -497,25 +379,27 @@ include/pmt/pmt.h
 include/pmt/pmt_pool.h
 include/pmt/pmt_serial_tags.h
 include/pmt/pmt_sugar.h
-lib/cmake/gnuradio/CMakeMacroLibtoolFile.cmake
 lib/cmake/gnuradio/CMakeOverloads.cmake
 lib/cmake/gnuradio/CMakeParseArgumentsCopy.cmake
 lib/cmake/gnuradio/CodeCoverage.cmake
 lib/cmake/gnuradio/FindALSA.cmake
-lib/cmake/gnuradio/FindCppUnit.cmake
+lib/cmake/gnuradio/FindCodec2.cmake
 lib/cmake/gnuradio/FindFFTW3f.cmake
+lib/cmake/gnuradio/FindGMP.cmake
 lib/cmake/gnuradio/FindGSL.cmake
+lib/cmake/gnuradio/FindGSM.cmake
 lib/cmake/gnuradio/FindGit.cmake
-lib/cmake/gnuradio/FindJack.cmake
-lib/cmake/gnuradio/FindLog4cpp.cmake
+lib/cmake/gnuradio/FindJACK.cmake
+lib/cmake/gnuradio/FindLOG4CPP.cmake
+lib/cmake/gnuradio/FindMPIR.cmake
+lib/cmake/gnuradio/FindMPLIB.cmake
 lib/cmake/gnuradio/FindOSS.cmake
-lib/cmake/gnuradio/FindPortaudio.cmake
+lib/cmake/gnuradio/FindPORTAUDIO.cmake
 lib/cmake/gnuradio/FindQwt.cmake
 lib/cmake/gnuradio/FindSWIG.cmake
 lib/cmake/gnuradio/FindSphinx.cmake
-lib/cmake/gnuradio/FindThrift.cmake
+lib/cmake/gnuradio/FindTHRIFT.cmake
 lib/cmake/gnuradio/FindUHD.cmake
-lib/cmake/gnuradio/FindUSB.cmake
 lib/cmake/gnuradio/FindZeroMQ.cmake
 lib/cmake/gnuradio/GnuradioConfig.cmake
 lib/cmake/gnuradio/GnuradioConfigVersion.cmake
@@ -523,28 +407,56 @@ lib/cmake/gnuradio/GrBoost.cmake
 lib/cmake/gnuradio/GrBuildTypes.cmake
 lib/cmake/gnuradio/GrComponent.cmake
 lib/cmake/gnuradio/GrMiscUtils.cmake
-lib/cmake/gnuradio/GrPackage.cmake
 lib/cmake/gnuradio/GrPlatform.cmake
 lib/cmake/gnuradio/GrPython.cmake
-lib/cmake/gnuradio/GrSetupQt4.cmake
 lib/cmake/gnuradio/GrSwig.cmake
 lib/cmake/gnuradio/GrTest.cmake
 lib/cmake/gnuradio/GrVersion.cmake
 lib/cmake/gnuradio/LibFindMacros.cmake
 lib/cmake/gnuradio/UseSWIG.cmake
+lib/cmake/gnuradio/gnuradio-analogConfig.cmake
+lib/cmake/gnuradio/gnuradio-analogTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-analogTargets.cmake
+lib/cmake/gnuradio/gnuradio-audioConfig.cmake
+lib/cmake/gnuradio/gnuradio-audioTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-audioTargets.cmake
+lib/cmake/gnuradio/gnuradio-blocksConfig.cmake
+lib/cmake/gnuradio/gnuradio-blocksTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-blocksTargets.cmake
+lib/cmake/gnuradio/gnuradio-fftConfig.cmake
+lib/cmake/gnuradio/gnuradio-fftTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-fftTargets.cmake
+lib/cmake/gnuradio/gnuradio-filterConfig.cmake
+lib/cmake/gnuradio/gnuradio-filterTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-filterTargets.cmake
+lib/cmake/gnuradio/gnuradio-pmtConfig.cmake
+lib/cmake/gnuradio/gnuradio-pmtTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-pmtTargets.cmake
+lib/cmake/gnuradio/gnuradio-runtimeConfig.cmake
+lib/cmake/gnuradio/gnuradio-runtimeTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
+lib/cmake/gnuradio/runtime_swigTargets-release.cmake
+lib/cmake/gnuradio/runtime_swigTargets.cmake
 lib/libgnuradio-analog.so
+lib/libgnuradio-analog.so.3.8.1
 lib/libgnuradio-analog.so.${PKGVERSION}
 lib/libgnuradio-audio.so
+lib/libgnuradio-audio.so.3.8.1
 lib/libgnuradio-audio.so.${PKGVERSION}
 lib/libgnuradio-blocks.so
+lib/libgnuradio-blocks.so.3.8.1
 lib/libgnuradio-blocks.so.${PKGVERSION}
 lib/libgnuradio-fft.so
+lib/libgnuradio-fft.so.3.8.1
 lib/libgnuradio-fft.so.${PKGVERSION}
 lib/libgnuradio-filter.so
+lib/libgnuradio-filter.so.3.8.1
 lib/libgnuradio-filter.so.${PKGVERSION}
 lib/libgnuradio-pmt.so
+lib/libgnuradio-pmt.so.3.8.1
 lib/libgnuradio-pmt.so.${PKGVERSION}
 lib/libgnuradio-runtime.so
+lib/libgnuradio-runtime.so.3.8.1
 lib/libgnuradio-runtime.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-analog.pc
 lib/pkgconfig/gnuradio-audio.pc
@@ -674,6 +586,12 @@ ${PYSITELIB}/gnuradio/fft/fft_swig.pyo
 ${PYSITELIB}/gnuradio/fft/logpwrfft.py
 ${PYSITELIB}/gnuradio/fft/logpwrfft.pyc
 ${PYSITELIB}/gnuradio/fft/logpwrfft.pyo
+${PYSITELIB}/gnuradio/filter/CustomViewBox.py
+${PYSITELIB}/gnuradio/filter/CustomViewBox.pyc
+${PYSITELIB}/gnuradio/filter/CustomViewBox.pyo
+${PYSITELIB}/gnuradio/filter/GrFilterPlotWidget.py
+${PYSITELIB}/gnuradio/filter/GrFilterPlotWidget.pyc
+${PYSITELIB}/gnuradio/filter/GrFilterPlotWidget.pyo
 ${PYSITELIB}/gnuradio/filter/__init__.py
 ${PYSITELIB}/gnuradio/filter/__init__.pyc
 ${PYSITELIB}/gnuradio/filter/__init__.pyo
@@ -727,18 +645,12 @@ ${PYSITELIB}/gnuradio/gr/__init__.py
 ${PYSITELIB}/gnuradio/gr/__init__.pyc
 ${PYSITELIB}/gnuradio/gr/__init__.pyo
 ${PYSITELIB}/gnuradio/gr/_runtime_swig.so
+${PYSITELIB}/gnuradio/gr/exceptions.py
+${PYSITELIB}/gnuradio/gr/exceptions.pyc
+${PYSITELIB}/gnuradio/gr/exceptions.pyo
 ${PYSITELIB}/gnuradio/gr/gateway.py
 ${PYSITELIB}/gnuradio/gr/gateway.pyc
 ${PYSITELIB}/gnuradio/gr/gateway.pyo
-${PYSITELIB}/gnuradio/gr/gr_threading.py
-${PYSITELIB}/gnuradio/gr/gr_threading.pyc
-${PYSITELIB}/gnuradio/gr/gr_threading.pyo
-${PYSITELIB}/gnuradio/gr/gr_threading_23.py
-${PYSITELIB}/gnuradio/gr/gr_threading_23.pyc
-${PYSITELIB}/gnuradio/gr/gr_threading_23.pyo
-${PYSITELIB}/gnuradio/gr/gr_threading_24.py
-${PYSITELIB}/gnuradio/gr/gr_threading_24.pyc
-${PYSITELIB}/gnuradio/gr/gr_threading_24.pyo
 ${PYSITELIB}/gnuradio/gr/hier_block2.py
 ${PYSITELIB}/gnuradio/gr/hier_block2.pyc
 ${PYSITELIB}/gnuradio/gr/hier_block2.pyo
@@ -760,9 +672,6 @@ ${PYSITELIB}/gnuradio/gr/top_block.pyo
 ${PYSITELIB}/gnuradio/gr_unittest.py
 ${PYSITELIB}/gnuradio/gr_unittest.pyc
 ${PYSITELIB}/gnuradio/gr_unittest.pyo
-${PYSITELIB}/gnuradio/gr_xmlrunner.py
-${PYSITELIB}/gnuradio/gr_xmlrunner.pyc
-${PYSITELIB}/gnuradio/gr_xmlrunner.pyo
 ${PYSITELIB}/gnuradio/gru/__init__.py
 ${PYSITELIB}/gnuradio/gru/__init__.pyc
 ${PYSITELIB}/gnuradio/gru/__init__.pyo
@@ -796,21 +705,6 @@ ${PYSITELIB}/gnuradio/gru/seq_with_cursor.pyo
 ${PYSITELIB}/gnuradio/gru/socket_stuff.py
 ${PYSITELIB}/gnuradio/gru/socket_stuff.pyc
 ${PYSITELIB}/gnuradio/gru/socket_stuff.pyo
-${PYSITELIB}/grc_gnuradio/__init__.py
-${PYSITELIB}/grc_gnuradio/__init__.pyc
-${PYSITELIB}/grc_gnuradio/__init__.pyo
-${PYSITELIB}/grc_gnuradio/blks2/__init__.py
-${PYSITELIB}/grc_gnuradio/blks2/__init__.pyc
-${PYSITELIB}/grc_gnuradio/blks2/__init__.pyo
-${PYSITELIB}/grc_gnuradio/blks2/error_rate.py
-${PYSITELIB}/grc_gnuradio/blks2/error_rate.pyc
-${PYSITELIB}/grc_gnuradio/blks2/error_rate.pyo
-${PYSITELIB}/grc_gnuradio/blks2/selector.py
-${PYSITELIB}/grc_gnuradio/blks2/selector.pyc
-${PYSITELIB}/grc_gnuradio/blks2/selector.pyo
-${PYSITELIB}/grc_gnuradio/blks2/tcp.py
-${PYSITELIB}/grc_gnuradio/blks2/tcp.pyc
-${PYSITELIB}/grc_gnuradio/blks2/tcp.pyo
 ${PYSITELIB}/pmt/__init__.py
 ${PYSITELIB}/pmt/__init__.pyc
 ${PYSITELIB}/pmt/__init__.pyo
@@ -832,7 +726,6 @@ share/doc/gnuradio-${PKGVERSION}/README.md
 share/gnuradio/examples/analog/fmtest.py
 share/gnuradio/examples/analog/noise_power.grc
 share/gnuradio/examples/audio/audio_copy.py
-share/gnuradio/examples/audio/audio_fft.py
 share/gnuradio/examples/audio/audio_play.py
 share/gnuradio/examples/audio/audio_to_file.py
 share/gnuradio/examples/audio/cvsd_sweep.grc
@@ -848,6 +741,8 @@ share/gnuradio/examples/audio/spectrum_inversion.py
 share/gnuradio/examples/audio/test_resampler.py
 share/gnuradio/examples/blocks/matrix_multiplexer.grc
 share/gnuradio/examples/blocks/peak_detector2.grc
+share/gnuradio/examples/blocks/py_snippets_demo.grc
+share/gnuradio/examples/blocks/selector.grc
 share/gnuradio/examples/blocks/test_stream_mux_tags.grc
 share/gnuradio/examples/blocks/vector_source_with_tags.grc
 share/gnuradio/examples/filter/channelize.py
@@ -871,6 +766,7 @@ share/gnuradio/examples/gnuradio-runtime.conf
 share/gnuradio/examples/gr-audio-jack.conf
 share/gnuradio/examples/gr-audio-portaudio.conf
 share/gnuradio/examples/gr-audio.conf
+share/gnuradio/examples/gr_log_default.conf
 share/gnuradio/examples/metadata/file_metadata_sink.grc
 share/gnuradio/examples/metadata/file_metadata_source.grc
 share/gnuradio/examples/metadata/file_metadata_vector_sink.grc
@@ -894,221 +790,3 @@ share/gnuradio/examples/volk_benchmark/volk_math.py
 share/gnuradio/examples/volk_benchmark/volk_plot.py
 share/gnuradio/examples/volk_benchmark/volk_test_funcs.py
 share/gnuradio/examples/volk_benchmark/volk_types.py
-share/gnuradio/grc/blocks/analog_agc2_xx.xml
-share/gnuradio/grc/blocks/analog_agc3_xx.xml
-share/gnuradio/grc/blocks/analog_agc_xx.xml
-share/gnuradio/grc/blocks/analog_am_demod_cf.xml
-share/gnuradio/grc/blocks/analog_block_tree.xml
-share/gnuradio/grc/blocks/analog_const_source_x.xml
-share/gnuradio/grc/blocks/analog_cpfsk_bc.xml
-share/gnuradio/grc/blocks/analog_ctcss_squelch_ff.xml
-share/gnuradio/grc/blocks/analog_dpll_bb.xml
-share/gnuradio/grc/blocks/analog_fastnoise_source_x.xml
-share/gnuradio/grc/blocks/analog_feedforward_agc_cc.xml
-share/gnuradio/grc/blocks/analog_fm_deemph.xml
-share/gnuradio/grc/blocks/analog_fm_demod_cf.xml
-share/gnuradio/grc/blocks/analog_fm_preemph.xml
-share/gnuradio/grc/blocks/analog_fmdet_cf.xml
-share/gnuradio/grc/blocks/analog_frequency_modulator_fc.xml
-share/gnuradio/grc/blocks/analog_nbfm_rx.xml
-share/gnuradio/grc/blocks/analog_nbfm_tx.xml
-share/gnuradio/grc/blocks/analog_noise_source_x.xml
-share/gnuradio/grc/blocks/analog_phase_modulator_fc.xml
-share/gnuradio/grc/blocks/analog_pll_carriertracking_cc.xml
-share/gnuradio/grc/blocks/analog_pll_freqdet_cf.xml
-share/gnuradio/grc/blocks/analog_pll_refout_cc.xml
-share/gnuradio/grc/blocks/analog_probe_avg_mag_sqrd_x.xml
-share/gnuradio/grc/blocks/analog_pwr_squelch_xx.xml
-share/gnuradio/grc/blocks/analog_quadrature_demod_cf.xml
-share/gnuradio/grc/blocks/analog_rail_ff.xml
-share/gnuradio/grc/blocks/analog_random_source_x.xml
-share/gnuradio/grc/blocks/analog_random_uniform_source_x.xml
-share/gnuradio/grc/blocks/analog_sig_source_x.xml
-share/gnuradio/grc/blocks/analog_simple_squelch_cc.xml
-share/gnuradio/grc/blocks/analog_standard_squelch.xml
-share/gnuradio/grc/blocks/analog_wfm_rcv.xml
-share/gnuradio/grc/blocks/analog_wfm_rcv_pll.xml
-share/gnuradio/grc/blocks/analog_wfm_tx.xml
-share/gnuradio/grc/blocks/audio_sink.xml
-share/gnuradio/grc/blocks/audio_source.xml
-share/gnuradio/grc/blocks/blks2_error_rate.xml
-share/gnuradio/grc/blocks/blks2_selector.xml
-share/gnuradio/grc/blocks/blks2_tcp_sink.xml
-share/gnuradio/grc/blocks/blks2_tcp_source.xml
-share/gnuradio/grc/blocks/blks2_valve.xml
-share/gnuradio/grc/blocks/blocks_abs_xx.xml
-share/gnuradio/grc/blocks/blocks_add_const_vxx.xml
-share/gnuradio/grc/blocks/blocks_add_xx.xml
-share/gnuradio/grc/blocks/blocks_and_const_xx.xml
-share/gnuradio/grc/blocks/blocks_and_xx.xml
-share/gnuradio/grc/blocks/blocks_argmax_xx.xml
-share/gnuradio/grc/blocks/blocks_block_tree.xml
-share/gnuradio/grc/blocks/blocks_burst_tagger.xml
-share/gnuradio/grc/blocks/blocks_char_to_float.xml
-share/gnuradio/grc/blocks/blocks_char_to_short.xml
-share/gnuradio/grc/blocks/blocks_complex_to_arg.xml
-share/gnuradio/grc/blocks/blocks_complex_to_float.xml
-share/gnuradio/grc/blocks/blocks_complex_to_imag.xml
-share/gnuradio/grc/blocks/blocks_complex_to_interleaved_char.xml
-share/gnuradio/grc/blocks/blocks_complex_to_interleaved_short.xml
-share/gnuradio/grc/blocks/blocks_complex_to_mag.xml
-share/gnuradio/grc/blocks/blocks_complex_to_mag_squared.xml
-share/gnuradio/grc/blocks/blocks_complex_to_magphase.xml
-share/gnuradio/grc/blocks/blocks_complex_to_real.xml
-share/gnuradio/grc/blocks/blocks_conjugate_cc.xml
-share/gnuradio/grc/blocks/blocks_copy.xml
-share/gnuradio/grc/blocks/blocks_ctrlport_performance.xml
-share/gnuradio/grc/blocks/blocks_ctrlport_probe2_c.xml
-share/gnuradio/grc/blocks/blocks_ctrlport_probe2_x.xml
-share/gnuradio/grc/blocks/blocks_ctrlport_probe_c.xml
-share/gnuradio/grc/blocks/blocks_ctrlport_viewer.xml
-share/gnuradio/grc/blocks/blocks_deinterleave.xml
-share/gnuradio/grc/blocks/blocks_delay.xml
-share/gnuradio/grc/blocks/blocks_divide_XX.xml
-share/gnuradio/grc/blocks/blocks_endian_swap.xml
-share/gnuradio/grc/blocks/blocks_exponentiate_const_cci.xml
-share/gnuradio/grc/blocks/blocks_file_descriptor_sink.xml
-share/gnuradio/grc/blocks/blocks_file_descriptor_source.xml
-share/gnuradio/grc/blocks/blocks_file_meta_sink.xml
-share/gnuradio/grc/blocks/blocks_file_meta_source.xml
-share/gnuradio/grc/blocks/blocks_file_sink.xml
-share/gnuradio/grc/blocks/blocks_file_source.xml
-share/gnuradio/grc/blocks/blocks_float_to_char.xml
-share/gnuradio/grc/blocks/blocks_float_to_complex.xml
-share/gnuradio/grc/blocks/blocks_float_to_int.xml
-share/gnuradio/grc/blocks/blocks_float_to_short.xml
-share/gnuradio/grc/blocks/blocks_float_uchar.xml
-share/gnuradio/grc/blocks/blocks_head.xml
-share/gnuradio/grc/blocks/blocks_int_to_float.xml
-share/gnuradio/grc/blocks/blocks_integrate_xx.xml
-share/gnuradio/grc/blocks/blocks_interleave.xml
-share/gnuradio/grc/blocks/blocks_interleaved_char_to_complex.xml
-share/gnuradio/grc/blocks/blocks_interleaved_short_to_complex.xml
-share/gnuradio/grc/blocks/blocks_keep_m_in_n.xml
-share/gnuradio/grc/blocks/blocks_keep_one_in_n.xml
-share/gnuradio/grc/blocks/blocks_magphase_to_complex.xml
-share/gnuradio/grc/blocks/blocks_max_xx.xml
-share/gnuradio/grc/blocks/blocks_message_burst_source.xml
-share/gnuradio/grc/blocks/blocks_message_debug.xml
-share/gnuradio/grc/blocks/blocks_message_sink.xml
-share/gnuradio/grc/blocks/blocks_message_source.xml
-share/gnuradio/grc/blocks/blocks_message_strobe.xml
-share/gnuradio/grc/blocks/blocks_message_strobe_random.xml
-share/gnuradio/grc/blocks/blocks_min_xx.xml
-share/gnuradio/grc/blocks/blocks_moving_average_xx.xml
-share/gnuradio/grc/blocks/blocks_multiply_by_tag_value_cc.xml
-share/gnuradio/grc/blocks/blocks_multiply_conjugate_cc.xml
-share/gnuradio/grc/blocks/blocks_multiply_const_vxx.xml
-share/gnuradio/grc/blocks/blocks_multiply_const_xx.xml
-share/gnuradio/grc/blocks/blocks_multiply_matrix_xx.xml
-share/gnuradio/grc/blocks/blocks_multiply_xx.xml
-share/gnuradio/grc/blocks/blocks_mute_xx.xml
-share/gnuradio/grc/blocks/blocks_nlog10_ff.xml
-share/gnuradio/grc/blocks/blocks_nop.xml
-share/gnuradio/grc/blocks/blocks_not_xx.xml
-share/gnuradio/grc/blocks/blocks_null_sink.xml
-share/gnuradio/grc/blocks/blocks_null_source.xml
-share/gnuradio/grc/blocks/blocks_or_xx.xml
-share/gnuradio/grc/blocks/blocks_pack_k_bits_bb.xml
-share/gnuradio/grc/blocks/blocks_packed_to_unpacked_xx.xml
-share/gnuradio/grc/blocks/blocks_patterned_interleaver.xml
-share/gnuradio/grc/blocks/blocks_pdu_filter.xml
-share/gnuradio/grc/blocks/blocks_pdu_remove.xml
-share/gnuradio/grc/blocks/blocks_pdu_set.xml
-share/gnuradio/grc/blocks/blocks_pdu_to_tagged_stream.xml
-share/gnuradio/grc/blocks/blocks_peak_detector2_fb.xml
-share/gnuradio/grc/blocks/blocks_peak_detector_xb.xml
-share/gnuradio/grc/blocks/blocks_plateau_detector_fb.xml
-share/gnuradio/grc/blocks/blocks_probe_rate.xml
-share/gnuradio/grc/blocks/blocks_probe_signal_vx.xml
-share/gnuradio/grc/blocks/blocks_probe_signal_x.xml
-share/gnuradio/grc/blocks/blocks_random_pdu.xml
-share/gnuradio/grc/blocks/blocks_regenerate_bb.xml
-share/gnuradio/grc/blocks/blocks_repack_bits_bb.xml
-share/gnuradio/grc/blocks/blocks_repeat.xml
-share/gnuradio/grc/blocks/blocks_rms_xx.xml
-share/gnuradio/grc/blocks/blocks_rotator_cc.xml
-share/gnuradio/grc/blocks/blocks_sample_and_hold_xx.xml
-share/gnuradio/grc/blocks/blocks_short_to_char.xml
-share/gnuradio/grc/blocks/blocks_short_to_float.xml
-share/gnuradio/grc/blocks/blocks_skiphead.xml
-share/gnuradio/grc/blocks/blocks_socket_pdu.xml
-share/gnuradio/grc/blocks/blocks_stream_mux.xml
-share/gnuradio/grc/blocks/blocks_stream_to_streams.xml
-share/gnuradio/grc/blocks/blocks_stream_to_tagged_stream.xml
-share/gnuradio/grc/blocks/blocks_stream_to_vector.xml
-share/gnuradio/grc/blocks/blocks_stream_to_vector_decimator.xml
-share/gnuradio/grc/blocks/blocks_streams_to_stream.xml
-share/gnuradio/grc/blocks/blocks_streams_to_vector.xml
-share/gnuradio/grc/blocks/blocks_stretch_ff.xml
-share/gnuradio/grc/blocks/blocks_sub_xx.xml
-share/gnuradio/grc/blocks/blocks_tag_debug.xml
-share/gnuradio/grc/blocks/blocks_tag_gate.xml
-share/gnuradio/grc/blocks/blocks_tag_object.xml
-share/gnuradio/grc/blocks/blocks_tag_share.xml
-share/gnuradio/grc/blocks/blocks_tagged_file_sink.xml
-share/gnuradio/grc/blocks/blocks_tagged_stream_align.xml
-share/gnuradio/grc/blocks/blocks_tagged_stream_multiply_length.xml
-share/gnuradio/grc/blocks/blocks_tagged_stream_mux.xml
-share/gnuradio/grc/blocks/blocks_tagged_stream_to_pdu.xml
-share/gnuradio/grc/blocks/blocks_tags_strobe.xml
-share/gnuradio/grc/blocks/blocks_tcp_server_sink.xml
-share/gnuradio/grc/blocks/blocks_test_tag_variable_rate_ff.xml
-share/gnuradio/grc/blocks/blocks_threshold_ff.xml
-share/gnuradio/grc/blocks/blocks_throttle.xml
-share/gnuradio/grc/blocks/blocks_transcendental.xml
-share/gnuradio/grc/blocks/blocks_tuntap_pdu.xml
-share/gnuradio/grc/blocks/blocks_uchar_to_float.xml
-share/gnuradio/grc/blocks/blocks_udp_sink.xml
-share/gnuradio/grc/blocks/blocks_udp_source.xml
-share/gnuradio/grc/blocks/blocks_unpack_k_bits_bb.xml
-share/gnuradio/grc/blocks/blocks_unpacked_to_packed_xx.xml
-share/gnuradio/grc/blocks/blocks_vco_c.xml
-share/gnuradio/grc/blocks/blocks_vco_f.xml
-share/gnuradio/grc/blocks/blocks_vector_insert_x.xml
-share/gnuradio/grc/blocks/blocks_vector_sink_x.xml
-share/gnuradio/grc/blocks/blocks_vector_source_x.xml
-share/gnuradio/grc/blocks/blocks_vector_to_stream.xml
-share/gnuradio/grc/blocks/blocks_vector_to_streams.xml
-share/gnuradio/grc/blocks/blocks_wavfile_sink.xml
-share/gnuradio/grc/blocks/blocks_wavfile_source.xml
-share/gnuradio/grc/blocks/blocks_xor_xx.xml
-share/gnuradio/grc/blocks/fft_block_tree.xml
-share/gnuradio/grc/blocks/fft_ctrlport_probe_psd.xml
-share/gnuradio/grc/blocks/fft_fft_vxx.xml
-share/gnuradio/grc/blocks/fft_goertzel_fc.xml
-share/gnuradio/grc/blocks/fft_logpwrfft_x.xml
-share/gnuradio/grc/blocks/filter_band_pass_filter.xml
-share/gnuradio/grc/blocks/filter_band_reject_filter.xml
-share/gnuradio/grc/blocks/filter_block_tree.xml
-share/gnuradio/grc/blocks/filter_dc_blocker_xx.xml
-share/gnuradio/grc/blocks/filter_fft_filter_xxx.xml
-share/gnuradio/grc/blocks/filter_filter_delay_fc.xml
-share/gnuradio/grc/blocks/filter_filterbank_vcvcf.xml
-share/gnuradio/grc/blocks/filter_fir_filter_xxx.xml
-share/gnuradio/grc/blocks/filter_fractional_interpolator_xx.xml
-share/gnuradio/grc/blocks/filter_fractional_resampler_xx.xml
-share/gnuradio/grc/blocks/filter_freq_xlating_fft_filter_ccc.xml
-share/gnuradio/grc/blocks/filter_freq_xlating_fir_filter_xxx.xml
-share/gnuradio/grc/blocks/filter_high_pass_filter.xml
-share/gnuradio/grc/blocks/filter_hilbert_fc.xml
-share/gnuradio/grc/blocks/filter_iir_filter_xxx.xml
-share/gnuradio/grc/blocks/filter_interp_fir_filter_xxx.xml
-share/gnuradio/grc/blocks/filter_low_pass_filter.xml
-share/gnuradio/grc/blocks/filter_pfb_arb_resampler.xml
-share/gnuradio/grc/blocks/filter_pfb_channelizer.xml
-share/gnuradio/grc/blocks/filter_pfb_channelizer_hier.xml
-share/gnuradio/grc/blocks/filter_pfb_decimator.xml
-share/gnuradio/grc/blocks/filter_pfb_interpolator.xml
-share/gnuradio/grc/blocks/filter_pfb_synthesizer.xml
-share/gnuradio/grc/blocks/filter_rational_resampler_base_xxx.xml
-share/gnuradio/grc/blocks/filter_rational_resampler_xxx.xml
-share/gnuradio/grc/blocks/filter_root_raised_cosine_filter.xml
-share/gnuradio/grc/blocks/filter_single_pole_iir_filter_xx.xml
-share/gnuradio/grc/blocks/variable_band_pass_filter_taps.xml
-share/gnuradio/grc/blocks/variable_band_reject_filter_taps.xml
-share/gnuradio/grc/blocks/variable_high_pass_filter_taps.xml
-share/gnuradio/grc/blocks/variable_low_pass_filter_taps.xml
-share/gnuradio/grc/blocks/variable_rrc_filter_taps.xml
-share/gnuradio/grc/blocks/xmlrpc_client.xml
-share/gnuradio/grc/blocks/xmlrpc_server.xml
diff --git a/ham/gnuradio-core/buildlink3.mk b/ham/gnuradio-core/buildlink3.mk
index d762a2079c5..83dbc1d1ada 100644
--- a/ham/gnuradio-core/buildlink3.mk
+++ b/ham/gnuradio-core/buildlink3.mk
@@ -1,13 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.29 2017/03/15 14:07:12 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2020/08/30 20:43:46 tnn Exp $
 
 BUILDLINK_TREE+=	gnuradio-core
 
 .if !defined(GNURADIO_CORE_BUILDLINK3_MK)
 GNURADIO_CORE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-core+=	gnuradio-core>=3.7.11
-BUILDLINK_ABI_DEPENDS.gnuradio-core+=	gnuradio-core>=3.7.11
+BUILDLINK_API_DEPENDS.gnuradio-core+=	gnuradio-core>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-core+=	gnuradio-core>=3.8.1.0
 BUILDLINK_PKGSRCDIR.gnuradio-core?=	../../ham/gnuradio-core
+
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../textproc/log4cpp/buildlink3.mk"
+.include "../../math/volk/buildlink3.mk"
 .endif # GNURADIO_CORE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-core
diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo
index 2837d090d5a..3ca0f22f9d7 100644
--- a/ham/gnuradio-core/distinfo
+++ b/ham/gnuradio-core/distinfo
@@ -1,61 +1,11 @@
-$NetBSD: distinfo,v 1.38 2020/08/01 07:49:26 tnn Exp $
+$NetBSD: distinfo,v 1.39 2020/08/30 20:43:46 tnn Exp $
 
-SHA1 (gnuradio-3.7.13.5.tar.gz) = c81a9cb1ec5e9455d885c804ba8fb656c4573b53
-RMD160 (gnuradio-3.7.13.5.tar.gz) = 87786c5f333069c15316c6a45dbce11f329ddac6
-SHA512 (gnuradio-3.7.13.5.tar.gz) = 35fad30ccbc8a82e03d44815bb958dc3718089bce628795ded53f554dff68a4acb1a0f1110b97446f5dc0182c0313855c0f1624b5e9caea26ae6189be81453bf
-Size (gnuradio-3.7.13.5.tar.gz) = 4548612 bytes
-SHA1 (patch-cmake_Modules_FindSphinx.cmake) = 3b51f8e201bae6604498a6395013221e3659646b
-SHA1 (patch-gnuradio-runtime_lib_block.cc) = a08a3f69ade0a935d88140e386e6f623c0edb1c6
-SHA1 (patch-gnuradio-runtime_lib_pmt_pmt__serialize.cc) = be8d6704aadc62f6a9c1e85c68443a94e81ea882
+SHA1 (gnuradio-3.8.1.0.tar.gz) = d01a97bc06ac2543e393dc0b7df629f9a4fb07d4
+RMD160 (gnuradio-3.8.1.0.tar.gz) = 6b6c96a7942ae1a42aff2ac4f70fb761b735864a
+SHA512 (gnuradio-3.8.1.0.tar.gz) = d1ada5b36c32aefd5915e4aa33beafd06aaaa00654f5a9f126bc9068f9e607580660bd5c57177503c3c29c23e9f3f4bc0f9c6c394a6f4bb003f6ffdf520eb2e0
+Size (gnuradio-3.8.1.0.tar.gz) = 3567141 bytes
+SHA1 (patch-cmake_Modules_FindSphinx.cmake) = 1e42ad000962f4766810fbd322c80dad1f0b1c3c
 SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7ac76b2ce35cda68c378bc2abad20a5
-SHA1 (patch-gnuradio_runtime_lib_thread_thread_cc) = 7e8aa146447fc7ffd006ffd540764ae4b15da2a5
-SHA1 (patch-gr-analog_lib_sig__source__X__impl.cc.t) = 103bd0b61f18e3d86d7a01189f611a9d0e3124c0
-SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 42e0b52d6baba936c03e2414e83a96a19c5331e7
-SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = d61dcd31058c04a6050479a6e8c321ca15420d49
-SHA1 (patch-gr-blocks_lib_copy__impl.cc) = 86f6ea02c12788ba42a477500c8dcdb03f44ee6b
-SHA1 (patch-gr-blocks_lib_message__debug__impl.cc) = 1f44d4dc99a46b97617e911747f5820095049d31
-SHA1 (patch-gr-blocks_lib_message__strobe__impl.cc) = 67115a9fa7f1b134384eca9cd9af4a40a6aba1f4
-SHA1 (patch-gr-blocks_lib_message__strobe__random__impl.cc) = 7512b5ca9a4ab55acb77a95b35943f070f19344e
-SHA1 (patch-gr-blocks_lib_multiply__matrix__cc__impl.cc) = 96ba01c18ed47bd97cc90e6f2642ae950a9c32d4
-SHA1 (patch-gr-blocks_lib_multiply__matrix__ff__impl.cc) = 4ca3df47fce12d426efa4edfa59143bff911a1f0
-SHA1 (patch-gr-blocks_lib_mute__XX__impl.cc.t) = e2d511fd6f729f0d2947306f752cdca0e7b1c0d4
-SHA1 (patch-gr-blocks_lib_nop__impl.cc) = c388f57385a31a4c5d87923797241a9c6388303c
-SHA1 (patch-gr-blocks_lib_pdu__filter__impl.cc) = 7e7ff5033120a043871cb38bdc481dd60118b9e7
-SHA1 (patch-gr-blocks_lib_pdu__remove__impl.cc) = bbf83d6097cf0a6cfb257664a7b8925c20323d34
-SHA1 (patch-gr-blocks_lib_pdu__set__impl.cc) = 9d83b3fdb39bc76bb7b9ae64d7ffa8151e8b443b
-SHA1 (patch-gr-blocks_lib_random__pdu__impl.cc) = 818035e99e9607d5b429e3453a8d5e76d12fad5b
-SHA1 (patch-gr-blocks_lib_repeat__impl.cc) = 7971eeb9904090d69659d6dfb9423f0673043e82
-SHA1 (patch-gr-blocks_lib_socket__pdu__impl.cc) = 41a365478936aa66bf1a31ab36f7ced81520f0de
-SHA1 (patch-gr-blocks_lib_tagged__stream__multiply__length__impl.cc) = a3d2ee3887ede46142e3604c7bb4b1a77856b3af
-SHA1 (patch-gr-blocks_lib_tcp__connection.cc) = ef932b7a4d87d7fd2ed6dcff5ab2d75b25095acc
-SHA1 (patch-gr-blocks_lib_tcp__connection.h) = ef6e19424a07f4cf16dbac834bdb48f3f639ebf5
-SHA1 (patch-gr-blocks_lib_tuntap__pdu__impl.cc) = d01da5adf8a3fb888553de502657e25f730f373d
-SHA1 (patch-gr-blocks_lib_wavfile.cc) = f4348c02e450671d64f4cbd5920609e3b637e981
-SHA1 (patch-gr-digital_lib_chunks__to__symbols__XX__impl.cc.t) = 39d8e2a07d98bf10d21e75976281bb0a966ff775
-SHA1 (patch-gr-digital_lib_constellation__receiver__cb__impl.cc) = 1fcd65271f2cfc6587cb03ad644a7e8004ddc48b
-SHA1 (patch-gr-digital_lib_costas__loop__cc__impl.cc) = 214d438228784aa87f480ffc7f2db0a83c6ade5a
-SHA1 (patch-gr-digital_lib_crc32__async__bb__impl.cc) = 48d931059906d9d4b35232ddfba69e171bada60e
-SHA1 (patch-gr-digital_lib_header__payload__demux__impl.cc) = d19ac29263008c7055a4e3f55a951a404c0a8213
-SHA1 (patch-gr-digital_lib_protocol__formatter__async__impl.cc) = d7b6e654c7b7221302f6882fca5e6a7221806dd7
-SHA1 (patch-gr-fec_lib_async__decoder__impl.cc) = 003391b3c6c16aa420fa62c5d6f828343bf19dbf
-SHA1 (patch-gr-fec_lib_async__encoder__impl.cc) = a6ff329fadb0670ed315e388b9200f76eaf497bb
-SHA1 (patch-gr-fec_lib_depuncture__bb__impl.cc) = 806b426799ecf7a6c342ad7e67dce456f45623e3
-SHA1 (patch-gr-filter_lib_fractional__resampler__cc__impl.cc) = 22fb471e1bb0ff46f07d824b27b113ad40ba963d
-SHA1 (patch-gr-filter_lib_fractional__resampler__ff__impl.cc) = d8eac11e6788b405678cb86adf9224af6af568bf
-SHA1 (patch-gr-filter_lib_freq__xlating__fir__filter__XXX__impl.cc.t) = c5bbbb471a476fdb676cbfb01efa082054d9a718
-SHA1 (patch-gr-qtgui_lib_TimeDomainDisplayPlot.cc) = 61e3e8d9b43b792ee3eb9bb33476e0c0243968f5
-SHA1 (patch-gr-qtgui_lib_const__sink__c__impl.cc) = 2bbb9fe30201833cdadb846f30d3763286ef21b1
-SHA1 (patch-gr-qtgui_lib_edit__box__msg__impl.cc) = 81890c5dd60c262527047b2be8ad169f5827a140
-SHA1 (patch-gr-qtgui_lib_freq__sink__c__impl.cc) = 20b7a3ab5ee8d14b94f68a904110cd5ba2f620b8
-SHA1 (patch-gr-qtgui_lib_freq__sink__f__impl.cc) = d04cfdf6217e0534087c65fae4bd83fba90d904a
-SHA1 (patch-gr-qtgui_lib_histogram__sink__f__impl.cc) = 92c8a7ea136ea9260f54ffca7020c771dc84c2f1
-SHA1 (patch-gr-qtgui_lib_sink__c__impl.cc) = 5b03e4e7b8751880ab896befd664b55f68b0a3b2
-SHA1 (patch-gr-qtgui_lib_sink__f__impl.cc) = 08c0c79f6ac3e0c375938113581ab095db4c6832
-SHA1 (patch-gr-qtgui_lib_time__raster__sink__b__impl.cc) = 3a54ab864b4520a4c270088587c2fddaafc4731f
-SHA1 (patch-gr-qtgui_lib_time__raster__sink__f__impl.cc) = a933b87e3de2c49d562d5f961e08e7cd7fa97784
-SHA1 (patch-gr-qtgui_lib_time__sink__c__impl.cc) = 65bfd025841375410ba0fe464337875af781a32e
-SHA1 (patch-gr-qtgui_lib_time__sink__f__impl.cc) = e918f7d757ed9a47c40e89036ba3f162a8567166
-SHA1 (patch-gr-qtgui_lib_waterfall__sink__c__impl.cc) = 532f134213f4d5b41fb9b9c471e46314f863624d
-SHA1 (patch-gr-qtgui_lib_waterfall__sink__f__impl.cc) = 555d31ffeecaadfa9c958df999108bcde8f5cc0e
-SHA1 (patch-gr-zeromq_lib_pub__msg__sink__impl.cc) = 719abaf0408e0ac73666f4f42cae3fc938532854
-SHA1 (patch-gr-zeromq_lib_push__msg__sink__impl.cc) = 92d115956cdd69747391ee13adc9c8b701ed9186
+SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 9adacb93a20b2be596a23985306cbfd5f93c80a8
+SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = 565b4ada865395f19228511659bfc489a5a9583f
+SHA1 (patch-grc_scripts_gnuradio-companion) = 852f520670c0b9ec822b88aea331a1e052175340
diff --git a/ham/gnuradio-core/options.mk b/ham/gnuradio-core/options.mk
index 8d579944bbf..5731d810648 100644
--- a/ham/gnuradio-core/options.mk
+++ b/ham/gnuradio-core/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2020/05/19 13:58:24 joerg Exp $
+# $NetBSD: options.mk,v 1.7 2020/08/30 20:43:46 tnn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnuradio
 PKG_SUPPORTED_OPTIONS=	ninja-build filter-design alsa
@@ -19,15 +19,15 @@ CMAKE_ARGS+=	-GNinja
 BUILD_DEPENDS+=	ninja-build-[0-9]*:../../devel/ninja-build
 
 do-build:
-	cd ${WRKSRC}/${BUILD_DIRS} && ${PKGSRC_SETENV} ${MAKE_ENV} ninja
+	(cd ${WRKSRC}/build; ninja)
 .else
 do-build:
-	cd ${WRKSRC}/${BUILD_DIRS} && ${BUILD_MAKE_CMD}
+	(cd ${WRKSRC}/build; ${BUILD_MAKE_CMD})
 .endif
 
 .if !empty(PKG_OPTIONS:Mfilter-design)
 # Running gr_filter_design asks for the package
-DEPENDS+=		${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy12
+DEPENDS+=		${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
 .endif
 
 .if !empty(PKG_OPTIONS:Malsa)
diff --git a/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake b/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
index 3a9467e9639..f4ea0af57d5 100644
--- a/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
+++ b/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
@@ -1,4 +1,4 @@
-$NetBSD: patch-cmake_Modules_FindSphinx.cmake,v 1.2 2020/05/19 13:57:11 joerg Exp $
+$NetBSD: patch-cmake_Modules_FindSphinx.cmake,v 1.3 2020/08/30 20:43:46 tnn Exp $
 
 (Starting with gnuradio-3.7.6), cmake wants sphinx-build exact executable
 name. With SUBST_CLASSES.pyvers in Makefile.common, tell the name.
@@ -11,7 +11,7 @@ name. With SUBST_CLASSES.pyvers in Makefile.common, tell the name.
  #  License text for the above reference.)
  
 -find_program(SPHINX_EXECUTABLE NAMES sphinx-build
-+find_program(SPHINX_EXECUTABLE NAMES sphinx-build-@PYVERSSUFFIX@
++find_program(SPHINX_EXECUTABLE NAMES sphinx-build@PYVERSSUFFIX@
    HINTS
    $ENV{SPHINX_DIR}
    PATH_SUFFIXES bin
diff --git a/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_block.cc b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_block.cc
deleted file mode 100644
index 7444c9d0cf4..00000000000
--- a/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_block.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gnuradio-runtime_lib_block.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gnuradio-runtime/lib/block.cc.orig	2020-05-08 23:51:09.426889790 +0000
-+++ gnuradio-runtime/lib/block.cc
-@@ -60,7 +60,7 @@ namespace gr {
-   {
-     global_block_registry.register_primitive(alias(), this);
-     message_port_register_in(d_system_port);
--    set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, _1));
-+    set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, boost::placeholders::_1));
- 
-     configure_default_loggers(d_logger, d_debug_logger, symbol_name());
-   }
diff --git a/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_pmt_pmt__serialize.cc b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_pmt_pmt__serialize.cc
deleted file mode 100644
index 03b8d03a673..00000000000
--- a/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_pmt_pmt__serialize.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-gnuradio-runtime_lib_pmt_pmt__serialize.cc,v 1.1 2020/04/17 13:33:44 joerg Exp $
-
---- gnuradio-runtime/lib/pmt/pmt_serialize.cc.orig	2020-04-17 00:28:42.316619809 +0000
-+++ gnuradio-runtime/lib/pmt/pmt_serialize.cc
-@@ -23,6 +23,7 @@
- #include <config.h>
- #endif
- 
-+#include <sstream>
- #include <vector>
- #include <pmt/pmt.h>
- #include "pmt_int.h"
diff --git a/ham/gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc b/ham/gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc
deleted file mode 100644
index cebc80e5a3f..00000000000
--- a/ham/gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-gnuradio_runtime_lib_thread_thread_cc,v 1.5 2018/07/16 07:55:22 mef Exp $
-
-Extending for BSD
-
---- gnuradio-runtime/lib/thread/thread.cc.orig	2018-06-14 06:42:48.000000000 +0900
-+++ gnuradio-runtime/lib/thread/thread.cc	2018-07-08 07:51:13.971772414 +0900
-@@ -166,7 +166,7 @@ namespace gr {
- 
- 
- #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || \
--  defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
-+  defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)|| defined(__NetBSD__) || defined(__sun) 
- 
- namespace gr {
-   namespace thread {
-@@ -284,6 +284,7 @@ namespace gr {
-     void
-     thread_bind_to_processor(gr_thread_t thread, const std::vector<int> &mask)
-     {
-+#ifdef _GNU_SOURCE
-       cpu_set_t set;
-       size_t len = sizeof(cpu_set_t);
-       std::vector<int> _mask = mask;
-@@ -299,6 +300,7 @@ namespace gr {
-         s << "thread_bind_to_processor failed with error: " << ret << std::endl;
-         throw std::runtime_error(s.str());
-       }
-+#endif
-     }
- 
-     void
-@@ -310,6 +312,7 @@ namespace gr {
-     void
-     thread_unbind(gr_thread_t thread)
-     {
-+#ifdef _GNU_SOURCE
-       cpu_set_t set;
-       size_t len = sizeof(cpu_set_t);
- 
-@@ -325,6 +328,7 @@ namespace gr {
-         s << "thread_unbind failed with error: " << ret << std::endl;
-         throw std::runtime_error(s.str());
-       }
-+#endif
-     }
- 
-     int
diff --git a/ham/gnuradio-core/patches/patch-gr-analog_lib_sig__source__X__impl.cc.t b/ham/gnuradio-core/patches/patch-gr-analog_lib_sig__source__X__impl.cc.t
deleted file mode 100644
index f271bf65dab..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-analog_lib_sig__source__X__impl.cc.t
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-analog_lib_sig__source__X__impl.cc.t,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-analog/lib/sig_source_X_impl.cc.t.orig	2020-05-09 00:48:44.893191233 +0000
-+++ gr-analog/lib/sig_source_X_impl.cc.t
-@@ -55,7 +55,7 @@ namespace gr {
-       set_frequency(frequency);
- 
-       message_port_register_in(pmt::mp("freq"));
--      set_msg_handler(pmt::mp("freq"), boost::bind(&@IMPL_NAME@::set_frequency_msg, this, _1));
-+      set_msg_handler(pmt::mp("freq"), boost::bind(&@IMPL_NAME@::set_frequency_msg, this, boost::placeholders::_1));
-     }
- 
-     @IMPL_NAME@::~@IMPL_NAME@()
diff --git a/ham/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt b/ham/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
index 9855b173ce1..d0ab80ac4aa 100644
--- a/ham/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
+++ b/ham/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
@@ -1,15 +1,16 @@
-$NetBSD: patch-gr-audio_lib_CMakeLists.txt,v 1.2 2018/07/16 07:55:22 mef Exp $
+$NetBSD: patch-gr-audio_lib_CMakeLists.txt,v 1.3 2020/08/30 20:43:46 tnn Exp $
 
-Patch and SUBST to disable/enable ALSA depending on PKGOPTIONS.
+If alsa is present on the system but the PKG_OPTION disabled we
+should not use it.
 
---- gr-audio/lib/CMakeLists.txt.orig	2018-06-14 06:42:48.000000000 +0900
-+++ gr-audio/lib/CMakeLists.txt	2018-07-08 07:53:35.184868747 +0900
-@@ -42,7 +42,7 @@ endif(ENABLE_GR_CTRLPORT)
+--- gr-audio/lib/CMakeLists.txt.orig	2019-08-09 21:40:34.000000000 +0000
++++ gr-audio/lib/CMakeLists.txt
+@@ -35,7 +35,7 @@ list(APPEND gr_audio_confs ${CMAKE_CURRE
  ########################################################################
  ## ALSA Support
  ########################################################################
 -find_package(ALSA)
 +@@ALSA@@find_package(ALSA)
  
- if((ALSA_FOUND) AND NOT (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") AND NOT (CMAKE_SYSTEM_NAME STREQUAL GNU))
+ set(audio_deps "")
  
diff --git a/ham/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h b/ham/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
index 2817e39be04..3e46bfb4c64 100644
--- a/ham/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
+++ b/ham/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
@@ -1,19 +1,19 @@
-$NetBSD: patch-gr-audio_lib_alsa_alsa__impl_h,v 1.2 2014/10/17 09:51:56 mef Exp $
+$NetBSD: patch-gr-audio_lib_alsa_alsa__impl_h,v 1.3 2020/08/30 20:43:46 tnn Exp $
 
 gnuradio-3.7.2.1/gr-audio/lib/alsa/alsa_source.cc:477:23: error: 'ESTRPIPE' was not declared in this scope
 See also
 https://mail-index.netbsd.org/pkgsrc-wip-discuss/2013/10/27/msg002529.html
 
---- gr-audio/lib/alsa/alsa_impl.h.orig	2014-09-06 18:07:27.000000000 +0900
-+++ gr-audio/lib/alsa/alsa_impl.h	2014-09-06 18:07:55.000000000 +0900
+--- gr-audio/lib/alsa/alsa_impl.h.orig	2019-08-10 06:40:34.000000000 +0900
++++ gr-audio/lib/alsa/alsa_impl.h	2019-09-10 21:21:40.475233198 +0900
 @@ -26,6 +26,10 @@
- #include <stdio.h>
  #include <alsa/asoundlib.h>
+ #include <stdio.h>
  
 +#ifndef ESTRPIPE
 +#define ESTRPIPE EPIPE
 +#endif
 +
- void
- gri_alsa_dump_hw_params (snd_pcm_t *pcm,
- 			 snd_pcm_hw_params_t *hwparams,
+ void gri_alsa_dump_hw_params(snd_pcm_t* pcm, snd_pcm_hw_params_t* hwparams, FILE* fp);
+ 
+ bool gri_alsa_pick_acceptable_format(snd_pcm_t* pcm,
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_copy__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_copy__impl.cc
deleted file mode 100644
index 016a3653fd3..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_copy__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_copy__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/copy_impl.cc.orig	2020-05-09 00:11:28.288489868 +0000
-+++ gr-blocks/lib/copy_impl.cc
-@@ -47,7 +47,7 @@ namespace gr {
-     {
-       message_port_register_in(pmt::mp("en"));
-       set_msg_handler(pmt::mp("en"),
--                      boost::bind(&copy_impl::handle_enable, this, _1));
-+                      boost::bind(&copy_impl::handle_enable, this, boost::placeholders::_1));
-     }
- 
-     copy_impl::~copy_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__debug__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__debug__impl.cc
deleted file mode 100644
index e0fd0ee3fb7..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__debug__impl.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_message__debug__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/message_debug_impl.cc.orig	2020-05-09 00:13:10.692843843 +0000
-+++ gr-blocks/lib/message_debug_impl.cc
-@@ -102,13 +102,13 @@ namespace gr {
-                  io_signature::make(0, 0, 0))
-     {
-       message_port_register_in(pmt::mp("print"));
--      set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1));
-+      set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, boost::placeholders::_1));
- 
-       message_port_register_in(pmt::mp("store"));
--      set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, _1));
-+      set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, boost::placeholders::_1));
- 
-       message_port_register_in(pmt::mp("print_pdu"));
--      set_msg_handler(pmt::mp("print_pdu"), boost::bind(&message_debug_impl::print_pdu, this, _1));
-+      set_msg_handler(pmt::mp("print_pdu"), boost::bind(&message_debug_impl::print_pdu, this, boost::placeholders::_1));
-     }
- 
-     message_debug_impl::~message_debug_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__impl.cc
deleted file mode 100644
index 9fca1097c64..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_message__strobe__impl.cc,v 1.3 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/message_strobe_impl.cc.orig	2020-05-09 00:13:08.349836282 +0000
-+++ gr-blocks/lib/message_strobe_impl.cc
-@@ -58,7 +58,7 @@ namespace gr {
- 
-       message_port_register_in(pmt::mp("set_msg"));
-       set_msg_handler(pmt::mp("set_msg"),
--                      boost::bind(&message_strobe_impl::set_msg, this, _1));
-+                      boost::bind(&message_strobe_impl::set_msg, this, boost::placeholders::_1));
-     }
- 
-     message_strobe_impl::~message_strobe_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__random__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__random__impl.cc
deleted file mode 100644
index 02f7212c10c..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__random__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_message__strobe__random__impl.cc,v 1.3 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/message_strobe_random_impl.cc.orig	2020-05-09 00:14:08.662748468 +0000
-+++ gr-blocks/lib/message_strobe_random_impl.cc
-@@ -68,7 +68,7 @@ namespace gr {
- 
-       message_port_register_in(pmt::mp("set_msg"));
-       set_msg_handler(pmt::mp("set_msg"),
--                      boost::bind(&message_strobe_random_impl::set_msg, this, _1));
-+                      boost::bind(&message_strobe_random_impl::set_msg, this, boost::placeholders::_1));
-     }
- 
-     float message_strobe_random_impl::next_delay(){
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__cc__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__cc__impl.cc
deleted file mode 100644
index 7caf88b5598..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__cc__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_multiply__matrix__cc__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/multiply_matrix_cc_impl.cc.orig	2020-05-09 00:14:15.273419586 +0000
-+++ gr-blocks/lib/multiply_matrix_cc_impl.cc
-@@ -57,7 +57,7 @@ namespace gr {
-       message_port_register_in(port_name);
-       set_msg_handler(
-           port_name,
--          boost::bind(&multiply_matrix_cc_impl::msg_handler_A, this, _1)
-+          boost::bind(&multiply_matrix_cc_impl::msg_handler_A, this, boost::placeholders::_1)
-       );
-     }
- 
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__ff__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__ff__impl.cc
deleted file mode 100644
index f94a60e4160..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__ff__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_multiply__matrix__ff__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/multiply_matrix_ff_impl.cc.orig	2020-05-09 00:14:17.402598574 +0000
-+++ gr-blocks/lib/multiply_matrix_ff_impl.cc
-@@ -57,7 +57,7 @@ namespace gr {
-       message_port_register_in(port_name);
-       set_msg_handler(
-           port_name,
--          boost::bind(&multiply_matrix_ff_impl::msg_handler_A, this, _1)
-+          boost::bind(&multiply_matrix_ff_impl::msg_handler_A, this, boost::placeholders::_1)
-       );
-     }
- 
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_mute__XX__impl.cc.t b/ham/gnuradio-core/patches/patch-gr-blocks_lib_mute__XX__impl.cc.t
deleted file mode 100644
index 935b483d47d..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_mute__XX__impl.cc.t
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_mute__XX__impl.cc.t,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/mute_XX_impl.cc.t.orig	2020-05-09 00:48:46.934718299 +0000
-+++ gr-blocks/lib/mute_XX_impl.cc.t
-@@ -48,7 +48,7 @@ namespace gr {
-     {
-       message_port_register_in(pmt::intern("set_mute"));
-       set_msg_handler(pmt::intern("set_mute"),
--        boost::bind(&@NAME_IMPL@::set_mute_pmt, this, _1));
-+        boost::bind(&@NAME_IMPL@::set_mute_pmt, this, boost::placeholders::_1));
-     }
- 
-     @NAME_IMPL@::~@NAME_IMPL@()
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_nop__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_nop__impl.cc
deleted file mode 100644
index b4393198731..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_nop__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_nop__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/nop_impl.cc.orig	2020-05-09 00:14:19.564916271 +0000
-+++ gr-blocks/lib/nop_impl.cc
-@@ -46,7 +46,7 @@ namespace gr {
-     {
-       // Arrange to have count_received_msgs called when messages are received.
-       message_port_register_in(pmt::mp("port"));
--      set_msg_handler(pmt::mp("port"), boost::bind(&nop_impl::count_received_msgs, this, _1));
-+      set_msg_handler(pmt::mp("port"), boost::bind(&nop_impl::count_received_msgs, this, boost::placeholders::_1));
-     }
- 
-     nop_impl::~nop_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__filter__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__filter__impl.cc
deleted file mode 100644
index 03c4373cdd3..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__filter__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_pdu__filter__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/pdu_filter_impl.cc.orig	2020-05-09 00:14:21.693971011 +0000
-+++ gr-blocks/lib/pdu_filter_impl.cc
-@@ -45,7 +45,7 @@ namespace gr {
-     {
-       message_port_register_out(pdu::pdu_port_id());
-       message_port_register_in(pdu::pdu_port_id());
--      set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_filter_impl::handle_msg, this, _1));
-+      set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_filter_impl::handle_msg, this, boost::placeholders::_1));
-     }
- 
-     void
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__remove__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__remove__impl.cc
deleted file mode 100644
index 914245e0ce2..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__remove__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_pdu__remove__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/pdu_remove_impl.cc.orig	2020-05-09 00:14:25.622411218 +0000
-+++ gr-blocks/lib/pdu_remove_impl.cc
-@@ -45,7 +45,7 @@ namespace gr {
-     {
-       message_port_register_out(pdu::pdu_port_id());
-       message_port_register_in(pdu::pdu_port_id());
--      set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_remove_impl::handle_msg, this, _1));
-+      set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_remove_impl::handle_msg, this, boost::placeholders::_1));
-     }
- 
-     void
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__set__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__set__impl.cc
deleted file mode 100644
index 2f84e546749..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__set__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_pdu__set__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/pdu_set_impl.cc.orig	2020-05-09 00:14:27.639478192 +0000
-+++ gr-blocks/lib/pdu_set_impl.cc
-@@ -45,7 +45,7 @@ namespace gr {
-     {
-       message_port_register_out(pdu::pdu_port_id());
-       message_port_register_in(pdu::pdu_port_id());
--      set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, _1));
-+      set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, boost::placeholders::_1));
-     }
- 
-     void
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_random__pdu__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_random__pdu__impl.cc
deleted file mode 100644
index a5d965172f3..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_random__pdu__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_random__pdu__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/random_pdu_impl.cc.orig	2020-05-09 00:14:29.761401160 +0000
-+++ gr-blocks/lib/random_pdu_impl.cc
-@@ -50,7 +50,7 @@ namespace gr {
-     {
-       message_port_register_out(pdu::pdu_port_id());
-       message_port_register_in(pmt::mp("generate"));
--      set_msg_handler(pmt::mp("generate"), boost::bind(&random_pdu_impl::generate_pdu, this, _1));
-+      set_msg_handler(pmt::mp("generate"), boost::bind(&random_pdu_impl::generate_pdu, this, boost::placeholders::_1));
-       if(length_modulo < 1)
-         throw std::runtime_error("length_module must be >= 1");
-       if(max_items < length_modulo)
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_repeat__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_repeat__impl.cc
deleted file mode 100644
index ada1da64190..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_repeat__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_repeat__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/repeat_impl.cc.orig	2020-05-09 00:14:31.767691624 +0000
-+++ gr-blocks/lib/repeat_impl.cc
-@@ -45,7 +45,7 @@ namespace gr {
-     {
-         message_port_register_in(pmt::mp("interpolation"));
-         set_msg_handler(pmt::mp("interpolation"),
--                boost::bind(&repeat_impl::msg_set_interpolation, this, _1));
-+                boost::bind(&repeat_impl::msg_set_interpolation, this, boost::placeholders::_1));
-     }
- 
-     void
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc
deleted file mode 100644
index 8a5fbe8ba64..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_socket__pdu__impl.cc,v 1.2 2020/05/09 15:17:51 joerg Exp $
-
-* Fix build with boost-1.70.0
-
---- gr-blocks/lib/socket_pdu_impl.cc.orig	2019-04-20 09:58:09.000000000 +0000
-+++ gr-blocks/lib/socket_pdu_impl.cc
-@@ -86,7 +86,7 @@ namespace gr {
- 
-         start_tcp_accept();
- 
--        set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_server_send, this, _1));
-+        set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_server_send, this, boost::placeholders::_1));
-       }
-       else if (type =="TCP_CLIENT") {
-         boost::system::error_code error = boost::asio::error::host_not_found;
-@@ -96,7 +96,7 @@ namespace gr {
-             throw boost::system::system_error(error);
-         d_tcp_socket->set_option(boost::asio::ip::tcp::no_delay(d_tcp_no_delay));
- 
--        set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_client_send, this, _1));
-+        set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_client_send, this, boost::placeholders::_1));
- 
-         d_tcp_socket->async_read_some(boost::asio::buffer(d_rxbuf),
-           boost::bind(&socket_pdu_impl::handle_tcp_read, this,
-@@ -110,7 +110,7 @@ namespace gr {
-             boost::asio::placeholders::error,
-             boost::asio::placeholders::bytes_transferred));
- 
--        set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, _1));
-+        set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1));
-       }
-       else if (type =="UDP_CLIENT") {
-         d_udp_socket.reset(new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint));
-@@ -119,7 +119,7 @@ namespace gr {
-             boost::asio::placeholders::error,
-             boost::asio::placeholders::bytes_transferred));
- 
--        set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, _1));
-+        set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1));
-       }
-       else
-         throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type");
-@@ -165,7 +165,7 @@ namespace gr {
-     void
-     socket_pdu_impl::start_tcp_accept()
-     {
--      tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
-+      tcp_connection::sptr new_connection = tcp_connection::make(static_cast<boost::asio::io_context&>(d_acceptor_tcp->get_executor().context()), d_rxbuf.size(), d_tcp_no_delay);
- 
-       d_acceptor_tcp->async_accept(new_connection->socket(),
-         boost::bind(&socket_pdu_impl::handle_tcp_accept, this,
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tagged__stream__multiply__length__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tagged__stream__multiply__length__impl.cc
deleted file mode 100644
index 1669a7ed517..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tagged__stream__multiply__length__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_tagged__stream__multiply__length__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/tagged_stream_multiply_length_impl.cc.orig	2020-05-09 00:14:36.233242762 +0000
-+++ gr-blocks/lib/tagged_stream_multiply_length_impl.cc
-@@ -48,7 +48,7 @@ namespace gr {
-       set_relative_rate(1);
-       message_port_register_in(pmt::intern("set_scalar"));
-       set_msg_handler(pmt::intern("set_scalar"),
--        boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, _1));
-+        boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, boost::placeholders::_1));
-     }
- 
-     tagged_stream_multiply_length_impl::~tagged_stream_multiply_length_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc
deleted file mode 100644
index ef904952a87..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_tcp__connection.cc,v 1.1 2019/07/08 17:50:55 ryoon Exp $
-
-* Fix build with boost-1.70.0
-
---- gr-blocks/lib/tcp_connection.cc.orig	2019-04-20 09:58:09.000000000 +0000
-+++ gr-blocks/lib/tcp_connection.cc
-@@ -31,12 +31,12 @@
- namespace gr {
-   namespace blocks {
- 
--    tcp_connection::sptr tcp_connection::make(boost::asio::io_service& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
-+    tcp_connection::sptr tcp_connection::make(boost::asio::io_context& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
-     {
-       return sptr(new tcp_connection(io_service, MTU, no_delay));
-     }
- 
--    tcp_connection::tcp_connection(boost::asio::io_service& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
-+    tcp_connection::tcp_connection(boost::asio::io_context& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
-       : d_socket(io_service)
-       , d_block(NULL)
-       , d_no_delay(no_delay)
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h
deleted file mode 100644
index c5a0e727958..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_tcp__connection.h,v 1.1 2019/07/08 17:50:55 ryoon Exp $
-
-* Fix build with boost-1.70.0
-
---- gr-blocks/lib/tcp_connection.h.orig	2019-04-20 09:58:09.000000000 +0000
-+++ gr-blocks/lib/tcp_connection.h
-@@ -42,12 +42,12 @@ namespace gr {
-       basic_block *d_block;
-       bool d_no_delay;
- 
--      tcp_connection(boost::asio::io_service& io_service, int MTU=10000, bool no_delay=false);
-+      tcp_connection(boost::asio::io_context& io_service, int MTU=10000, bool no_delay=false);
- 
-     public:
-       typedef boost::shared_ptr<tcp_connection> sptr;
- 
--      static sptr make(boost::asio::io_service& io_service, int MTU=10000, bool no_delay=false);
-+      static sptr make(boost::asio::io_context& io_service, int MTU=10000, bool no_delay=false);
- 
-       boost::asio::ip::tcp::socket& socket() { return d_socket; };
- 
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tuntap__pdu__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tuntap__pdu__impl.cc
deleted file mode 100644
index 34bf7bf3cee..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tuntap__pdu__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_tuntap__pdu__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/tuntap_pdu_impl.cc.orig	2020-05-09 00:14:38.266368341 +0000
-+++ gr-blocks/lib/tuntap_pdu_impl.cc
-@@ -97,7 +97,7 @@ namespace gr {
- 
-       // set up input message port
-       message_port_register_in(pdu::pdu_port_id());
--      set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, _1));
-+      set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, boost::placeholders::_1));
-     }
- 
-     int
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_wavfile.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_wavfile.cc
deleted file mode 100644
index 9c54f824c16..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_wavfile.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_wavfile.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-blocks/lib/wavfile.cc.orig	2020-05-09 00:06:11.248216593 +0000
-+++ gr-blocks/lib/wavfile.cc
-@@ -27,7 +27,7 @@
- #include <gnuradio/blocks/wavfile.h>
- #include <cstring>
- #include <stdint.h>
--#include <boost/detail/endian.hpp> //BOOST_BIG_ENDIAN
-+#include <boost/predef/other/endian.h>
- 
- namespace gr {
-   namespace blocks {
-@@ -35,7 +35,7 @@ namespace gr {
- 
-     // Basically, this is the opposite of htonx() and ntohx()
-     // Define host to/from worknet (little endian) short and long
--#ifdef BOOST_BIG_ENDIAN
-+#if BOOST_ENDIAN_BIG_BYTE
- 
-     static inline uint16_t __gri_wav_bs16(uint16_t x)
-     {
-@@ -52,7 +52,7 @@ namespace gr {
-     #define htows(x) __gri_wav_bs16(x)
-     #define wtohs(x) __gri_wav_bs16(x)
- 
--#else
-+#elif BOOST_ENDIAN_LITTLE_BYTE
- 
-     #define htowl(x) uint32_t(x)
-     #define wtohl(x) uint32_t(x)
diff --git a/ham/gnuradio-core/patches/patch-gr-digital_lib_chunks__to__symbols__XX__impl.cc.t b/ham/gnuradio-core/patches/patch-gr-digital_lib_chunks__to__symbols__XX__impl.cc.t
deleted file mode 100644
index fe1cc89fab5..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-digital_lib_chunks__to__symbols__XX__impl.cc.t
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-digital_lib_chunks__to__symbols__XX__impl.cc.t,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-digital/lib/chunks_to_symbols_XX_impl.cc.t.orig	2020-05-09 00:48:48.819019376 +0000
-+++ gr-digital/lib/chunks_to_symbols_XX_impl.cc.t
-@@ -52,7 +52,7 @@ namespace gr {
-       set_msg_handler(
-         pmt::mp("set_symbol_table"),
-         boost::bind(&@IMPL_NAME@::handle_set_symbol_table,
--                    this, _1));
-+                    this, boost::placeholders::_1));
-     }
- 
-     @IMPL_NAME@::~@IMPL_NAME@()
diff --git a/ham/gnuradio-core/patches/patch-gr-digital_lib_constellation__receiver__cb__impl.cc b/ham/gnuradio-core/patches/patch-gr-digital_lib_constellation__receiver__cb__impl.cc
deleted file mode 100644
index f5d3bb3eb76..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-digital_lib_constellation__receiver__cb__impl.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-gr-digital_lib_constellation__receiver__cb__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-digital/lib/constellation_receiver_cb_impl.cc.orig	2020-05-10 02:22:19.685626371 +0000
-+++ gr-digital/lib/constellation_receiver_cb_impl.cc
-@@ -65,12 +65,12 @@ namespace gr {
-       set_msg_handler(
-         pmt::mp("set_constellation"),
-         boost::bind(&constellation_receiver_cb_impl::handle_set_constellation,
--                    this, _1));
-+                    this, boost::placeholders::_1));
- 
-       message_port_register_in(pmt::mp("rotate_phase"));
-       set_msg_handler(pmt::mp("rotate_phase"),
-                       boost::bind(&constellation_receiver_cb_impl::handle_rotate_phase,
--                                  this, _1));
-+                                  this, boost::placeholders::_1));
-     }
- 
-     constellation_receiver_cb_impl::~constellation_receiver_cb_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-digital_lib_costas__loop__cc__impl.cc b/ham/gnuradio-core/patches/patch-gr-digital_lib_costas__loop__cc__impl.cc
deleted file mode 100644
index 2a01ae6fbb2..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-digital_lib_costas__loop__cc__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-digital_lib_costas__loop__cc__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-digital/lib/costas_loop_cc_impl.cc.orig	2020-05-10 02:22:30.424208998 +0000
-+++ gr-digital/lib/costas_loop_cc_impl.cc
-@@ -83,7 +83,7 @@ namespace gr {
-       set_msg_handler(
-         pmt::mp("noise"),
-         boost::bind(&costas_loop_cc_impl::handle_set_noise,
--                    this, _1));
-+                    this, boost::placeholders::_1));
-     }
- 
-     costas_loop_cc_impl::~costas_loop_cc_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-digital_lib_crc32__async__bb__impl.cc b/ham/gnuradio-core/patches/patch-gr-digital_lib_crc32__async__bb__impl.cc
deleted file mode 100644
index f923184df6d..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-digital_lib_crc32__async__bb__impl.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-gr-digital_lib_crc32__async__bb__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-digital/lib/crc32_async_bb_impl.cc.orig	2020-05-10 02:22:32.417304070 +0000
-+++ gr-digital/lib/crc32_async_bb_impl.cc
-@@ -51,9 +51,9 @@ namespace gr {
-       message_port_register_out(d_out_port);
- 
-       if(check)
--        set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::check, this ,_1) );
-+        set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::check, this ,boost::placeholders::_1) );
-       else
--        set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::calc, this ,_1) );
-+        set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::calc, this ,boost::placeholders::_1) );
-     }
- 
-     crc32_async_bb_impl::~crc32_async_bb_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-digital_lib_header__payload__demux__impl.cc b/ham/gnuradio-core/patches/patch-gr-digital_lib_header__payload__demux__impl.cc
deleted file mode 100644
index 43cec01e11e..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-digital_lib_header__payload__demux__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-digital_lib_header__payload__demux__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-digital/lib/header_payload_demux_impl.cc.orig	2020-05-10 02:22:34.316920013 +0000
-+++ gr-digital/lib/header_payload_demux_impl.cc
-@@ -154,7 +154,7 @@ namespace gr {
-       }
-       set_tag_propagation_policy(TPP_DONT);
-       message_port_register_in(msg_port_id());
--      set_msg_handler(msg_port_id(), boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, _1));
-+      set_msg_handler(msg_port_id(), boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, boost::placeholders::_1));
-       for (size_t i = 0; i < special_tags.size(); i++) {
-         d_special_tags.push_back(pmt::string_to_symbol(special_tags[i]));
-         d_special_tags_last_value.push_back(pmt::PMT_NIL);
diff --git a/ham/gnuradio-core/patches/patch-gr-digital_lib_protocol__formatter__async__impl.cc b/ham/gnuradio-core/patches/patch-gr-digital_lib_protocol__formatter__async__impl.cc
deleted file mode 100644
index ae20cfec539..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-digital_lib_protocol__formatter__async__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-digital_lib_protocol__formatter__async__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-digital/lib/protocol_formatter_async_impl.cc.orig	2020-05-10 02:22:36.161047409 +0000
-+++ gr-digital/lib/protocol_formatter_async_impl.cc
-@@ -55,7 +55,7 @@ namespace gr {
-       message_port_register_out(d_pld_port);
- 
-       set_msg_handler(d_in_port,
--                      boost::bind(&protocol_formatter_async_impl::append, this ,_1) );
-+                      boost::bind(&protocol_formatter_async_impl::append, this ,boost::placeholders::_1) );
-     }
- 
-     protocol_formatter_async_impl::~protocol_formatter_async_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-fec_lib_async__decoder__impl.cc b/ham/gnuradio-core/patches/patch-gr-fec_lib_async__decoder__impl.cc
deleted file mode 100644
index 36787f5a6dc..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-fec_lib_async__decoder__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-gr-fec_lib_async__decoder__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-fec/lib/async_decoder_impl.cc.orig	2020-05-10 02:07:16.487899286 +0000
-+++ gr-fec/lib/async_decoder_impl.cc
-@@ -67,10 +67,10 @@ namespace gr {
- 
-       if(d_packed) {
-         d_pack = new blocks::kernel::pack_k_bits(8);
--        set_msg_handler(d_in_port, boost::bind(&async_decoder_impl::decode_packed, this ,_1));
-+        set_msg_handler(d_in_port, boost::bind(&async_decoder_impl::decode_packed, this ,boost::placeholders::_1));
-       }
-       else {
--        set_msg_handler(d_in_port, boost::bind(&async_decoder_impl::decode_unpacked, this ,_1));
-+        set_msg_handler(d_in_port, boost::bind(&async_decoder_impl::decode_unpacked, this ,boost::placeholders::_1));
-       }
- 
-       // The maximum frame size is set by the initial frame size of the decoder.
diff --git a/ham/gnuradio-core/patches/patch-gr-fec_lib_async__encoder__impl.cc b/ham/gnuradio-core/patches/patch-gr-fec_lib_async__encoder__impl.cc
deleted file mode 100644
index 88762d4ecea..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-fec_lib_async__encoder__impl.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-gr-fec_lib_async__encoder__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-fec/lib/async_encoder_impl.cc.orig	2020-05-10 02:07:18.405428399 +0000
-+++ gr-fec/lib/async_encoder_impl.cc
-@@ -63,7 +63,7 @@ namespace gr {
-       message_port_register_out(d_out_port);
- 
-       if(d_packed) {
--        set_msg_handler(d_in_port, boost::bind(&async_encoder_impl::encode_packed, this ,_1) );
-+        set_msg_handler(d_in_port, boost::bind(&async_encoder_impl::encode_packed, this ,boost::placeholders::_1) );
- 
-         d_unpack = new blocks::kernel::unpack_k_bits(8);
- 
-@@ -73,7 +73,7 @@ namespace gr {
- 
-       }
-       else {
--        set_msg_handler(d_in_port, boost::bind(&async_encoder_impl::encode_unpacked, this ,_1) );
-+        set_msg_handler(d_in_port, boost::bind(&async_encoder_impl::encode_unpacked, this ,boost::placeholders::_1) );
-       }
- 
-       if(d_packed || (strncmp(d_encoder->get_input_conversion(), "pack", 4) == 0)) {
diff --git a/ham/gnuradio-core/patches/patch-gr-fec_lib_depuncture__bb__impl.cc b/ham/gnuradio-core/patches/patch-gr-fec_lib_depuncture__bb__impl.cc
deleted file mode 100644
index a07d757480a..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-fec_lib_depuncture__bb__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-fec_lib_depuncture__bb__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-fec/lib/depuncture_bb_impl.cc.orig	2020-05-10 02:07:20.402816615 +0000
-+++ gr-fec/lib/depuncture_bb_impl.cc
-@@ -76,7 +76,7 @@ namespace gr {
-       set_fixed_rate(true);
-       set_relative_rate((double)d_puncsize/(d_puncsize - d_puncholes));
-       set_output_multiple(d_puncsize);
--      //set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, this, _1));
-+      //set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, this, boost::placeholders::_1));
-     }
- 
-     depuncture_bb_impl::~depuncture_bb_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__cc__impl.cc b/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__cc__impl.cc
deleted file mode 100644
index 5f1be9fbb10..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__cc__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-filter_lib_fractional__resampler__cc__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-filter/lib/fractional_resampler_cc_impl.cc.orig	2020-05-09 00:31:08.332613492 +0000
-+++ gr-filter/lib/fractional_resampler_cc_impl.cc
-@@ -54,7 +54,7 @@ namespace gr {
-       set_relative_rate(1.0 / resamp_ratio);
-       message_port_register_in(pmt::intern("msg_in"));
-       set_msg_handler(pmt::intern("msg_in"), boost::bind(
--              &fractional_resampler_cc_impl::handle_msg, this, _1));
-+              &fractional_resampler_cc_impl::handle_msg, this, boost::placeholders::_1));
-     }
- 
-     fractional_resampler_cc_impl::~fractional_resampler_cc_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__ff__impl.cc b/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__ff__impl.cc
deleted file mode 100644
index ef77cc6da31..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__ff__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-filter_lib_fractional__resampler__ff__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-filter/lib/fractional_resampler_ff_impl.cc.orig	2020-05-09 00:31:06.387390287 +0000
-+++ gr-filter/lib/fractional_resampler_ff_impl.cc
-@@ -55,7 +55,7 @@ namespace gr {
- 
-       message_port_register_in(pmt::intern("msg_in"));
-       set_msg_handler(pmt::intern("msg_in"), boost::bind(
--              &fractional_resampler_ff_impl::handle_msg, this, _1));
-+              &fractional_resampler_ff_impl::handle_msg, this, boost::placeholders::_1));
-     }
- 
-     fractional_resampler_ff_impl::~fractional_resampler_ff_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-filter_lib_freq__xlating__fir__filter__XXX__impl.cc.t b/ham/gnuradio-core/patches/patch-gr-filter_lib_freq__xlating__fir__filter__XXX__impl.cc.t
deleted file mode 100644
index ce8d5d9707a..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-filter_lib_freq__xlating__fir__filter__XXX__impl.cc.t
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-filter_lib_freq__xlating__fir__filter__XXX__impl.cc.t,v 1.1 2020/05/09 15:17:51 joerg Exp $
-
---- gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t.orig	2020-05-09 00:48:50.738435461 +0000
-+++ gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t
-@@ -69,7 +69,7 @@ namespace gr {
-       message_port_register_in(pmt::mp("freq"));
-       set_msg_handler(pmt::mp("freq"),
-                       boost::bind(&@IMPL_NAME@::handle_set_center_freq,
--                                  this, _1));
-+                                  this, boost::placeholders::_1));
-     }
- 
-     @IMPL_NAME@::~@IMPL_NAME@()
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_TimeDomainDisplayPlot.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_TimeDomainDisplayPlot.cc
deleted file mode 100644
index a0722d04b20..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_TimeDomainDisplayPlot.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_TimeDomainDisplayPlot.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/TimeDomainDisplayPlot.cc.orig	2020-05-10 01:44:39.017593633 +0000
-+++ gr-qtgui/lib/TimeDomainDisplayPlot.cc
-@@ -30,6 +30,7 @@
- #include <QColor>
- #include <cmath>
- #include <iostream>
-+#include <sstream>
- #include <volk/volk.h>
- 
- class TimePrecisionClass
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_const__sink__c__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_const__sink__c__impl.cc
deleted file mode 100644
index 2c02f960376..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_const__sink__c__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_const__sink__c__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/const_sink_c_impl.cc.orig	2020-05-10 01:47:27.704318621 +0000
-+++ gr-qtgui/lib/const_sink_c_impl.cc
-@@ -69,7 +69,7 @@ namespace gr {
-       // setup PDU handling input port
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler(pmt::mp("in"),
--                      boost::bind(&const_sink_c_impl::handle_pdus, this, _1));
-+                      boost::bind(&const_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
- 
-       for(int i = 0; i < d_nconnections; i++) {
- 	d_residbufs_real.push_back((double*)volk_malloc(d_buffer_size*sizeof(double),
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_edit__box__msg__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_edit__box__msg__impl.cc
deleted file mode 100644
index 3693c8c4b8d..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_edit__box__msg__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_edit__box__msg__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/edit_box_msg_impl.cc.orig	2020-05-10 01:47:30.641188810 +0000
-+++ gr-qtgui/lib/edit_box_msg_impl.cc
-@@ -161,7 +161,7 @@ namespace gr {
-       message_port_register_in(pmt::mp("val"));
- 
-       set_msg_handler(pmt::mp("val"),
--                      boost::bind(&edit_box_msg_impl::set_value, this, _1));
-+                      boost::bind(&edit_box_msg_impl::set_value, this, boost::placeholders::_1));
-     }
- 
-     edit_box_msg_impl::~edit_box_msg_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_freq__sink__c__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_freq__sink__c__impl.cc
deleted file mode 100644
index 47fe9791c42..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_freq__sink__c__impl.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_freq__sink__c__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/freq_sink_c_impl.cc.orig	2020-05-10 01:47:14.103801167 +0000
-+++ gr-qtgui/lib/freq_sink_c_impl.cc
-@@ -76,12 +76,12 @@ namespace gr {
-       message_port_register_out(d_port);
-       message_port_register_in(d_port);
-       set_msg_handler(d_port,
--                      boost::bind(&freq_sink_c_impl::handle_set_freq, this, _1));
-+                      boost::bind(&freq_sink_c_impl::handle_set_freq, this, boost::placeholders::_1));
- 
-       // setup PDU handling input port
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler(pmt::mp("in"),
--                      boost::bind(&freq_sink_c_impl::handle_pdus, this, _1));
-+                      boost::bind(&freq_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
- 
-       d_main_gui = NULL;
- 
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_freq__sink__f__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_freq__sink__f__impl.cc
deleted file mode 100644
index 07c609aa306..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_freq__sink__f__impl.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_freq__sink__f__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/freq_sink_f_impl.cc.orig	2020-05-10 01:47:33.005346964 +0000
-+++ gr-qtgui/lib/freq_sink_f_impl.cc
-@@ -76,12 +76,12 @@ namespace gr {
-       message_port_register_out(d_port);
-       message_port_register_in(d_port);
-       set_msg_handler(d_port,
--                      boost::bind(&freq_sink_f_impl::handle_set_freq, this, _1));
-+                      boost::bind(&freq_sink_f_impl::handle_set_freq, this, boost::placeholders::_1));
- 
-       // setup PDU handling input port
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler(pmt::mp("in"),
--                      boost::bind(&freq_sink_f_impl::handle_pdus, this, _1));
-+                      boost::bind(&freq_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
- 
-       d_main_gui = NULL;
- 
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_histogram__sink__f__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_histogram__sink__f__impl.cc
deleted file mode 100644
index 939e8a7d3af..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_histogram__sink__f__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_histogram__sink__f__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/histogram_sink_f_impl.cc.orig	2020-05-10 01:47:35.846954976 +0000
-+++ gr-qtgui/lib/histogram_sink_f_impl.cc
-@@ -72,7 +72,7 @@ namespace gr {
-       // setup PDU handling input port
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler(pmt::mp("in"),
--                      boost::bind(&histogram_sink_f_impl::handle_pdus, this, _1));
-+                      boost::bind(&histogram_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
- 
-       // +1 for the PDU buffer
-       for(int i = 0; i < d_nconnections+1; i++) {
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_sink__c__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_sink__c__impl.cc
deleted file mode 100644
index 3d17b411cf6..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_sink__c__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_sink__c__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/sink_c_impl.cc.orig	2020-05-10 01:47:38.139712715 +0000
-+++ gr-qtgui/lib/sink_c_impl.cc
-@@ -79,7 +79,7 @@ namespace gr {
-       message_port_register_out(d_port);
-       message_port_register_in(d_port);
-       set_msg_handler(d_port,
--                      boost::bind(&sink_c_impl::handle_set_freq, this, _1));
-+                      boost::bind(&sink_c_impl::handle_set_freq, this, boost::placeholders::_1));
- 
-       d_main_gui = NULL;
- 
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_sink__f__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_sink__f__impl.cc
deleted file mode 100644
index 95d4272fed3..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_sink__f__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_sink__f__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/sink_f_impl.cc.orig	2020-05-10 01:47:40.242558048 +0000
-+++ gr-qtgui/lib/sink_f_impl.cc
-@@ -79,7 +79,7 @@ namespace gr {
-       message_port_register_out(d_port);
-       message_port_register_in(d_port);
-       set_msg_handler(d_port,
--                      boost::bind(&sink_f_impl::handle_set_freq, this, _1));
-+                      boost::bind(&sink_f_impl::handle_set_freq, this, boost::placeholders::_1));
- 
-       d_main_gui = NULL;
- 
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__raster__sink__b__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__raster__sink__b__impl.cc
deleted file mode 100644
index f8acdd4d69f..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__raster__sink__b__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_time__raster__sink__b__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/time_raster_sink_b_impl.cc.orig	2020-05-10 01:47:42.312800845 +0000
-+++ gr-qtgui/lib/time_raster_sink_b_impl.cc
-@@ -82,7 +82,7 @@ namespace gr {
-       // setup PDU handling input port
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler(pmt::mp("in"),
--                      boost::bind(&time_raster_sink_b_impl::handle_pdus, this, _1));
-+                      boost::bind(&time_raster_sink_b_impl::handle_pdus, this, boost::placeholders::_1));
- 
-       d_scale = 1.0f;
- 
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__raster__sink__f__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__raster__sink__f__impl.cc
deleted file mode 100644
index e55136a7c03..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__raster__sink__f__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_time__raster__sink__f__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/time_raster_sink_f_impl.cc.orig	2020-05-10 01:47:45.039050549 +0000
-+++ gr-qtgui/lib/time_raster_sink_f_impl.cc
-@@ -82,7 +82,7 @@ namespace gr {
-       // setup PDU handling input port
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler(pmt::mp("in"),
--                      boost::bind(&time_raster_sink_f_impl::handle_pdus, this, _1));
-+                      boost::bind(&time_raster_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
- 
-       d_icols = static_cast<int>(ceil(d_cols));
-       d_tmpflt = (float*)volk_malloc(d_icols*sizeof(float),
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__sink__c__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__sink__c__impl.cc
deleted file mode 100644
index 8f73a64b147..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__sink__c__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_time__sink__c__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/time_sink_c_impl.cc.orig	2020-05-10 01:46:15.407160673 +0000
-+++ gr-qtgui/lib/time_sink_c_impl.cc
-@@ -73,7 +73,7 @@ namespace gr {
-       // setup PDU handling input port
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler(pmt::mp("in"),
--                      boost::bind(&time_sink_c_impl::handle_pdus, this, _1));
-+                      boost::bind(&time_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
- 
-       // +2 for the PDU message buffers
-       for(int n = 0; n < d_nconnections+2; n++) {
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__sink__f__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__sink__f__impl.cc
deleted file mode 100644
index 3636bad7037..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_time__sink__f__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_time__sink__f__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/time_sink_f_impl.cc.orig	2020-05-10 01:47:48.672097068 +0000
-+++ gr-qtgui/lib/time_sink_f_impl.cc
-@@ -73,7 +73,7 @@ namespace gr {
-       // setup PDU handling input port
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler(pmt::mp("in"),
--                      boost::bind(&time_sink_f_impl::handle_pdus, this, _1));
-+                      boost::bind(&time_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
- 
-       // +1 for the PDU buffer
-       for(int n = 0; n < d_nconnections+1; n++) {
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_waterfall__sink__c__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_waterfall__sink__c__impl.cc
deleted file mode 100644
index 4c7c1b0b26f..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_waterfall__sink__c__impl.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_waterfall__sink__c__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/waterfall_sink_c_impl.cc.orig	2020-05-10 01:49:02.999982945 +0000
-+++ gr-qtgui/lib/waterfall_sink_c_impl.cc
-@@ -114,12 +114,12 @@ namespace gr {
-       message_port_register_out(d_port);
-       message_port_register_in(d_port);
-       set_msg_handler(d_port,
--                      boost::bind(&waterfall_sink_c_impl::handle_set_freq, this, _1));
-+                      boost::bind(&waterfall_sink_c_impl::handle_set_freq, this, boost::placeholders::_1));
- 
-       // setup PDU handling input port
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler(pmt::mp("in"),
--                      boost::bind(&waterfall_sink_c_impl::handle_pdus, this, _1));
-+                      boost::bind(&waterfall_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
-     }
- 
-     waterfall_sink_c_impl::~waterfall_sink_c_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_waterfall__sink__f__impl.cc b/ham/gnuradio-core/patches/patch-gr-qtgui_lib_waterfall__sink__f__impl.cc
deleted file mode 100644
index a12fdab617d..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-qtgui_lib_waterfall__sink__f__impl.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-gr-qtgui_lib_waterfall__sink__f__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-qtgui/lib/waterfall_sink_f_impl.cc.orig	2020-05-10 01:49:06.169881493 +0000
-+++ gr-qtgui/lib/waterfall_sink_f_impl.cc
-@@ -110,12 +110,12 @@ namespace gr {
-       message_port_register_out(d_port);
-       message_port_register_in(d_port);
-       set_msg_handler(d_port,
--                      boost::bind(&waterfall_sink_f_impl::handle_set_freq, this, _1));
-+                      boost::bind(&waterfall_sink_f_impl::handle_set_freq, this, boost::placeholders::_1));
- 
-       // setup PDU handling input port
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler(pmt::mp("in"),
--                      boost::bind(&waterfall_sink_f_impl::handle_pdus, this, _1));
-+                      boost::bind(&waterfall_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
-     }
- 
-     waterfall_sink_f_impl::~waterfall_sink_f_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-zeromq_lib_pub__msg__sink__impl.cc b/ham/gnuradio-core/patches/patch-gr-zeromq_lib_pub__msg__sink__impl.cc
deleted file mode 100644
index 0db46e4a5d8..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-zeromq_lib_pub__msg__sink__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-zeromq_lib_pub__msg__sink__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-zeromq/lib/pub_msg_sink_impl.cc.orig	2020-05-10 01:26:09.507359022 +0000
-+++ gr-zeromq/lib/pub_msg_sink_impl.cc
-@@ -58,7 +58,7 @@ namespace gr {
- 
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler( pmt::mp("in"),
--        boost::bind(&pub_msg_sink_impl::handler, this, _1));
-+        boost::bind(&pub_msg_sink_impl::handler, this, boost::placeholders::_1));
-     }
- 
-     pub_msg_sink_impl::~pub_msg_sink_impl()
diff --git a/ham/gnuradio-core/patches/patch-gr-zeromq_lib_push__msg__sink__impl.cc b/ham/gnuradio-core/patches/patch-gr-zeromq_lib_push__msg__sink__impl.cc
deleted file mode 100644
index 320a3a7b5e5..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-zeromq_lib_push__msg__sink__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gr-zeromq_lib_push__msg__sink__impl.cc,v 1.1 2020/05/14 19:22:44 joerg Exp $
-
---- gr-zeromq/lib/push_msg_sink_impl.cc.orig	2020-05-10 01:25:20.808024050 +0000
-+++ gr-zeromq/lib/push_msg_sink_impl.cc
-@@ -60,7 +60,7 @@ namespace gr {
- 
-       message_port_register_in(pmt::mp("in"));
-       set_msg_handler(pmt::mp("in"),
--                      boost::bind(&push_msg_sink_impl::handler, this, _1));
-+                      boost::bind(&push_msg_sink_impl::handler, this, boost::placeholders::_1));
-     }
- 
-     push_msg_sink_impl::~push_msg_sink_impl()
diff --git a/ham/gnuradio-core/patches/patch-grc_scripts_gnuradio-companion b/ham/gnuradio-core/patches/patch-grc_scripts_gnuradio-companion
new file mode 100644
index 00000000000..a0eb0e30aa6
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-grc_scripts_gnuradio-companion
@@ -0,0 +1,15 @@
+$NetBSD: patch-grc_scripts_gnuradio-companion,v 1.1 2020/08/30 20:43:47 tnn Exp $
+
+Add message for NetBSD when failed to import gnuradio.
+Or missing gnuradio-core package.
+
+--- grc/scripts/gnuradio-companion.orig	2019-08-10 06:40:34.000000000 +0900
++++ grc/scripts/gnuradio-companion	2019-09-16 21:26:17.217333967 +0900
+@@ -23,6 +23,7 @@ import warnings
+ 
+ GR_IMPORT_ERROR_MESSAGE = """\
+ Cannot import gnuradio.
++You may be missing gnuradio-core package or
+ 
+ Is the model path environment variable set correctly?
+     All OS: PYTHONPATH
diff --git a/ham/gnuradio-core/version.mk b/ham/gnuradio-core/version.mk
new file mode 100644
index 00000000000..b3c259351d3
--- /dev/null
+++ b/ham/gnuradio-core/version.mk
@@ -0,0 +1,3 @@
+# $NetBSD: version.mk,v 1.1 2020/08/30 20:43:46 tnn Exp $
+
+VERSION=	3.8.1.0
author	tnn <tnn@pkgsrc.org>	2020-08-30 20:43:46 +0000
committer	tnn <tnn@pkgsrc.org>	2020-08-30 20:43:46 +0000
commit	15cc2507d4bbef58f7a47a576856457c8425e3c8 (patch)
tree	a38407151311b6623bea67eb4d8727cd9fd1a89d
parent	6622c378a1444322428b92e88ce7dcabf1c846d1 (diff)
download	pkgsrc-15cc2507d4bbef58f7a47a576856457c8425e3c8.tar.gz