7 files changed, 101 insertions, 121 deletions

diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 299a07c4ab3a..57e38f091b20 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	gnuradio
 #MASTER_SITES=	http://gnuradio.org/releases/gnuradio/
 DISTVERSION=	3.8tech-preview-381
 DISTVERSIONSUFFIX=	-g27dd99e49
+PORTREVISION=	1
 CATEGORIES=	comms astro hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
@@ -58,9 +59,7 @@ SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
 USE_GITHUB=	yes
-GH_ACCOUNT=	gnuradio
-GH_PROJECT=	gnuradio volk:volk
-GH_TAGNAME=	a664001 d250816:volk
+GH_TUPLE=	gnuradio:volk:d250816:volk/volk
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 		-DENABLE_GR_CTRLPORT="YES" \
@@ -72,16 +71,13 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 		-DXMLTO_EXECUTABLE:STRING=minixmlto
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
-MAJOR_SUB_VER=	3.8
-#MAJOR_SUB_VER=	${PORTVERSION}
-DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
+DOCSDIR=	share/doc/${PORTNAME}-3.8git
 USE_GNOME=	pygtk2
 USE_PYQT=	core gui opengl
 USE_WX=		3.0
 USE_QT=		buildtools core gui xml qmake widgets
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_LDCONFIG=	yes
-PLIST_SUB+=	MAJOR_SUB_VER="${MAJOR_SUB_VER}"git
 LIBSTRIP_FILES=	analog audio blocks channels digital dtv fec fft\
 		filter pmt qtgui runtime trellis video-sdl\
 		vocoder wavelet
@@ -128,10 +124,6 @@ PLIST_SUB+=	UHD="@comment "
 PATCH_FILES=	docs/doxygen/Doxyfile.in \
 		gr-fec/lib/CMakeLists.txt
 
-post-extract:
-	@${RMDIR} ${WRKSRC}/volk
-	@${MV} ${WRKSRC_volk} ${WRKSRC}/volk
-
 post-patch:
 	@${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \
 	    ${XARGS} ${REINPLACE_CMD} -e \
@@ -143,8 +135,6 @@ post-patch:
 .endfor
 
 post-install:
-.for a in ${LIBSTRIP_FILES}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-${a}.so.${MAJOR_SUB_VER}git
-.endfor
+	@cd ${STAGEDIR}${PREFIX} && ${RMDIR} include/volk/asm/neon include/volk/asm/orc include/volk/asm
 
 .include <bsd.port.post.mk>
diff --git a/comms/gnuradio/distinfo b/comms/gnuradio/distinfo
index 83bf4ffabaee..a2b31e0ab11f 100644
--- a/comms/gnuradio/distinfo
+++ b/comms/gnuradio/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1559440141
-SHA256 (gnuradio-gnuradio-3.8tech-preview-381-g27dd99e49-a664001_GH0.tar.gz) = 47b22e4f28b3c44f2ea3da4deee24ead6238ec8de7873d16cbba126fa7bfaa5b
-SIZE (gnuradio-gnuradio-3.8tech-preview-381-g27dd99e49-a664001_GH0.tar.gz) = 3406038
+TIMESTAMP = 1559503341
+SHA256 (gnuradio-gnuradio-3.8tech-preview-381-g27dd99e49_GH0.tar.gz) = a07897ebf6d68588ca5b3635f87f0251be9234a8adc4b9e89c372caaecd9a737
+SIZE (gnuradio-gnuradio-3.8tech-preview-381-g27dd99e49_GH0.tar.gz) = 3386872
 SHA256 (gnuradio-volk-d250816_GH0.tar.gz) = 334da8910cfadc2e1487ef2a651f8eaa472262a4bfd3fa7c38d913c8fc32cbd8
 SIZE (gnuradio-volk-d250816_GH0.tar.gz) = 252477
diff --git a/comms/gnuradio/files/patch-CMakeLists.txt b/comms/gnuradio/files/patch-CMakeLists.txt
index c9f0ff1084e9..859e6b03cd07 100644
--- a/comms/gnuradio/files/patch-CMakeLists.txt
+++ b/comms/gnuradio/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2019-03-09 13:28:14 UTC
+--- CMakeLists.txt.orig	2019-05-29 03:34:08 UTC
 +++ CMakeLists.txt
 @@ -31,6 +31,7 @@ cmake_minimum_required(VERSION 3.8)
  project(gnuradio CXX C)
@@ -22,5 +22,5 @@
 +set(GR_PKGCONFIG_DIR      lib${LIB_SUFFIX})
 +endif()
  
- ########################################################################
- # Configure CMake policies
+ # Enable generation of compile_commands.json for code completion engines
+ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
diff --git a/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc b/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc
deleted file mode 100644
index fda2556e3f65..000000000000
--- a/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- gr-blocks/lib/socket_pdu_impl.cc.orig	2019-04-16 13:45:00 UTC
-+++ gr-blocks/lib/socket_pdu_impl.cc
-@@ -165,8 +165,11 @@ 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);
--
-+#if (BOOST_VERSION >= 107000)
-+	tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay);
-+#else
-+	tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
-+#endif
-       d_acceptor_tcp->async_accept(new_connection->socket(),
-         boost::bind(&socket_pdu_impl::handle_tcp_accept, this,
-           new_connection, boost::asio::placeholders::error));
diff --git a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h
index d0154a65ff78..526dd4a51cd7 100644
--- a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h
+++ b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h
@@ -1,4 +1,4 @@
---- gr-vocoder/lib/gsm_fr_decode_ps_impl.h.orig	2019-03-13 15:13:10 UTC
+--- gr-vocoder/lib/gsm_fr_decode_ps_impl.h.orig	2019-05-29 03:34:08 UTC
 +++ gr-vocoder/lib/gsm_fr_decode_ps_impl.h
 @@ -26,7 +26,11 @@
  #include <gnuradio/vocoder/gsm_fr_decode_ps.h>
@@ -7,7 +7,7 @@
 +#ifdef __FreeBSD__
 +#include <gsm.h>
 +#else
- #include "gsm/gsm.h"
+ #include "gsm.h"
 +#endif
  }
  
diff --git a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h
index 5154023439e6..2d1096501144 100644
--- a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h
+++ b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h
@@ -1,4 +1,4 @@
---- gr-vocoder/lib/gsm_fr_encode_sp_impl.h.orig	2019-03-13 15:22:30 UTC
+--- gr-vocoder/lib/gsm_fr_encode_sp_impl.h.orig	2019-05-29 03:34:08 UTC
 +++ gr-vocoder/lib/gsm_fr_encode_sp_impl.h
 @@ -26,7 +26,11 @@
  #include <gnuradio/vocoder/gsm_fr_encode_sp.h>
@@ -7,7 +7,7 @@
 +#ifdef __FreeBSD__
 +#include <gsm.h>
 +#else
- #include "gsm/gsm.h"
+ #include "gsm.h"
 +#endif
  }
  
diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist
index cb8f9181df4e..cecfd1cc1d71 100644
--- a/comms/gnuradio/pkg-plist
+++ b/comms/gnuradio/pkg-plist
@@ -1,20 +1,3 @@
-%%UHD%%libdata/pkgconfig/gnuradio-uhd.pc
-libdata/pkgconfig/gnuradio-analog.pc
-libdata/pkgconfig/gnuradio-audio.pc
-libdata/pkgconfig/gnuradio-blocks.pc
-libdata/pkgconfig/gnuradio-channels.pc
-libdata/pkgconfig/gnuradio-digital.pc
-libdata/pkgconfig/gnuradio-dtv.pc
-libdata/pkgconfig/gnuradio-fec.pc
-libdata/pkgconfig/gnuradio-fft.pc
-libdata/pkgconfig/gnuradio-filter.pc
-libdata/pkgconfig/gnuradio-qtgui.pc
-libdata/pkgconfig/gnuradio-runtime.pc
-libdata/pkgconfig/gnuradio-trellis.pc
-libdata/pkgconfig/gnuradio-video-sdl.pc
-libdata/pkgconfig/gnuradio-vocoder.pc
-libdata/pkgconfig/gnuradio-wavelet.pc
-libdata/pkgconfig/gnuradio-zeromq.pc
 bin/gnuradio-companion
 bin/gnuradio-config-info
 bin/gr-ctrlport-monitor
@@ -644,7 +627,6 @@ include/gnuradio/swig/gnuradio.i
 include/gnuradio/swig/gr_ctrlport.i
 include/gnuradio/swig/gr_extras.i
 include/gnuradio/swig/gr_filter_swig_doc.i
-include/gnuradio/swig/gr_intrusive_ptr.i
 include/gnuradio/swig/gr_logger.i
 include/gnuradio/swig/gr_shared_ptr.i
 include/gnuradio/swig/gr_swig_block_magic.i
@@ -675,6 +657,8 @@ 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
+%%UHD%%include/gnuradio/swig/uhd_swig.i
+%%UHD%%include/gnuradio/swig/uhd_swig_doc.i
 include/gnuradio/swig/video_sdl_swig.i
 include/gnuradio/swig/video_sdl_swig_doc.i
 include/gnuradio/swig/vocoder_swig.i
@@ -718,6 +702,11 @@ include/gnuradio/trellis/siso_type.h
 include/gnuradio/trellis/viterbi.h
 include/gnuradio/trellis/viterbi_combined.h
 include/gnuradio/types.h
+%%UHD%%include/gnuradio/uhd/amsg_source.h
+%%UHD%%include/gnuradio/uhd/api.h
+%%UHD%%include/gnuradio/uhd/usrp_block.h
+%%UHD%%include/gnuradio/uhd/usrp_sink.h
+%%UHD%%include/gnuradio/uhd/usrp_source.h
 include/gnuradio/unittests.h
 include/gnuradio/video_sdl/api.h
 include/gnuradio/video_sdl/sink_s.h
@@ -743,13 +732,6 @@ include/gnuradio/vocoder/gsm_fr_decode_ps.h
 include/gnuradio/vocoder/gsm_fr_encode_sp.h
 include/gnuradio/vocoder/ulaw_decode_bs.h
 include/gnuradio/vocoder/ulaw_encode_sb.h
-%%UHD%%include/gnuradio/swig/uhd_swig.i
-%%UHD%%include/gnuradio/swig/uhd_swig_doc.i
-%%UHD%%include/gnuradio/uhd/amsg_source.h
-%%UHD%%include/gnuradio/uhd/api.h
-%%UHD%%include/gnuradio/uhd/usrp_block.h
-%%UHD%%include/gnuradio/uhd/usrp_sink.h
-%%UHD%%include/gnuradio/uhd/usrp_source.h
 include/gnuradio/wavelet/api.h
 include/gnuradio/wavelet/squash_ff.h
 include/gnuradio/wavelet/wavelet_ff.h
@@ -990,6 +972,9 @@ lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
 lib/cmake/gnuradio/gnuradio-trellisConfig.cmake
 lib/cmake/gnuradio/gnuradio-trellisTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/gnuradio/gnuradio-trellisTargets.cmake
+%%UHD%%lib/cmake/gnuradio/gnuradio-uhdConfig.cmake
+%%UHD%%lib/cmake/gnuradio/gnuradio-uhdTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%UHD%%lib/cmake/gnuradio/gnuradio-uhdTargets.cmake
 lib/cmake/gnuradio/gnuradio-video-sdlConfig.cmake
 lib/cmake/gnuradio/gnuradio-video-sdlTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/gnuradio/gnuradio-video-sdlTargets.cmake
@@ -1004,49 +989,64 @@ lib/cmake/gnuradio/gnuradio-zeromqTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/gnuradio/gnuradio-zeromqTargets.cmake
 lib/cmake/gnuradio/runtime_swigTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/gnuradio/runtime_swigTargets.cmake
-%%UHD%%lib/cmake/gnuradio/gnuradio-uhdConfig.cmake
-%%UHD%%lib/cmake/gnuradio/gnuradio-uhdTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%UHD%%lib/cmake/gnuradio/gnuradio-uhdTargets.cmake
-%%UHD%%lib/libgnuradio-uhd.so
-%%UHD%%lib/libgnuradio-uhd.so.%%MAJOR_SUB_VER%%
 lib/cmake/volk/VolkConfig.cmake
 lib/cmake/volk/VolkConfigVersion.cmake
 lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/volk/VolkTargets.cmake
 lib/libgnuradio-analog.so
-lib/libgnuradio-analog.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-analog.so.3.8git
+lib/libgnuradio-analog.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-audio.so
-lib/libgnuradio-audio.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-audio.so.3.8git
+lib/libgnuradio-audio.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-blocks.so
-lib/libgnuradio-blocks.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-blocks.so.3.8git
+lib/libgnuradio-blocks.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-channels.so
-lib/libgnuradio-channels.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-channels.so.3.8git
+lib/libgnuradio-channels.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-digital.so
-lib/libgnuradio-digital.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-digital.so.3.8git
+lib/libgnuradio-digital.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-dtv.so
-lib/libgnuradio-dtv.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-dtv.so.3.8git
+lib/libgnuradio-dtv.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-fec.so
-lib/libgnuradio-fec.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-fec.so.3.8git
+lib/libgnuradio-fec.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-fft.so
-lib/libgnuradio-fft.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-fft.so.3.8git
+lib/libgnuradio-fft.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-filter.so
-lib/libgnuradio-filter.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-filter.so.3.8git
+lib/libgnuradio-filter.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-pmt.so
-lib/libgnuradio-pmt.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-pmt.so.3.8git
+lib/libgnuradio-pmt.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-qtgui.so
-lib/libgnuradio-qtgui.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-qtgui.so.3.8git
+lib/libgnuradio-qtgui.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-runtime.so
-lib/libgnuradio-runtime.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-runtime.so.3.8git
+lib/libgnuradio-runtime.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-trellis.so
-lib/libgnuradio-trellis.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-trellis.so.3.8git
+lib/libgnuradio-trellis.so.v3.8-compat-xxx-xunknown
+%%UHD%%lib/libgnuradio-uhd.so
+%%UHD%%lib/libgnuradio-uhd.so.3.8git
+%%UHD%%lib/libgnuradio-uhd.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-video-sdl.so
-lib/libgnuradio-video-sdl.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-video-sdl.so.3.8git
+lib/libgnuradio-video-sdl.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-vocoder.so
-lib/libgnuradio-vocoder.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-vocoder.so.3.8git
+lib/libgnuradio-vocoder.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-wavelet.so
-lib/libgnuradio-wavelet.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-wavelet.so.3.8git
+lib/libgnuradio-wavelet.so.v3.8-compat-xxx-xunknown
 lib/libgnuradio-zeromq.so
-lib/libgnuradio-zeromq.so.%%MAJOR_SUB_VER%%
+lib/libgnuradio-zeromq.so.3.8git
+lib/libgnuradio-zeromq.so.v3.8-compat-xxx-xunknown
 lib/libvolk.so
 lib/libvolk.so.1.4.1git
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py
@@ -1892,12 +1892,6 @@ lib/libvolk.so.1.4.1git
 %%PYTHON_SITELIBDIR%%/gnuradio/modtool/templates/templates.py
 %%PYTHON_SITELIBDIR%%/gnuradio/modtool/templates/templates.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/modtool/templates/templates.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/modtool/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/gnuradio/modtool/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/modtool/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/modtool/tests/test_modtool.py
-%%PYTHON_SITELIBDIR%%/gnuradio/modtool/tests/test_modtool.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/modtool/tests/test_modtool.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/modtool/tools/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/modtool/tools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/modtool/tools/__init__.pyo
@@ -2033,27 +2027,44 @@ lib/libvolk.so.1.4.1git
 %%PYTHON_SITELIBDIR%%/volk_modtool/volk_modtool_generate.py
 %%PYTHON_SITELIBDIR%%/volk_modtool/volk_modtool_generate.pyc
 %%PYTHON_SITELIBDIR%%/volk_modtool/volk_modtool_generate.pyo
+libdata/pkgconfig/gnuradio-analog.pc
+libdata/pkgconfig/gnuradio-audio.pc
+libdata/pkgconfig/gnuradio-blocks.pc
+libdata/pkgconfig/gnuradio-channels.pc
+libdata/pkgconfig/gnuradio-digital.pc
+libdata/pkgconfig/gnuradio-dtv.pc
+libdata/pkgconfig/gnuradio-fec.pc
+libdata/pkgconfig/gnuradio-fft.pc
+libdata/pkgconfig/gnuradio-filter.pc
+libdata/pkgconfig/gnuradio-qtgui.pc
+libdata/pkgconfig/gnuradio-runtime.pc
+libdata/pkgconfig/gnuradio-trellis.pc
+%%UHD%%libdata/pkgconfig/gnuradio-uhd.pc
+libdata/pkgconfig/gnuradio-video-sdl.pc
+libdata/pkgconfig/gnuradio-vocoder.pc
+libdata/pkgconfig/gnuradio-wavelet.pc
+libdata/pkgconfig/gnuradio-zeromq.pc
 libdata/pkgconfig/volk.pc
 libexec/gnuradio/grc_setup_freedesktop
 share/applications/gnuradio-grc.desktop
-%%UHD%%share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.uhd
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/CHANGELOG.md
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.analog
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.audio
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.blocks
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.channels
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.digital
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.dtv
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.fec
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.fft
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.filter
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.hacking
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.md
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.qtgui
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/README.vocoder
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/html/gr-trellis.html
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/xml/test_tcm.py.xml
-share/doc/gnuradio-%%MAJOR_SUB_VER%%/xml/test_viterbi_equalization1.py.xml
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
+%%PORTDOCS%%%%DOCSDIR%%/README.analog
+%%PORTDOCS%%%%DOCSDIR%%/README.audio
+%%PORTDOCS%%%%DOCSDIR%%/README.blocks
+%%PORTDOCS%%%%DOCSDIR%%/README.channels
+%%PORTDOCS%%%%DOCSDIR%%/README.digital
+%%PORTDOCS%%%%DOCSDIR%%/README.dtv
+%%PORTDOCS%%%%DOCSDIR%%/README.fec
+%%PORTDOCS%%%%DOCSDIR%%/README.fft
+%%PORTDOCS%%%%DOCSDIR%%/README.filter
+%%PORTDOCS%%%%DOCSDIR%%/README.hacking
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/README.qtgui
+%%PORTDOCS%%%%DOCSDIR%%/README.uhd
+%%PORTDOCS%%%%DOCSDIR%%/README.vocoder
+%%PORTDOCS%%%%DOCSDIR%%/html/gr-trellis.html
+%%PORTDOCS%%%%DOCSDIR%%/xml/test_tcm.py.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/test_viterbi_equalization1.py.xml
 %%DATADIR%%/examples/analog/fmtest.py
 %%DATADIR%%/examples/analog/noise_power.grc
 %%DATADIR%%/examples/audio/audio_copy.py
@@ -2300,10 +2311,6 @@ share/doc/gnuradio-%%MAJOR_SUB_VER%%/xml/test_viterbi_equalization1.py.xml
 %%UHD%%%%DATADIR%%/examples/uhd/uhd_fft.grc
 %%UHD%%%%DATADIR%%/examples/uhd/uhd_two_tone_loopback.grc
 %%UHD%%%%DATADIR%%/examples/uhd/uhd_wbfm_receive.grc
-%%UHD%%%%DATADIR%%/grc/blocks/uhd.tree.yml
-%%UHD%%%%DATADIR%%/grc/blocks/uhd_amsg_source.block.yml
-%%UHD%%%%DATADIR%%/grc/blocks/uhd_usrp_sink.block.yml
-%%UHD%%%%DATADIR%%/grc/blocks/uhd_usrp_source.block.yml
 %%DATADIR%%/examples/vocoder/alaw_audio_loopback.py
 %%DATADIR%%/examples/vocoder/codec2_audio_loopback.py
 %%DATADIR%%/examples/vocoder/cvsd_audio_loopback.py
@@ -2312,6 +2319,7 @@ share/doc/gnuradio-%%MAJOR_SUB_VER%%/xml/test_viterbi_equalization1.py.xml
 %%DATADIR%%/examples/vocoder/g723_40_audio_loopback.py
 %%DATADIR%%/examples/vocoder/grfreedv.grc
 %%DATADIR%%/examples/vocoder/gsm_audio_loopback.py
+%%DATADIR%%/examples/vocoder/loopback-codec2.grc
 %%DATADIR%%/examples/vocoder/ulaw_audio_loopback.py
 %%DATADIR%%/examples/volk_benchmark/README
 %%DATADIR%%/examples/volk_benchmark/volk_math.py
@@ -2749,6 +2757,10 @@ share/doc/gnuradio-%%MAJOR_SUB_VER%%/xml/test_viterbi_equalization1.py.xml
 %%DATADIR%%/grc/blocks/trellis_siso_f.block.yml
 %%DATADIR%%/grc/blocks/trellis_viterbi_combined_xx.block.yml
 %%DATADIR%%/grc/blocks/trellis_viterbi_x.block.yml
+%%UHD%%%%DATADIR%%/grc/blocks/uhd.tree.yml
+%%UHD%%%%DATADIR%%/grc/blocks/uhd_amsg_source.block.yml
+%%UHD%%%%DATADIR%%/grc/blocks/uhd_usrp_sink.block.yml
+%%UHD%%%%DATADIR%%/grc/blocks/uhd_usrp_source.block.yml
 %%DATADIR%%/grc/blocks/variable.block.yml
 %%DATADIR%%/grc/blocks/variable_band_pass_filter_taps.block.yml
 %%DATADIR%%/grc/blocks/variable_band_reject_filter_taps.block.yml
@@ -2858,9 +2870,6 @@ share/doc/gnuradio-%%MAJOR_SUB_VER%%/xml/test_viterbi_equalization1.py.xml
 %%DATADIR%%/modtool/templates/gr-newmod/include/howto/api.h
 %%DATADIR%%/modtool/templates/gr-newmod/lib/CMakeLists.txt
 %%DATADIR%%/modtool/templates/gr-newmod/lib/CMakeLists.txt.bak
-%%DATADIR%%/modtool/templates/gr-newmod/lib/qa_howto.cc
-%%DATADIR%%/modtool/templates/gr-newmod/lib/qa_howto.h
-%%DATADIR%%/modtool/templates/gr-newmod/lib/test_howto.cc
 %%DATADIR%%/modtool/templates/gr-newmod/python/CMakeLists.txt
 %%DATADIR%%/modtool/templates/gr-newmod/python/CMakeLists.txt.bak
 %%DATADIR%%/modtool/templates/gr-newmod/python/__init__.py
@@ -2886,6 +2895,3 @@ share/icons/hicolor/32x32/apps/gnuradio-grc.png
 share/icons/hicolor/48x48/apps/gnuradio-grc.png
 share/icons/hicolor/64x64/apps/gnuradio-grc.png
 share/mime/packages/gnuradio-grc.xml
-@dir include/volk/asm/neon
-@dir include/volk/asm/orc
-@dir libdata/pkgconfig