pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

(ham/gnuradio, ham/gr-*) For preparing another update, copy from pkgsrc proper



Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara (CF-SX3) <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Mon Sep 16 17:24:53 2019 +0900
Changeset:	d796ec2df77254dc5693578193712ef636a6f846

Modified Files:
	gnuradio-atsc/Makefile
	gnuradio-atsc/PLIST
	gnuradio-channels/Makefile
	gnuradio-channels/PLIST
	gnuradio-companion/Makefile
	gnuradio-companion/PLIST
	gnuradio-core/Makefile
	gnuradio-core/Makefile.common
	gnuradio-core/Makefile.version
	gnuradio-core/Nocore.mk
	gnuradio-core/PLIST
	gnuradio-core/PLIST.alsa
	gnuradio-core/buildlink3.mk
	gnuradio-core/distinfo
	gnuradio-core/options.mk
	gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
	gnuradio-core/patches/patch-gnuradio_runtime_include_gnuradio_high__res__timer__h
	gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc
	gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
	gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
	gnuradio-ctrlport/Makefile
	gnuradio-ctrlport/PLIST
	gnuradio-ctrlport/buildlink3.mk
	gnuradio-digital/Makefile
	gnuradio-digital/PLIST
	gnuradio-digital/buildlink3.mk
	gnuradio-doxygen/Makefile
	gnuradio-doxygen/PLIST
	gnuradio-dtv/Makefile
	gnuradio-dtv/PLIST
	gnuradio-dtv/buildlink3.mk
	gnuradio-fcd/Makefile
	gnuradio-fcd/PLIST
	gnuradio-fcd/buildlink3.mk
	gnuradio-fec/Makefile
	gnuradio-fec/PLIST
	gnuradio-fec/buildlink3.mk
	gnuradio-noaa/Makefile
	gnuradio-noaa/PLIST
	gnuradio-pager/Makefile
	gnuradio-pager/PLIST
	gnuradio-pager/buildlink3.mk
	gnuradio-qtgui/Makefile
	gnuradio-qtgui/PLIST
	gnuradio-trellis/Makefile
	gnuradio-trellis/PLIST
	gnuradio-trellis/buildlink3.mk
	gnuradio-uhd/Makefile
	gnuradio-uhd/PLIST
	gnuradio-uhd/buildlink3.mk
	gnuradio-utils/Makefile
	gnuradio-utils/PLIST
	gnuradio-utils/buildlink3.mk
	gnuradio-video-sdl/Makefile
	gnuradio-video-sdl/PLIST
	gnuradio-video-sdl/buildlink3.mk
	gnuradio-vocoder/Makefile
	gnuradio-vocoder/PLIST
	gnuradio-vocoder/buildlink3.mk
	gnuradio-wavelet/Makefile
	gnuradio-wavelet/PLIST
	gnuradio-wavelet/buildlink3.mk
	gnuradio-wxgui/Makefile
	gnuradio-wxgui/PLIST
	gnuradio-wxgui/buildlink3.mk
	gnuradio-zeromq/Makefile
	gnuradio-zeromq/PLIST
	gnuradio-zeromq/buildlink3.mk
Added Files:
	gnuradio-core/PLIST.Darwin
	gnuradio-core/files/REPLACE_PYTHON
	gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc
	gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc
	gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h
	gr-fcdproplus/.#Makefile.1.11
	gr-fcdproplus/DESCR
	gr-fcdproplus/Makefile
	gr-fcdproplus/PLIST
	gr-fcdproplus/buildlink3.mk
	gr-fcdproplus/distinfo
	gr-osmosdr/DESCR
	gr-osmosdr/Makefile
	gr-osmosdr/PLIST
	gr-osmosdr/buildlink3.mk
	gr-osmosdr/distinfo

Log Message:
(ham/gnuradio, ham/gr-*) For preparing another update, copy from pkgsrc proper

(as)
CF-SX3@makoto 17:26:11/190916(..pkgsrc/ham)% foreach i (gr-* gnur*)
rsync -aH $i/ ../wip/$i/
end

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d796ec2df77254dc5693578193712ef636a6f846

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnuradio-atsc/Makefile                             |  10 +-
 gnuradio-atsc/PLIST                                |  29 +-
 gnuradio-channels/Makefile                         |   7 +-
 gnuradio-channels/PLIST                            |   2 +-
 gnuradio-companion/Makefile                        |   9 +-
 gnuradio-companion/PLIST                           | 200 +++---
 gnuradio-core/Makefile                             |   3 +-
 gnuradio-core/Makefile.common                      |  79 ++-
 gnuradio-core/Makefile.version                     |   4 +-
 gnuradio-core/Nocore.mk                            |  14 +-
 gnuradio-core/PLIST                                |  97 ++-
 gnuradio-core/PLIST.Darwin                         |   3 +
 gnuradio-core/PLIST.alsa                           |   4 +-
 gnuradio-core/buildlink3.mk                        |   8 +-
 gnuradio-core/distinfo                             |  18 +-
 gnuradio-core/files/REPLACE_PYTHON                 | 568 ++++++++++++++++
 gnuradio-core/options.mk                           |  14 +-
 .../patches/patch-cmake_Modules_FindSphinx.cmake   |   2 +-
 ...io_runtime_include_gnuradio_high__res__timer__h |   2 +-
 .../patch-gnuradio_runtime_lib_thread_thread_cc    |  20 +-
 .../patches/patch-gr-audio_lib_CMakeLists.txt      |  10 +-
 .../patches/patch-gr-audio_lib_alsa_alsa__impl_h   |   2 +-
 .../patch-gr-blocks_lib_socket__pdu__impl.cc       |  15 +
 .../patches/patch-gr-blocks_lib_tcp__connection.cc |  21 +
 .../patches/patch-gr-blocks_lib_tcp__connection.h  |  21 +
 gnuradio-ctrlport/Makefile                         |   7 +-
 gnuradio-ctrlport/PLIST                            |   2 +-
 gnuradio-ctrlport/buildlink3.mk                    |   4 +-
 gnuradio-digital/Makefile                          |   9 +-
 gnuradio-digital/PLIST                             |  83 ++-
 gnuradio-digital/buildlink3.mk                     |   4 +-
 gnuradio-doxygen/Makefile                          |  14 +-
 gnuradio-doxygen/PLIST                             | 749 +++++++++++++--------
 gnuradio-dtv/Makefile                              |  10 +-
 gnuradio-dtv/PLIST                                 |  61 +-
 gnuradio-dtv/buildlink3.mk                         |   4 +-
 gnuradio-fcd/Makefile                              |   7 +-
 gnuradio-fcd/PLIST                                 |   2 +-
 gnuradio-fcd/buildlink3.mk                         |   4 +-
 gnuradio-fec/Makefile                              |   8 +-
 gnuradio-fec/PLIST                                 |  19 +-
 gnuradio-fec/buildlink3.mk                         |   4 +-
 gnuradio-noaa/Makefile                             |   7 +-
 gnuradio-noaa/PLIST                                |   2 +-
 gnuradio-pager/Makefile                            |   7 +-
 gnuradio-pager/PLIST                               |   2 +-
 gnuradio-pager/buildlink3.mk                       |   4 +-
 gnuradio-qtgui/Makefile                            |   7 +-
 gnuradio-qtgui/PLIST                               |  11 +-
 gnuradio-trellis/Makefile                          |   9 +-
 gnuradio-trellis/PLIST                             |  17 +-
 gnuradio-trellis/buildlink3.mk                     |   4 +-
 gnuradio-uhd/Makefile                              |   7 +-
 gnuradio-uhd/PLIST                                 |   2 +-
 gnuradio-uhd/buildlink3.mk                         |   4 +-
 gnuradio-utils/Makefile                            |  11 +-
 gnuradio-utils/PLIST                               |   2 +-
 gnuradio-utils/buildlink3.mk                       |   4 +-
 gnuradio-video-sdl/Makefile                        |   7 +-
 gnuradio-video-sdl/PLIST                           |   2 +-
 gnuradio-video-sdl/buildlink3.mk                   |   4 +-
 gnuradio-vocoder/Makefile                          |   7 +-
 gnuradio-vocoder/PLIST                             |   5 +-
 gnuradio-vocoder/buildlink3.mk                     |   4 +-
 gnuradio-wavelet/Makefile                          |   7 +-
 gnuradio-wavelet/PLIST                             |   2 +-
 gnuradio-wavelet/buildlink3.mk                     |   4 +-
 gnuradio-wxgui/Makefile                            |   9 +-
 gnuradio-wxgui/PLIST                               |   2 +-
 gnuradio-wxgui/buildlink3.mk                       |   4 +-
 gnuradio-zeromq/Makefile                           |   7 +-
 gnuradio-zeromq/PLIST                              |   2 +-
 gnuradio-zeromq/buildlink3.mk                      |   4 +-
 gr-fcdproplus/.#Makefile.1.11                      |  35 +
 gr-fcdproplus/DESCR                                |   6 +
 gr-fcdproplus/Makefile                             |  36 +
 gr-fcdproplus/PLIST                                |  15 +
 gr-fcdproplus/buildlink3.mk                        |  13 +
 gr-fcdproplus/distinfo                             |   6 +
 gr-osmosdr/DESCR                                   |  19 +
 gr-osmosdr/Makefile                                |  52 ++
 gr-osmosdr/PLIST                                   |  29 +
 gr-osmosdr/buildlink3.mk                           |  15 +
 gr-osmosdr/distinfo                                |   6 +
 84 files changed, 1916 insertions(+), 639 deletions(-)

diffs:
diff --git a/gnuradio-atsc/Makefile b/gnuradio-atsc/Makefile
index b8a233220f..9dda2359a7 100644
--- a/gnuradio-atsc/Makefile
+++ b/gnuradio-atsc/Makefile
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.3 2015/09/17 13:48:04 makoto Exp $
+# $NetBSD: Makefile,v 1.18 2019/08/22 12:23:21 ryoon Exp $
 
 PKGNAME=	gnuradio-atsc-${VERSION}
+PKGREVISION=	2
 COMMENT=	Advanced Television Systems Committee, ATSC module of GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=OFF
 CMAKE_ARGS+=	-DENABLE_GR_ATSC=ON
 CMAKE_ARGS+=	-DENABLE_GR_FEC=ON
 
-DEPENDS+=	gnuradio-fec-[0-9]*:../../wip/gnuradio-fec
+DEPENDS+=	gnuradio-fec-[0-9]*:../../ham/gnuradio-fec
 
 PLIST_MINUS+=	fec
+.include	"../../math/gsl/buildlink3.mk"
 .include	"../../mk/bsd.pkg.mk"
diff --git a/gnuradio-atsc/PLIST b/gnuradio-atsc/PLIST
index 75e296c98f..0f7f529102 100644
--- a/gnuradio-atsc/PLIST
+++ b/gnuradio-atsc/PLIST
@@ -1,28 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2015/09/17 13:48:04 makoto Exp $
-include/gnuradio/atsc/CMakeLists.txt
-include/gnuradio/atsc/GrAtscBitTimingLoop.h
-include/gnuradio/atsc/GrAtscBitTimingLoop2.h
-include/gnuradio/atsc/GrAtscBitTimingLoop3.h
-include/gnuradio/atsc/GrAtscConvert2xTo20.h
-include/gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h
-include/gnuradio/atsc/GrAtscDeinterleaver.h
-include/gnuradio/atsc/GrAtscDerandomizer.h
-include/gnuradio/atsc/GrAtscEqualizer.h
-include/gnuradio/atsc/GrAtscFPLL.h
-include/gnuradio/atsc/GrAtscFieldSyncChecker.h
-include/gnuradio/atsc/GrAtscFieldSyncCorrelator.h
-include/gnuradio/atsc/GrAtscFieldSyncDemux.h
-include/gnuradio/atsc/GrAtscFieldSyncMux.h
-include/gnuradio/atsc/GrAtscInterleaver.h
-include/gnuradio/atsc/GrAtscRSDecoder.h
-include/gnuradio/atsc/GrAtscRSEncoder.h
-include/gnuradio/atsc/GrAtscRandomizer.h
-include/gnuradio/atsc/GrAtscSegSymSync.h
-include/gnuradio/atsc/GrAtscSegSymSyncImpl.h
+@comment $NetBSD: PLIST,v 1.4 2016/07/12 11:36:46 mef Exp $
 include/gnuradio/atsc/GrAtscSegSymSyncImpl_export.h
-include/gnuradio/atsc/GrAtscSymbolMapper.h
-include/gnuradio/atsc/GrAtscTrellisEncoder.h
-include/gnuradio/atsc/GrAtscViterbiDecoder.h
 include/gnuradio/atsc/api.h
 include/gnuradio/atsc/basic_trellis_encoder_impl.h
 include/gnuradio/atsc/bit_timing_loop.h
@@ -42,7 +19,6 @@ include/gnuradio/atsc/equalizer_impl.h
 include/gnuradio/atsc/equalizer_lms2_impl.h
 include/gnuradio/atsc/equalizer_lms_impl.h
 include/gnuradio/atsc/equalizer_nop_impl.h
-include/gnuradio/atsc/exp2_lp_impl.h
 include/gnuradio/atsc/fake_single_viterbi_impl.h
 include/gnuradio/atsc/field_sync_demux.h
 include/gnuradio/atsc/field_sync_mux.h
@@ -59,8 +35,6 @@ include/gnuradio/atsc/pnXXX_impl.h
 include/gnuradio/atsc/randomizer.h
 include/gnuradio/atsc/randomizer_impl.h
 include/gnuradio/atsc/reed_solomon_impl.h
-include/gnuradio/atsc/root_raised_cosine_bandpass_impl.h
-include/gnuradio/atsc/root_raised_cosine_impl.h
 include/gnuradio/atsc/rs_decoder.h
 include/gnuradio/atsc/rs_encoder.h
 include/gnuradio/atsc/single_viterbi_impl.h
@@ -74,7 +48,6 @@ include/gnuradio/atsc/trellis_encoder_impl.h
 include/gnuradio/atsc/types.h
 include/gnuradio/atsc/viterbi_decoder.h
 include/gnuradio/atsc/viterbi_decoder_impl.h
-include/gnuradio/atsc/vsbtx_lp_impl.h
 include/gnuradio/swig/atsc_swig.i
 include/gnuradio/swig/atsc_swig_doc.i
 lib/libgnuradio-atsc.so
diff --git a/gnuradio-channels/Makefile b/gnuradio-channels/Makefile
index 7ba9f1eba8..b557cef3f5 100644
--- a/gnuradio-channels/Makefile
+++ b/gnuradio-channels/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2015/09/17 13:48:04 makoto Exp $
+# $NetBSD: Makefile,v 1.16 2019/08/22 12:23:21 ryoon Exp $
 
 PKGNAME=	gnuradio-channels-${VERSION}
+PKGREVISION=	2
 COMMENT=	Signal processing blocks to simulate channel models of GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=OFF
 CMAKE_ARGS+=	-DENABLE_GR_CHANNELS=ON
diff --git a/gnuradio-channels/PLIST b/gnuradio-channels/PLIST
index abe2c9a83b..0d9e64311e 100644
--- a/gnuradio-channels/PLIST
+++ b/gnuradio-channels/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/09/17 13:48:04 makoto Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/10/28 16:59:33 mef Exp $
 include/gnuradio/channels/api.h
 include/gnuradio/channels/channel_model.h
 include/gnuradio/channels/channel_model2.h
diff --git a/gnuradio-companion/Makefile b/gnuradio-companion/Makefile
index a371135e29..cb0ff6017a 100644
--- a/gnuradio-companion/Makefile
+++ b/gnuradio-companion/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2015/09/17 13:48:04 makoto Exp $
+# $NetBSD: Makefile,v 1.31 2019/08/22 12:23:21 ryoon Exp $
 
 PKGNAME=	gnuradio-companion-${VERSION}
+PKGREVISION=	3
 COMMENT=	User interface entry of GNU Radio
 
 #CONF_FILES+=	${EGDIR}/grc.conf	${PKG_SYSCONFDIR}/grc.conf
 
 DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
-REPLACE_BASH=	grc/freedesktop/grc_setup_freedesktop.in
+REPLACE_BASH=	grc/scripts/freedesktop/grc_setup_freedesktop.in
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 # gnuradio-companion
 CMAKE_ARGS+=	-DENABLE_DEFAULT=OFF
diff --git a/gnuradio-companion/PLIST b/gnuradio-companion/PLIST
index 589690fb36..8d4f8cd9de 100644
--- a/gnuradio-companion/PLIST
+++ b/gnuradio-companion/PLIST
@@ -1,44 +1,83 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.9 2018/07/16 07:55:22 mef Exp $
 bin/gnuradio-companion
 ${PYSITELIB}/gnuradio/grc/__init__.py
 ${PYSITELIB}/gnuradio/grc/__init__.pyc
 ${PYSITELIB}/gnuradio/grc/__init__.pyo
-${PYSITELIB}/gnuradio/grc/base/Block.py
-${PYSITELIB}/gnuradio/grc/base/Block.pyc
-${PYSITELIB}/gnuradio/grc/base/Block.pyo
-${PYSITELIB}/gnuradio/grc/base/Connection.py
-${PYSITELIB}/gnuradio/grc/base/Connection.pyc
-${PYSITELIB}/gnuradio/grc/base/Connection.pyo
-${PYSITELIB}/gnuradio/grc/base/Constants.py
-${PYSITELIB}/gnuradio/grc/base/Constants.pyc
-${PYSITELIB}/gnuradio/grc/base/Constants.pyo
-${PYSITELIB}/gnuradio/grc/base/Element.py
-${PYSITELIB}/gnuradio/grc/base/Element.pyc
-${PYSITELIB}/gnuradio/grc/base/Element.pyo
-${PYSITELIB}/gnuradio/grc/base/FlowGraph.py
-${PYSITELIB}/gnuradio/grc/base/FlowGraph.pyc
-${PYSITELIB}/gnuradio/grc/base/FlowGraph.pyo
-${PYSITELIB}/gnuradio/grc/base/Param.py
-${PYSITELIB}/gnuradio/grc/base/Param.pyc
-${PYSITELIB}/gnuradio/grc/base/Param.pyo
-${PYSITELIB}/gnuradio/grc/base/ParseXML.py
-${PYSITELIB}/gnuradio/grc/base/ParseXML.pyc
-${PYSITELIB}/gnuradio/grc/base/ParseXML.pyo
-${PYSITELIB}/gnuradio/grc/base/Platform.py
-${PYSITELIB}/gnuradio/grc/base/Platform.pyc
-${PYSITELIB}/gnuradio/grc/base/Platform.pyo
-${PYSITELIB}/gnuradio/grc/base/Port.py
-${PYSITELIB}/gnuradio/grc/base/Port.pyc
-${PYSITELIB}/gnuradio/grc/base/Port.pyo
-${PYSITELIB}/gnuradio/grc/base/__init__.py
-${PYSITELIB}/gnuradio/grc/base/__init__.pyc
-${PYSITELIB}/gnuradio/grc/base/__init__.pyo
-${PYSITELIB}/gnuradio/grc/base/block_tree.dtd
-${PYSITELIB}/gnuradio/grc/base/domain.dtd
-${PYSITELIB}/gnuradio/grc/base/flow_graph.dtd
-${PYSITELIB}/gnuradio/grc/base/odict.py
-${PYSITELIB}/gnuradio/grc/base/odict.pyc
-${PYSITELIB}/gnuradio/grc/base/odict.pyo
+${PYSITELIB}/gnuradio/grc/__main__.py
+${PYSITELIB}/gnuradio/grc/__main__.pyc
+${PYSITELIB}/gnuradio/grc/__main__.pyo
+${PYSITELIB}/gnuradio/grc/core/Block.py
+${PYSITELIB}/gnuradio/grc/core/Block.pyc
+${PYSITELIB}/gnuradio/grc/core/Block.pyo
+${PYSITELIB}/gnuradio/grc/core/Config.py
+${PYSITELIB}/gnuradio/grc/core/Config.pyc
+${PYSITELIB}/gnuradio/grc/core/Config.pyo
+${PYSITELIB}/gnuradio/grc/core/Connection.py
+${PYSITELIB}/gnuradio/grc/core/Connection.pyc
+${PYSITELIB}/gnuradio/grc/core/Connection.pyo
+${PYSITELIB}/gnuradio/grc/core/Constants.py
+${PYSITELIB}/gnuradio/grc/core/Constants.pyc
+${PYSITELIB}/gnuradio/grc/core/Constants.pyo
+${PYSITELIB}/gnuradio/grc/core/Element.py
+${PYSITELIB}/gnuradio/grc/core/Element.pyc
+${PYSITELIB}/gnuradio/grc/core/Element.pyo
+${PYSITELIB}/gnuradio/grc/core/FlowGraph.py
+${PYSITELIB}/gnuradio/grc/core/FlowGraph.pyc
+${PYSITELIB}/gnuradio/grc/core/FlowGraph.pyo
+${PYSITELIB}/gnuradio/grc/core/Messages.py
+${PYSITELIB}/gnuradio/grc/core/Messages.pyc
+${PYSITELIB}/gnuradio/grc/core/Messages.pyo
+${PYSITELIB}/gnuradio/grc/core/Param.py
+${PYSITELIB}/gnuradio/grc/core/Param.pyc
+${PYSITELIB}/gnuradio/grc/core/Param.pyo
+${PYSITELIB}/gnuradio/grc/core/ParseXML.py
+${PYSITELIB}/gnuradio/grc/core/ParseXML.pyc
+${PYSITELIB}/gnuradio/grc/core/ParseXML.pyo
+${PYSITELIB}/gnuradio/grc/core/Platform.py
+${PYSITELIB}/gnuradio/grc/core/Platform.pyc
+${PYSITELIB}/gnuradio/grc/core/Platform.pyo
+${PYSITELIB}/gnuradio/grc/core/Port.py
+${PYSITELIB}/gnuradio/grc/core/Port.pyc
+${PYSITELIB}/gnuradio/grc/core/Port.pyo
+${PYSITELIB}/gnuradio/grc/core/__init__.py
+${PYSITELIB}/gnuradio/grc/core/__init__.pyc
+${PYSITELIB}/gnuradio/grc/core/__init__.pyo
+${PYSITELIB}/gnuradio/grc/core/block.dtd
+${PYSITELIB}/gnuradio/grc/core/block_tree.dtd
+${PYSITELIB}/gnuradio/grc/core/default_flow_graph.grc
+${PYSITELIB}/gnuradio/grc/core/domain.dtd
+${PYSITELIB}/gnuradio/grc/core/flow_graph.dtd
+${PYSITELIB}/gnuradio/grc/core/generator/FlowGraphProxy.py
+${PYSITELIB}/gnuradio/grc/core/generator/FlowGraphProxy.pyc
+${PYSITELIB}/gnuradio/grc/core/generator/FlowGraphProxy.pyo
+${PYSITELIB}/gnuradio/grc/core/generator/Generator.py
+${PYSITELIB}/gnuradio/grc/core/generator/Generator.pyc
+${PYSITELIB}/gnuradio/grc/core/generator/Generator.pyo
+${PYSITELIB}/gnuradio/grc/core/generator/__init__.py
+${PYSITELIB}/gnuradio/grc/core/generator/__init__.pyc
+${PYSITELIB}/gnuradio/grc/core/generator/__init__.pyo
+${PYSITELIB}/gnuradio/grc/core/generator/flow_graph.tmpl
+${PYSITELIB}/gnuradio/grc/core/utils/__init__.py
+${PYSITELIB}/gnuradio/grc/core/utils/__init__.pyc
+${PYSITELIB}/gnuradio/grc/core/utils/__init__.pyo
+${PYSITELIB}/gnuradio/grc/core/utils/complexity.py
+${PYSITELIB}/gnuradio/grc/core/utils/complexity.pyc
+${PYSITELIB}/gnuradio/grc/core/utils/complexity.pyo
+${PYSITELIB}/gnuradio/grc/core/utils/epy_block_io.py
+${PYSITELIB}/gnuradio/grc/core/utils/epy_block_io.pyc
+${PYSITELIB}/gnuradio/grc/core/utils/epy_block_io.pyo
+${PYSITELIB}/gnuradio/grc/core/utils/expr_utils.py
+${PYSITELIB}/gnuradio/grc/core/utils/expr_utils.pyc
+${PYSITELIB}/gnuradio/grc/core/utils/expr_utils.pyo
+${PYSITELIB}/gnuradio/grc/core/utils/extract_docs.py
+${PYSITELIB}/gnuradio/grc/core/utils/extract_docs.pyc
+${PYSITELIB}/gnuradio/grc/core/utils/extract_docs.pyo
+${PYSITELIB}/gnuradio/grc/core/utils/hide_bokeh_gui_options_if_not_installed.py
+${PYSITELIB}/gnuradio/grc/core/utils/hide_bokeh_gui_options_if_not_installed.pyc
+${PYSITELIB}/gnuradio/grc/core/utils/hide_bokeh_gui_options_if_not_installed.pyo
+${PYSITELIB}/gnuradio/grc/core/utils/odict.py
+${PYSITELIB}/gnuradio/grc/core/utils/odict.pyc
+${PYSITELIB}/gnuradio/grc/core/utils/odict.pyo
 ${PYSITELIB}/gnuradio/grc/gui/ActionHandler.py
 ${PYSITELIB}/gnuradio/grc/gui/ActionHandler.pyc
 ${PYSITELIB}/gnuradio/grc/gui/ActionHandler.pyo
@@ -57,6 +96,9 @@ ${PYSITELIB}/gnuradio/grc/gui/BlockTreeWindow.pyo
 ${PYSITELIB}/gnuradio/grc/gui/Colors.py
 ${PYSITELIB}/gnuradio/grc/gui/Colors.pyc
 ${PYSITELIB}/gnuradio/grc/gui/Colors.pyo
+${PYSITELIB}/gnuradio/grc/gui/Config.py
+${PYSITELIB}/gnuradio/grc/gui/Config.pyc
+${PYSITELIB}/gnuradio/grc/gui/Config.pyo
 ${PYSITELIB}/gnuradio/grc/gui/Connection.py
 ${PYSITELIB}/gnuradio/grc/gui/Connection.pyc
 ${PYSITELIB}/gnuradio/grc/gui/Connection.pyo
@@ -72,6 +114,9 @@ ${PYSITELIB}/gnuradio/grc/gui/DrawingArea.pyo
 ${PYSITELIB}/gnuradio/grc/gui/Element.py
 ${PYSITELIB}/gnuradio/grc/gui/Element.pyc
 ${PYSITELIB}/gnuradio/grc/gui/Element.pyo
+${PYSITELIB}/gnuradio/grc/gui/Executor.py
+${PYSITELIB}/gnuradio/grc/gui/Executor.pyc
+${PYSITELIB}/gnuradio/grc/gui/Executor.pyo
 ${PYSITELIB}/gnuradio/grc/gui/FileDialogs.py
 ${PYSITELIB}/gnuradio/grc/gui/FileDialogs.pyc
 ${PYSITELIB}/gnuradio/grc/gui/FileDialogs.pyo
@@ -81,9 +126,6 @@ ${PYSITELIB}/gnuradio/grc/gui/FlowGraph.pyo
 ${PYSITELIB}/gnuradio/grc/gui/MainWindow.py
 ${PYSITELIB}/gnuradio/grc/gui/MainWindow.pyc
 ${PYSITELIB}/gnuradio/grc/gui/MainWindow.pyo
-${PYSITELIB}/gnuradio/grc/gui/Messages.py
-${PYSITELIB}/gnuradio/grc/gui/Messages.pyc
-${PYSITELIB}/gnuradio/grc/gui/Messages.pyo
 ${PYSITELIB}/gnuradio/grc/gui/NotebookPage.py
 ${PYSITELIB}/gnuradio/grc/gui/NotebookPage.pyc
 ${PYSITELIB}/gnuradio/grc/gui/NotebookPage.pyo
@@ -111,83 +153,21 @@ ${PYSITELIB}/gnuradio/grc/gui/StateCache.pyo
 ${PYSITELIB}/gnuradio/grc/gui/Utils.py
 ${PYSITELIB}/gnuradio/grc/gui/Utils.pyc
 ${PYSITELIB}/gnuradio/grc/gui/Utils.pyo
+${PYSITELIB}/gnuradio/grc/gui/VariableEditor.py
+${PYSITELIB}/gnuradio/grc/gui/VariableEditor.pyc
+${PYSITELIB}/gnuradio/grc/gui/VariableEditor.pyo
 ${PYSITELIB}/gnuradio/grc/gui/__init__.py
 ${PYSITELIB}/gnuradio/grc/gui/__init__.pyc
 ${PYSITELIB}/gnuradio/grc/gui/__init__.pyo
 ${PYSITELIB}/gnuradio/grc/gui/external_editor.py
 ${PYSITELIB}/gnuradio/grc/gui/external_editor.pyc
 ${PYSITELIB}/gnuradio/grc/gui/external_editor.pyo
-${PYSITELIB}/gnuradio/grc/python/Block.py
-${PYSITELIB}/gnuradio/grc/python/Block.pyc
-${PYSITELIB}/gnuradio/grc/python/Block.pyo
-${PYSITELIB}/gnuradio/grc/python/Connection.py
-${PYSITELIB}/gnuradio/grc/python/Connection.pyc
-${PYSITELIB}/gnuradio/grc/python/Connection.pyo
-${PYSITELIB}/gnuradio/grc/python/Constants.py
-${PYSITELIB}/gnuradio/grc/python/Constants.pyc
-${PYSITELIB}/gnuradio/grc/python/Constants.pyo
-${PYSITELIB}/gnuradio/grc/python/FlowGraph.py
-${PYSITELIB}/gnuradio/grc/python/FlowGraph.pyc
-${PYSITELIB}/gnuradio/grc/python/FlowGraph.pyo
-${PYSITELIB}/gnuradio/grc/python/Generator.py
-${PYSITELIB}/gnuradio/grc/python/Generator.pyc
-${PYSITELIB}/gnuradio/grc/python/Generator.pyo
-${PYSITELIB}/gnuradio/grc/python/Param.py
-${PYSITELIB}/gnuradio/grc/python/Param.pyc
-${PYSITELIB}/gnuradio/grc/python/Param.pyo
-${PYSITELIB}/gnuradio/grc/python/Platform.py
-${PYSITELIB}/gnuradio/grc/python/Platform.pyc
-${PYSITELIB}/gnuradio/grc/python/Platform.pyo
-${PYSITELIB}/gnuradio/grc/python/Port.py
-${PYSITELIB}/gnuradio/grc/python/Port.pyc
-${PYSITELIB}/gnuradio/grc/python/Port.pyo
-${PYSITELIB}/gnuradio/grc/python/__init__.py
-${PYSITELIB}/gnuradio/grc/python/__init__.pyc
-${PYSITELIB}/gnuradio/grc/python/__init__.pyo
-${PYSITELIB}/gnuradio/grc/python/block.dtd
-${PYSITELIB}/gnuradio/grc/python/default_flow_graph.grc
-${PYSITELIB}/gnuradio/grc/python/epy_block_io.py
-${PYSITELIB}/gnuradio/grc/python/epy_block_io.pyc
-${PYSITELIB}/gnuradio/grc/python/epy_block_io.pyo
-${PYSITELIB}/gnuradio/grc/python/expr_utils.py
-${PYSITELIB}/gnuradio/grc/python/expr_utils.pyc
-${PYSITELIB}/gnuradio/grc/python/expr_utils.pyo
-${PYSITELIB}/gnuradio/grc/python/extract_docs.py
-${PYSITELIB}/gnuradio/grc/python/extract_docs.pyc
-${PYSITELIB}/gnuradio/grc/python/extract_docs.pyo
-${PYSITELIB}/gnuradio/grc/python/flow_graph.tmpl
-${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/packet.py
-${PYSITELIB}/grc_gnuradio/blks2/packet.pyc
-${PYSITELIB}/grc_gnuradio/blks2/packet.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}/gnuradio/grc/gui/icon.png
+${PYSITELIB}/gnuradio/grc/main.py
+${PYSITELIB}/gnuradio/grc/main.pyc
+${PYSITELIB}/gnuradio/grc/main.pyo
 libexec/gnuradio/grc_setup_freedesktop
 share/gnuradio/examples/grc.conf
-share/gnuradio/examples/grc/simple/variable_config.grc
-share/gnuradio/examples/grc/xmlrpc/readme.txt
-share/gnuradio/examples/grc/xmlrpc/xmlrpc_client.grc
-share/gnuradio/examples/grc/xmlrpc/xmlrpc_client_script.py
-share/gnuradio/examples/grc/xmlrpc/xmlrpc_server.grc
-share/gnuradio/grc/blocks/blks2_error_rate.xml
-share/gnuradio/grc/blocks/blks2_packet_decoder.xml
-share/gnuradio/grc/blocks/blks2_packet_encoder.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/block_tree.xml
 share/gnuradio/grc/blocks/bus_sink.xml
 share/gnuradio/grc/blocks/bus_source.xml
@@ -210,8 +190,6 @@ share/gnuradio/grc/blocks/variable_function_probe.xml
 share/gnuradio/grc/blocks/variable_struct.xml
 share/gnuradio/grc/blocks/virtual_sink.xml
 share/gnuradio/grc/blocks/virtual_source.xml
-share/gnuradio/grc/blocks/xmlrpc_client.xml
-share/gnuradio/grc/blocks/xmlrpc_server.xml
 share/gnuradio/grc/freedesktop/gnuradio-grc.desktop
 share/gnuradio/grc/freedesktop/gnuradio-grc.xml
 share/gnuradio/grc/freedesktop/grc-icon-128.png
diff --git a/gnuradio-core/Makefile b/gnuradio-core/Makefile
index 0e0d595e1e..66b6b5d5cf 100644
--- a/gnuradio-core/Makefile
+++ b/gnuradio-core/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2015/09/17 13:48:04 makoto Exp $
+# $NetBSD: Makefile,v 1.69 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-core-${VERSION}
+PKGREVISION=	3
 COMMENT=	Core part of GNU Radio, all others need this
 
 PLIST_MINUS=	# empty
diff --git a/gnuradio-core/Makefile.common b/gnuradio-core/Makefile.common
index df05571525..1688719f68 100644
--- a/gnuradio-core/Makefile.common
+++ b/gnuradio-core/Makefile.common
@@ -1,39 +1,40 @@
-# $NetBSD: Makefile.common,v 1.12 2015/09/17 13:48:04 makoto Exp $
-#
+# $NetBSD: Makefile.common,v 1.19 2019/09/02 13:19:57 adam 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 wip/gnuradio-atsc/Makefile
-# used by wip/gnuradio-channels/Makefile
-# used by wip/gnuradio-companion/Makefile
-# used by wip/gnuradio-core/Makefile
-# used by wip/gnuradio-ctrlport/Makefile
-# used by wip/gnuradio-default/Makefile
-# used by wip/gnuradio-digital/Makefile
-# used by wip/gnuradio-doxygen/Makefile
-# used by wip/gnuradio-dtv/Makefile
-# used by wip/gnuradio-fcd/Makefile
-# used by wip/gnuradio-fec/Makefile
-# used by wip/gnuradio-fcd/Makefile
-# used by wip/gnuradio-noaa/Makefile
-# used by wip/gnuradio-pager/Makefile
-# used by wip/gnuradio-qtgui/Makefile
-# used by wip/gnuradio-trellis/Makefile
-# used by wip/gnuradio-uhd/Makefile
-# used by wip/gnuradio-utils/Makefile
-# used by wip/gnuradio-video-sdl/Makefile
-# used by wip/gnuradio-vocoder/Makefile
-# used by wip/gnuradio-wavelet/Makefile
-# used by wip/gnuradio-wxgui/Makefile
-# used by wip/gnuradio-zeromq/Makefile
-
-.include	"../../wip/gnuradio-core/Makefile.version"
+# used by ham/gnuradio-atsc/Makefile
+# 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-fcd/Makefile
+# used by ham/gnuradio-fec/Makefile
+
+# used by ham/gnuradio-fcd/Makefile
+# used by ham/gnuradio-noaa/Makefile
+# used by ham/gnuradio-pager/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-wxgui/Makefile
+# used by ham/gnuradio-zeromq/Makefile
+
+.include	"../../ham/gnuradio-core/Makefile.version"
 
 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/
 
 MAINTAINER?=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE?=	http://www.gnu.org/software/gnuradio/
@@ -44,11 +45,13 @@ USE_TOOLS=	perl gmake cmake pkg-config
 USE_CMAKE=	yes
 
 DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
+DEPENDS+=	${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
+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
 
-DISTINFO_FILE=		${.CURDIR}/../../wip/gnuradio-core/distinfo
-PATCHDIR=		${.CURDIR}/../../wip/gnuradio-core/patches
+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
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
@@ -60,6 +63,7 @@ CONFIGURE_DIRS=	build
 EGDIR=			share/gnuradio/examples
 PKG_SYSCONFSUBDIR=	gnuradio/conf.d
 
+CXXFLAGS+=		-pthread
 LDFLAGS.DragonFly+=	-lboost_system
 LDFLAGS.SunOS+=		-lboost_system
 CXXFLAGS.SunOS+=	-pthreads
@@ -81,6 +85,7 @@ CMAKE_ARGS+=	-DENABLE_GR_FFT=ON
 CMAKE_ARGS+=	-DENABLE_GR_FILTER=ON
 CMAKE_ARGS+=	-DENABLE_PYTHON=ON
 CMAKE_ARGS+=	-DENABLE_VOLK=ON
+CMAKE_ARGS+=	-DCMAKE_HAVE_PTHREADS_CREATE=OFF
 
 # Default setting (for pkgsrc)
 CMAKE_ARGS+=	-Wno-dev
@@ -94,6 +99,10 @@ CMAKE_ARGS+=	-DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0
 CMAKE_ARGS+=	-DGR_LIBRARY_DIR=${PREFIX}/lib
 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}
+
 CMAKE_ARGS+=	-DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
 CMAKE_ARG_PATH=	../
 
@@ -105,7 +114,7 @@ SUBST_MESSAGE.alsa=	Arrange the patched line depepending on alsa is in PKG_OPTIO
 SUBST_FILES.alsa+=	gr-audio/lib/CMakeLists.txt
 ## The value of ${ALSA_ENABLED} is either '#' or '' by options.mk.
 SUBST_SED.alsa=		-e 's,@@ALSA@@,${ALSA_ENABLED},'
-SUBST_STAGE.alsa=	post-patch
+SUBST_STAGE.alsa=	pre-configure
 
 SUBST_CLASSES+=		pyvers
 SUBST_FILES.pyvers=	cmake/Modules/FindSphinx.cmake
@@ -114,7 +123,7 @@ SUBST_VARS.pyvers+=	PYVERSSUFFIX
 SUBST_STAGE.pyvers=	pre-configure
 
 # REPLACE_PYTHON is some 600 files
-.include "../../wip/gnuradio-core/replace-python.mk"
+.include	"../../ham/gnuradio-core/files/REPLACE_PYTHON"
 
 pre-configure:
 	(${MKDIR} ${WRKSRC}/build;)
@@ -128,9 +137,11 @@ do-install:
 
 .include	"../../devel/boost-headers/buildlink3.mk"
 .include	"../../devel/boost-libs/buildlink3.mk"
+.include	"../../devel/cppunit/buildlink3.mk"
 # VOLK needs orc.h, so in the common
 .include	"../../devel/orc/buildlink3.mk"
 .include	"../../devel/swig2/buildlink3.mk"
 
 .include	"../../lang/python/application.mk"
 .include	"../../math/fftwf/buildlink3.mk"
+.include	"../../math/gsl/buildlink3.mk"
diff --git a/gnuradio-core/Makefile.version b/gnuradio-core/Makefile.version
index 4dec01aa06..1d4163897c 100644
--- a/gnuradio-core/Makefile.version
+++ b/gnuradio-core/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.5 2015/09/17 13:48:04 makoto Exp $
+# $NetBSD: Makefile.version,v 1.13 2019/06/21 16:02:16 mef Exp $
 
-VERSION=	3.7.9.1
+VERSION=        3.7.13.5
diff --git a/gnuradio-core/Nocore.mk b/gnuradio-core/Nocore.mk
index 865d8f889d..e84507d01a 100644
--- a/gnuradio-core/Nocore.mk
+++ b/gnuradio-core/Nocore.mk
@@ -1,6 +1,6 @@
-# $NetBSD: Nocore.mk,v 1.4 2015/09/17 13:48:04 makoto Exp $
+# $NetBSD: Nocore.mk,v 1.9 2016/07/12 11:36:46 mef Exp $
 
-DEPENDS+=	gnuradio-core-[0-9]*:../../wip/gnuradio-core
+DEPENDS+=	gnuradio-core-[0-9]*:../../ham/gnuradio-core
 
 # Default list for reducing PLIST
 # gnuradio-* names to be common (to get the list to reduce)
@@ -15,7 +15,7 @@ post-install:
 #			    ${DESTDIR}${PREFIX}/${EGDIR}/
 	for i in ${PLIST_MINUS} ; do				\
 	  for p in PLIST PLIST.oss PLIST.${OPSYS} ; do		\
-	    f="${PKGDIR}/../../wip/gnuradio-$${i}/$${p}";	\
+	    f="${PKGDIR}/../../ham/gnuradio-$${i}/$${p}";	\
 	    if [ -f "$${f}" ]; then				\
 	      ${SED} -e 's,$${PYSITELIB},${PYSITELIB},'		\
 	       -e 's,$${PKGVERSION},${PKGVERSION_NOREV},'	\
@@ -29,3 +29,11 @@ post-install:
 	> ${WRKDIR}/.PLIST.minus;
 	(cd ${WRKDIR}/.destdir/${PREFIX};			\
 	${RM} -f $$(cat ${WRKDIR}/.PLIST.minus)	);
+# workaround for gnuradio-doxygen
+#  (the same target can't be set on gnuradio-doxygen side
+#
+	(cd ${WRKDIR}/.destdir/${PREFIX};			\
+	${RM} -f share/doc/gnuradio-${PKGVERSION}/html/_formulas.aux; \
+	${RM} -f share/doc/gnuradio-${PKGVERSION}/html/_formulas.log; \
+	${RM} -f share/doc/gnuradio-${PKGVERSION}/html/_formulas.dvi; \
+	)
diff --git a/gnuradio-core/PLIST b/gnuradio-core/PLIST
index 8c78506cd3..e24b112577 100644
--- a/gnuradio-core/PLIST
+++ b/gnuradio-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.28 2018/08/13 05:56:29 dbj Exp $
 bin/gnuradio-config-info
 bin/gr_filter_design
 bin/volk-config-info
@@ -114,6 +114,7 @@ include/gnuradio/blocks/divide_ff.h
 include/gnuradio/blocks/divide_ii.h
 include/gnuradio/blocks/divide_ss.h
 include/gnuradio/blocks/endian_swap.h
+include/gnuradio/blocks/exponentiate_const_cci.h
 include/gnuradio/blocks/file_descriptor_sink.h
 include/gnuradio/blocks/file_descriptor_source.h
 include/gnuradio/blocks/file_meta_sink.h
@@ -158,6 +159,7 @@ 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/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
@@ -243,12 +245,15 @@ include/gnuradio/blocks/sub_ii.h
 include/gnuradio/blocks/sub_ss.h
 include/gnuradio/blocks/tag_debug.h
 include/gnuradio/blocks/tag_gate.h
+include/gnuradio/blocks/tag_share.h
 include/gnuradio/blocks/tagged_file_sink.h
 include/gnuradio/blocks/tagged_stream_align.h
 include/gnuradio/blocks/tagged_stream_multiply_length.h
 include/gnuradio/blocks/tagged_stream_mux.h
 include/gnuradio/blocks/tagged_stream_to_pdu.h
 include/gnuradio/blocks/tags_strobe.h
+include/gnuradio/blocks/tcp_server_sink.h
+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
@@ -350,6 +355,8 @@ include/gnuradio/filter/interp_fir_filter_scc.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/pfb_arb_resampler.h
 include/gnuradio/filter/pfb_arb_resampler_ccc.h
 include/gnuradio/filter/pfb_arb_resampler_ccf.h
@@ -419,6 +426,8 @@ include/gnuradio/swig/block_gateway.i
 include/gnuradio/swig/blocks_swig0.i
 include/gnuradio/swig/blocks_swig0_doc.i
 include/gnuradio/swig/blocks_swig1.i
+include/gnuradio/swig/blocks_swig10.i
+include/gnuradio/swig/blocks_swig10_doc.i
 include/gnuradio/swig/blocks_swig1_doc.i
 include/gnuradio/swig/blocks_swig2.i
 include/gnuradio/swig/blocks_swig2_doc.i
@@ -428,6 +437,14 @@ include/gnuradio/swig/blocks_swig4.i
 include/gnuradio/swig/blocks_swig4_doc.i
 include/gnuradio/swig/blocks_swig5.i
 include/gnuradio/swig/blocks_swig5_doc.i
+include/gnuradio/swig/blocks_swig6.i
+include/gnuradio/swig/blocks_swig6_doc.i
+include/gnuradio/swig/blocks_swig7.i
+include/gnuradio/swig/blocks_swig7_doc.i
+include/gnuradio/swig/blocks_swig8.i
+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
@@ -483,6 +500,7 @@ include/pmt/pmt.h
 include/pmt/pmt_pool.h
 include/pmt/pmt_serial_tags.h
 include/pmt/pmt_sugar.h
+include/volk/saturation_arithmetic.h
 include/volk/volk.h
 include/volk/volk_16i_32fc_dot_prod_32fc.h
 include/volk/volk_16i_branch_4_state_8.h
@@ -493,6 +511,7 @@ include/volk/volk_16i_permute_and_scalar_add.h
 include/volk/volk_16i_s32f_convert_32f.h
 include/volk/volk_16i_x4_quad_max_star_16i.h
 include/volk/volk_16i_x5_add_quad_16i_x4.h
+include/volk/volk_16ic_convert_32fc.h
 include/volk/volk_16ic_deinterleave_16i_x2.h
 include/volk/volk_16ic_deinterleave_real_16i.h
 include/volk/volk_16ic_deinterleave_real_8i.h
@@ -500,8 +519,12 @@ include/volk/volk_16ic_magnitude_16i.h
 include/volk/volk_16ic_s32f_deinterleave_32f_x2.h
 include/volk/volk_16ic_s32f_deinterleave_real_32f.h
 include/volk/volk_16ic_s32f_magnitude_32f.h
+include/volk/volk_16ic_x2_dot_prod_16ic.h
+include/volk/volk_16ic_x2_multiply_16ic.h
 include/volk/volk_16u_byteswap.h
 include/volk/volk_16u_byteswappuppet_16u.h
+include/volk/volk_32f_64f_add_64f.h
+include/volk/volk_32f_64f_multiply_64f.h
 include/volk/volk_32f_8u_polarbutterfly_32f.h
 include/volk/volk_32f_8u_polarbutterflypuppet_32f.h
 include/volk/volk_32f_accumulator_s32f.h
@@ -514,6 +537,7 @@ include/volk/volk_32f_convert_64f.h
 include/volk/volk_32f_cos_32f.h
 include/volk/volk_32f_expfast_32f.h
 include/volk/volk_32f_index_max_16u.h
+include/volk/volk_32f_index_max_32u.h
 include/volk/volk_32f_invsqrt_32f.h
 include/volk/volk_32f_log2_32f.h
 include/volk/volk_32f_null_32f.h
@@ -522,9 +546,11 @@ include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f.h
 include/volk/volk_32f_s32f_convert_16i.h
 include/volk/volk_32f_s32f_convert_32i.h
 include/volk/volk_32f_s32f_convert_8i.h
+include/volk/volk_32f_s32f_mod_rangepuppet_32f.h
 include/volk/volk_32f_s32f_multiply_32f.h
 include/volk/volk_32f_s32f_normalize.h
 include/volk/volk_32f_s32f_power_32f.h
+include/volk/volk_32f_s32f_s32f_mod_range_32f.h
 include/volk/volk_32f_s32f_stddev_32f.h
 include/volk/volk_32f_sin_32f.h
 include/volk/volk_32f_sqrt_32f.h
@@ -544,15 +570,18 @@ include/volk/volk_32f_x2_pow_32f.h
 include/volk/volk_32f_x2_s32f_interleave_16ic.h
 include/volk/volk_32f_x2_subtract_32f.h
 include/volk/volk_32f_x3_sum_of_poly_32f.h
+include/volk/volk_32fc_32f_add_32fc.h
 include/volk/volk_32fc_32f_dot_prod_32fc.h
 include/volk/volk_32fc_32f_multiply_32fc.h
 include/volk/volk_32fc_conjugate_32fc.h
+include/volk/volk_32fc_convert_16ic.h
 include/volk/volk_32fc_deinterleave_32f_x2.h
 include/volk/volk_32fc_deinterleave_64f_x2.h
 include/volk/volk_32fc_deinterleave_imag_32f.h
 include/volk/volk_32fc_deinterleave_real_32f.h
 include/volk/volk_32fc_deinterleave_real_64f.h
 include/volk/volk_32fc_index_max_16u.h
+include/volk/volk_32fc_index_max_32u.h
 include/volk/volk_32fc_magnitude_32f.h
 include/volk/volk_32fc_magnitude_squared_32f.h
 include/volk/volk_32fc_s32f_atan2_32f.h
@@ -564,7 +593,9 @@ include/volk/volk_32fc_s32f_x2_power_spectral_density_32f.h
 include/volk/volk_32fc_s32fc_multiply_32fc.h
 include/volk/volk_32fc_s32fc_rotatorpuppet_32fc.h
 include/volk/volk_32fc_s32fc_x2_rotator_32fc.h
+include/volk/volk_32fc_x2_add_32fc.h
 include/volk/volk_32fc_x2_conjugate_dot_prod_32fc.h
+include/volk/volk_32fc_x2_divide_32fc.h
 include/volk/volk_32fc_x2_dot_prod_32fc.h
 include/volk/volk_32fc_x2_multiply_32fc.h
 include/volk/volk_32fc_x2_multiply_conjugate_32fc.h
@@ -577,9 +608,12 @@ include/volk/volk_32u_byteswap.h
 include/volk/volk_32u_byteswappuppet_32u.h
 include/volk/volk_32u_popcnt.h
 include/volk/volk_32u_popcntpuppet_32u.h
+include/volk/volk_32u_reverse_32u.h
 include/volk/volk_64f_convert_32f.h
+include/volk/volk_64f_x2_add_64f.h
 include/volk/volk_64f_x2_max_64f.h
 include/volk/volk_64f_x2_min_64f.h
+include/volk/volk_64f_x2_multiply_64f.h
 include/volk/volk_64u_byteswap.h
 include/volk/volk_64u_byteswappuppet_64u.h
 include/volk/volk_64u_popcnt.h
@@ -607,9 +641,12 @@ include/volk/volk_malloc.h
 include/volk/volk_neon_intrinsics.h
 include/volk/volk_prefs.h
 include/volk/volk_sse3_intrinsics.h
+include/volk/volk_sse_intrinsics.h
 include/volk/volk_typedefs.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/FindFFTW3f.cmake
@@ -658,7 +695,7 @@ lib/libgnuradio-pmt.so.${PKGVERSION}
 lib/libgnuradio-runtime.so
 lib/libgnuradio-runtime.so.${PKGVERSION}
 lib/libvolk.so
-lib/libvolk.so.1.2.1
+lib/libvolk.so.1.4
 lib/pkgconfig/gnuradio-analog.pc
 lib/pkgconfig/gnuradio-audio.pc
 lib/pkgconfig/gnuradio-blocks.pc
@@ -718,10 +755,15 @@ ${PYSITELIB}/gnuradio/blocks/__init__.pyc
 ${PYSITELIB}/gnuradio/blocks/__init__.pyo
 ${PYSITELIB}/gnuradio/blocks/_blocks_swig0.so
 ${PYSITELIB}/gnuradio/blocks/_blocks_swig1.so
+${PYSITELIB}/gnuradio/blocks/_blocks_swig10.so
 ${PYSITELIB}/gnuradio/blocks/_blocks_swig2.so
 ${PYSITELIB}/gnuradio/blocks/_blocks_swig3.so
 ${PYSITELIB}/gnuradio/blocks/_blocks_swig4.so
 ${PYSITELIB}/gnuradio/blocks/_blocks_swig5.so
+${PYSITELIB}/gnuradio/blocks/_blocks_swig6.so
+${PYSITELIB}/gnuradio/blocks/_blocks_swig7.so
+${PYSITELIB}/gnuradio/blocks/_blocks_swig8.so
+${PYSITELIB}/gnuradio/blocks/_blocks_swig9.so
 ${PYSITELIB}/gnuradio/blocks/blocks_swig.py
 ${PYSITELIB}/gnuradio/blocks/blocks_swig.pyc
 ${PYSITELIB}/gnuradio/blocks/blocks_swig.pyo
@@ -731,6 +773,9 @@ ${PYSITELIB}/gnuradio/blocks/blocks_swig0.pyo
 ${PYSITELIB}/gnuradio/blocks/blocks_swig1.py
 ${PYSITELIB}/gnuradio/blocks/blocks_swig1.pyc
 ${PYSITELIB}/gnuradio/blocks/blocks_swig1.pyo
+${PYSITELIB}/gnuradio/blocks/blocks_swig10.py
+${PYSITELIB}/gnuradio/blocks/blocks_swig10.pyc
+${PYSITELIB}/gnuradio/blocks/blocks_swig10.pyo
 ${PYSITELIB}/gnuradio/blocks/blocks_swig2.py
 ${PYSITELIB}/gnuradio/blocks/blocks_swig2.pyc
 ${PYSITELIB}/gnuradio/blocks/blocks_swig2.pyo
@@ -743,6 +788,18 @@ ${PYSITELIB}/gnuradio/blocks/blocks_swig4.pyo
 ${PYSITELIB}/gnuradio/blocks/blocks_swig5.py
 ${PYSITELIB}/gnuradio/blocks/blocks_swig5.pyc
 ${PYSITELIB}/gnuradio/blocks/blocks_swig5.pyo
+${PYSITELIB}/gnuradio/blocks/blocks_swig6.py
+${PYSITELIB}/gnuradio/blocks/blocks_swig6.pyc
+${PYSITELIB}/gnuradio/blocks/blocks_swig6.pyo
+${PYSITELIB}/gnuradio/blocks/blocks_swig7.py
+${PYSITELIB}/gnuradio/blocks/blocks_swig7.pyc
+${PYSITELIB}/gnuradio/blocks/blocks_swig7.pyo
+${PYSITELIB}/gnuradio/blocks/blocks_swig8.py
+${PYSITELIB}/gnuradio/blocks/blocks_swig8.pyc
+${PYSITELIB}/gnuradio/blocks/blocks_swig8.pyo
+${PYSITELIB}/gnuradio/blocks/blocks_swig9.py
+${PYSITELIB}/gnuradio/blocks/blocks_swig9.pyc
+${PYSITELIB}/gnuradio/blocks/blocks_swig9.pyo
 ${PYSITELIB}/gnuradio/blocks/parse_file_metadata.py
 ${PYSITELIB}/gnuradio/blocks/parse_file_metadata.pyc
 ${PYSITELIB}/gnuradio/blocks/parse_file_metadata.pyo
@@ -890,6 +947,21 @@ ${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
@@ -909,13 +981,14 @@ ${PYSITELIB}/volk_modtool/cfg.pyo
 ${PYSITELIB}/volk_modtool/volk_modtool_generate.py
 ${PYSITELIB}/volk_modtool/volk_modtool_generate.pyc
 ${PYSITELIB}/volk_modtool/volk_modtool_generate.pyo
-share/doc/gnuradio-${PKGVERSION}/README
+share/doc/gnuradio-${PKGVERSION}/CHANGELOG.md
 share/doc/gnuradio-${PKGVERSION}/README.analog
 share/doc/gnuradio-${PKGVERSION}/README.audio
 share/doc/gnuradio-${PKGVERSION}/README.blocks
 share/doc/gnuradio-${PKGVERSION}/README.fft
 share/doc/gnuradio-${PKGVERSION}/README.filter
 share/doc/gnuradio-${PKGVERSION}/README.hacking
+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
@@ -935,6 +1008,7 @@ 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/test_stream_mux_tags.grc
 share/gnuradio/examples/blocks/vector_source_with_tags.grc
 share/gnuradio/examples/filter/channelize.py
 share/gnuradio/examples/filter/chirp_channelize.py
@@ -955,7 +1029,6 @@ share/gnuradio/examples/filter/synth_filter.py
 share/gnuradio/examples/filter/synth_to_chan.py
 share/gnuradio/examples/gnuradio-runtime.conf
 share/gnuradio/examples/gr-audio-jack.conf
-share/gnuradio/examples/gr-audio-oss.conf
 share/gnuradio/examples/gr-audio-portaudio.conf
 share/gnuradio/examples/gr-audio.conf
 share/gnuradio/examples/metadata/file_metadata_sink.grc
@@ -995,6 +1068,7 @@ 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
@@ -1017,6 +1091,11 @@ 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
@@ -1047,6 +1126,7 @@ 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
@@ -1076,8 +1156,10 @@ 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
@@ -1123,12 +1205,15 @@ 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
@@ -1185,3 +1270,7 @@ 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
+@pkgdir include/volk/asm/orc
+@pkgdir include/volk/asm/neon
diff --git a/gnuradio-core/PLIST.Darwin b/gnuradio-core/PLIST.Darwin
new file mode 100644
index 0000000000..e54de82add
--- /dev/null
+++ b/gnuradio-core/PLIST.Darwin
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.Darwin,v 1.2 2015/11/26 20:53:52 wiedi Exp $
+include/gnuradio/audio/osx_impl.h
+share/gnuradio/examples/gr-audio-osx.conf
diff --git a/gnuradio-core/PLIST.alsa b/gnuradio-core/PLIST.alsa
index 74916b12b0..760817da43 100644
--- a/gnuradio-core/PLIST.alsa
+++ b/gnuradio-core/PLIST.alsa
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.alsa,v 1.2 2015/09/17 13:48:04 makoto Exp $
-share/examples/gnuradio/conf.d/gr-audio-alsa.conf
+@comment $NetBSD: PLIST.alsa,v 1.2 2015/11/26 20:57:48 wiedi Exp $
+share/gnuradio/examples/gr-audio-alsa.conf
diff --git a/gnuradio-core/buildlink3.mk b/gnuradio-core/buildlink3.mk
index bb7283cdaf..d762a2079c 100644
--- a/gnuradio-core/buildlink3.mk
+++ b/gnuradio-core/buildlink3.mk
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2015/09/17 13:48:04 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2017/03/15 14:07:12 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-core
 
 .if !defined(GNURADIO_CORE_BUILDLINK3_MK)
 GNURADIO_CORE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-core+=	gnuradio-core>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-core+=	gnuradio-core>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-core?=	../../wip/gnuradio-core
+BUILDLINK_API_DEPENDS.gnuradio-core+=	gnuradio-core>=3.7.11
+BUILDLINK_ABI_DEPENDS.gnuradio-core+=	gnuradio-core>=3.7.11
+BUILDLINK_PKGSRCDIR.gnuradio-core?=	../../ham/gnuradio-core
 .endif # GNURADIO_CORE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-core
diff --git a/gnuradio-core/distinfo b/gnuradio-core/distinfo
index 70da9b3b8f..2c1c0369bd 100644
--- a/gnuradio-core/distinfo
+++ b/gnuradio-core/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.11 2015/09/17 13:48:04 makoto Exp $
+$NetBSD: distinfo,v 1.33 2019/07/08 17:50:55 ryoon Exp $
 
-SHA1 (gnuradio-3.7.9.1.tar.gz) = 6b9960ebed57610e52da2c23ef953674faefb849
-RMD160 (gnuradio-3.7.9.1.tar.gz) = a058199b480db264d2ca6b8b87a7b18d2a876d62
-SHA512 (gnuradio-3.7.9.1.tar.gz) = ee575616bede307e18c3f6c4d039cdf27388796ad17adaf65bd39a74a7754bc5f822b4d18da0dd31587d453d625dfa58d75809c4a37fa0809c4009ac8fe5451d
-Size (gnuradio-3.7.9.1.tar.gz) = 4857025 bytes
+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) = 1e42ad000962f4766810fbd322c80dad1f0b1c3c
 SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7ac76b2ce35cda68c378bc2abad20a5
-SHA1 (patch-gnuradio_runtime_lib_thread_thread_cc) = c05628aa88ac968928f9eabd8c56d4527e258767
-SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 00ff8c14658acd2d1dc8be18ea6a19ace8d12968
+SHA1 (patch-gnuradio_runtime_lib_thread_thread_cc) = 7e8aa146447fc7ffd006ffd540764ae4b15da2a5
+SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 42e0b52d6baba936c03e2414e83a96a19c5331e7
 SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = d61dcd31058c04a6050479a6e8c321ca15420d49
-SHA1 (patch-grc_script_gnuradio-companion) = 15dde8f3a9e057061e56157533f8af1919240b93
+SHA1 (patch-gr-blocks_lib_socket__pdu__impl.cc) = 96a0f5c17fdea993531846ef011767c999d17d36
+SHA1 (patch-gr-blocks_lib_tcp__connection.cc) = ef932b7a4d87d7fd2ed6dcff5ab2d75b25095acc
+SHA1 (patch-gr-blocks_lib_tcp__connection.h) = ef6e19424a07f4cf16dbac834bdb48f3f639ebf5
diff --git a/gnuradio-core/files/REPLACE_PYTHON b/gnuradio-core/files/REPLACE_PYTHON
new file mode 100644
index 0000000000..c233ea04e9
--- /dev/null
+++ b/gnuradio-core/files/REPLACE_PYTHON
@@ -0,0 +1,568 @@
+REPLACE_PYTHON = \
+	grc/__init__.py \
+	grc/gui/Platform.py \
+	grc/gui/Port.py \
+	grc/gui/NotebookPage.py \
+	grc/gui/Constants.py \
+	grc/gui/FileDialogs.py \
+	grc/gui/DrawingArea.py \
+	grc/gui/Utils.py \
+	grc/gui/Bars.py \
+	grc/gui/PropsDialog.py \
+	grc/gui/Param.py \
+	grc/gui/StateCache.py \
+	grc/gui/Actions.py \
+	grc/gui/MainWindow.py \
+	grc/gui/BlockTreeWindow.py \
+	grc/gui/Connection.py \
+	grc/gui/Dialogs.py \
+	grc/gui/Preferences.py \
+	grc/gui/Element.py \
+	grc/gui/FlowGraph.py \
+	grc/gui/Colors.py \
+	grc/gui/__init__.py \
+	grc/gui/ActionHandler.py \
+	grc/gui/Block.py \
+	gr-filter/python/filter/qa_hilbert.py \
+	gr-filter/python/filter/qa_pfb_arb_resampler.py \
+	gr-filter/python/filter/qa_filter_delay_fc.py \
+	gr-filter/python/filter/qa_rational_resampler.py \
+	gr-filter/python/filter/qa_fir_filter.py \
+	gr-filter/python/filter/qa_pfb_channelizer.py \
+	gr-filter/python/filter/qa_pfb_interpolator.py \
+	gr-filter/python/filter/qa_firdes.py \
+	gr-filter/python/filter/optfir.py \
+	gr-filter/python/filter/qa_interp_fir_filter.py \
+	gr-filter/python/filter/qa_single_pole_iir.py \
+	gr-filter/python/filter/qa_dc_blocker.py \
+	gr-filter/python/filter/filterbank.py \
+	gr-filter/python/filter/qa_freq_xlating_fir_filter.py \
+	gr-filter/python/filter/qa_pfb_decimator.py \
+	gr-filter/python/filter/qa_fft_filter.py \
+	gr-filter/python/filter/qa_fractional_resampler.py \
+	gr-filter/python/filter/qa_iir_filter.py \
+	gr-filter/python/filter/qa_fractional_interpolator.py \
+	gr-filter/python/filter/__init__.py \
+	gr-filter/python/filter/qa_pfb_synthesizer.py \
+	gr-filter/python/filter/rational_resampler.py \
+	gr-filter/python/filter/qa_pm_remez.py \
+	gr-filter/python/filter/design/api_object.py \
+	gr-filter/python/filter/design/filter_design.py \
+	gr-filter/python/filter/design/fir_design.py \
+	gr-filter/python/filter/gui/banditems.py \
+	gr-filter/python/filter/gui/pyqt_filter_stacked.py \
+	gr-filter/python/filter/gui/icons_rc.py \
+	gr-filter/python/filter/gui/bandgraphicsview.py \
+	gr-filter/python/filter/gui/idealbanditems.py \
+	gr-filter/python/filter/gui/polezero_plot.py \
+	gr-filter/python/filter/pfb.py \
+	gr-filter/examples/fir_filter_ccc.py \
+	gr-filter/examples/decimate.py \
+	gr-filter/examples/gr_filtdes_restrict.py \
+	gr-filter/examples/synth_filter.py \
+	gr-filter/examples/fft_filter_ccc.py \
+	gr-filter/examples/chirp_channelize.py \
+	gr-filter/examples/gr_filtdes_callback.py \
+	gr-filter/examples/interpolate.py \
+	gr-filter/examples/gr_filtdes_api.py \
+	gr-filter/examples/resampler.py \
+	gr-filter/examples/gr_filtdes_live_upd.py \
+	gr-filter/examples/synth_to_chan.py \
+	gr-filter/examples/channelize.py \
+	gr-filter/examples/benchmark_filters.py \
+	gr-filter/examples/reconstruction.py \
+	gr-filter/examples/fir_filter_fff.py \
+	gr-fec/python/fec/qa_ecc_ccsds_27.py \
+	gr-fec/python/fec/__init__.py \
+	gr-analog/python/analog/qa_pll_refout.py \
+	gr-analog/python/analog/qa_noise.py \
+	gr-analog/python/analog/qa_fmdet.py \
+	gr-analog/python/analog/fm_emph.py \
+	gr-analog/python/analog/qa_simple_squelch.py \
+	gr-analog/python/analog/qa_fastnoise.py \
+	gr-analog/python/analog/qa_sig_source.py \
+	gr-analog/python/analog/wfm_rcv_fmdet.py \
+	gr-analog/python/analog/qa_quadrature_demod.py \
+	gr-analog/python/analog/nbfm_rx.py \
+	gr-analog/python/analog/am_demod.py \
+	gr-analog/python/analog/nbfm_tx.py \
+	gr-analog/python/analog/qa_agc.py \
+	gr-analog/python/analog/qa_pll_freqdet.py \
+	gr-analog/python/analog/qa_dpll.py \
+	gr-analog/python/analog/qa_pll_carriertracking.py \
+	gr-analog/python/analog/qa_rail_ff.py \
+	gr-analog/python/analog/qa_phase_modulator.py \
+	gr-analog/python/analog/wfm_rcv_pll.py \
+	gr-analog/python/analog/qa_frequency_modulator.py \
+	gr-analog/python/analog/standard_squelch.py \
+	gr-analog/python/analog/__init__.py \
+	gr-analog/python/analog/fm_demod.py \
+	gr-analog/python/analog/qa_ctcss_squelch.py \
+	gr-analog/python/analog/qa_pwr_squelch.py \
+	gr-analog/python/analog/wfm_tx.py \
+	gr-analog/python/analog/wfm_rcv.py \
+	gr-analog/python/analog/qa_probe_avg_mag_sqrd.py \
+	gr-analog/python/analog/qa_cpfsk.py \
+	gr-analog/examples/tags/uhd_burst_detector.py \
+	gr-analog/examples/fmtest.py \
+	volk/python/volk_modtool/volk_modtool_generate.py \
+	volk/python/volk_modtool/cfg.py \
+	volk/python/volk_modtool/__init__.py \
+	volk/gen/volk_compile_utils.py \
+	volk/gen/volk_arch_defs.py \
+	volk/gen/volk_tmpl_utils.py \
+	volk/gen/volk_machine_defs.py \
+	volk/gen/volk_kernel_defs.py \
+	gr-digital/python/digital/ofdm.py \
+	gr-digital/python/digital/generic_mod_demod.py \
+	gr-digital/python/digital/qa_probe_density.py \
+	gr-digital/python/digital/qa_packet_headerparser_b.py \
+	gr-digital/python/digital/qa_correlate_access_code.py \
+	gr-digital/python/digital/ofdm_sync_fixed.py \
+	gr-digital/python/digital/qa_constellation_soft_decoder_cf.py \
+	gr-digital/python/digital/qa_ofdm_serializer_vcc.py \
+	gr-digital/python/digital/packet_utils.py \
+	gr-digital/python/digital/soft_dec_lut_gen.py \
+	gr-digital/python/digital/qpsk.py \
+	gr-digital/python/digital/qa_clock_recovery_mm.py \
+	gr-digital/python/digital/qa_ofdm_chanest_vcvc.py \
+	gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py \
+	gr-digital/python/digital/qa_simple_framer.py \
+	gr-digital/python/digital/qa_ofdm_insert_preamble.py \
+	gr-digital/python/digital/psk_constellations.py \
+	gr-digital/python/digital/qa_constellation.py \
+	gr-digital/python/digital/qa_mpsk_snr_est.py \
+	gr-digital/python/digital/cpm.py \
+	gr-digital/python/digital/bpsk.py \
+	gr-digital/python/digital/ofdm_sync_pn.py \
+	gr-digital/python/digital/qa_chunks_to_symbols.py \
+	gr-digital/python/digital/qa_pfb_clock_sync.py \
+	gr-digital/python/digital/gmsk.py \
+	gr-digital/python/digital/qa_map.py \
+	gr-digital/python/digital/qa_ofdm_cyclic_prefixer.py \
+	gr-digital/python/digital/ofdm_receiver.py \
+	gr-digital/python/digital/qa_ofdm_carrier_allocator_cvc.py \
+	gr-digital/python/digital/crc.py \
+	gr-digital/python/digital/psk.py \
+	gr-digital/python/digital/ofdm_sync_pnac.py \
+	gr-digital/python/digital/pkt.py \
+	gr-digital/python/digital/qa_ofdm_frame_equalizer_vcvc.py \
+	gr-digital/python/digital/qam_constellations.py \
+	gr-digital/python/digital/constellation_map_generator.py \
+	gr-digital/python/digital/qa_mpsk_receiver.py \
+	gr-digital/python/digital/qa_lms_equalizer.py \
+	gr-digital/python/digital/ofdm_sync_ml.py \
+	gr-digital/python/digital/qa_diff_phasor_cc.py \
+	gr-digital/python/digital/qa_ofdm_txrx.py \
+	gr-digital/python/digital/qam.py \
+	gr-digital/python/digital/qa_costas_loop_cc.py \
+	gr-digital/python/digital/qa_simple_correlator.py \
+	gr-digital/python/digital/qa_digital.py \
+	gr-digital/python/digital/qa_correlate_and_sync.py \
+	gr-digital/python/digital/qa_framer_sink.py \
+	gr-digital/python/digital/ofdm_packet_utils.py \
+	gr-digital/python/digital/qa_lfsr.py \
+	gr-digital/python/digital/utils/alignment.py \
+	gr-digital/python/digital/utils/mod_codes.py \
+	gr-digital/python/digital/utils/gray_code.py \
+	gr-digital/python/digital/utils/tagged_streams.py \
+	gr-digital/python/digital/utils/__init__.py \
+	gr-digital/python/digital/qa_diff_encoder.py \
+	gr-digital/python/digital/qa_constellation_receiver.py \
+	gr-digital/python/digital/qa_glfsr_source.py \
+	gr-digital/python/digital/qa_scrambler.py \
+	gr-digital/python/digital/qa_cma_equalizer.py \
+	gr-digital/python/digital/ofdm_txrx.py \
+	gr-digital/python/digital/qa_fll_band_edge.py \
+	gr-digital/python/digital/__init__.py \
+	gr-digital/python/digital/qa_crc32.py \
+	gr-digital/python/digital/qa_packet_headergenerator_bb.py \
+	gr-digital/python/digital/qa_constellation_decoder_cb.py \
+	gr-digital/python/digital/qa_crc32_bb.py \
+	gr-digital/python/digital/qa_pn_correlator_cc.py \
+	gr-digital/python/digital/gfsk.py \
+	gr-digital/python/digital/qa_header_payload_demux.py \
+	gr-digital/python/digital/qa_binary_slicer_fb.py \
+	gr-digital/python/digital/qamlike.py \
+	gr-digital/python/digital/modulation_utils.py \
+	gr-digital/python/digital/test_soft_decisions.py \
+	gr-digital/python/digital/qa_cpm.py \
+	gr-digital/examples/example_timing.py \
+	gr-digital/examples/example_costas.py \
+	gr-digital/examples/run_length.py \
+	gr-digital/examples/narrowband/benchmark_add_channel.py \
+	gr-digital/examples/narrowband/benchmark_rx.py \
+	gr-digital/examples/narrowband/receive_path.py \
+	gr-digital/examples/narrowband/tx_voice.py \
+	gr-digital/examples/narrowband/digital_bert_tx.py \
+	gr-digital/examples/narrowband/tunnel.py \
+	gr-digital/examples/narrowband/benchmark_tx.py \
+	gr-digital/examples/narrowband/rx_voice.py \
+	gr-digital/examples/narrowband/digital_bert_rx.py \
+	gr-digital/examples/narrowband/uhd_interface.py \
+	gr-digital/examples/narrowband/transmit_path.py \
+	gr-digital/examples/example_fll.py \
+	gr-digital/examples/ofdm/gr_plot_ofdm.py \
+	gr-digital/examples/ofdm/benchmark_add_channel.py \
+	gr-digital/examples/ofdm/benchmark_rx.py \
+	gr-digital/examples/ofdm/receive_path.py \
+	gr-digital/examples/ofdm/tunnel.py \
+	gr-digital/examples/ofdm/benchmark_tx.py \
+	gr-digital/examples/ofdm/uhd_interface.py \
+	gr-digital/examples/ofdm/transmit_path.py \
+	gr-digital/examples/gen_whitener.py \
+	gr-digital/examples/snr_estimators.py \
+	gr-digital/examples/berawgn.py \
+	gr-audio/python/audio/__init__.py \
+	gr-audio/examples/python/audio_fft.py \
+	gr-audio/examples/python/noise.py \
+	gr-audio/examples/python/dial_tone_daemon.py \
+	gr-audio/examples/python/dial_tone_wav.py \
+	gr-audio/examples/python/test_resampler.py \
+	gr-audio/examples/python/audio_to_file.py \
+	gr-audio/examples/python/multi_tone.py \
+	gr-audio/examples/python/audio_copy.py \
+	gr-audio/examples/python/audio_play.py \
+	gr-audio/examples/python/dial_tone.py \
+	gr-audio/examples/python/spectrum_inversion.py \
+	gr-audio/examples/python/mono_tone.py \
+	gr-wxgui/grc/top_block_gui.py \
+	gr-wxgui/grc/panel.py \
+	gr-wxgui/grc/__init__.py \
+	gr-wxgui/python/wxgui/constants.py \
+	gr-wxgui/python/wxgui/numbersink2.py \
+	gr-wxgui/python/wxgui/const_window.py \
+	gr-wxgui/python/wxgui/waterfall_window.py \
+	gr-wxgui/python/wxgui/plotter/gltext.py \
+	gr-wxgui/python/wxgui/plotter/plotter_base.py \
+	gr-wxgui/python/wxgui/plotter/channel_plotter.py \
+	gr-wxgui/python/wxgui/plotter/grid_plotter_base.py \
+	gr-wxgui/python/wxgui/plotter/common.py \
+	gr-wxgui/python/wxgui/plotter/__init__.py \
+	gr-wxgui/python/wxgui/plotter/bar_plotter.py \
+	gr-wxgui/python/wxgui/plotter/waterfall_plotter.py \
+	gr-wxgui/python/wxgui/constsink_gl.py \
+	gr-wxgui/python/wxgui/fftsink2.py \
+	gr-wxgui/python/wxgui/pubsub.py \
+	gr-wxgui/python/wxgui/scopesink_gl.py \
+	gr-wxgui/python/wxgui/fft_window.py \
+	gr-wxgui/python/wxgui/gui.py \
+	gr-wxgui/python/wxgui/plot.py \
+	gr-wxgui/python/wxgui/waterfallsink_nongl.py \
+	gr-wxgui/python/wxgui/histo_window.py \
+	gr-wxgui/python/wxgui/slider.py \
+	gr-wxgui/python/wxgui/termsink.py \
+	gr-wxgui/python/wxgui/waterfallsink_gl.py \
+	gr-wxgui/python/wxgui/powermate.py \
+	gr-wxgui/python/wxgui/forms/forms.py \
+	gr-wxgui/python/wxgui/forms/__init__.py \
+	gr-wxgui/python/wxgui/forms/converters.py \
+	gr-wxgui/python/wxgui/form.py \
+	gr-wxgui/python/wxgui/fftsink_gl.py \
+	gr-wxgui/python/wxgui/common.py \
+	gr-wxgui/python/wxgui/histosink_gl.py \
+	gr-wxgui/python/wxgui/scopesink_nongl.py \
+	gr-wxgui/python/wxgui/stdgui2.py \
+	gr-wxgui/python/wxgui/scopesink2.py \
+	gr-wxgui/python/wxgui/number_window.py \
+	gr-wxgui/python/wxgui/fftsink_nongl.py \
+	gr-wxgui/python/wxgui/__init__.py \
+	gr-wxgui/python/wxgui/scope_window.py \
+	gr-wxgui/python/wxgui/waterfallsink2.py \
+	gr-qtgui/python/qtgui/qa_qtgui.py \
+	gr-qtgui/python/qtgui/__init__.py \
+	gr-qtgui/apps/qt_digital_window.py \
+	gr-qtgui/apps/uhd_display.py \
+	gr-qtgui/apps/plot_time_form.py \
+	gr-qtgui/apps/plot_psd_form.py \
+	gr-qtgui/apps/plot_spectrogram_form.py \
+	gr-qtgui/apps/plot_constellation_form.py \
+	gr-qtgui/apps/plot_base.py \
+	gr-qtgui/apps/plot_spectrogram_base.py \
+	gr-qtgui/apps/plot_form.py \
+	gr-qtgui/apps/usrp_display_qtgui.py \
+	gr-qtgui/apps/plot_psd_base.py \
+	gr-qtgui/apps/plot_time_base.py \
+	gr-qtgui/apps/plot_time_raster_form.py \
+	gr-qtgui/apps/qt_digital.py \
+	gr-qtgui/apps/plot_time_raster_base.py \
+	gr-qtgui/examples/pyqt_waterfall_f.py \
+	gr-qtgui/examples/pyqt_example_f.py \
+	gr-qtgui/examples/pyqt_example_c.py \
+	gr-qtgui/examples/pyqt_time_f.py \
+	gr-qtgui/examples/pyqt_waterfall_c.py \
+	gr-qtgui/examples/pyqt_histogram_f.py \
+	gr-qtgui/examples/pyqt_time_c.py \
+	gr-qtgui/examples/pyqt_const_c.py \
+	gr-qtgui/examples/pyqt_time_raster_b.py \
+	gr-qtgui/examples/pyqt_freq_f.py \
+	gr-qtgui/examples/pyqt_time_raster_f.py \
+	gr-qtgui/examples/pyqt_freq_c.py \
+	gr-wavelet/python/wavelet/__init__.py \
+	gr-wavelet/python/wavelet/qa_classify.py \
+	gr-channels/python/channels/quantizer.py \
+	gr-channels/python/channels/phase_bal.py \
+	gr-channels/python/channels/amp_bal.py \
+	gr-channels/python/channels/phase_noise_gen.py \
+	gr-channels/python/channels/distortion_2_gen.py \
+	gr-channels/python/channels/conj_fs_iqcorr.py \
+	gr-channels/python/channels/distortion_3_gen.py \
+	gr-channels/python/channels/iqbal_gen.py \
+	gr-channels/python/channels/__init__.py \
+	gr-channels/python/channels/impairments.py \
+	gr-channels/python/channels/qa_channel_model.py \
+	gr-channels/python/channels/qa_fading_model.py \
+	gr-comedi/python/comedi/qa_comedi.py \
+	gr-comedi/python/comedi/__init__.py \
+	gnuradio-runtime/python/pmt/qa_pmt.py \
+	gnuradio-runtime/python/pmt/__init__.py \
+	gnuradio-runtime/python/pmt/pmt_to_python.py \
+	gnuradio-runtime/python/pmt/qa_pmt_to_python.py \
+	gnuradio-runtime/python/gnuradio/gru/os_read_exactly.py \
+	gnuradio-runtime/python/gnuradio/gru/mathmisc.py \
+	gnuradio-runtime/python/gnuradio/gru/listmisc.py \
+	gnuradio-runtime/python/gnuradio/gru/socket_stuff.py \
+	gnuradio-runtime/python/gnuradio/gru/seq_with_cursor.py \
+	gnuradio-runtime/python/gnuradio/gru/daemon.py \
+	gnuradio-runtime/python/gnuradio/gru/msgq_runner.py \
+	gnuradio-runtime/python/gnuradio/gru/__init__.py \
+	gnuradio-runtime/python/gnuradio/gru/hexint.py \
+	gnuradio-runtime/python/gnuradio/gru/freqz.py \
+	gnuradio-runtime/python/gnuradio/gru/gnuplot_freqz.py \
+	gnuradio-runtime/python/gnuradio/gr/exceptions.py \
+	gnuradio-runtime/python/gnuradio/gr/qa_feval.py \
+	gnuradio-runtime/python/gnuradio/gr/gr_threading.py \
+	gnuradio-runtime/python/gnuradio/gr/tag_utils.py \
+	gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py \
+	gnuradio-runtime/python/gnuradio/gr/top_block.py \
+	gnuradio-runtime/python/gnuradio/gr/gateway.py \
+	gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py \
+	gnuradio-runtime/python/gnuradio/gr/hier_block2.py \
+	gnuradio-runtime/python/gnuradio/gr/__init__.py \
+	gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py \
+	gnuradio-runtime/python/gnuradio/gr/qa_kludged_imports.py \
+	gnuradio-runtime/python/gnuradio/gr/pubsub.py \
+	gnuradio-runtime/python/gnuradio/gr_xmlrunner.py \
+	gnuradio-runtime/python/gnuradio/eng_notation.py \
+	gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py \
+	gnuradio-runtime/python/gnuradio/ctrlport/monitor.py \
+	gnuradio-runtime/python/gnuradio/ctrlport/__init__.py \
+	gnuradio-runtime/python/gnuradio/eng_option.py \
+	gnuradio-runtime/python/gnuradio/__init__.py \
+	gnuradio-runtime/python/gnuradio/gr_unittest.py \
+	gnuradio-runtime/python/build_utils.py \
+	gnuradio-runtime/python/build_utils_codes.py \
+	gnuradio-runtime/lib/pmt/gen-serial-tags.py \
+	gnuradio-runtime/lib/pmt/generate_unv.py \
+	gnuradio-runtime/lib/math/gen_sine_table.py \
+	gnuradio-runtime/examples/network/vector_sink.py \
+	gnuradio-runtime/examples/network/dial_tone_source.py \
+	gnuradio-runtime/examples/network/dial_tone_sink.py \
+	gnuradio-runtime/examples/network/vector_source.py \
+	gnuradio-runtime/examples/network/audio_sink.py \
+	gnuradio-runtime/examples/network/audio_source.py \
+	gnuradio-runtime/examples/mp-sched/affinity_set.py \
+	gnuradio-runtime/examples/mp-sched/run_synthetic.py \
+	gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py \
+	gnuradio-runtime/examples/mp-sched/synthetic.py \
+	gnuradio-runtime/examples/mp-sched/plot_flops.py \
+	gnuradio-runtime/examples/volk_benchmark/volk_types.py \
+	gnuradio-runtime/examples/volk_benchmark/volk_test_funcs.py \
+	gnuradio-runtime/examples/volk_benchmark/volk_plot.py \
+	gnuradio-runtime/examples/volk_benchmark/volk_math.py \
+	gr-fft/python/fft/qa_goertzel.py \
+	gr-fft/python/fft/qa_fft.py \
+	gr-fft/python/fft/logpwrfft.py \
+	gr-fft/python/fft/__init__.py \
+	gr-blocks/python/blocks/qa_block_gateway.py \
+	gr-blocks/python/blocks/qa_patterned_interleaver.py \
+	gr-blocks/python/blocks/qa_throttle.py \
+	gr-blocks/python/blocks/qa_tag_debug.py \
+	gr-blocks/python/blocks/qa_regenerate.py \
+	gr-blocks/python/blocks/qa_skiphead.py \
+	gr-blocks/python/blocks/qa_interleave.py \
+	gr-blocks/python/blocks/qa_tag_file_sink.py \
+	gr-blocks/python/blocks/qa_message.py \
+	gr-blocks/python/blocks/qa_sample_and_hold.py \
+	gr-blocks/python/blocks/qa_vector_insert.py \
+	gr-blocks/python/blocks/qa_moving_average.py \
+	gr-blocks/python/blocks/qa_null_sink_source.py \
+	gr-blocks/python/blocks/qa_head.py \
+	gr-blocks/python/blocks/qa_unpack_k_bits.py \
+	gr-blocks/python/blocks/qa_stream_to_tagged_stream.py \
+	gr-blocks/python/blocks/qa_repack_bits_bb.py \
+	gr-blocks/python/blocks/qa_tag_gate.py \
+	gr-blocks/python/blocks/qa_endian_swap.py \
+	gr-blocks/python/blocks/qa_tags_strobe.py \
+	gr-blocks/python/blocks/qa_pipe_fittings.py \
+	gr-blocks/python/blocks/qa_argmax.py \
+	gr-blocks/python/blocks/qa_mute.py \
+	gr-blocks/python/blocks/qa_packed_to_unpacked.py \
+	gr-blocks/python/blocks/qa_vector_sink_source.py \
+	gr-blocks/python/blocks/qa_integrate.py \
+	gr-blocks/python/blocks/qa_tagged_stream_mux.py \
+	gr-blocks/python/blocks/qa_keep_m_in_n.py \
+	gr-blocks/python/blocks/qa_boolean_operators.py \
+	gr-blocks/python/blocks/qa_file_metadata.py \
+	gr-blocks/python/blocks/qa_conjugate.py \
+	gr-blocks/python/blocks/qa_threshold.py \
+	gr-blocks/python/blocks/qa_delay.py \
+	gr-blocks/python/blocks/qa_udp_source_sink.py \
+	gr-blocks/python/blocks/qa_repeat.py \
+	gr-blocks/python/blocks/qa_multiply_conjugate.py \
+	gr-blocks/python/blocks/qa_vector_map.py \
+	gr-blocks/python/blocks/qa_file_source_sink.py \
+	gr-blocks/python/blocks/qa_max.py \
+	gr-blocks/python/blocks/qa_stream_mux.py \
+	gr-blocks/python/blocks/qa_probe_signal.py \
+	gr-blocks/python/blocks/qa_add_mult_v.py \
+	gr-blocks/python/blocks/qa_transcendental.py \
+	gr-blocks/python/blocks/qa_add_mult_div_sub.py \
+	gr-blocks/python/blocks/qa_stretch.py \
+	gr-blocks/python/blocks/qa_rms.py \
+	gr-blocks/python/blocks/qa_nlog10.py \
+	gr-blocks/python/blocks/qa_keep_one_in_n.py \
+	gr-blocks/python/blocks/qa_pack_k_bits.py \
+	gr-blocks/python/blocks/qa_peak_detector2.py \
+	gr-blocks/python/blocks/qa_message_tags.py \
+	gr-blocks/python/blocks/qa_vco.py \
+	gr-blocks/python/blocks/qa_type_conversions.py \
+	gr-blocks/python/blocks/stream_to_vector_decimator.py \
+	gr-blocks/python/blocks/qa_affinity.py \
+	gr-blocks/python/blocks/__init__.py \
+	gr-blocks/python/blocks/qa_wavfile.py \
+	gr-blocks/python/blocks/qa_copy.py \
+	gr-blocks/python/blocks/qa_pdu.py \
+	gr-blocks/python/blocks/qa_peak_detector.py \
+	gr-blocks/python/blocks/qa_python_message_passing.py \
+	gr-blocks/python/blocks/qa_bin_statistics.py \
+	gr-blocks/python/blocks/qa_ctrlport_probes.py \
+	gr-blocks/python/blocks/qa_burst_tagger.py \
+	gr-blocks/python/blocks/qa_plateau_detector_fb.py \
+	gr-blocks/python/blocks/parse_file_metadata.py \
+	gr-blocks/examples/tags/test_file_tags.py \
+	gr-trellis/python/trellis/qa_trellis.py \
+	gr-trellis/python/trellis/__init__.py \
+	gr-trellis/examples/python/test_cpm.py \
+	gr-video-sdl/python/video_sdl/qa_video_sdl.py \
+	gr-video-sdl/python/video_sdl/__init__.py \
+	gr-uhd/grc/gen_uhd_usrp_blocks.py \
+	gr-uhd/python/uhd/qa_uhd.py \
+	gr-uhd/python/uhd/__init__.py \
+	gr-uhd/apps/hf_explorer/hfx.py \
+	gr-uhd/apps/uhd_siggen_base.py \
+	gr-uhd/apps/hf_radio/radio.py \
+	gr-uhd/apps/hf_radio/ssbdemod.py \
+	gr-uhd/apps/hf_radio/startup.py \
+	gr-uhd/apps/hf_radio/input.py \
+	gr-uhd/apps/hf_radio/ssbagc.py \
+	gr-uhd/apps/hf_radio/ui.py \
+	gr-uhd/apps/hf_radio/output.py \
+	gr-uhd/examples/python/usrp_tv_rcv.py \
+	gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py \
+	gr-uhd/examples/python/usrp_am_mw_rcv.py \
+	gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py \
+	gr-uhd/examples/python/usrp_wfm_rcv.py \
+	gr-uhd/examples/python/usrp_wfm_rcv_pll.py \
+	gr-uhd/examples/python/fm_tx_2_daughterboards.py \
+	gr-uhd/examples/python/usrp_spectrum_sense.py \
+	gr-uhd/examples/python/usrp_nbfm_rcv.py \
+	gr-uhd/examples/python/usrp_wfm_rcv_sca.py \
+	gr-uhd/examples/python/usrp_wxapt_rcv.py \
+	gr-uhd/examples/python/usrp_tv_rcv_nogui.py \
+	gr-uhd/examples/python/fm_tx4.py \
+	gr-uhd/examples/python/usrp_nbfm_ptt.py \
+	gr-uhd/examples/python/max_power.py \
+	gr-uhd/examples/python/usrp_wfm_rcv_nogui.py \
+	gr-vocoder/python/vocoder/cvsd.py \
+	gr-vocoder/python/vocoder/qa_ulaw_vocoder.py \
+	gr-vocoder/python/vocoder/qa_cvsd_vocoder.py \
+	gr-vocoder/python/vocoder/qa_gsm_full_rate.py \
+	gr-vocoder/python/vocoder/qa_alaw_vocoder.py \
+	gr-vocoder/python/vocoder/qa_g723_24_vocoder.py \
+	gr-vocoder/python/vocoder/__init__.py \
+	gr-vocoder/python/vocoder/qa_codec2_vocoder.py \
+	gr-vocoder/python/vocoder/qa_g721_vocoder.py \
+	gr-vocoder/python/vocoder/qa_g723_40_vocoder.py \
+	gr-vocoder/examples/ulaw_audio_loopback.py \
+	gr-vocoder/examples/g723_24_audio_loopback.py \
+	gr-vocoder/examples/alaw_audio_loopback.py \
+	gr-vocoder/examples/cvsd_audio_loopback.py \
+	gr-vocoder/examples/gsm_audio_loopback.py \
+	gr-vocoder/examples/codec2_audio_loopback.py \
+	gr-vocoder/examples/g721_audio_loopback.py \
+	gr-vocoder/examples/g723_40_audio_loopback.py \
+	gr-pager/python/pager/pager_utils.py \
+	gr-pager/python/pager/flex_demod.py \
+	gr-pager/python/pager/__init__.py \
+	gr-pager/python/pager/qa_pager.py \
+	gr-pager/apps/usrp_rx_flex.py \
+	docs/sphinx/hieroglyph/errors.py \
+	docs/sphinx/hieroglyph/test/test_nodes.py \
+	docs/sphinx/hieroglyph/test/test_hierglyph.py \
+	docs/sphinx/hieroglyph/test/test_comments.py \
+	docs/sphinx/hieroglyph/test/__init__.py \
+	docs/sphinx/hieroglyph/hieroglyph.py \
+	docs/sphinx/hieroglyph/version.py \
+	docs/sphinx/hieroglyph/__init__.py \
+	docs/sphinx/hieroglyph/nodes.py \
+	docs/sphinx/gnuradio_sphinx.py \
+	docs/doxygen/swig_doc.py \
+	docs/doxygen/doxyxml/generated/indexsuper.py \
+	docs/doxygen/doxyxml/generated/index.py \
+	docs/doxygen/doxyxml/generated/compoundsuper.py \
+	docs/doxygen/doxyxml/generated/compound.py \
+	docs/doxygen/doxyxml/generated/__init__.py \
+	docs/doxygen/doxyxml/base.py \
+	docs/doxygen/doxyxml/doxyindex.py \
+	docs/doxygen/doxyxml/__init__.py \
+	docs/doxygen/doxyxml/text.py \
+	docs/doxygen/other/doxypy.py \
+	docs/exploring-gnuradio/dial_tone.py \
+	docs/exploring-gnuradio/fm_demod.py \
+	gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
+	gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx \
+	gr-fcd/python/fcd/qa_fcd.py \
+	gr-fcd/python/fcd/__init__.py \
+	gr-noaa/python/noaa/qa_noaa.py \
+	gr-noaa/python/noaa/__init__.py \
+	gr-utils/python/modtool/util_functions.py \
+	gr-utils/python/modtool/templates.py \
+	gr-utils/python/modtool/gr-newmod/python/build_utils.py \
+	gr-utils/python/modtool/gr-newmod/python/build_utils_codes.py \
+	gr-utils/python/modtool/gr-newmod/python/__init__.py \
+	gr-utils/python/modtool/gr-newmod/docs/doxygen/swig_doc.py \
+	gr-utils/python/modtool/gr-newmod/docs/doxygen/doxyxml/generated/indexsuper.py \
+	gr-utils/python/modtool/gr-newmod/docs/doxygen/doxyxml/generated/index.py \
+	gr-utils/python/modtool/gr-newmod/docs/doxygen/doxyxml/generated/compoundsuper.py \
+	gr-utils/python/modtool/gr-newmod/docs/doxygen/doxyxml/generated/compound.py \
+	gr-utils/python/modtool/gr-newmod/docs/doxygen/doxyxml/generated/__init__.py \
+	gr-utils/python/modtool/gr-newmod/docs/doxygen/doxyxml/base.py \
+	gr-utils/python/modtool/gr-newmod/docs/doxygen/doxyxml/doxyindex.py \
+	gr-utils/python/modtool/gr-newmod/docs/doxygen/doxyxml/__init__.py \
+	gr-utils/python/modtool/gr-newmod/docs/doxygen/doxyxml/text.py \
+	gr-utils/python/modtool/cmakefile_editor.py \
+	gr-utils/python/modtool/modtool_newmod.py \
+	gr-utils/python/modtool/modtool_makexml.py \
+	gr-utils/python/modtool/modtool_add.py \
+	gr-utils/python/modtool/modtool_rm.py \
+	gr-utils/python/modtool/code_generator.py \
+	gr-utils/python/modtool/modtool_disable.py \
+	gr-utils/python/modtool/parser_cc_block.py \
+	gr-utils/python/modtool/__init__.py \
+	gr-utils/python/modtool/modtool_help.py \
+	gr-utils/python/modtool/modtool_base.py \
+	gr-utils/python/modtool/grc_xml_generator.py \
+	gr-utils/python/modtool/modtool_info.py \
+	gr-utils/python/utils/plot_data.py \
+	gr-utils/python/utils/plot_fft_base.py \
+	gr-utils/python/utils/pyqt_filter.py \
+	gr-utils/python/utils/plot_psd_base.py \
+	gr-utils/python/utils/pyqt_plot.py \
+	gr-atsc/python/atsc/atsc_utils.py \
+	gr-atsc/python/atsc/atsc_rx.py \
+	gr-atsc/python/atsc/__init__.py \
+	gr-atsc/python/atsc/qa_atsc.py \
+	gr-atsc/lib/gen_encoder.py \
+	gr-digital/python/digital/packet_utils.py \
+	gr-filter/python/filter/freq_xlating_fft_filter.py \
diff --git a/gnuradio-core/options.mk b/gnuradio-core/options.mk
index 192e75504d..377649c917 100644
--- a/gnuradio-core/options.mk
+++ b/gnuradio-core/options.mk
@@ -1,16 +1,16 @@
-# $NetBSD: options.mk,v 1.17 2015/09/17 13:48:04 makoto Exp $
+# $NetBSD: options.mk,v 1.4 2019/06/15 17:54:22 adam Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gnuradio
-PKG_SUPPORTED_OPTIONS=	ninja-build filter-design alsa
+PKG_OPTIONS_VAR=        PKG_OPTIONS.gnuradio
+PKG_SUPPORTED_OPTIONS=  ninja-build filter-design alsa
 # ninja-build is said supported, but not working
 # alas        is said supported, but not good on NetBSD
 
 # Adding ninja-build to following line (now) stops
-# [164/850] cd /PATH/wip/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
-# FAILED: cd /PATH/wip/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
+# [164/850] cd /PATH/ham/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
+# FAILED: cd /PATH/ham/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
 # : permission denied
 
-PKG_SUGGESTED_OPTIONS=	filter-design
+PKG_SUGGESTED_OPTIONS= filter-design
 
 .include "../../mk/bsd.options.mk"
 
@@ -27,7 +27,7 @@ do-build:
 
 .if !empty(PKG_OPTIONS:Mfilter-design)
 # Running gr_filter_design asks for the package
-DEPENDS+=		${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
+DEPENDS+=		${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy12
 .endif
 
 .if !empty(PKG_OPTIONS:Malsa)
diff --git a/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake b/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
index 7503b47d88..4473cd6c75 100644
--- a/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
+++ b/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
@@ -1,4 +1,4 @@
-$NetBSD: patch-cmake_Modules_FindSphinx.cmake,v 1.2 2015/09/17 13:48:05 makoto Exp $
+$NetBSD: patch-cmake_Modules_FindSphinx.cmake,v 1.1 2015/03/07 05:10:45 mef Exp $
 
 (Starting with gnuradio-3.7.6), cmake wants sphinx-build exact executable
 name. With SUBST_CLASSES.pyvers in Makefile.common, tell the name.
diff --git a/gnuradio-core/patches/patch-gnuradio_runtime_include_gnuradio_high__res__timer__h b/gnuradio-core/patches/patch-gnuradio_runtime_include_gnuradio_high__res__timer__h
index 5243bd2442..d3fb9e9302 100644
--- a/gnuradio-core/patches/patch-gnuradio_runtime_include_gnuradio_high__res__timer__h
+++ b/gnuradio-core/patches/patch-gnuradio_runtime_include_gnuradio_high__res__timer__h
@@ -1,4 +1,4 @@
-$NetBSD: patch-gnuradio_runtime_include_gnuradio_high__res__timer__h,v 1.3 2014/11/17 13:51:06 makoto Exp $
+$NetBSD: patch-gnuradio_runtime_include_gnuradio_high__res__timer__h,v 1.2 2014/10/17 09:51:56 mef Exp $
 
 This patch is kind of joke, but better than nothing for packaging
 
diff --git a/gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc b/gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc
index a27aa70640..cebc80e5a3 100644
--- a/gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc
+++ b/gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc
@@ -1,19 +1,19 @@
-$NetBSD: patch-gnuradio_runtime_lib_thread_thread_cc,v 1.3 2015/09/17 13:48:05 makoto Exp $
+$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	2014-07-30 20:39:51.000000000 +0000
-+++ gnuradio-runtime/lib/thread/thread.cc
-@@ -158,7 +158,7 @@ namespace gr {
+--- 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__) || defined(__NetBSD__) || defined(__sun)
+-  defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
++  defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)|| defined(__NetBSD__) || defined(__sun) 
  
  namespace gr {
    namespace thread {
-@@ -276,6 +276,7 @@ namespace gr {
+@@ -284,6 +284,7 @@ namespace gr {
      void
      thread_bind_to_processor(gr_thread_t thread, const std::vector<int> &mask)
      {
@@ -21,7 +21,7 @@ Extending for BSD
        cpu_set_t set;
        size_t len = sizeof(cpu_set_t);
        std::vector<int> _mask = mask;
-@@ -291,6 +292,7 @@ namespace gr {
+@@ -299,6 +300,7 @@ namespace gr {
          s << "thread_bind_to_processor failed with error: " << ret << std::endl;
          throw std::runtime_error(s.str());
        }
@@ -29,7 +29,7 @@ Extending for BSD
      }
  
      void
-@@ -302,6 +304,7 @@ namespace gr {
+@@ -310,6 +312,7 @@ namespace gr {
      void
      thread_unbind(gr_thread_t thread)
      {
@@ -37,7 +37,7 @@ Extending for BSD
        cpu_set_t set;
        size_t len = sizeof(cpu_set_t);
  
-@@ -317,6 +320,7 @@ namespace gr {
+@@ -325,6 +328,7 @@ namespace gr {
          s << "thread_unbind failed with error: " << ret << std::endl;
          throw std::runtime_error(s.str());
        }
diff --git a/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt b/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
index 9bbc5fdc28..9855b173ce 100644
--- a/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
+++ b/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
@@ -1,15 +1,15 @@
-$NetBSD: patch-gr-audio_lib_CMakeLists.txt,v 1.2 2014/11/17 13:51:06 makoto Exp $
+$NetBSD: patch-gr-audio_lib_CMakeLists.txt,v 1.2 2018/07/16 07:55:22 mef Exp $
 
 Patch and SUBST to disable/enable ALSA depending on PKGOPTIONS.
 
---- gr-audio/lib/CMakeLists.txt.orig	2014-08-18 02:53:59.000000000 +0900
-+++ gr-audio/lib/CMakeLists.txt	2014-10-14 21:39:56.000000000 +0900
-@@ -44,7 +44,7 @@ endif(ENABLE_GR_CTRLPORT)
+--- 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)
  ########################################################################
  ## ALSA Support
  ########################################################################
 -find_package(ALSA)
 +@@ALSA@@find_package(ALSA)
  
- if(ALSA_FOUND)
+ if((ALSA_FOUND) AND NOT (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") AND NOT (CMAKE_SYSTEM_NAME STREQUAL GNU))
  
diff --git a/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h b/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
index a186664a9e..2817e39be0 100644
--- a/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
+++ b/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
@@ -1,4 +1,4 @@
-$NetBSD: patch-gr-audio_lib_alsa_alsa__impl_h,v 1.2 2014/11/17 13:51:06 makoto Exp $
+$NetBSD: patch-gr-audio_lib_alsa_alsa__impl_h,v 1.2 2014/10/17 09:51:56 mef 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
diff --git a/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc b/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc
new file mode 100644
index 0000000000..b350ef4a3e
--- /dev/null
+++ b/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-blocks_lib_socket__pdu__impl.cc,v 1.1 2019/07/08 17:50:55 ryoon 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
+@@ -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/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc b/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc
new file mode 100644
index 0000000000..ef904952a8
--- /dev/null
+++ b/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc
@@ -0,0 +1,21 @@
+$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/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h b/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h
new file mode 100644
index 0000000000..c5a0e72795
--- /dev/null
+++ b/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h
@@ -0,0 +1,21 @@
+$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/gnuradio-ctrlport/Makefile b/gnuradio-ctrlport/Makefile
index c5a9916dd0..8dae2c1be0 100644
--- a/gnuradio-ctrlport/Makefile
+++ b/gnuradio-ctrlport/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2015/09/17 13:48:05 makoto Exp $
+# $NetBSD: Makefile,v 1.16 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-ctrlport-${VERSION}
+PKGREVISION=	2
 COMMENT=	New set of hooks into GNU Radio to allow a remote client to attach
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_CTRLPORT=True
diff --git a/gnuradio-ctrlport/PLIST b/gnuradio-ctrlport/PLIST
index 750a74a133..0006bc4fdd 100644
--- a/gnuradio-ctrlport/PLIST
+++ b/gnuradio-ctrlport/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.3 2016/03/07 13:14:31 mef Exp $
 bin/gr-ctrlport-monitor
 bin/gr-ctrlport-monitorc
 bin/gr-ctrlport-monitoro
diff --git a/gnuradio-ctrlport/buildlink3.mk b/gnuradio-ctrlport/buildlink3.mk
index 9bfa3cc211..d5adb88912 100644
--- a/gnuradio-ctrlport/buildlink3.mk
+++ b/gnuradio-ctrlport/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:05 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:08 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-dtv
 
@@ -7,7 +7,7 @@ GNURADIO_DTV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-dtv+=	gnuradio-dtv>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-dtv+=	gnuradio-dtv>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-dtv?=	../../wip/gnuradio-dtv
+BUILDLINK_PKGSRCDIR.gnuradio-dtv?=	../../ham/gnuradio-dtv
 .endif # GNURADIO_DTV_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-dtv
diff --git a/gnuradio-digital/Makefile b/gnuradio-digital/Makefile
index dd3852479c..d783e86a20 100644
--- a/gnuradio-digital/Makefile
+++ b/gnuradio-digital/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2015/09/17 13:48:05 makoto Exp $
+# $NetBSD: Makefile,v 1.17 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-digital-${VERSION}
+PKGREVISION=	2
 COMMENT=	Digital related algorithms for GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 # link to libgnuradio-fft.so.${PKGVERSON_NOREV}
-.include       "../../wip/gnuradio-core/buildlink3.mk"
+.include       "../../ham/gnuradio-core/buildlink3.mk"
 
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
diff --git a/gnuradio-digital/PLIST b/gnuradio-digital/PLIST
index 7c5eb481e2..d1caff3b97 100644
--- a/gnuradio-digital/PLIST
+++ b/gnuradio-digital/PLIST
@@ -1,12 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2015/09/17 13:48:05 makoto Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/07/16 07:55:22 mef Exp $
 include/gnuradio/digital/additive_scrambler_bb.h
 include/gnuradio/digital/api.h
 include/gnuradio/digital/binary_slicer_fb.h
 include/gnuradio/digital/burst_shaper_cc.h
 include/gnuradio/digital/burst_shaper_ff.h
-include/gnuradio/digital/corr_est_cc.h
-include/gnuradio/digital/modulate_vector.h
-include/gnuradio/digital/msk_timing_recovery_cc.h
 include/gnuradio/digital/chunks_to_symbols_bc.h
 include/gnuradio/digital/chunks_to_symbols_bf.h
 include/gnuradio/digital/chunks_to_symbols_ic.h
@@ -20,10 +17,12 @@ include/gnuradio/digital/constellation.h
 include/gnuradio/digital/constellation_decoder_cb.h
 include/gnuradio/digital/constellation_receiver_cb.h
 include/gnuradio/digital/constellation_soft_decoder_cf.h
+include/gnuradio/digital/corr_est_cc.h
 include/gnuradio/digital/correlate_access_code_bb.h
 include/gnuradio/digital/correlate_access_code_bb_ts.h
 include/gnuradio/digital/correlate_access_code_ff_ts.h
 include/gnuradio/digital/correlate_access_code_tag_bb.h
+include/gnuradio/digital/correlate_access_code_tag_ff.h
 include/gnuradio/digital/correlate_and_sync_cc.h
 include/gnuradio/digital/costas_loop_cc.h
 include/gnuradio/digital/cpmmod_bc.h
@@ -41,15 +40,24 @@ include/gnuradio/digital/glfsr_source_b.h
 include/gnuradio/digital/glfsr_source_f.h
 include/gnuradio/digital/hdlc_deframer_bp.h
 include/gnuradio/digital/hdlc_framer_pb.h
+include/gnuradio/digital/header_buffer.h
+include/gnuradio/digital/header_format_base.h
+include/gnuradio/digital/header_format_counter.h
+include/gnuradio/digital/header_format_crc.h
+include/gnuradio/digital/header_format_default.h
+include/gnuradio/digital/header_format_ofdm.h
 include/gnuradio/digital/header_payload_demux.h
+include/gnuradio/digital/interpolating_resampler_type.h
 include/gnuradio/digital/kurtotic_equalizer_cc.h
 include/gnuradio/digital/lfsr.h
 include/gnuradio/digital/lms_dd_equalizer_cc.h
 include/gnuradio/digital/map_bb.h
 include/gnuradio/digital/metric_type.h
+include/gnuradio/digital/modulate_vector.h
 include/gnuradio/digital/mpsk_receiver_cc.h
 include/gnuradio/digital/mpsk_snr_est.h
 include/gnuradio/digital/mpsk_snr_est_cc.h
+include/gnuradio/digital/msk_timing_recovery_cc.h
 include/gnuradio/digital/ofdm_carrier_allocator_cvc.h
 include/gnuradio/digital/ofdm_chanest_vcvc.h
 include/gnuradio/digital/ofdm_cyclic_prefixer.h
@@ -74,13 +82,23 @@ include/gnuradio/digital/pfb_clock_sync_fff.h
 include/gnuradio/digital/pn_correlator_cc.h
 include/gnuradio/digital/probe_density_b.h
 include/gnuradio/digital/probe_mpsk_snr_est_c.h
+include/gnuradio/digital/protocol_formatter_async.h
+include/gnuradio/digital/protocol_formatter_bb.h
+include/gnuradio/digital/protocol_parser_b.h
 include/gnuradio/digital/scrambler_bb.h
 include/gnuradio/digital/simple_correlator.h
 include/gnuradio/digital/simple_framer.h
 include/gnuradio/digital/simple_framer_sync.h
+include/gnuradio/digital/symbol_sync_cc.h
+include/gnuradio/digital/symbol_sync_ff.h
+include/gnuradio/digital/timing_error_detector_type.h
 include/gnuradio/swig/constellation.i
-include/gnuradio/swig/digital_swig.i
-include/gnuradio/swig/digital_swig_doc.i
+include/gnuradio/swig/digital_swig0.i
+include/gnuradio/swig/digital_swig0_doc.i
+include/gnuradio/swig/digital_swig1.i
+include/gnuradio/swig/digital_swig1_doc.i
+include/gnuradio/swig/digital_swig2.i
+include/gnuradio/swig/digital_swig2_doc.i
 include/gnuradio/swig/ofdm_equalizer.i
 include/gnuradio/swig/packet_header.i
 lib/libgnuradio-digital.so
@@ -89,7 +107,9 @@ lib/pkgconfig/gnuradio-digital.pc
 ${PYSITELIB}/gnuradio/digital/__init__.py
 ${PYSITELIB}/gnuradio/digital/__init__.pyc
 ${PYSITELIB}/gnuradio/digital/__init__.pyo
-${PYSITELIB}/gnuradio/digital/_digital_swig.so
+${PYSITELIB}/gnuradio/digital/_digital_swig0.so
+${PYSITELIB}/gnuradio/digital/_digital_swig1.so
+${PYSITELIB}/gnuradio/digital/_digital_swig2.so
 ${PYSITELIB}/gnuradio/digital/bpsk.py
 ${PYSITELIB}/gnuradio/digital/bpsk.pyc
 ${PYSITELIB}/gnuradio/digital/bpsk.pyo
@@ -105,6 +125,15 @@ ${PYSITELIB}/gnuradio/digital/crc.pyo
 ${PYSITELIB}/gnuradio/digital/digital_swig.py
 ${PYSITELIB}/gnuradio/digital/digital_swig.pyc
 ${PYSITELIB}/gnuradio/digital/digital_swig.pyo
+${PYSITELIB}/gnuradio/digital/digital_swig0.py
+${PYSITELIB}/gnuradio/digital/digital_swig0.pyc
+${PYSITELIB}/gnuradio/digital/digital_swig0.pyo
+${PYSITELIB}/gnuradio/digital/digital_swig1.py
+${PYSITELIB}/gnuradio/digital/digital_swig1.pyc
+${PYSITELIB}/gnuradio/digital/digital_swig1.pyo
+${PYSITELIB}/gnuradio/digital/digital_swig2.py
+${PYSITELIB}/gnuradio/digital/digital_swig2.pyc
+${PYSITELIB}/gnuradio/digital/digital_swig2.pyo
 ${PYSITELIB}/gnuradio/digital/generic_mod_demod.py
 ${PYSITELIB}/gnuradio/digital/generic_mod_demod.pyc
 ${PYSITELIB}/gnuradio/digital/generic_mod_demod.pyo
@@ -183,6 +212,9 @@ ${PYSITELIB}/gnuradio/digital/utils/mod_codes.pyo
 ${PYSITELIB}/gnuradio/digital/utils/tagged_streams.py
 ${PYSITELIB}/gnuradio/digital/utils/tagged_streams.pyc
 ${PYSITELIB}/gnuradio/digital/utils/tagged_streams.pyo
+${PYSITELIB}/grc_gnuradio/blks2/packet.py
+${PYSITELIB}/grc_gnuradio/blks2/packet.pyc
+${PYSITELIB}/grc_gnuradio/blks2/packet.pyo
 share/doc/gnuradio-${PKGVERSION}/README.digital
 share/gnuradio/examples/digital/burst_shaper.grc
 share/gnuradio/examples/digital/demod/ber_simulation.grc
@@ -193,6 +225,9 @@ share/gnuradio/examples/digital/demod/gfsk_loopback.grc
 share/gnuradio/examples/digital/demod/mpsk_demod.grc
 share/gnuradio/examples/digital/demod/pam_sync.grc
 share/gnuradio/examples/digital/demod/pam_timing.grc
+share/gnuradio/examples/digital/demod/symbol_sync_test_complex.grc
+share/gnuradio/examples/digital/demod/symbol_sync_test_float.grc
+share/gnuradio/examples/digital/demod/symbol_sync_test_float_ted_gain.m
 share/gnuradio/examples/digital/demod/test_corr_and_sync.grc
 share/gnuradio/examples/digital/demod/test_corr_est.grc
 share/gnuradio/examples/digital/demod/uhd_corr_and_sync_rx.grc
@@ -222,8 +257,33 @@ share/gnuradio/examples/digital/ofdm/transmit_path.py
 share/gnuradio/examples/digital/ofdm/tunnel.py
 share/gnuradio/examples/digital/ofdm/tx_ofdm.grc
 share/gnuradio/examples/digital/ofdm/uhd_interface.py
+share/gnuradio/examples/digital/packet/burst_tagger.grc
+share/gnuradio/examples/digital/packet/example_corr_est.grc
+share/gnuradio/examples/digital/packet/example_corr_est_and_clock_sync.grc
+share/gnuradio/examples/digital/packet/example_corr_est_and_phase_sync.grc
+share/gnuradio/examples/digital/packet/formatter_crc.grc
+share/gnuradio/examples/digital/packet/formatter_ofdm.grc
+share/gnuradio/examples/digital/packet/packet_loopback_hier.grc
+share/gnuradio/examples/digital/packet/packet_rx.grc
+share/gnuradio/examples/digital/packet/packet_tx.grc
+share/gnuradio/examples/digital/packet/simple_bpsk_tx.grc
+share/gnuradio/examples/digital/packet/transmitter_sim_hier.grc
+share/gnuradio/examples/digital/packet/tx_stage0.grc
+share/gnuradio/examples/digital/packet/tx_stage1.grc
+share/gnuradio/examples/digital/packet/tx_stage2.grc
+share/gnuradio/examples/digital/packet/tx_stage3.grc
+share/gnuradio/examples/digital/packet/tx_stage4.grc
+share/gnuradio/examples/digital/packet/tx_stage5.grc
+share/gnuradio/examples/digital/packet/tx_stage6.grc
+share/gnuradio/examples/digital/packet/tx_stage6a.grc
+share/gnuradio/examples/digital/packet/uhd_packet_rx.grc
+share/gnuradio/examples/digital/packet/uhd_packet_rx_tun.grc
+share/gnuradio/examples/digital/packet/uhd_packet_tx.grc
+share/gnuradio/examples/digital/packet/uhd_packet_tx_tun.grc
 share/gnuradio/examples/digital/run_length.py
 share/gnuradio/examples/digital/snr_estimators.py
+share/gnuradio/grc/blocks/blks2_packet_decoder.xml
+share/gnuradio/grc/blocks/blks2_packet_encoder.xml
 share/gnuradio/grc/blocks/digital_additive_scrambler_bb.xml
 share/gnuradio/grc/blocks/digital_binary_slicer_fb.xml
 share/gnuradio/grc/blocks/digital_block_tree.xml
@@ -237,11 +297,11 @@ share/gnuradio/grc/blocks/digital_constellation_modulator.xml
 share/gnuradio/grc/blocks/digital_constellation_receiver_cb.xml
 share/gnuradio/grc/blocks/digital_constellation_rect.xml
 share/gnuradio/grc/blocks/digital_constellation_soft_decoder_cf.xml
+share/gnuradio/grc/blocks/digital_corr_est_cc.xml
 share/gnuradio/grc/blocks/digital_correlate_access_code_bb.xml
-share/gnuradio/grc/blocks/digital_correlate_access_code_tag_bb.xml
+share/gnuradio/grc/blocks/digital_correlate_access_code_tag_xx.xml
 share/gnuradio/grc/blocks/digital_correlate_access_code_xx_ts.xml
 share/gnuradio/grc/blocks/digital_correlate_and_sync_cc.xml
-share/gnuradio/grc/blocks/digital_corr_est_cc.xml
 share/gnuradio/grc/blocks/digital_costas_loop_cc.xml
 share/gnuradio/grc/blocks/digital_cpmmod_bc.xml
 share/gnuradio/grc/blocks/digital_crc32_async_bb.xml
@@ -294,6 +354,9 @@ share/gnuradio/grc/blocks/digital_pfb_clock_sync.xml
 share/gnuradio/grc/blocks/digital_pn_correlator_cc.xml
 share/gnuradio/grc/blocks/digital_probe_density_b.xml
 share/gnuradio/grc/blocks/digital_probe_mpsk_snr_est_c.xml
+share/gnuradio/grc/blocks/digital_protocol_formatter_async.xml
+share/gnuradio/grc/blocks/digital_protocol_formatter_bb.xml
+share/gnuradio/grc/blocks/digital_protocol_parser_b.xml
 share/gnuradio/grc/blocks/digital_psk_demod.xml
 share/gnuradio/grc/blocks/digital_psk_mod.xml
 share/gnuradio/grc/blocks/digital_qam_demod.xml
@@ -301,3 +364,5 @@ share/gnuradio/grc/blocks/digital_qam_mod.xml
 share/gnuradio/grc/blocks/digital_scrambler_bb.xml
 share/gnuradio/grc/blocks/digital_simple_correlator.xml
 share/gnuradio/grc/blocks/digital_simple_framer.xml
+share/gnuradio/grc/blocks/digital_symbol_sync_xx.xml
+share/gnuradio/grc/blocks/variable_header_format_default.xml
diff --git a/gnuradio-digital/buildlink3.mk b/gnuradio-digital/buildlink3.mk
index b6719428c9..855c1476f5 100644
--- a/gnuradio-digital/buildlink3.mk
+++ b/gnuradio-digital/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:05 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=	gnuradio-digital
 
@@ -7,7 +7,7 @@ GNURADIO_DIGITAL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-digital+=	gnuradio-digital>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-digital+=	gnuradio-digital>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-digital?=		../../wip/gnuradio-digital
+BUILDLINK_PKGSRCDIR.gnuradio-digital?=		../../ham/gnuradio-digital
 .endif # GNURADIO_DIGITAL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-digital
diff --git a/gnuradio-doxygen/Makefile b/gnuradio-doxygen/Makefile
index 94ed4214e9..94365b5181 100644
--- a/gnuradio-doxygen/Makefile
+++ b/gnuradio-doxygen/Makefile
@@ -1,15 +1,21 @@
-# $NetBSD: Makefile,v 1.7 2015/09/17 13:48:05 makoto Exp $
+# $NetBSD: Makefile,v 1.27 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-doxygen-${VERSION}
+PKGREVISION=	2
 COMMENT=	Doxygen documentation of GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
-BUILD_DEPENDS+=	doxygen>=1.8.9.1:../../devel/doxygen
+BUILD_DEPENDS+=	doxygen>=1.8.15:../../devel/doxygen
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 BUILD_DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
 
+DEPENDS+=	web2c-[0-9]*:../../print/web2c
+# in case those packages are already installed by other requirement..
+DEPENDS+=	texlive-collection-latex-[0-9]*:../../meta-pkgs/texlive-collection-latex
+DEPENDS+=	tex-newunicodechar-[-0-9]*:../../print/tex-newunicodechar
+
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_DOXYGEN=ON
 CMAKE_ARGS+=	-DENABLE_SPHINX=ON
diff --git a/gnuradio-doxygen/PLIST b/gnuradio-doxygen/PLIST
index 0c69bdb0b1..ae307a5b05 100644
--- a/gnuradio-doxygen/PLIST
+++ b/gnuradio-doxygen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.19 2019/07/11 14:26:09 mef Exp $
 share/doc/gnuradio-${PKGVERSION}/dial_tone.py
 share/doc/gnuradio-${PKGVERSION}/fm_demod.py
 share/doc/gnuradio-${PKGVERSION}/fm_rx.grc
@@ -28,122 +28,9 @@ share/doc/gnuradio-${PKGVERSION}/html/FrequencyDisplayPlot_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/FrequencyDisplayPlot_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/FrequencyDisplayPlot_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/FrequencyDisplayPlot_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop2_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop2_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop2_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop2_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop2_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop3_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop3_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop3_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop3_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop3_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscBitTimingLoop_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscConvert2xTo20_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscConvert2xTo20_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscConvert2xTo20_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscConvert2xTo20_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscConvert2xTo20_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDataSegToSoftDataSeg_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDataSegToSoftDataSeg_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDataSegToSoftDataSeg_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDataSegToSoftDataSeg_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDataSegToSoftDataSeg_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDeinterleaver_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDeinterleaver_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDeinterleaver_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDeinterleaver_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDeinterleaver_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDerandomizer_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDerandomizer_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDerandomizer_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDerandomizer_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscDerandomizer_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscEqualizer_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscEqualizer_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscEqualizer_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscEqualizer_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscEqualizer_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFPLL_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFPLL_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFPLL_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFPLL_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFPLL_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncChecker_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncChecker_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncChecker_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncChecker_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncChecker_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncCorrelator_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncCorrelator_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncCorrelator_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncCorrelator_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncCorrelator_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncDemux_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncDemux_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncDemux_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncDemux_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncDemux_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncMux_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncMux_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncMux_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncMux_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscFieldSyncMux_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscInterleaver_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscInterleaver_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscInterleaver_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscInterleaver_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscInterleaver_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRSDecoder_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRSDecoder_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRSDecoder_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRSDecoder_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRSDecoder_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRSEncoder_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRSEncoder_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRSEncoder_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRSEncoder_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRSEncoder_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRandomizer_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRandomizer_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRandomizer_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRandomizer_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscRandomizer_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSyncImpl_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSyncImpl_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSyncImpl_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSyncImpl_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSyncImpl_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSyncImpl__export_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSyncImpl__export_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSyncImpl__export_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSync_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSync_8h__dep__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSync_8h__dep__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSync_8h__dep__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSync_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSync_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSync_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSegSymSync_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSymbolMapper_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSymbolMapper_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSymbolMapper_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSymbolMapper_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscSymbolMapper_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscTrellisEncoder_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscTrellisEncoder_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscTrellisEncoder_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscTrellisEncoder_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscTrellisEncoder_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscViterbiDecoder_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscViterbiDecoder_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscViterbiDecoder_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscViterbiDecoder_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/GrAtscViterbiDecoder_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/HistogramDisplayPlot_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/HistogramDisplayPlot_8h__dep__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/HistogramDisplayPlot_8h__dep__incl.md5
@@ -152,6 +39,7 @@ share/doc/gnuradio-${PKGVERSION}/html/HistogramDisplayPlot_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/HistogramDisplayPlot_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/HistogramDisplayPlot_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/HistogramDisplayPlot_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/License.html
 share/doc/gnuradio-${PKGVERSION}/html/SpectrumGUIClass_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/SpectrumGUIClass_8h__dep__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/SpectrumGUIClass_8h__dep__incl.md5
@@ -263,6 +151,9 @@ share/doc/gnuradio-${PKGVERSION}/html/add__const__vss_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/add__const__vss_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/add__const__vss_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/add__ff_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/add__ff_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/add__ff_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/add__ff_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/add__ff_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/add__ff_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/add__ff_8h__incl.png
@@ -378,7 +269,7 @@ share/doc/gnuradio-${PKGVERSION}/html/and__ss_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/and__ss_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/and__ss_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/annotated.html
-share/doc/gnuradio-${PKGVERSION}/html/annotated.js
+share/doc/gnuradio-${PKGVERSION}/html/annotated_dup.js
 share/doc/gnuradio-${PKGVERSION}/html/annotator__1to1_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/annotator__1to1_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/annotator__1to1_8h__incl.md5
@@ -409,8 +300,6 @@ share/doc/gnuradio-${PKGVERSION}/html/argmax__ss_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/argmax__ss_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/argmax__ss_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/argmax__ss_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/arrowdown.png
-share/doc/gnuradio-${PKGVERSION}/html/arrowright.png
 share/doc/gnuradio-${PKGVERSION}/html/async__decoder_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/async__decoder_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/async__decoder_8h__incl.md5
@@ -623,6 +512,37 @@ share/doc/gnuradio-${PKGVERSION}/html/calc__metric_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/calc__metric_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/calc__metric_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/calc__metric_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__config_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__config_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/catv__config_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/catv__config_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/catv__config_8h__dep__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/catv__config_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__frame__sync__enc__bb_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__frame__sync__enc__bb_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/catv__frame__sync__enc__bb_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/catv__frame__sync__enc__bb_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/catv__frame__sync__enc__bb_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__randomizer__bb_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__randomizer__bb_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/catv__randomizer__bb_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/catv__randomizer__bb_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/catv__randomizer__bb_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__reed__solomon__enc__bb_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__reed__solomon__enc__bb_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/catv__reed__solomon__enc__bb_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/catv__reed__solomon__enc__bb_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/catv__reed__solomon__enc__bb_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__transport__framing__enc__bb_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__transport__framing__enc__bb_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/catv__transport__framing__enc__bb_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/catv__transport__framing__enc__bb_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/catv__transport__framing__enc__bb_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__trellis__enc__bb_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/catv__trellis__enc__bb_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/catv__trellis__enc__bb_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/catv__trellis__enc__bb_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/catv__trellis__enc__bb_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/cc__common_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/cc__common_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/cc__common_8h__dep__incl.map
@@ -751,72 +671,6 @@ share/doc/gnuradio-${PKGVERSION}/html/classGF2Mat.js
 share/doc/gnuradio-${PKGVERSION}/html/classGF2Vec-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classGF2Vec.html
 share/doc/gnuradio-${PKGVERSION}/html/classGF2Vec.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscBitTimingLoop-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscBitTimingLoop.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscBitTimingLoop.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscBitTimingLoop2-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscBitTimingLoop2.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscBitTimingLoop2.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscBitTimingLoop3-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscBitTimingLoop3.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscBitTimingLoop3.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscConvert2xTo20-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscConvert2xTo20.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscConvert2xTo20.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscDataSegToSoftDataSeg-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscDataSegToSoftDataSeg.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscDataSegToSoftDataSeg.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscDeinterleaver-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscDeinterleaver.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscDeinterleaver.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscDerandomizer-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscDerandomizer.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscDerandomizer.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscEqualizer-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscEqualizer.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscEqualizer.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFPLL-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFPLL.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFPLL.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncChecker-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncChecker.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncChecker.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncCorrelator-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncCorrelator.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncCorrelator.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncDemux-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncDemux.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncDemux.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncMux-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncMux.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscFieldSyncMux.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscInterleaver-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscInterleaver.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscInterleaver.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscRSDecoder-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscRSDecoder.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscRSDecoder.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscRSEncoder-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscRSEncoder.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscRSEncoder.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscRandomizer-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscRandomizer.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscRandomizer.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscSegSymSync-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscSegSymSync.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscSegSymSync.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscSegSymSyncImpl-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscSegSymSyncImpl.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscSegSymSyncImpl.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscSymbolMapper-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscSymbolMapper.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscSymbolMapper.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscTrellisEncoder-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscTrellisEncoder.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscTrellisEncoder.js
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscViterbiDecoder-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscViterbiDecoder.html
-share/doc/gnuradio-${PKGVERSION}/html/classGrAtscViterbiDecoder.js
 share/doc/gnuradio-${PKGVERSION}/html/classHistogramClearEvent-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classHistogramClearEvent.html
 share/doc/gnuradio-${PKGVERSION}/html/classHistogramClearEvent.js
@@ -1021,12 +875,6 @@ share/doc/gnuradio-${PKGVERSION}/html/classatsc__pad.js
 share/doc/gnuradio-${PKGVERSION}/html/classatsc__randomizer-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsc__randomizer.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsc__randomizer.js
-share/doc/gnuradio-${PKGVERSION}/html/classatsc__root__raised__cosine-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classatsc__root__raised__cosine.html
-share/doc/gnuradio-${PKGVERSION}/html/classatsc__root__raised__cosine.js
-share/doc/gnuradio-${PKGVERSION}/html/classatsc__root__raised__cosine__bandpass-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classatsc__root__raised__cosine__bandpass.html
-share/doc/gnuradio-${PKGVERSION}/html/classatsc__root__raised__cosine__bandpass.js
 share/doc/gnuradio-${PKGVERSION}/html/classatsc__rs__decoder-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsc__rs__decoder.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsc__rs__decoder.js
@@ -1042,9 +890,6 @@ share/doc/gnuradio-${PKGVERSION}/html/classatsc__trellis__encoder.js
 share/doc/gnuradio-${PKGVERSION}/html/classatsc__viterbi__decoder-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsc__viterbi__decoder.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsc__viterbi__decoder.js
-share/doc/gnuradio-${PKGVERSION}/html/classatsc__vsbtx__lp-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classatsc__vsbtx__lp.html
-share/doc/gnuradio-${PKGVERSION}/html/classatsc__vsbtx__lp.js
 share/doc/gnuradio-${PKGVERSION}/html/classatsci__basic__trellis__encoder-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsci__basic__trellis__encoder.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsci__basic__trellis__encoder.js
@@ -1066,9 +911,6 @@ share/doc/gnuradio-${PKGVERSION}/html/classatsci__equalizer__lms2.js
 share/doc/gnuradio-${PKGVERSION}/html/classatsci__equalizer__nop-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsci__equalizer__nop.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsci__equalizer__nop.js
-share/doc/gnuradio-${PKGVERSION}/html/classatsci__exp2__lp-members.html
-share/doc/gnuradio-${PKGVERSION}/html/classatsci__exp2__lp.html
-share/doc/gnuradio-${PKGVERSION}/html/classatsci__exp2__lp.js
 share/doc/gnuradio-${PKGVERSION}/html/classatsci__fake__single__viterbi-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsci__fake__single__viterbi.html
 share/doc/gnuradio-${PKGVERSION}/html/classatsci__fake__single__viterbi.js
@@ -1461,6 +1303,9 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1divide__ss.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1endian__swap-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1endian__swap.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1endian__swap.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1exponentiate__const__cci-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1exponentiate__const__cci.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1exponentiate__const__cci.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1file__descriptor__sink-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1file__descriptor__sink.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1file__descriptor__sink.js
@@ -1596,6 +1441,9 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1moving__average__ii.j
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1moving__average__ss-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1moving__average__ss.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1moving__average__ss.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1multiply__by__tag__value__cc-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1multiply__by__tag__value__cc.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1multiply__by__tag__value__cc.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1multiply__cc-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1multiply__cc.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1multiply__cc.js
@@ -1845,6 +1693,9 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tag__debug.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tag__gate-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tag__gate.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tag__gate.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tag__share-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tag__share.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tag__share.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tagged__file__sink-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tagged__file__sink.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tagged__file__sink.js
@@ -1863,6 +1714,12 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tagged__stream__to__p
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tags__strobe-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tags__strobe.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tags__strobe.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tcp__server__sink-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tcp__server__sink.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1tcp__server__sink.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1test__tag__variable__rate__ff-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1test__tag__variable__rate__ff.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1test__tag__variable__rate__ff.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1threshold__ff-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1threshold__ff.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1blocks_1_1threshold__ff.js
@@ -2094,6 +1951,9 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1correlate__access__c
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1correlate__access__code__tag__bb-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1correlate__access__code__tag__bb.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1correlate__access__code__tag__bb.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1correlate__access__code__tag__ff-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1correlate__access__code__tag__ff.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1correlate__access__code__tag__ff.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1correlate__and__sync__cc-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1correlate__and__sync__cc.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1correlate__and__sync__cc.js
@@ -2142,6 +2002,24 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1hdlc__deframer__bp.j
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1hdlc__framer__pb-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1hdlc__framer__pb.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1hdlc__framer__pb.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__buffer-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__buffer.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__buffer.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__base-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__base.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__base.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__counter-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__counter.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__counter.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__crc-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__crc.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__crc.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__default-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__default.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__default.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__ofdm-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__ofdm.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__format__ofdm.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__payload__demux-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__payload__demux.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1header__payload__demux.js
@@ -2256,6 +2134,15 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1probe__density__b.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1probe__mpsk__snr__est__c-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1probe__mpsk__snr__est__c.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1probe__mpsk__snr__est__c.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1protocol__formatter__async-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1protocol__formatter__async.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1protocol__formatter__async.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1protocol__formatter__bb-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1protocol__formatter__bb.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1protocol__formatter__bb.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1protocol__parser__b-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1protocol__parser__b.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1protocol__parser__b.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1scrambler__bb-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1scrambler__bb.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1scrambler__bb.js
@@ -2268,6 +2155,12 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1simple__framer.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1snr__est__m2m4-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1snr__est__m2m4.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1snr__est__m2m4.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1symbol__sync__cc-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1symbol__sync__cc.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1symbol__sync__cc.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1symbol__sync__ff-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1symbol__sync__ff.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1digital_1_1symbol__sync__ff.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1atsc__deinterleaver-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1atsc__deinterleaver.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1atsc__deinterleaver.js
@@ -2313,6 +2206,21 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1atsc__trellis__encoder.j
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1atsc__viterbi__decoder-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1atsc__viterbi__decoder.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1atsc__viterbi__decoder.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__frame__sync__enc__bb-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__frame__sync__enc__bb.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__frame__sync__enc__bb.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__randomizer__bb-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__randomizer__bb.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__randomizer__bb.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__reed__solomon__enc__bb-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__reed__solomon__enc__bb.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__reed__solomon__enc__bb.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__transport__framing__enc__bb-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__transport__framing__enc__bb.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__transport__framing__enc__bb.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__trellis__enc__bb-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__trellis__enc__bb.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1catv__trellis__enc__bb.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1dvb__bbheader__bb-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1dvb__bbheader__bb.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1dtv_1_1dvb__bbheader__bb.js
@@ -2751,6 +2659,12 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1mmse__fir__interpolat
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1mmse__fir__interpolator__ff-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1mmse__fir__interpolator__ff.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1mmse__fir__interpolator__ff.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1mmse__interp__differentiator__cc-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1mmse__interp__differentiator__cc.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1mmse__interp__differentiator__cc.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1mmse__interp__differentiator__ff-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1mmse__interp__differentiator__ff.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1mmse__interp__differentiator__ff.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1pfb__arb__resampler__ccc-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1pfb__arb__resampler__ccc.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1filter_1_1pfb__arb__resampler__ccc.js
@@ -2904,6 +2818,9 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1qtgui_1_1ber__sink__b.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1qtgui_1_1const__sink__c-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1qtgui_1_1const__sink__c.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1qtgui_1_1const__sink__c.js
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1qtgui_1_1edit__box__msg-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1qtgui_1_1edit__box__msg.html
+share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1qtgui_1_1edit__box__msg.js
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1qtgui_1_1freq__sink__c-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1qtgui_1_1freq__sink__c.html
 share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1qtgui_1_1freq__sink__c.js
@@ -3117,6 +3034,9 @@ share/doc/gnuradio-${PKGVERSION}/html/classgr_1_1zeromq_1_1sub__source.js
 share/doc/gnuradio-${PKGVERSION}/html/classinterleaver__fifo-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classinterleaver__fifo.html
 share/doc/gnuradio-${PKGVERSION}/html/classinterleaver__fifo.js
+share/doc/gnuradio-${PKGVERSION}/html/classmywindow-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classmywindow.html
+share/doc/gnuradio-${PKGVERSION}/html/classmywindow.js
 share/doc/gnuradio-${PKGVERSION}/html/classplinfo-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classplinfo.html
 share/doc/gnuradio-${PKGVERSION}/html/classplinfo.js
@@ -3201,6 +3121,9 @@ share/doc/gnuradio-${PKGVERSION}/html/classrpcbasic__inserter_3_01T_00_01std_1_1
 share/doc/gnuradio-${PKGVERSION}/html/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01float_01_4_01_4-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01float_01_4_01_4.html
 share/doc/gnuradio-${PKGVERSION}/html/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01float_01_4_01_4.js
+share/doc/gnuradio-${PKGVERSION}/html/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01int64__t_01_4_01_4-members.html
+share/doc/gnuradio-${PKGVERSION}/html/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01int64__t_01_4_01_4.html
+share/doc/gnuradio-${PKGVERSION}/html/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01int64__t_01_4_01_4.js
 share/doc/gnuradio-${PKGVERSION}/html/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01int_01_4_01_4-members.html
 share/doc/gnuradio-${PKGVERSION}/html/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01int_01_4_01_4.html
 share/doc/gnuradio-${PKGVERSION}/html/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01int_01_4_01_4.js
@@ -3504,6 +3427,11 @@ share/doc/gnuradio-${PKGVERSION}/html/correlate__access__code__tag__bb_8h__incl.
 share/doc/gnuradio-${PKGVERSION}/html/correlate__access__code__tag__bb_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/correlate__access__code__tag__bb_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/correlate__access__code__tag__bb_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/correlate__access__code__tag__ff_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/correlate__access__code__tag__ff_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/correlate__access__code__tag__ff_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/correlate__access__code__tag__ff_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/correlate__access__code__tag__ff_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/correlate__and__sync__cc_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/correlate__and__sync__cc_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/correlate__and__sync__cc_8h__incl.md5
@@ -3828,6 +3756,28 @@ share/doc/gnuradio-${PKGVERSION}/html/dir_000110.html
 share/doc/gnuradio-${PKGVERSION}/html/dir_000111.html
 share/doc/gnuradio-${PKGVERSION}/html/dir_000112.html
 share/doc/gnuradio-${PKGVERSION}/html/dir_000113.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000114.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000115.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000116.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000117.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000118.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000119.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000120.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000121.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000122.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000123.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000124.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000125.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000126.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000127.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000128.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000129.html
+share/doc/gnuradio-${PKGVERSION}/html/dir_000130.html
+share/doc/gnuradio-${PKGVERSION}/html/display__qt_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/display__qt_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/display__qt_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/display__qt_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/display__qt_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/displayform_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/displayform_8h__dep__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/displayform_8h__dep__incl.md5
@@ -4070,6 +4020,11 @@ share/doc/gnuradio-${PKGVERSION}/html/dynamic__channel__model_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/dynamic__channel__model_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/dynamic__channel__model_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/dynsections.js
+share/doc/gnuradio-${PKGVERSION}/html/edit__box__msg_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/edit__box__msg_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/edit__box__msg_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/edit__box__msg_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/edit__box__msg_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/encode__ccsds__27__bb_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/encode__ccsds__27__bb_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/encode__ccsds__27__bb_8h__incl.md5
@@ -4124,11 +4079,6 @@ share/doc/gnuradio-${PKGVERSION}/html/equalizer__nop__impl_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/equalizer__nop__impl_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/equalizer__nop__impl_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/example_ofdm_packet_rx.png
-share/doc/gnuradio-${PKGVERSION}/html/exp2__lp__impl_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/exp2__lp__impl_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/exp2__lp__impl_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/exp2__lp__impl_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/exp2__lp__impl_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/expj_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/expj_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/expj_8h__incl.map
@@ -4136,6 +4086,11 @@ share/doc/gnuradio-${PKGVERSION}/html/expj_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/expj_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/expj_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/exploring__gnuradio_8dox.html
+share/doc/gnuradio-${PKGVERSION}/html/exponentiate__const__cci_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/exponentiate__const__cci_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/exponentiate__const__cci_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/exponentiate__const__cci_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/exponentiate__const__cci_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/fading__model_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/fading__model_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/fading__model_8h__incl.md5
@@ -4286,7 +4241,7 @@ share/doc/gnuradio-${PKGVERSION}/html/file__source_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/file__source_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/file__source_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/files.html
-share/doc/gnuradio-${PKGVERSION}/html/files.js
+share/doc/gnuradio-${PKGVERSION}/html/files_dup.js
 share/doc/gnuradio-${PKGVERSION}/html/filter_8dox.html
 share/doc/gnuradio-${PKGVERSION}/html/filter__delay__fc_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/filter__delay__fc_8h__incl.map
@@ -4459,7 +4414,19 @@ share/doc/gnuradio-${PKGVERSION}/html/form_42.png
 share/doc/gnuradio-${PKGVERSION}/html/form_43.png
 share/doc/gnuradio-${PKGVERSION}/html/form_44.png
 share/doc/gnuradio-${PKGVERSION}/html/form_45.png
+share/doc/gnuradio-${PKGVERSION}/html/form_46.png
+share/doc/gnuradio-${PKGVERSION}/html/form_47.png
+share/doc/gnuradio-${PKGVERSION}/html/form_48.png
+share/doc/gnuradio-${PKGVERSION}/html/form_49.png
 share/doc/gnuradio-${PKGVERSION}/html/form_5.png
+share/doc/gnuradio-${PKGVERSION}/html/form_50.png
+share/doc/gnuradio-${PKGVERSION}/html/form_51.png
+share/doc/gnuradio-${PKGVERSION}/html/form_52.png
+share/doc/gnuradio-${PKGVERSION}/html/form_53.png
+share/doc/gnuradio-${PKGVERSION}/html/form_54.png
+share/doc/gnuradio-${PKGVERSION}/html/form_55.png
+share/doc/gnuradio-${PKGVERSION}/html/form_56.png
+share/doc/gnuradio-${PKGVERSION}/html/form_57.png
 share/doc/gnuradio-${PKGVERSION}/html/form_6.png
 share/doc/gnuradio-${PKGVERSION}/html/form_7.png
 share/doc/gnuradio-${PKGVERSION}/html/form_8.png
@@ -4510,6 +4477,9 @@ share/doc/gnuradio-${PKGVERSION}/html/freq__sink__c_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/freq__sink__c_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/freq__sink__c_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/freq__sink__f_8h__incl.png
@@ -4658,7 +4628,6 @@ share/doc/gnuradio-${PKGVERSION}/html/functions_type.html
 share/doc/gnuradio-${PKGVERSION}/html/functions_type.js
 share/doc/gnuradio-${PKGVERSION}/html/functions_type_f.html
 share/doc/gnuradio-${PKGVERSION}/html/functions_type_h.html
-share/doc/gnuradio-${PKGVERSION}/html/functions_type_i.html
 share/doc/gnuradio-${PKGVERSION}/html/functions_type_m.html
 share/doc/gnuradio-${PKGVERSION}/html/functions_type_o.html
 share/doc/gnuradio-${PKGVERSION}/html/functions_type_q.html
@@ -4819,6 +4788,7 @@ share/doc/gnuradio-${PKGVERSION}/html/globals_u.html
 share/doc/gnuradio-${PKGVERSION}/html/globals_v.html
 share/doc/gnuradio-${PKGVERSION}/html/globals_vars.html
 share/doc/gnuradio-${PKGVERSION}/html/globals_w.html
+share/doc/gnuradio-${PKGVERSION}/html/globals_x.html
 share/doc/gnuradio-${PKGVERSION}/html/globals_z.html
 share/doc/gnuradio-${PKGVERSION}/html/gnuradio-logo.svg
 share/doc/gnuradio-${PKGVERSION}/html/gnuradio-runtime_2include_2gnuradio_2api_8h.html
@@ -4936,9 +4906,6 @@ share/doc/gnuradio-${PKGVERSION}/html/gr-digital_2include_2gnuradio_2digital_2ap
 share/doc/gnuradio-${PKGVERSION}/html/gr-digital_2include_2gnuradio_2digital_2api_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/gr-dtv_2include_2gnuradio_2dtv_2api_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/gr-dtv_2include_2gnuradio_2dtv_2api_8h.js
-share/doc/gnuradio-${PKGVERSION}/html/gr-dtv_2include_2gnuradio_2dtv_2api_8h__dep__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/gr-dtv_2include_2gnuradio_2dtv_2api_8h__dep__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/gr-dtv_2include_2gnuradio_2dtv_2api_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/gr-dtv_2include_2gnuradio_2dtv_2api_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/gr-dtv_2include_2gnuradio_2dtv_2api_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/gr-dtv_2include_2gnuradio_2dtv_2api_8h__incl.png
@@ -5231,6 +5198,48 @@ share/doc/gnuradio-${PKGVERSION}/html/head_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/head_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/head_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/head_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/header__buffer_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/header__buffer_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/header__buffer_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/header__buffer_8h__dep__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/header__buffer_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/header__buffer_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/header__buffer_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/header__buffer_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/header__format__base_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/header__format__base_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/header__format__base_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/header__format__base_8h__dep__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/header__format__base_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/header__format__base_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/header__format__base_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/header__format__base_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/header__format__counter_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/header__format__counter_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/header__format__counter_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/header__format__counter_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/header__format__counter_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/header__format__crc_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/header__format__crc_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/header__format__crc_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/header__format__crc_8h__dep__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/header__format__crc_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/header__format__crc_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/header__format__crc_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/header__format__crc_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/header__format__default_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/header__format__default_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/header__format__default_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/header__format__default_8h__dep__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/header__format__default_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/header__format__default_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/header__format__default_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/header__format__default_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/header__format__ofdm_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/header__format__ofdm_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/header__format__ofdm_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/header__format__ofdm_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/header__format__ofdm_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/header__payload__demux_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/header__payload__demux_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/header__payload__demux_8h__incl.md5
@@ -5267,6 +5276,9 @@ share/doc/gnuradio-${PKGVERSION}/html/histo__sink__f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/histo__sink__f_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/histo__sink__f_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/histogram__sink__f_8h__incl.png
@@ -5547,12 +5559,6 @@ share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_163.png
 share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_164.map
 share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_164.md5
 share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_164.png
-share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_165.map
-share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_165.md5
-share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_165.png
-share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_166.map
-share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_166.md5
-share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_166.png
 share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_17.map
 share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_17.md5
 share/doc/gnuradio-${PKGVERSION}/html/inherit_graph_17.png
@@ -5875,6 +5881,9 @@ share/doc/gnuradio-${PKGVERSION}/html/interleaver__fifo_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/interleaver__fifo_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/interleaver__fifo_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/interleaver__fifo_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/interp__differentiator__taps_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/interp__differentiator__taps_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/interp__differentiator__taps_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/interp__fir__filter__ccc_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/interp__fir__filter__ccc_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/interp__fir__filter__ccc_8h__incl.md5
@@ -5905,6 +5914,12 @@ share/doc/gnuradio-${PKGVERSION}/html/interp__fir__filter__scc_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/interp__fir__filter__scc_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/interp__fir__filter__scc_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/interp__fir__filter__scc_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/interpolating__resampler__type_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/interpolating__resampler__type_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/interpolating__resampler__type_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/interpolating__resampler__type_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/interpolating__resampler__type_8h__dep__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/interpolating__resampler__type_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/interpolator__taps_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/interpolator__taps_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/interpolator__taps_8h_source.html
@@ -6000,6 +6015,7 @@ share/doc/gnuradio-${PKGVERSION}/html/lfsr__32k__source__s_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/lfsr__32k__source__s_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/lfsr__32k__source__s_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/lfsr__32k__source__s_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/license_8dox.html
 share/doc/gnuradio-${PKGVERSION}/html/lms__dd__equalizer__cc_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/lms__dd__equalizer__cc_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/lms__dd__equalizer__cc_8h__incl.md5
@@ -6157,6 +6173,16 @@ share/doc/gnuradio-${PKGVERSION}/html/mmse__fir__interpolator__ff_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/mmse__fir__interpolator__ff_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/mmse__fir__interpolator__ff_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/mmse__fir__interpolator__ff_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/mmse__interp__differentiator__cc_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/mmse__interp__differentiator__cc_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/mmse__interp__differentiator__cc_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/mmse__interp__differentiator__cc_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/mmse__interp__differentiator__cc_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/mmse__interp__differentiator__ff_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/mmse__interp__differentiator__ff_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/mmse__interp__differentiator__ff_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/mmse__interp__differentiator__ff_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/mmse__interp__differentiator__ff_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/modulate__vector_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/modulate__vector_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/modulate__vector_8h__incl.map
@@ -6253,6 +6279,11 @@ share/doc/gnuradio-${PKGVERSION}/html/msk__timing__recovery__cc_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/msk__timing__recovery__cc_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/msk__timing__recovery__cc_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/msk__timing__recovery__cc_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/multiply__by__tag__value__cc_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/multiply__by__tag__value__cc_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/multiply__by__tag__value__cc_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/multiply__by__tag__value__cc_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/multiply__by__tag__value__cc_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/multiply__cc_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/multiply__cc_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/multiply__cc_8h__incl.md5
@@ -6422,20 +6453,76 @@ share/doc/gnuradio-${PKGVERSION}/html/namespacegr_1_1wxgui.js
 share/doc/gnuradio-${PKGVERSION}/html/namespacegr_1_1zeromq.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacegr_1_1zeromq.js
 share/doc/gnuradio-${PKGVERSION}/html/namespacemembers.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_b.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_c.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_d.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_dup.js
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_e.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_enum.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval.js
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_b.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_c.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_d.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_e.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_f.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_g.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_i.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_l.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_m.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_n.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_p.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_r.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_s.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_t.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_v.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_eval_w.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_f.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func.js
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_b.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_c.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_d.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_e.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_f.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_g.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_h.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_i.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_l.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_m.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_n.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_o.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_p.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_q.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_r.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_s.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_t.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_u.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_v.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_func_w.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_g.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_h.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_i.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_l.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_m.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_n.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_o.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_p.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_q.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_r.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_s.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_t.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_type.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_u.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_v.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_vars.html
+share/doc/gnuradio-${PKGVERSION}/html/namespacemembers_w.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacepmt.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacepmt.js
 share/doc/gnuradio-${PKGVERSION}/html/namespacerpcpmtconverter.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacerpcpmtconverter.js
 share/doc/gnuradio-${PKGVERSION}/html/namespaces.html
-share/doc/gnuradio-${PKGVERSION}/html/namespaces.js
+share/doc/gnuradio-${PKGVERSION}/html/namespaces_dup.js
 share/doc/gnuradio-${PKGVERSION}/html/namespacesssr.html
 share/doc/gnuradio-${PKGVERSION}/html/namespacesssr.js
 share/doc/gnuradio-${PKGVERSION}/html/namespaceuhd.html
@@ -6487,6 +6574,7 @@ share/doc/gnuradio-${PKGVERSION}/html/navtreeindex42.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex43.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex44.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex45.js
+share/doc/gnuradio-${PKGVERSION}/html/navtreeindex46.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex5.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex6.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex7.js
@@ -6511,6 +6599,9 @@ share/doc/gnuradio-${PKGVERSION}/html/noise__source__c_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/noise__source__c_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/noise__source__c_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/noise__source__f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/noise__source__f_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/noise__source__f_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/noise__source__f_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/noise__source__f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/noise__source__f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/noise__source__f_8h__incl.png
@@ -6720,6 +6811,7 @@ share/doc/gnuradio-${PKGVERSION}/html/packed__to__unpacked__ss_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/packed__to__unpacked__ss_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/packed__to__unpacked__ss_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/packed__to__unpacked__ss_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/packet__comms_8dox.html
 share/doc/gnuradio-${PKGVERSION}/html/packet__header__default_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/packet__header__default_8h__dep__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/packet__header__default_8h__dep__incl.md5
@@ -6775,6 +6867,7 @@ share/doc/gnuradio-${PKGVERSION}/html/page_msg_passing.html
 share/doc/gnuradio-${PKGVERSION}/html/page_ofdm.html
 share/doc/gnuradio-${PKGVERSION}/html/page_oot_config.html
 share/doc/gnuradio-${PKGVERSION}/html/page_operating_fg.html
+share/doc/gnuradio-${PKGVERSION}/html/page_packet_comms.html
 share/doc/gnuradio-${PKGVERSION}/html/page_packet_data.html
 share/doc/gnuradio-${PKGVERSION}/html/page_perf_counters.html
 share/doc/gnuradio-${PKGVERSION}/html/page_pfb.html
@@ -7125,6 +7218,21 @@ share/doc/gnuradio-${PKGVERSION}/html/probe__signal__vs_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/probe__signal__vs_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/probe__signal__vs_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/probe__signal__vs_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/protocol__formatter__async_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/protocol__formatter__async_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/protocol__formatter__async_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/protocol__formatter__async_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/protocol__formatter__async_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/protocol__formatter__bb_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/protocol__formatter__bb_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/protocol__formatter__bb_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/protocol__formatter__bb_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/protocol__formatter__bb_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/protocol__parser__b_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/protocol__parser__b_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/protocol__parser__b_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/protocol__parser__b_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/protocol__parser__b_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/pub__msg__sink_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/pub__msg__sink_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/pub__msg__sink_8h__incl.md5
@@ -7364,19 +7472,6 @@ share/doc/gnuradio-${PKGVERSION}/html/rms__ff_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/rms__ff_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/rms__ff_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/rms__ff_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__bandpass__impl_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__bandpass__impl_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__bandpass__impl_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__bandpass__impl_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__bandpass__impl_8h_source.html
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__impl_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__impl_8h__dep__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__impl_8h__dep__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__impl_8h__dep__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__impl_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__impl_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__impl_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/root__raised__cosine__impl_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/rotator_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/rotator_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/rotator_8h__incl.md5
@@ -7683,6 +7778,8 @@ share/doc/gnuradio-${PKGVERSION}/html/search/enums_0.html
 share/doc/gnuradio-${PKGVERSION}/html/search/enums_0.js
 share/doc/gnuradio-${PKGVERSION}/html/search/enums_1.html
 share/doc/gnuradio-${PKGVERSION}/html/search/enums_1.js
+share/doc/gnuradio-${PKGVERSION}/html/search/enums_10.html
+share/doc/gnuradio-${PKGVERSION}/html/search/enums_10.js
 share/doc/gnuradio-${PKGVERSION}/html/search/enums_2.html
 share/doc/gnuradio-${PKGVERSION}/html/search/enums_2.js
 share/doc/gnuradio-${PKGVERSION}/html/search/enums_3.html
@@ -7719,6 +7816,8 @@ share/doc/gnuradio-${PKGVERSION}/html/search/enumvalues_10.html
 share/doc/gnuradio-${PKGVERSION}/html/search/enumvalues_10.js
 share/doc/gnuradio-${PKGVERSION}/html/search/enumvalues_11.html
 share/doc/gnuradio-${PKGVERSION}/html/search/enumvalues_11.js
+share/doc/gnuradio-${PKGVERSION}/html/search/enumvalues_12.html
+share/doc/gnuradio-${PKGVERSION}/html/search/enumvalues_12.js
 share/doc/gnuradio-${PKGVERSION}/html/search/enumvalues_2.html
 share/doc/gnuradio-${PKGVERSION}/html/search/enumvalues_2.js
 share/doc/gnuradio-${PKGVERSION}/html/search/enumvalues_3.html
@@ -7817,6 +7916,8 @@ share/doc/gnuradio-${PKGVERSION}/html/search/functions_17.html
 share/doc/gnuradio-${PKGVERSION}/html/search/functions_17.js
 share/doc/gnuradio-${PKGVERSION}/html/search/functions_18.html
 share/doc/gnuradio-${PKGVERSION}/html/search/functions_18.js
+share/doc/gnuradio-${PKGVERSION}/html/search/functions_19.html
+share/doc/gnuradio-${PKGVERSION}/html/search/functions_19.js
 share/doc/gnuradio-${PKGVERSION}/html/search/functions_2.html
 share/doc/gnuradio-${PKGVERSION}/html/search/functions_2.js
 share/doc/gnuradio-${PKGVERSION}/html/search/functions_3.html
@@ -8079,6 +8180,9 @@ share/doc/gnuradio-${PKGVERSION}/html/sig__source__c_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/sig__source__c_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/sig__source__c_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/sig__source__f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/sig__source__f_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/sig__source__f_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/sig__source__f_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/sig__source__f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/sig__source__f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/sig__source__f_8h__incl.png
@@ -8194,9 +8298,6 @@ share/doc/gnuradio-${PKGVERSION}/html/skiphead_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/skiphead_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/skiphead_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/slicer__agc__impl_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/slicer__agc__impl_8h__dep__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/slicer__agc__impl_8h__dep__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/slicer__agc__impl_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/slicer__agc__impl_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/slicer__agc__impl_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/slicer__agc__impl_8h__incl.png
@@ -8457,6 +8558,16 @@ share/doc/gnuradio-${PKGVERSION}/html/sub__ss_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/sub__ss_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/sub__ss_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/sub__ss_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/symbol__sync__cc_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/symbol__sync__cc_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/symbol__sync__cc_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/symbol__sync__cc_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/symbol__sync__cc_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/symbol__sync__ff_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/symbol__sync__ff_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/symbol__sync__ff_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/symbol__sync__ff_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/symbol__sync__ff_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/syminfo__impl_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/syminfo__impl_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/syminfo__impl_8h__dep__incl.map
@@ -8520,6 +8631,11 @@ share/doc/gnuradio-${PKGVERSION}/html/tag__gate_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/tag__gate_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/tag__gate_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/tag__gate_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/tag__share_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/tag__share_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/tag__share_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/tag__share_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/tag__share_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/tagged__decoder_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/tagged__decoder_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/tagged__decoder_8h__incl.md5
@@ -8577,6 +8693,16 @@ share/doc/gnuradio-${PKGVERSION}/html/tags__strobe_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/tags__strobe_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/tags__strobe_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/tags__strobe_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/tcp__server__sink_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/tcp__server__sink_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/tcp__server__sink_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/tcp__server__sink_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/tcp__server__sink_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/test__tag__variable__rate__ff_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/test__tag__variable__rate__ff_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/test__tag__variable__rate__ff_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/test__tag__variable__rate__ff_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/test__tag__variable__rate__ff_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/thread_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/thread_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/thread_8h__dep__incl.map
@@ -8620,6 +8746,9 @@ share/doc/gnuradio-${PKGVERSION}/html/thrift__server__template_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/thrift__server__template_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/thrift__server__template_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/throttle_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/throttle_8h__incl.png
@@ -8648,6 +8777,9 @@ share/doc/gnuradio-${PKGVERSION}/html/time__sink__c_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/time__sink__c_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/time__sink__c_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/time__sink__f_8h__incl.png
@@ -8670,8 +8802,17 @@ share/doc/gnuradio-${PKGVERSION}/html/timerasterdisplayform_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/timerasterdisplayform_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/timerasterdisplayform_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/timerasterdisplayform_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/timing__error__detector__type_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/timing__error__detector__type_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/timing__error__detector__type_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/timing__error__detector__type_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/timing__error__detector__type_8h__dep__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/timing__error__detector__type_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/top__block_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/top__block_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/top__block_8h__incl.png
@@ -8814,6 +8955,7 @@ share/doc/gnuradio-${PKGVERSION}/html/unpacked__to__packed__ss_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/unpacked__to__packed__ss_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/usage_8dox.html
 share/doc/gnuradio-${PKGVERSION}/html/usrp__block_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/usrp__block_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/usrp__block_8h__dep__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/usrp__block_8h__dep__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/usrp__block_8h__dep__incl.png
@@ -8968,11 +9110,6 @@ share/doc/gnuradio-${PKGVERSION}/html/viterbi__decoder__impl_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/vocoder_8dox.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__guide_8dox.html
 share/doc/gnuradio-${PKGVERSION}/html/volk_guide.html
-share/doc/gnuradio-${PKGVERSION}/html/vsbtx__lp__impl_8h.html
-share/doc/gnuradio-${PKGVERSION}/html/vsbtx__lp__impl_8h__incl.map
-share/doc/gnuradio-${PKGVERSION}/html/vsbtx__lp__impl_8h__incl.md5
-share/doc/gnuradio-${PKGVERSION}/html/vsbtx__lp__impl_8h__incl.png
-share/doc/gnuradio-${PKGVERSION}/html/vsbtx__lp__impl_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/waterfallGlobalData_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/waterfallGlobalData_8h__dep__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/waterfallGlobalData_8h__dep__incl.md5
@@ -8987,6 +9124,9 @@ share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__c_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__c_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__c_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/waterfall__sink__f_8h__incl.png
@@ -9045,34 +9185,19 @@ share/doc/gnuradio-${PKGVERSION}/html/xor__ss_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/xor__ss_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/xor__ss_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/xor__ss_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/xoroshiro128p_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/xoroshiro128p_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/xoroshiro128p_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/xoroshiro128p_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/xoroshiro128p_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/xoroshiro128p_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/zeromq_8dox.html
 share/doc/gnuradio-${PKGVERSION}/xml/ConstellationDisplayPlot_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/DisplayPlot_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/FrequencyDisplayPlot_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscBitTimingLoop2_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscBitTimingLoop3_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscBitTimingLoop_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscConvert2xTo20_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscDataSegToSoftDataSeg_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscDeinterleaver_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscDerandomizer_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscEqualizer_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscFPLL_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscFieldSyncChecker_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscFieldSyncCorrelator_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscFieldSyncDemux_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscFieldSyncMux_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscInterleaver_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscRSDecoder_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscRSEncoder_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscRandomizer_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscSegSymSyncImpl_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/GrAtscSegSymSyncImpl__export_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscSegSymSync_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscSymbolMapper_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscTrellisEncoder_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/GrAtscViterbiDecoder_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/HistogramDisplayPlot_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/License.xml
 share/doc/gnuradio-${PKGVERSION}/xml/SpectrumGUIClass_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/TimeDomainDisplayPlot_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/TimeRasterDisplayPlot_8h.xml
@@ -9160,6 +9285,12 @@ share/doc/gnuradio-${PKGVERSION}/xml/build__guide_8dox.xml
 share/doc/gnuradio-${PKGVERSION}/xml/build_guide.xml
 share/doc/gnuradio-${PKGVERSION}/xml/burst__tagger_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/calc__metric_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/catv__config_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/catv__frame__sync__enc__bb_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/catv__randomizer__bb_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/catv__reed__solomon__enc__bb_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/catv__transport__framing__enc__bb_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/catv__trellis__enc__bb_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/cc__common_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/cc__decoder_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/cc__encoder_8h.xml
@@ -9196,28 +9327,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/classFreqUpdateEvent.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classFrequencyDisplayPlot.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classGF2Mat.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classGF2Vec.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscBitTimingLoop.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscBitTimingLoop2.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscBitTimingLoop3.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscConvert2xTo20.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscDataSegToSoftDataSeg.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscDeinterleaver.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscDerandomizer.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscEqualizer.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscFPLL.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscFieldSyncChecker.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscFieldSyncCorrelator.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscFieldSyncDemux.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscFieldSyncMux.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscInterleaver.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscRSDecoder.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscRSEncoder.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscRandomizer.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscSegSymSync.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscSegSymSyncImpl.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscSymbolMapper.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscTrellisEncoder.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classGrAtscViterbiDecoder.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classHistogramClearEvent.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classHistogramDisplayForm.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classHistogramDisplayPlot.xml
@@ -9286,14 +9395,11 @@ share/doc/gnuradio-${PKGVERSION}/xml/classatsc__mpeg__packet__no__sync.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsc__mpeg__packet__rs__encoded.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsc__pad.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsc__randomizer.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classatsc__root__raised__cosine.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classatsc__root__raised__cosine__bandpass.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsc__rs__decoder.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsc__rs__encoder.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsc__soft__data__segment.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsc__trellis__encoder.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsc__viterbi__decoder.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classatsc__vsbtx__lp.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsci__basic__trellis__encoder.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsci__data__deinterleaver.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsci__data__interleaver.xml
@@ -9301,7 +9407,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/classatsci__equalizer.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsci__equalizer__lms.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsci__equalizer__lms2.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsci__equalizer__nop.xml
-share/doc/gnuradio-${PKGVERSION}/xml/classatsci__exp2__lp.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsci__fake__single__viterbi.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsci__fs__checker.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classatsci__fs__checker__naive.xml
@@ -9434,6 +9539,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1divide__ff.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1divide__ii.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1divide__ss.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1endian__swap.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1exponentiate__const__cci.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1file__descriptor__sink.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1file__descriptor__source.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1file__meta__sink.xml
@@ -9479,6 +9585,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1moving__average__cc.xm
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1moving__average__ff.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1moving__average__ii.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1moving__average__ss.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1multiply__by__tag__value__cc.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1multiply__cc.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1multiply__conjugate__cc.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1multiply__const__cc.xml
@@ -9562,12 +9669,15 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1sub__ii.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1sub__ss.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1tag__debug.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1tag__gate.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1tag__share.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1tagged__file__sink.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1tagged__stream__align.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1tagged__stream__multiply__length.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1tagged__stream__mux.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1tagged__stream__to__pdu.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1tags__strobe.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1tcp__server__sink.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1test__tag__variable__rate__ff.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1threshold__ff.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1throttle.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1blocks_1_1transcendental.xml
@@ -9645,6 +9755,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1correlate__access__co
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1correlate__access__code__bb__ts.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1correlate__access__code__ff__ts.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1correlate__access__code__tag__bb.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1correlate__access__code__tag__ff.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1correlate__and__sync__cc.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1costas__loop__cc.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1cpmmod__bc.xml
@@ -9661,6 +9772,12 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1glfsr__source__b.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1glfsr__source__f.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1hdlc__deframer__bp.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1hdlc__framer__pb.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1header__buffer.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1header__format__base.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1header__format__counter.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1header__format__crc.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1header__format__default.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1header__format__ofdm.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1header__payload__demux.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1kurtotic__equalizer__cc.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1lfsr.xml
@@ -9699,10 +9816,15 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1pfb__clock__sync__fff
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1pn__correlator__cc.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1probe__density__b.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1probe__mpsk__snr__est__c.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1protocol__formatter__async.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1protocol__formatter__bb.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1protocol__parser__b.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1scrambler__bb.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1simple__correlator.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1simple__framer.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1snr__est__m2m4.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1symbol__sync__cc.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1digital_1_1symbol__sync__ff.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1atsc__deinterleaver.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1atsc__depad.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1atsc__derandomizer.xml
@@ -9718,6 +9840,11 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1atsc__rs__encoder.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1atsc__sync.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1atsc__trellis__encoder.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1atsc__viterbi__decoder.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1catv__frame__sync__enc__bb.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1catv__randomizer__bb.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1catv__reed__solomon__enc__bb.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1catv__transport__framing__enc__bb.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1catv__trellis__enc__bb.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1dvb__bbheader__bb.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1dvb__bbscrambler__bb.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1dtv_1_1dvb__bch__bb.xml
@@ -9864,6 +9991,8 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1filter_1_1kernel_1_1pfb__arb__re
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1filter_1_1kernel_1_1polyphase__filterbank.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1filter_1_1mmse__fir__interpolator__cc.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1filter_1_1mmse__fir__interpolator__ff.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1filter_1_1mmse__interp__differentiator__cc.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1filter_1_1mmse__interp__differentiator__ff.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1filter_1_1pfb__arb__resampler__ccc.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1filter_1_1pfb__arb__resampler__ccf.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1filter_1_1pfb__arb__resampler__fff.xml
@@ -9915,6 +10044,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1py__feval__ll.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1py__feval__p.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1qtgui_1_1ber__sink__b.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1qtgui_1_1const__sink__c.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1qtgui_1_1edit__box__msg.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1qtgui_1_1freq__sink__c.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1qtgui_1_1freq__sink__f.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1qtgui_1_1histogram__sink__f.xml
@@ -9986,6 +10116,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1zeromq_1_1req__source.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1zeromq_1_1sub__msg__source.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classgr_1_1zeromq_1_1sub__source.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classinterleaver__fifo.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classmywindow.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classplinfo.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classpmt_1_1comparator.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classpmt_1_1comperator.xml
@@ -10014,6 +10145,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/classrpcbasic__inserter.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classrpcbasic__inserter_3_01T_00_01std_1_1complex_3_01double_01_4_01_4.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classrpcbasic__inserter_3_01T_00_01std_1_1complex_3_01float_01_4_01_4.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01float_01_4_01_4.xml
+share/doc/gnuradio-${PKGVERSION}/xml/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01int64__t_01_4_01_4.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01int_01_4_01_4.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01short_01_4_01_4.xml
 share/doc/gnuradio-${PKGVERSION}/xml/classrpcbasic__inserter_3_01T_00_01std_1_1vector_3_01signed_01char_01_4_01_4.xml
@@ -10086,6 +10218,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/correlate__access__code__bb_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/correlate__access__code__bb__ts_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/correlate__access__code__ff__ts_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/correlate__access__code__tag__bb_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/correlate__access__code__tag__ff_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/correlate__and__sync__cc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/costas__loop__cc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/count__bits_8h.xml
@@ -10240,6 +10373,24 @@ share/doc/gnuradio-${PKGVERSION}/xml/dir_000110.xml
 share/doc/gnuradio-${PKGVERSION}/xml/dir_000111.xml
 share/doc/gnuradio-${PKGVERSION}/xml/dir_000112.xml
 share/doc/gnuradio-${PKGVERSION}/xml/dir_000113.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000114.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000115.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000116.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000117.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000118.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000119.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000120.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000121.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000122.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000123.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000124.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000125.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000126.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000127.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000128.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000129.xml
+share/doc/gnuradio-${PKGVERSION}/xml/dir_000130.xml
+share/doc/gnuradio-${PKGVERSION}/xml/display__qt_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/displayform_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/divide__cc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/divide__ff_8h.xml
@@ -10286,6 +10437,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/dvbt__reference__signals_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/dvbt__symbol__inner__interleaver_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/dvbt__viterbi__decoder_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/dynamic__channel__model_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/edit__box__msg_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/encode__ccsds__27__bb_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/encoder_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/endian__swap_8h.xml
@@ -10295,9 +10447,10 @@ share/doc/gnuradio-${PKGVERSION}/xml/equalizer__impl_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/equalizer__lms2__impl_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/equalizer__lms__impl_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/equalizer__nop__impl_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/exp2__lp__impl_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/example_ofdm_packet_rx.png
 share/doc/gnuradio-${PKGVERSION}/xml/expj_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/exploring__gnuradio_8dox.xml
+share/doc/gnuradio-${PKGVERSION}/xml/exponentiate__const__cci_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/fading__model_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/fake__single__viterbi__impl_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/fastnoise__source__c_8h.xml
@@ -10391,6 +10544,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/gf2vec_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/glfsr_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/glfsr__source__b_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/glfsr__source__f_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/gnuradio-logo.svg
 share/doc/gnuradio-${PKGVERSION}/xml/gnuradio-runtime_2include_2gnuradio_2api_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/gnuradio-runtime_2include_2gnuradio_2types_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/gnuradio-runtime_2include_2pmt_2api_8h.xml
@@ -10484,6 +10638,12 @@ share/doc/gnuradio-${PKGVERSION}/xml/gsm__fr__encode__sp_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/hdlc__deframer__bp_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/hdlc__framer__pb_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/head_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/header__buffer_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/header__format__base_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/header__format__counter_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/header__format__crc_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/header__format__default_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/header__format__ofdm_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/header__payload__demux_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/hier__block2_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/high__res__timer_8h.xml
@@ -10513,12 +10673,14 @@ share/doc/gnuradio-${PKGVERSION}/xml/interleave_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/interleaved__char__to__complex_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/interleaved__short__to__complex_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/interleaver__fifo_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/interp__differentiator__taps_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/interp__fir__filter__ccc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/interp__fir__filter__ccf_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/interp__fir__filter__fcc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/interp__fir__filter__fff_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/interp__fir__filter__fsf_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/interp__fir__filter__scc_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/interpolating__resampler__type_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/interpolator__taps_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/io__signature_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/keep__m__in__n_8h.xml
@@ -10535,6 +10697,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/lfsr_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/lfsr__15__1__0_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/lfsr__32k_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/lfsr__32k__source__s_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/license_8dox.xml
 share/doc/gnuradio-${PKGVERSION}/xml/lms__dd__equalizer__cc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/log2__const_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/logger_8dox.xml
@@ -10564,6 +10727,8 @@ share/doc/gnuradio-${PKGVERSION}/xml/min__ss_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/misc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/mmse__fir__interpolator__cc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/mmse__fir__interpolator__ff_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/mmse__interp__differentiator__cc_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/mmse__interp__differentiator__ff_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/modulate__vector_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/moving__average__cc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/moving__average__ff_8h.xml
@@ -10580,6 +10745,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/msg__passing_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/msg__producer_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/msg__queue_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/msk__timing__recovery__cc_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/multiply__by__tag__value__cc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/multiply__cc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/multiply__conjugate__cc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/multiply__const__cc_8h.xml
@@ -10599,7 +10765,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/mute__cc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/mute__ff_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/mute__ii_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/mute__ss_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/namespace%236.xml@localhost
+share/doc/gnuradio-${PKGVERSION}/xml/namespace_0D237.xml
 share/doc/gnuradio-${PKGVERSION}/xml/namespaceapache.xml
 share/doc/gnuradio-${PKGVERSION}/xml/namespaceapache_1_1thrift.xml
 share/doc/gnuradio-${PKGVERSION}/xml/namespaceapache_1_1thrift_1_1server.xml
@@ -10674,6 +10840,8 @@ share/doc/gnuradio-${PKGVERSION}/xml/ofdm__mapper__bcv_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/ofdm__sampler_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/ofdm__serializer__vcc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/ofdm__sync__sc__cfb_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/ofdm_rx_core.png
+share/doc/gnuradio-${PKGVERSION}/xml/ofdm_tx_core.png
 share/doc/gnuradio-${PKGVERSION}/xml/oot__config_8dox.xml
 share/doc/gnuradio-${PKGVERSION}/xml/operating__fg_8dox.xml
 share/doc/gnuradio-${PKGVERSION}/xml/or__bb_8h.xml
@@ -10688,6 +10856,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/pack__k__bits__bb_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/packed__to__unpacked__bb_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/packed__to__unpacked__ii_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/packed__to__unpacked__ss_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/packet__comms_8dox.xml
 share/doc/gnuradio-${PKGVERSION}/xml/packet__header__default_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/packet__header__ofdm_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/packet__headergenerator__bb_8h.xml
@@ -10714,6 +10883,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/page_msg_passing.xml
 share/doc/gnuradio-${PKGVERSION}/xml/page_ofdm.xml
 share/doc/gnuradio-${PKGVERSION}/xml/page_oot_config.xml
 share/doc/gnuradio-${PKGVERSION}/xml/page_operating_fg.xml
+share/doc/gnuradio-${PKGVERSION}/xml/page_packet_comms.xml
 share/doc/gnuradio-${PKGVERSION}/xml/page_packet_data.xml
 share/doc/gnuradio-${PKGVERSION}/xml/page_perf_counters.xml
 share/doc/gnuradio-${PKGVERSION}/xml/page_pfb.xml
@@ -10791,6 +10961,9 @@ share/doc/gnuradio-${PKGVERSION}/xml/probe__signal__vc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/probe__signal__vf_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/probe__signal__vi_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/probe__signal__vs_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/protocol__formatter__async_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/protocol__formatter__bb_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/protocol__parser__b_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/pub__msg__sink_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/pub__sink_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/pull__msg__source_8h.xml
@@ -10836,8 +11009,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/req__msg__source_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/req__source_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/rms__cf_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/rms__ff_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/root__raised__cosine__bandpass__impl_8h.xml
-share/doc/gnuradio-${PKGVERSION}/xml/root__raised__cosine__impl_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/rotator_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/rotator__cc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/rpcbufferedget_8h.xml
@@ -10961,6 +11132,8 @@ share/doc/gnuradio-${PKGVERSION}/xml/sub__ii_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/sub__msg__source_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/sub__source_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/sub__ss_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/symbol__sync__cc_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/symbol__sync__ff_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/syminfo__impl_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/sync__block_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/sync__decimator_8h.xml
@@ -10971,6 +11144,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/sys__pri_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/tag__checker_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/tag__debug_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/tag__gate_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/tag__share_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/tagged__decoder_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/tagged__encoder_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/tagged__file__sink_8h.xml
@@ -10982,6 +11156,8 @@ share/doc/gnuradio-${PKGVERSION}/xml/tagged__stream__mux_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/tagged__stream__to__pdu_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/tags_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/tags__strobe_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/tcp__server__sink_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/test__tag__variable__rate__ff_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/thread_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/thread__affinity_8dox.xml
 share/doc/gnuradio-${PKGVERSION}/xml/thread__body__wrapper_8h.xml
@@ -10998,6 +11174,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/time__sink__f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/timecontrolpanel_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/timedisplayform_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/timerasterdisplayform_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/timing__error__detector__type_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/top__block_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/tpb__detail_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/tpc__common_8h.xml
@@ -11058,7 +11235,6 @@ share/doc/gnuradio-${PKGVERSION}/xml/viterbi__decoder__impl_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/vocoder_8dox.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__guide_8dox.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk_guide.xml
-share/doc/gnuradio-${PKGVERSION}/xml/vsbtx__lp__impl_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/waterfallGlobalData_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/waterfall__sink__c_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/waterfall__sink__f_8h.xml
@@ -11072,4 +11248,5 @@ share/doc/gnuradio-${PKGVERSION}/xml/wvps__ff_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/xor__bb_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/xor__ii_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/xor__ss_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/xoroshiro128p_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/zeromq_8dox.xml
diff --git a/gnuradio-dtv/Makefile b/gnuradio-dtv/Makefile
index 1de3ba2697..4836f10600 100644
--- a/gnuradio-dtv/Makefile
+++ b/gnuradio-dtv/Makefile
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.5 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.19 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-dtv-${VERSION}
+PKGREVISION=	2
 COMMENT=	Various digital television standards of GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_DTV=True
 CMAKE_ARGS+=	-DENABLE_GR_FEC=True
 
 PLIST_MINUS+=	fec
-.include	"../../wip/gnuradio-fec/buildlink3.mk"
+.include	"../../ham/gnuradio-fec/buildlink3.mk"
+.include	"../../math/gsl/buildlink3.mk"
 
 .include	"../../mk/bsd.pkg.mk"
diff --git a/gnuradio-dtv/PLIST b/gnuradio-dtv/PLIST
index a8558740f5..5d30a3f281 100644
--- a/gnuradio-dtv/PLIST
+++ b/gnuradio-dtv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.7 2018/07/16 07:55:22 mef Exp $
 include/gnuradio/dtv/api.h
 include/gnuradio/dtv/atsc_consts.h
 include/gnuradio/dtv/atsc_deinterleaver.h
@@ -16,6 +16,12 @@ include/gnuradio/dtv/atsc_rs_encoder.h
 include/gnuradio/dtv/atsc_sync.h
 include/gnuradio/dtv/atsc_trellis_encoder.h
 include/gnuradio/dtv/atsc_viterbi_decoder.h
+include/gnuradio/dtv/catv_config.h
+include/gnuradio/dtv/catv_frame_sync_enc_bb.h
+include/gnuradio/dtv/catv_randomizer_bb.h
+include/gnuradio/dtv/catv_reed_solomon_enc_bb.h
+include/gnuradio/dtv/catv_transport_framing_enc_bb.h
+include/gnuradio/dtv/catv_trellis_enc_bb.h
 include/gnuradio/dtv/dvb_bbheader_bb.h
 include/gnuradio/dtv/dvb_bbscrambler_bb.h
 include/gnuradio/dtv/dvb_bch_bb.h
@@ -71,6 +77,54 @@ ${PYSITELIB}/gnuradio/dtv/dtv_swig.py
 ${PYSITELIB}/gnuradio/dtv/dtv_swig.pyc
 ${PYSITELIB}/gnuradio/dtv/dtv_swig.pyo
 share/doc/gnuradio-${PKGVERSION}/README.dtv
+share/gnuradio/examples/dtv/README.catv
+share/gnuradio/examples/dtv/README.dvbs
+share/gnuradio/examples/dtv/README.dvbs2
+share/gnuradio/examples/dtv/README.dvbt
+share/gnuradio/examples/dtv/README.dvbt2
+share/gnuradio/examples/dtv/atsc_ctrlport_monitor.py
+share/gnuradio/examples/dtv/catv_tx_64qam.grc
+share/gnuradio/examples/dtv/dvbs2_tx.grc
+share/gnuradio/examples/dtv/dvbs_tx.grc
+share/gnuradio/examples/dtv/dvbt_rx_8k.grc
+share/gnuradio/examples/dtv/dvbt_tx_2k.grc
+share/gnuradio/examples/dtv/dvbt_tx_8k.grc
+share/gnuradio/examples/dtv/file_atsc_rx.grc
+share/gnuradio/examples/dtv/file_atsc_tx.grc
+share/gnuradio/examples/dtv/uhd_atsc_capture.grc
+share/gnuradio/examples/dtv/uhd_rx_atsc.grc
+share/gnuradio/examples/dtv/vv003-cr23.grc
+share/gnuradio/examples/dtv/vv009-4kfft.grc
+share/gnuradio/examples/dtv/vv018-miso.grc
+share/gnuradio/examples/dtv/README.atsc
+share/gnuradio/examples/dtv/germany-g1.grc
+share/gnuradio/examples/dtv/germany-g10.grc
+share/gnuradio/examples/dtv/germany-g2.grc
+share/gnuradio/examples/dtv/germany-g3.grc
+share/gnuradio/examples/dtv/germany-g4.grc
+share/gnuradio/examples/dtv/germany-g5.grc
+share/gnuradio/examples/dtv/germany-g6.grc
+share/gnuradio/examples/dtv/germany-g7.grc
+share/gnuradio/examples/dtv/germany-g8.grc
+share/gnuradio/examples/dtv/germany-g9.grc
+share/gnuradio/examples/dtv/uhd_atsc_tx.grc
+share/gnuradio/examples/dtv/vv001-cr35.grc
+share/gnuradio/examples/dtv/vv004-8kfft.grc
+share/gnuradio/examples/dtv/vv005-8kfft.grc
+share/gnuradio/examples/dtv/vv007-16kfft.grc
+share/gnuradio/examples/dtv/vv008-16kfft.grc
+share/gnuradio/examples/dtv/vv010-2kfft.grc
+share/gnuradio/examples/dtv/vv011-1kfft.grc
+share/gnuradio/examples/dtv/vv012-64qam45.grc
+share/gnuradio/examples/dtv/vv013-64qam56.grc
+share/gnuradio/examples/dtv/vv014-64qam34.grc
+share/gnuradio/examples/dtv/vv015-8kfft.grc
+share/gnuradio/examples/dtv/vv016-256qam34.grc
+share/gnuradio/examples/dtv/vv017-paprtr.grc
+share/gnuradio/examples/dtv/vv019-norot.grc
+share/gnuradio/examples/dtv/vv034-dtg016.grc
+share/gnuradio/examples/dtv/vv035-dtg052.grc
+share/gnuradio/examples/dtv/vv036-dtg091.grc
 share/gnuradio/grc/blocks/dtv_atsc_deinterleaver.xml
 share/gnuradio/grc/blocks/dtv_atsc_depad.xml
 share/gnuradio/grc/blocks/dtv_atsc_derandomizer.xml
@@ -89,6 +143,11 @@ share/gnuradio/grc/blocks/dtv_atsc_sync.xml
 share/gnuradio/grc/blocks/dtv_atsc_trellis_encoder.xml
 share/gnuradio/grc/blocks/dtv_atsc_viterbi_decoder.xml
 share/gnuradio/grc/blocks/dtv_block_tree.xml
+share/gnuradio/grc/blocks/dtv_catv_frame_sync_enc_bb.xml
+share/gnuradio/grc/blocks/dtv_catv_randomizer_bb.xml
+share/gnuradio/grc/blocks/dtv_catv_reed_solomon_enc_bb.xml
+share/gnuradio/grc/blocks/dtv_catv_transport_framing_enc_bb.xml
+share/gnuradio/grc/blocks/dtv_catv_trellis_enc_bb.xml
 share/gnuradio/grc/blocks/dtv_dvb_bbheader_bb.xml
 share/gnuradio/grc/blocks/dtv_dvb_bbscrambler_bb.xml
 share/gnuradio/grc/blocks/dtv_dvb_bch_bb.xml
diff --git a/gnuradio-dtv/buildlink3.mk b/gnuradio-dtv/buildlink3.mk
index 8378082d05..6b5426d7c1 100644
--- a/gnuradio-dtv/buildlink3.mk
+++ b/gnuradio-dtv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:09 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-dtv
 
@@ -7,7 +7,7 @@ GNURADIO_DTV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-dtv+=	gnuradio-dtv>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-dtv+=	gnuradio-dtv>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-dtv?=	../../wip/gnuradio-dtv
+BUILDLINK_PKGSRCDIR.gnuradio-dtv?=	../../ham/gnuradio-dtv
 .endif # GNURADIO_DTV_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-dtv
diff --git a/gnuradio-fcd/Makefile b/gnuradio-fcd/Makefile
index 18f6e454f8..cbeb3ba8b0 100644
--- a/gnuradio-fcd/Makefile
+++ b/gnuradio-fcd/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.26 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-fcd-${VERSION}
+PKGREVISION=	3
 COMMENT=	FanCube support of GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_FCD=True
diff --git a/gnuradio-fcd/PLIST b/gnuradio-fcd/PLIST
index 5c60a0279a..c0cdbdf5a6 100644
--- a/gnuradio-fcd/PLIST
+++ b/gnuradio-fcd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/09/17 13:48:06 makoto Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/10/28 16:59:33 mef Exp $
 ${PYSITELIB}/gnuradio/fcd/__init__.py
 ${PYSITELIB}/gnuradio/fcd/__init__.pyc
 ${PYSITELIB}/gnuradio/fcd/__init__.pyo
diff --git a/gnuradio-fcd/buildlink3.mk b/gnuradio-fcd/buildlink3.mk
index f489d0b218..fecf132a79 100644
--- a/gnuradio-fcd/buildlink3.mk
+++ b/gnuradio-fcd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:09 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-fcd
 
@@ -7,7 +7,7 @@ GNURADIO_FCD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-fcd+=	gnuradio-fcd>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-fcd+=	gnuradio-fcd>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-fcd?=	../../wip/gnuradio-fcd
+BUILDLINK_PKGSRCDIR.gnuradio-fcd?=	../../ham/gnuradio-fcd
 .endif # GNURADIO_FCD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-fcd
diff --git a/gnuradio-fec/Makefile b/gnuradio-fec/Makefile
index bca4bc0c36..843b748e2e 100644
--- a/gnuradio-fec/Makefile
+++ b/gnuradio-fec/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.18 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-fec-${VERSION}
+PKGREVISION=	2
 COMMENT=	Forward Error Correction blocks, utilities, & examples of GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=OFF
 CMAKE_ARGS+=	-DENABLE_GR_FEC=ON
 
+.include	"../../math/gsl/buildlink3.mk"
 .include	"../../mk/bsd.pkg.mk"
diff --git a/gnuradio-fec/PLIST b/gnuradio-fec/PLIST
index a35996d2e1..5de8346fde 100644
--- a/gnuradio-fec/PLIST
+++ b/gnuradio-fec/PLIST
@@ -1,13 +1,16 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.8 2017/03/15 14:07:12 mef Exp $
 bin/polar_channel_construction
+include/gnuradio/fec/alist.h
 include/gnuradio/fec/api.h
 include/gnuradio/fec/async_decoder.h
 include/gnuradio/fec/async_encoder.h
+include/gnuradio/fec/awgn_bp.h
 include/gnuradio/fec/ber_bf.h
 include/gnuradio/fec/cc_common.h
 include/gnuradio/fec/cc_decoder.h
 include/gnuradio/fec/cc_encoder.h
 include/gnuradio/fec/ccsds_encoder.h
+include/gnuradio/fec/cldpc.h
 include/gnuradio/fec/conv_bit_corr_bb.h
 include/gnuradio/fec/decode_ccsds_27_fb.h
 include/gnuradio/fec/decoder.h
@@ -16,10 +19,19 @@ include/gnuradio/fec/dummy_decoder.h
 include/gnuradio/fec/dummy_encoder.h
 include/gnuradio/fec/encode_ccsds_27_bb.h
 include/gnuradio/fec/encoder.h
+include/gnuradio/fec/fec_mtrx.h
 include/gnuradio/fec/generic_decoder.h
 include/gnuradio/fec/generic_encoder.h
+include/gnuradio/fec/gf2mat.h
+include/gnuradio/fec/gf2vec.h
+include/gnuradio/fec/ldpc_G_matrix.h
+include/gnuradio/fec/ldpc_H_matrix.h
+include/gnuradio/fec/ldpc_bit_flip_decoder.h
 include/gnuradio/fec/ldpc_decoder.h
 include/gnuradio/fec/ldpc_encoder.h
+include/gnuradio/fec/ldpc_gen_mtrx_encoder.h
+include/gnuradio/fec/ldpc_par_mtrx_encoder.h
+include/gnuradio/fec/maxstar.h
 include/gnuradio/fec/polar_common.h
 include/gnuradio/fec/polar_decoder_common.h
 include/gnuradio/fec/polar_decoder_sc.h
@@ -34,6 +46,9 @@ include/gnuradio/fec/repetition_encoder.h
 include/gnuradio/fec/rs.h
 include/gnuradio/fec/tagged_decoder.h
 include/gnuradio/fec/tagged_encoder.h
+include/gnuradio/fec/tpc_common.h
+include/gnuradio/fec/tpc_decoder.h
+include/gnuradio/fec/tpc_encoder.h
 include/gnuradio/fec/viterbi.h
 include/gnuradio/swig/fec_swig.i
 include/gnuradio/swig/fec_swig_doc.i
@@ -142,8 +157,6 @@ share/gnuradio/fec/ldpc/n_0700_k_0282_gap_16.alist
 share/gnuradio/fec/ldpc/n_1100_k_0442_gap_24.alist
 share/gnuradio/fec/ldpc/n_1300_k_0522_gap_30.alist
 share/gnuradio/fec/ldpc/n_1800_k_0902_gap_28.alist
-share/gnuradio/fec/ldpc/n_2400_k_1198_gap_33.alist
-share/gnuradio/fec/ldpc/n_2400_k_1198_gen_matrix.alist
 share/gnuradio/fec/ldpc/simple_g_matrix.alist
 share/gnuradio/grc/blocks/fec_async_decoder.xml
 share/gnuradio/grc/blocks/fec_async_encoder.xml
diff --git a/gnuradio-fec/buildlink3.mk b/gnuradio-fec/buildlink3.mk
index 81042b8c83..d0623b19ba 100644
--- a/gnuradio-fec/buildlink3.mk
+++ b/gnuradio-fec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:09 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-fec
 
@@ -7,7 +7,7 @@ GNURADIO_FEC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-fec+=	gnuradio-fec>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-fec+=	gnuradio-fec>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-fec?=	../../wip/gnuradio-fec
+BUILDLINK_PKGSRCDIR.gnuradio-fec?=	../../ham/gnuradio-fec
 .endif # GNURADIO_FEC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-fec
diff --git a/gnuradio-noaa/Makefile b/gnuradio-noaa/Makefile
index ffdcd02d2f..69f677675b 100644
--- a/gnuradio-noaa/Makefile
+++ b/gnuradio-noaa/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.16 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-noaa-${VERSION}
+PKGREVISION=	2
 COMMENT=	NOAA, Weather Satellite Reception module of GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=OFF
 CMAKE_ARGS+=	-DENABLE_GR_NOAA=ON
diff --git a/gnuradio-noaa/PLIST b/gnuradio-noaa/PLIST
index 7ac2d2e467..5e829da706 100644
--- a/gnuradio-noaa/PLIST
+++ b/gnuradio-noaa/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/09/17 13:48:06 makoto Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/10/28 16:59:33 mef Exp $
 include/gnuradio/noaa/api.h
 include/gnuradio/noaa/hrpt.h
 include/gnuradio/noaa/hrpt_decoder.h
diff --git a/gnuradio-pager/Makefile b/gnuradio-pager/Makefile
index 30ceb2b41c..7be428e0e1 100644
--- a/gnuradio-pager/Makefile
+++ b/gnuradio-pager/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.16 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-pager-${VERSION}
+PKGREVISION=	2
 COMMENT=	FLEX radiopager receiver/demodulator of GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=OFF
 CMAKE_ARGS+=	-DENABLE_GR_PAGER=ON
diff --git a/gnuradio-pager/PLIST b/gnuradio-pager/PLIST
index d26b11f664..9dc0337f03 100644
--- a/gnuradio-pager/PLIST
+++ b/gnuradio-pager/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/09/17 13:48:06 makoto Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/10/28 16:59:33 mef Exp $
 bin/usrp_flex
 bin/usrp_flex_all
 bin/usrp_flex_band
diff --git a/gnuradio-pager/buildlink3.mk b/gnuradio-pager/buildlink3.mk
index ba1708e5f8..f227a5a817 100644
--- a/gnuradio-pager/buildlink3.mk
+++ b/gnuradio-pager/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:09 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-pager
 
@@ -7,7 +7,7 @@ GNURADIO_PAGER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-pager+=	gnuradio-pager>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-pager+=	gnuradio-pager>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-pager?=	../../wip/gnuradio-pager
+BUILDLINK_PKGSRCDIR.gnuradio-pager?=	../../ham/gnuradio-pager
 
 #.include "../../devel/boost-headers/buildlink3.mk"
 #.include "../../devel/boost-libs/buildlink3.mk"
diff --git a/gnuradio-qtgui/Makefile b/gnuradio-qtgui/Makefile
index 2dd2b4e655..12f06f7ae3 100644
--- a/gnuradio-qtgui/Makefile
+++ b/gnuradio-qtgui/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.23 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-qtgui-${VERSION}
+PKGREVISION=	2
 COMMENT=	Qt GUI module of GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 #ONF_FILES+=	${EGDIR}/gr-qtgui.conf	${PKG_SYSCONFDIR}/gr-qtgui.conf
 
diff --git a/gnuradio-qtgui/PLIST b/gnuradio-qtgui/PLIST
index b110bed36d..e26a3a22d0 100644
--- a/gnuradio-qtgui/PLIST
+++ b/gnuradio-qtgui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.9 2017/03/15 14:07:12 mef Exp $
 bin/gr_constellation_plot
 bin/gr_psd_plot_b
 bin/gr_psd_plot_c
@@ -23,7 +23,6 @@ include/gnuradio/qtgui/ConstellationDisplayPlot.h
 include/gnuradio/qtgui/DisplayPlot.h
 include/gnuradio/qtgui/FrequencyDisplayPlot.h
 include/gnuradio/qtgui/HistogramDisplayPlot.h
-include/gnuradio/qtgui/SpectrumGUIClass.h
 include/gnuradio/qtgui/TimeDomainDisplayPlot.h
 include/gnuradio/qtgui/TimeRasterDisplayPlot.h
 include/gnuradio/qtgui/VectorDisplayPlot.h
@@ -33,6 +32,7 @@ include/gnuradio/qtgui/ber_sink_b.h
 include/gnuradio/qtgui/const_sink_c.h
 include/gnuradio/qtgui/constellationdisplayform.h
 include/gnuradio/qtgui/displayform.h
+include/gnuradio/qtgui/edit_box_msg.h
 include/gnuradio/qtgui/form_menus.h
 include/gnuradio/qtgui/freq_sink_c.h
 include/gnuradio/qtgui/freq_sink_f.h
@@ -48,7 +48,6 @@ include/gnuradio/qtgui/qtgui_types.h
 include/gnuradio/qtgui/sink_c.h
 include/gnuradio/qtgui/sink_f.h
 include/gnuradio/qtgui/spectrumUpdateEvents.h
-include/gnuradio/qtgui/spectrumdisplayform.h
 include/gnuradio/qtgui/timeRasterGlobalData.h
 include/gnuradio/qtgui/time_raster_sink_b.h
 include/gnuradio/qtgui/time_raster_sink_f.h
@@ -113,8 +112,12 @@ ${PYSITELIB}/gnuradio/qtgui/qtgui_swig.pyo
 ${PYSITELIB}/gnuradio/qtgui/range.py
 ${PYSITELIB}/gnuradio/qtgui/range.pyc
 ${PYSITELIB}/gnuradio/qtgui/range.pyo
+${PYSITELIB}/gnuradio/qtgui/util.py
+${PYSITELIB}/gnuradio/qtgui/util.pyc
+${PYSITELIB}/gnuradio/qtgui/util.pyo
 share/doc/gnuradio-${PKGVERSION}/README.qtgui
 share/gnuradio/examples/gr-qtgui.conf
+share/gnuradio/examples/qt-gui/display_qt
 share/gnuradio/examples/qt-gui/pyqt_const_c.py
 share/gnuradio/examples/qt-gui/pyqt_example_c.py
 share/gnuradio/examples/qt-gui/pyqt_example_f.py
@@ -130,11 +133,13 @@ share/gnuradio/examples/qt-gui/pyqt_waterfall_f.py
 share/gnuradio/examples/qt-gui/qtgui_message_inputs.grc
 share/gnuradio/examples/qt-gui/qtgui_tags_viewing.grc
 share/gnuradio/examples/qt-gui/qtgui_vector_sink_example.grc
+share/gnuradio/examples/qt-gui/test_qtgui_msg.grc
 share/gnuradio/grc/blocks/qtgui_ber_sink_b.xml
 share/gnuradio/grc/blocks/qtgui_block_tree.xml
 share/gnuradio/grc/blocks/qtgui_check_box.xml
 share/gnuradio/grc/blocks/qtgui_chooser.xml
 share/gnuradio/grc/blocks/qtgui_const_sink_x.xml
+share/gnuradio/grc/blocks/qtgui_edit_box_msg.xml
 share/gnuradio/grc/blocks/qtgui_entry.xml
 share/gnuradio/grc/blocks/qtgui_freq_sink_x.xml
 share/gnuradio/grc/blocks/qtgui_histogram_sink_x.xml
diff --git a/gnuradio-trellis/Makefile b/gnuradio-trellis/Makefile
index 6a5a940e92..b4336c0b7f 100644
--- a/gnuradio-trellis/Makefile
+++ b/gnuradio-trellis/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.35 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-trellis-${VERSION}
+PKGREVISION=	2
 COMMENT=	Trellis-based encoding and decoding algorithms for GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_TRELLIS=True
 CMAKE_ARGS+=	-DENABLE_GR_DIGITAL=True
 
-DEPENDS+=	gnuradio-digital-[0-9]*:../../wip/gnuradio-digital
+DEPENDS+=	gnuradio-digital-[0-9]*:../../ham/gnuradio-digital
 DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 
 PLIST_MINUS+=	digital
diff --git a/gnuradio-trellis/PLIST b/gnuradio-trellis/PLIST
index 6aa0818448..2a45547a59 100644
--- a/gnuradio-trellis/PLIST
+++ b/gnuradio-trellis/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2015/09/17 13:48:06 makoto Exp $
-include/gnuradio/swig/trellis_swig.i
-include/gnuradio/swig/trellis_swig_doc.i
+@comment $NetBSD: PLIST,v 1.9 2017/03/15 14:07:12 mef Exp $
+include/gnuradio/swig/trellis_swig0.i
+include/gnuradio/swig/trellis_swig0_doc.i
+include/gnuradio/swig/trellis_swig1.i
+include/gnuradio/swig/trellis_swig1_doc.i
 include/gnuradio/trellis/api.h
 include/gnuradio/trellis/base.h
 include/gnuradio/trellis/calc_metric.h
@@ -74,13 +76,20 @@ lib/pkgconfig/gnuradio-trellis.pc
 ${PYSITELIB}/gnuradio/trellis/__init__.py
 ${PYSITELIB}/gnuradio/trellis/__init__.pyc
 ${PYSITELIB}/gnuradio/trellis/__init__.pyo
-${PYSITELIB}/gnuradio/trellis/_trellis_swig.so
+${PYSITELIB}/gnuradio/trellis/_trellis_swig0.so
+${PYSITELIB}/gnuradio/trellis/_trellis_swig1.so
 ${PYSITELIB}/gnuradio/trellis/fsm_utils.py
 ${PYSITELIB}/gnuradio/trellis/fsm_utils.pyc
 ${PYSITELIB}/gnuradio/trellis/fsm_utils.pyo
 ${PYSITELIB}/gnuradio/trellis/trellis_swig.py
 ${PYSITELIB}/gnuradio/trellis/trellis_swig.pyc
 ${PYSITELIB}/gnuradio/trellis/trellis_swig.pyo
+${PYSITELIB}/gnuradio/trellis/trellis_swig0.py
+${PYSITELIB}/gnuradio/trellis/trellis_swig0.pyc
+${PYSITELIB}/gnuradio/trellis/trellis_swig0.pyo
+${PYSITELIB}/gnuradio/trellis/trellis_swig1.py
+${PYSITELIB}/gnuradio/trellis/trellis_swig1.pyc
+${PYSITELIB}/gnuradio/trellis/trellis_swig1.pyo
 share/doc/gnuradio-${PKGVERSION}/html/gr-trellis.html
 share/doc/gnuradio-${PKGVERSION}/xml/test_tcm.py.xml
 share/doc/gnuradio-${PKGVERSION}/xml/test_viterbi_equalization1.py.xml
diff --git a/gnuradio-trellis/buildlink3.mk b/gnuradio-trellis/buildlink3.mk
index ac18138a5f..ad3f195498 100644
--- a/gnuradio-trellis/buildlink3.mk
+++ b/gnuradio-trellis/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=	gnuradio-trellis
 
@@ -7,7 +7,7 @@ GNURADIO_TRELLIS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-trellis+=	gnuradio-trellis>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-trellis+=	gnuradio-trellis>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-trellis?=		../../wip/gnuradio-trellis
+BUILDLINK_PKGSRCDIR.gnuradio-trellis?=		../../ham/gnuradio-trellis
 .endif # GNURADIO_TRELLIS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-trellis
diff --git a/gnuradio-uhd/Makefile b/gnuradio-uhd/Makefile
index 88f14950a7..61cb5dbe50 100644
--- a/gnuradio-uhd/Makefile
+++ b/gnuradio-uhd/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.18 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-uhd-${VERSION}
+PKGREVISION=	2
 COMMENT=	Uhd-based encoding and decoding algorithms for GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_UHD=True
diff --git a/gnuradio-uhd/PLIST b/gnuradio-uhd/PLIST
index f56e6539a6..5798f8071c 100644
--- a/gnuradio-uhd/PLIST
+++ b/gnuradio-uhd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.5 2016/03/07 13:14:31 mef Exp $
 bin/uhd_fft
 bin/uhd_rx_cfile
 bin/uhd_rx_nogui
diff --git a/gnuradio-uhd/buildlink3.mk b/gnuradio-uhd/buildlink3.mk
index a235fdc09e..46f93f8e35 100644
--- a/gnuradio-uhd/buildlink3.mk
+++ b/gnuradio-uhd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-uhd
 
@@ -7,7 +7,7 @@ GNURADIO_UHD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-uhd+=	gnuradio-uhd>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-uhd+=	gnuradio-uhd>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-uhd?=	../../wip/gnuradio-uhd
+BUILDLINK_PKGSRCDIR.gnuradio-uhd?=	../../ham/gnuradio-uhd
 .endif # GNURADIO_UHD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-uhd
diff --git a/gnuradio-utils/Makefile b/gnuradio-utils/Makefile
index 17f5587a5e..4a5f0cb778 100644
--- a/gnuradio-utils/Makefile
+++ b/gnuradio-utils/Makefile
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.6 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.19 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-utils-${VERSION}
+PKGREVISION=	2
 COMMENT=	Utilities in GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
-DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+#BROKEN=		MatPlotLib requires Python 3.x.
+
+#DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 #ONF_FILES+=	${EGDIR}/modtool.conf	${PKG_SYSCONFDIR}/modtool.conf
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
diff --git a/gnuradio-utils/PLIST b/gnuradio-utils/PLIST
index fabdade9c6..19e511e59c 100644
--- a/gnuradio-utils/PLIST
+++ b/gnuradio-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.3 2015/12/08 21:28:57 wiedi Exp $
 bin/gr_modtool
 bin/gr_plot_char
 bin/gr_plot_const
diff --git a/gnuradio-utils/buildlink3.mk b/gnuradio-utils/buildlink3.mk
index 1b3a3bc65a..bdc93a276d 100644
--- a/gnuradio-utils/buildlink3.mk
+++ b/gnuradio-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-utils
 
@@ -7,7 +7,7 @@ GNURADIO_UTILS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-utils+=	gnuradio-utils>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-utils+=	gnuradio-utils>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-utils?=	../../wip/gnuradio-utils
+BUILDLINK_PKGSRCDIR.gnuradio-utils?=	../../ham/gnuradio-utils
 .endif # GNURADIO_UTILS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-utils
diff --git a/gnuradio-video-sdl/Makefile b/gnuradio-video-sdl/Makefile
index 2e249db984..59676bad33 100644
--- a/gnuradio-video-sdl/Makefile
+++ b/gnuradio-video-sdl/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.32 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-video-sdl-${VERSION}
+PKGREVISION=	2
 COMMENT=	SDL (Simple DirectMedia Layer) bindings for GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_VIDEO_SDL=True
diff --git a/gnuradio-video-sdl/PLIST b/gnuradio-video-sdl/PLIST
index 58e0ce09f1..8c66e129b2 100644
--- a/gnuradio-video-sdl/PLIST
+++ b/gnuradio-video-sdl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/09/17 13:48:06 makoto Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/09/01 04:14:55 mef Exp $
 include/gnuradio/swig/video_sdl_swig.i
 include/gnuradio/swig/video_sdl_swig_doc.i
 include/gnuradio/video_sdl/api.h
diff --git a/gnuradio-video-sdl/buildlink3.mk b/gnuradio-video-sdl/buildlink3.mk
index 16629ad27f..4d49e6da82 100644
--- a/gnuradio-video-sdl/buildlink3.mk
+++ b/gnuradio-video-sdl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-video-sdl
 
@@ -7,7 +7,7 @@ GNURADIO_VIDEO_SDL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-video-sdl+=	gnuradio-video-sdl>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-video-sdl+=	gnuradio-video-sdl>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-video-sdl?=	../../wip/gnuradio-video-sdl
+BUILDLINK_PKGSRCDIR.gnuradio-video-sdl?=	../../ham/gnuradio-video-sdl
 .endif # GNURADIO_VIDEO_SDL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-video-sdl
diff --git a/gnuradio-vocoder/Makefile b/gnuradio-vocoder/Makefile
index 583f435e6a..b5a6ae971c 100644
--- a/gnuradio-vocoder/Makefile
+++ b/gnuradio-vocoder/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.16 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-vocoder-${VERSION}
+PKGREVISION=	2
 COMMENT=	All available vocoders in GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_VOCODER=True
diff --git a/gnuradio-vocoder/PLIST b/gnuradio-vocoder/PLIST
index 1d25b4b5f0..61fa3b1ce3 100644
--- a/gnuradio-vocoder/PLIST
+++ b/gnuradio-vocoder/PLIST
@@ -1,12 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2015/09/17 13:48:06 makoto Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/07/12 11:36:47 mef Exp $
 include/gnuradio/swig/vocoder_swig.i
 include/gnuradio/swig/vocoder_swig_doc.i
 include/gnuradio/vocoder/alaw_decode_bs.h
 include/gnuradio/vocoder/alaw_encode_sb.h
 include/gnuradio/vocoder/api.h
-include/gnuradio/vocoder/codec2.h
-include/gnuradio/vocoder/codec2_decode_ps.h
-include/gnuradio/vocoder/codec2_encode_sp.h
 include/gnuradio/vocoder/cvsd_decode_bs.h
 include/gnuradio/vocoder/cvsd_encode_sb.h
 include/gnuradio/vocoder/g721_decode_bs.h
diff --git a/gnuradio-vocoder/buildlink3.mk b/gnuradio-vocoder/buildlink3.mk
index 4f8a7d4848..d6df8bc365 100644
--- a/gnuradio-vocoder/buildlink3.mk
+++ b/gnuradio-vocoder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=	gnuradio-vocoder
 
@@ -7,7 +7,7 @@ GNURADIO_VOCODER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-vocoder+=	gnuradio-vocoder>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-vocoder+=	gnuradio-vocoder>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-vocoder?=		../../wip/gnuradio-vocoder
+BUILDLINK_PKGSRCDIR.gnuradio-vocoder?=		../../ham/gnuradio-vocoder
 .endif # GNURADIO_VOCODER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-vocoder
diff --git a/gnuradio-wavelet/Makefile b/gnuradio-wavelet/Makefile
index 8cf6e21473..384be7082b 100644
--- a/gnuradio-wavelet/Makefile
+++ b/gnuradio-wavelet/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.16 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-wavelet-${VERSION}
+PKGREVISION=	2
 COMMENT=	Wavelet transform of GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_WAVELET=True
diff --git a/gnuradio-wavelet/PLIST b/gnuradio-wavelet/PLIST
index f7906a164e..35280a9ada 100644
--- a/gnuradio-wavelet/PLIST
+++ b/gnuradio-wavelet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/09/17 13:48:06 makoto Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/10/28 16:59:34 mef Exp $
 include/gnuradio/swig/wavelet_swig.i
 include/gnuradio/swig/wavelet_swig_doc.i
 include/gnuradio/wavelet/api.h
diff --git a/gnuradio-wavelet/buildlink3.mk b/gnuradio-wavelet/buildlink3.mk
index 968c8290db..76fbf75cff 100644
--- a/gnuradio-wavelet/buildlink3.mk
+++ b/gnuradio-wavelet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $
 
 BUILDLINK_TREE+=	gnuradio-wavelet
 
@@ -7,7 +7,7 @@ GNURADIO_WAVELET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-wavelet+=	gnuradio-wavelet>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-wavelet+=	gnuradio-wavelet>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-wavelet?=		../../wip/gnuradio-wavelet
+BUILDLINK_PKGSRCDIR.gnuradio-wavelet?=		../../ham/gnuradio-wavelet
 .endif # GNURADIO_WAVELET_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-wavelet
diff --git a/gnuradio-wxgui/Makefile b/gnuradio-wxgui/Makefile
index ae8539c5d4..ff85b7bb3b 100644
--- a/gnuradio-wxgui/Makefile
+++ b/gnuradio-wxgui/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.8 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.79 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-wxgui-${VERSION}
+PKGREVISION=	3
 COMMENT=	WxGTK Toolkit module of GNU Radio
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
-#CONF_FILES+=	${EGDIR}/gr-wxgui.conf	${PKG_SYSCONFDIR}/gr-wxgui.conf
+CONF_FILES+=	${EGDIR}/gr-wxgui.conf	${PKG_SYSCONFDIR}/gr-wxgui.conf
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_WXGUI=True
diff --git a/gnuradio-wxgui/PLIST b/gnuradio-wxgui/PLIST
index 93557a5206..84403d3ff1 100644
--- a/gnuradio-wxgui/PLIST
+++ b/gnuradio-wxgui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.12 2015/12/06 15:34:15 mef Exp $
 include/gnuradio/swig/wxgui_swig.i
 include/gnuradio/swig/wxgui_swig_doc.i
 include/gnuradio/wxgui/api.h
diff --git a/gnuradio-wxgui/buildlink3.mk b/gnuradio-wxgui/buildlink3.mk
index 3190515e9c..9a498a7d2e 100644
--- a/gnuradio-wxgui/buildlink3.mk
+++ b/gnuradio-wxgui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.45 2014/10/13 12:51:10 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-wxgui
 
@@ -7,7 +7,7 @@ GNURADIO_WXGUI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-wxgui+=	gnuradio-wxgui>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-wxgui+=	gnuradio-wxgui>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-wxgui?=	../../wip/gnuradio-wxgui
+BUILDLINK_PKGSRCDIR.gnuradio-wxgui?=	../../ham/gnuradio-wxgui
 .endif # GNURADIO_WXGUI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-wxgui
diff --git a/gnuradio-zeromq/Makefile b/gnuradio-zeromq/Makefile
index 6289ba632a..3938951798 100644
--- a/gnuradio-zeromq/Makefile
+++ b/gnuradio-zeromq/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: Makefile,v 1.19 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-zeromq-${VERSION}
+PKGREVISION=	2
 COMMENT=	All of the zeromq blocks, utilities, and examples
 
 #  zmq.hpp: No such file or directory
@@ -11,8 +12,8 @@ COMMENT=	All of the zeromq blocks, utilities, and examples
 #GIT_MODULE.master=	cppzmq
 # for work around, the file is copied to files directory
 
-.include	"../../wip/gnuradio-core/Makefile.common"
-.include	"../../wip/gnuradio-core/Nocore.mk"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_ZEROMQ=True
diff --git a/gnuradio-zeromq/PLIST b/gnuradio-zeromq/PLIST
index e18ba6047f..3643be883b 100644
--- a/gnuradio-zeromq/PLIST
+++ b/gnuradio-zeromq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/09/17 13:48:06 makoto Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/09/01 04:14:55 mef Exp $
 include/gnuradio/swig/zeromq_swig.i
 include/gnuradio/swig/zeromq_swig_doc.i
 include/gnuradio/zeromq/api.h
diff --git a/gnuradio-zeromq/buildlink3.mk b/gnuradio-zeromq/buildlink3.mk
index da49fab1f7..e6f3439b5d 100644
--- a/gnuradio-zeromq/buildlink3.mk
+++ b/gnuradio-zeromq/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/17 13:48:06 makoto Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-zeromq
 
@@ -7,7 +7,7 @@ GNURADIO_ZEROMQ_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-zeromq+=	gnuradio-zeromq>=3.7.5
 BUILDLINK_ABI_DEPENDS.gnuradio-zeromq+=	gnuradio-zeromq>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-zeromq?=	../../wip/gnuradio-zeromq
+BUILDLINK_PKGSRCDIR.gnuradio-zeromq?=	../../ham/gnuradio-zeromq
 .endif # GNURADIO_ZEROMQ_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-zeromq
diff --git a/gr-fcdproplus/.#Makefile.1.11 b/gr-fcdproplus/.#Makefile.1.11
new file mode 100644
index 0000000000..dec7482e09
--- /dev/null
+++ b/gr-fcdproplus/.#Makefile.1.11
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.11 2018/08/16 18:54:56 adam Exp $
+
+DISTNAME=		gr-fcdproplus-3.7.13
+CATEGORIES=		ham
+MASTER_SITES+=		${MASTER_SITE_GITHUB:=dl1ksv/}
+GITHUB_RELEASE=		v${PKGVERSION_NOREV}
+#GITHUB_PROJECT=		gr-fcdproplus
+
+MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=		https://github.com/dl1ksv/gr-fcdproplus
+COMMENT=		Addon for funcube dongle pro+ to GNU Radio
+LICENSE=		gnu-gpl-v2
+
+USE_LANGUAGES=		c c++
+USE_TOOLS=		cmake
+USE_CMAKE=		yes
+
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+CXXFLAGS+=		-I${PREFIX}/include/libusb-1.0
+
+# Suppress warning for developer
+CMAKE_ARGS+=		-Wno-dev
+CMAKE_ARGS+=		-DGNURADIO_RUNTIME_INCLUDE_DIRS=${PREFIX}/include
+PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
+
+CFLAGS+=		-I${PREFIX}/include/libusb-1.0
+
+.include	"../../devel/boost-headers/buildlink3.mk"
+.include	"../../devel/boost-libs/buildlink3.mk"
+.include	"../../devel/libusb1/buildlink3.mk"
+.include	"../../lang/python/application.mk"
+.include	"../../lang/python/pyversion.mk"
+.include 	"../../ham/gnuradio-core/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/gr-fcdproplus/DESCR b/gr-fcdproplus/DESCR
new file mode 100644
index 0000000000..67152243e8
--- /dev/null
+++ b/gr-fcdproplus/DESCR
@@ -0,0 +1,6 @@
+gr-fcdproplus is an linux and OSX addon for gnuradio to implement a
+funcube dongle pro+ source.
+On linux autodetects the correct soundcard from /proc/asound/cards.
+This idea was taken from the osmosdr drivers.
+
+To control the device the hidraw code of the hidapi is used.
diff --git a/gr-fcdproplus/Makefile b/gr-fcdproplus/Makefile
new file mode 100644
index 0000000000..537b9127b0
--- /dev/null
+++ b/gr-fcdproplus/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.15 2019/08/22 12:23:24 ryoon Exp $
+
+DISTNAME=		gr-fcdproplus_3.7.11.orig
+PKGNAME=		${DISTNAME:S/_/-/S/.orig//}
+PKGREVISION=		13
+CATEGORIES=		ham
+MASTER_SITES+=		${MASTER_SITE_DEBIAN:=pool/main/g/gr-fcdproplus/}
+EXTRACT_SUFX=		.tar.xz
+
+MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=		https://github.com/dl1ksv/gr-fcdproplus
+COMMENT=		Addon for funcube dongle pro+ to GNU Radio
+LICENSE=		gnu-gpl-v2
+
+USE_LANGUAGES=		c c++
+USE_TOOLS=		cmake
+USE_CMAKE=		yes
+
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+CXXFLAGS+=		-I${PREFIX}/include/libusb-1.0
+
+# Suppress warning for developer
+CMAKE_ARGS+=		-Wno-dev
+CMAKE_ARGS+=		-DGNURADIO_RUNTIME_INCLUDE_DIRS=${PREFIX}/include
+PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
+
+CFLAGS+=		-I${PREFIX}/include/libusb-1.0
+
+.include	"../../devel/boost-headers/buildlink3.mk"
+.include	"../../devel/boost-libs/buildlink3.mk"
+.include	"../../devel/libusb1/buildlink3.mk"
+.include	"../../lang/python/application.mk"
+.include	"../../lang/python/pyversion.mk"
+.include 	"../../ham/gnuradio-core/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/gr-fcdproplus/PLIST b/gr-fcdproplus/PLIST
new file mode 100644
index 0000000000..de646d8038
--- /dev/null
+++ b/gr-fcdproplus/PLIST
@@ -0,0 +1,15 @@
+@comment $NetBSD: PLIST,v 1.1 2014/10/13 13:07:13 mef Exp $
+include/fcdproplus/api.h
+include/fcdproplus/fcdproplus.h
+include/fcdproplus/fcdproplus/swig/fcdproplus_swig.i
+include/fcdproplus/fcdproplus/swig/fcdproplus_swig_doc.i
+lib/libgnuradio-fcdproplus.so
+lib/pkgconfig/gnuradio-fcdproplus.pc
+${PYSITELIB}/fcdproplus/__init__.py
+${PYSITELIB}/fcdproplus/__init__.pyc
+${PYSITELIB}/fcdproplus/__init__.pyo
+${PYSITELIB}/fcdproplus/_fcdproplus_swig.so
+${PYSITELIB}/fcdproplus/fcdproplus_swig.py
+${PYSITELIB}/fcdproplus/fcdproplus_swig.pyc
+${PYSITELIB}/fcdproplus/fcdproplus_swig.pyo
+share/gnuradio/grc/blocks/fcdproplus_fcdproplus.xml
diff --git a/gr-fcdproplus/buildlink3.mk b/gr-fcdproplus/buildlink3.mk
new file mode 100644
index 0000000000..02967d7953
--- /dev/null
+++ b/gr-fcdproplus/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 13:07:13 mef Exp $
+
+BUILDLINK_TREE+=	gr-fcdproplus
+
+.if !defined(GR_FCDPROPLUS_BUILDLINK3_MK)
+GR_FCDPROPLUS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gr-fcdproplus+=	gr-fcdproplus>=0.1
+BUILDLINK_ABI_DEPENDS.gr-fcdproplus+=	gr-fcdproplus>=0.1
+BUILDLINK_PKGSRCDIR.gr-fcdproplus?=	../../ham/gr-fcdproplus
+.endif # GR_FCDPROPLUS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gr-fcdproplus
diff --git a/gr-fcdproplus/distinfo b/gr-fcdproplus/distinfo
new file mode 100644
index 0000000000..65d6ccdeac
--- /dev/null
+++ b/gr-fcdproplus/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.3 2015/11/02 23:57:23 agc Exp $
+
+SHA1 (gr-fcdproplus_3.7.11.orig.tar.xz) = f9997af287116c821e49209d65e7cb5525b21544
+RMD160 (gr-fcdproplus_3.7.11.orig.tar.xz) = 571c4e698bd68d3f162cabb9dea03c7d4683ab10
+SHA512 (gr-fcdproplus_3.7.11.orig.tar.xz) = 43931eaba7bc299c063925b83653177c24d1e23bf36074f698d6396d9e4882ac55e4ca1b75c769d7a71c24121f978170c0d4ab3ed447a27492466d7420507bfa
+Size (gr-fcdproplus_3.7.11.orig.tar.xz) = 102896 bytes
diff --git a/gr-osmosdr/DESCR b/gr-osmosdr/DESCR
new file mode 100644
index 0000000000..974a78f3f6
--- /dev/null
+++ b/gr-osmosdr/DESCR
@@ -0,0 +1,19 @@
+While primarily being developed for the OsmoSDR hardware, this block
+as well supports:
+
+ * FUNcube Dongle through libgnuradio-fcd
+ * FUNcube Dongle Pro+ through gr-fcdproplus
+ * sysmocom OsmoSDR Devices through libosmosdr
+ * RTL2832U based DVB-T dongles through librtlsdr
+ * RTL-TCP spectrum server (see librtlsdr project)
+ * MSi2500 based DVB-T dongles through libmirisdr
+ * gnuradio .cfile input through libgnuradio-blocks
+ * RFSPACE SDR-IQ, SDR-IP, NetSDR (incl. X2 option)
+ * AirSpy Wideband Receiver through libairspy
+ * Great Scott Gadgets HackRF through libhackrf
+ * Nuand LLC bladeRF through libbladeRF library
+ * Ettus USRP Devices through Ettus UHD library
+ * Fairwaves UmTRX through Fairwaves' fork of UHD
+
+By using the OsmoSDR block you can take advantage of a common software api in
+your application(s) independent of the underlying radio hardware.
diff --git a/gr-osmosdr/Makefile b/gr-osmosdr/Makefile
new file mode 100644
index 0000000000..c477dcfd80
--- /dev/null
+++ b/gr-osmosdr/Makefile
@@ -0,0 +1,52 @@
+# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:57 adam Exp $
+
+DISTNAME=		gr-osmosdr-0.1.4
+PKGREVISION=		15
+CATEGORIES=		ham
+MASTER_SITES+=		http://git.osmocom.org/gr-osmosdr/snapshot/
+
+MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=		http://git.osmocom.org/gr-osmosdr
+COMMENT=		SDR Hardware support for OsmoSDR and so many more
+LICENSE=		gnu-gpl-v2
+
+USE_LANGUAGES=		c c++
+USE_TOOLS=		cmake
+USE_CMAKE=		yes
+
+# Suppress warning for developer
+CMAKE_ARGS+=	-Wno-dev
+# --   * Ettus USRP Devices
+CMAKE_ARGS+=	-DGNURADIO_UHD_INCLUDE_DIRS=${PREFIX}/include/uhd
+CMAKE_ARGS+=	-DGNURADIO_BLOCKS_INCLUDE_DIRS=${PREFIX}/include
+
+PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
+
+# Python 36 and 37 result in build errors; 27 builds ok.
+PYTHON_VERSIONS_ACCEPTED=	27
+REPLACE_PYTHON+=	apps/osmocom_siggen_base.py
+
+.include	"../../devel/boost-headers/buildlink3.mk"
+.include	"../../devel/boost-libs/buildlink3.mk"
+.include	"../../devel/libusb1/buildlink3.mk"
+.include	"../../devel/orc/buildlink3.mk"
+
+# \todo Clearly threre is some ordering scheme.  Explain it.
+
+.include	"../../ham/uhd/buildlink3.mk"
+.include	"../../lang/python/application.mk"
+.include	"../../lang/python/extension.mk"
+
+.include	"../../ham/rtl-sdr/buildlink3.mk"
+.include	"../../ham/libmirisdr/buildlink3.mk"
+.include	"../../ham/osmo-sdr/buildlink3.mk"
+# \todo Re-enable gr-fcdproplus when it works, or optionize it.
+# gr-fcdproplus does not build at the moment
+#.include	"../../ham/gr-fcdproplus/buildlink3.mk"
+.include	"../../ham/hackrf/buildlink3.mk"
+
+.include	"../../ham/gnuradio-core/buildlink3.mk"
+.include	"../../ham/gnuradio-fcd/buildlink3.mk"
+.include	"../../ham/gnuradio-uhd/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/gr-osmosdr/PLIST b/gr-osmosdr/PLIST
new file mode 100644
index 0000000000..3d352542ee
--- /dev/null
+++ b/gr-osmosdr/PLIST
@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST,v 1.1 2014/10/13 13:00:27 mef Exp $
+bin/osmocom_fft
+bin/osmocom_siggen
+bin/osmocom_siggen_nogui
+bin/osmocom_spectrum_sense
+include/osmosdr/api.h
+include/osmosdr/device.h
+include/osmosdr/pimpl.h
+include/osmosdr/ranges.h
+include/osmosdr/sink.h
+include/osmosdr/source.h
+include/osmosdr/swig/osmosdr_swig.i
+include/osmosdr/swig/osmosdr_swig_doc.i
+lib/libgnuradio-osmosdr.so
+lib/libgnuradio-osmosdr.so.${PKGVERSION}
+lib/pkgconfig/gnuradio-osmosdr.pc
+${PYSITELIB}/osmosdr/__init__.py
+${PYSITELIB}/osmosdr/__init__.pyc
+${PYSITELIB}/osmosdr/__init__.pyo
+${PYSITELIB}/osmosdr/_osmosdr_swig.so
+${PYSITELIB}/osmosdr/osmocom_siggen_base.py
+${PYSITELIB}/osmosdr/osmocom_siggen_base.pyc
+${PYSITELIB}/osmosdr/osmocom_siggen_base.pyo
+${PYSITELIB}/osmosdr/osmosdr_swig.py
+${PYSITELIB}/osmosdr/osmosdr_swig.pyc
+${PYSITELIB}/osmosdr/osmosdr_swig.pyo
+share/gnuradio/grc/blocks/osmosdr_sink.xml
+share/gnuradio/grc/blocks/osmosdr_source.xml
+share/gnuradio/grc/blocks/rtlsdr_source.xml
diff --git a/gr-osmosdr/buildlink3.mk b/gr-osmosdr/buildlink3.mk
new file mode 100644
index 0000000000..f9e0bd0da1
--- /dev/null
+++ b/gr-osmosdr/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2016/07/25 00:10:43 gdt Exp $
+
+BUILDLINK_TREE+=	gr-osmosdr
+
+.if !defined(GR_OSMOSDR_BUILDLINK3_MK)
+GR_OSMOSDR_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gr-osmosdr+=	gr-osmosdr>=0.1.4nb2
+BUILDLINK_PKGSRCDIR.gr-osmosdr?=	../../ham/gr-osmosdr
+
+.include	"../../devel/boost-headers/buildlink3.mk"
+.include	"../../ham/gnuradio-core/buildlink3.mk"
+.endif	# GR_OSMOSDR_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gr-osmosdr
diff --git a/gr-osmosdr/distinfo b/gr-osmosdr/distinfo
new file mode 100644
index 0000000000..e6be1d121e
--- /dev/null
+++ b/gr-osmosdr/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.3 2015/11/02 23:57:23 agc Exp $
+
+SHA1 (gr-osmosdr-0.1.4.tar.gz) = 672041a6ffa767d39ffad2432e2a13c11e3ec984
+RMD160 (gr-osmosdr-0.1.4.tar.gz) = 30f97d10655e5a88fdf2bf43a323ea9d9aba0479
+SHA512 (gr-osmosdr-0.1.4.tar.gz) = b364f95c140ba61ab1fc51c49fd01cf4d0db4ce3c3a7680f34ea13bc646820d9b2b860bc0438df83df942249fa959cb90f83c5d117737cd0818db35c27253e65
+Size (gr-osmosdr-0.1.4.tar.gz) = 222961 bytes


Home | Main Index | Thread Index | Old Index