14 files changed, 137 insertions, 90 deletions

diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index c2fedede3753..65b9b8cb1705 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnuradio
-PORTVERSION=	3.7.11
-PORTREVISION=	2
+PORTVERSION=	3.7.13.3
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
 		LOCAL/db
@@ -19,9 +18,10 @@ BROKEN_armv7=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: u
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${PY_FLAVOR} \
+		${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \
+		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \
 		aconnect:audio/alsa-utils \
 		cheetah:devel/py-cheetah@${PY_FLAVOR} \
-		git:devel/git \
 		guile:lang/guile \
 		minixmlto:textproc/minixmlto \
 		sdl-config:devel/sdl12 \
@@ -74,7 +74,7 @@ LIBSTRIP_FILES=	analog atsc audio blocks channels digital dtv fcd fec fft\
 		filter noaa pager pmt qtgui runtime trellis video-sdl\
 		vocoder wavelet wxgui
 
-OPTIONS_DEFINE=		UHD TESTING DOXYGEN
+OPTIONS_DEFINE=		DOCS UHD TESTING DOXYGEN
 # Unfortunately building docs on i386 fails
 ##OPTIONS_EXCLUDE_${i386}=	DOXYGEN
 # Yay. building docs is broken on 10 and HEAD too so turn them all off
diff --git a/comms/gnuradio/distinfo b/comms/gnuradio/distinfo
index f28d7e361564..abb914b59be7 100644
--- a/comms/gnuradio/distinfo
+++ b/comms/gnuradio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516377322
-SHA256 (gnuradio-3.7.11.tar.gz) = 87d9ba3183858efdbb237add3f9de40f7d65f25e16904a9bc8d764a7287252d4
-SIZE (gnuradio-3.7.11.tar.gz) = 4357123
+TIMESTAMP = 1529253899
+SHA256 (gnuradio-3.7.13.3.tar.gz) = 1e07ce40fa3c3eede1fb54e320dad8a221a3c01de341e9cef2d7b265ed06a6e9
+SIZE (gnuradio-3.7.13.3.tar.gz) = 4544605
diff --git a/comms/gnuradio/files/patch-CMakeLists.txt b/comms/gnuradio/files/patch-CMakeLists.txt
index 22acc7ca3328..62e4967cd9d8 100644
--- a/comms/gnuradio/files/patch-CMakeLists.txt
+++ b/comms/gnuradio/files/patch-CMakeLists.txt
@@ -1,19 +1,6 @@
---- CMakeLists.txt.orig	2016-09-02 04:16:14 UTC
+--- CMakeLists.txt.orig	2018-06-13 21:42:48 UTC
 +++ CMakeLists.txt
-@@ -29,6 +29,12 @@ cmake_minimum_required(VERSION 2.6)
- project(gnuradio CXX C)
- enable_testing()
- 
-+cmake_policy(SET CMP0026 OLD)
-+cmake_policy(SET CMP0043 OLD)
-+cmake_policy(SET CMP0045 OLD)
-+cmake_policy(SET CMP0046 OLD)
-+cmake_policy(SET CMP0056 OLD)
-+
- #make sure our local CMake Modules path comes first
- list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
- 
-@@ -70,6 +76,10 @@ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "M
+@@ -144,6 +144,10 @@ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
  ELSE()
      message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
  ENDIF()
@@ -24,7 +11,7 @@
  
  IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-@@ -191,6 +201,14 @@ string(REPLACE "\n" " \\n" COMPILER_INFO
+@@ -264,6 +268,14 @@ string(REPLACE "\n" " \\n" COMPILER_INFO ${COMPILER_IN
  ########################################################################
  include(GrPlatform) #define LIB_SUFFIX
  set(GR_RUNTIME_DIR     bin CACHE PATH "Path to install all binaries")
@@ -39,7 +26,7 @@
  set(GR_LIBRARY_DIR     lib${LIB_SUFFIX} CACHE PATH "Path to install libraries")
  set(GR_INCLUDE_DIR     include CACHE PATH "Path to install header files")
  set(GR_DATA_DIR        share CACHE PATH "Base location for data")
-@@ -276,6 +294,42 @@ add_custom_target(uninstall
+@@ -349,6 +361,42 @@ add_custom_target(uninstall
  include(GrBoost)
  
  ########################################################################
@@ -81,14 +68,14 @@
 +########################################################################
  # Enable python component
  ########################################################################
- find_package(PythonLibs 2)
-@@ -407,11 +461,13 @@ GR_LOGGING()
+ find_package(PythonLibs ${GR_PYTHON_MIN_VERSION})
+@@ -500,11 +548,13 @@ GR_LOGGING()
  ########################################################################
  # Distribute the README file
  ########################################################################
 +if(ENABLE_DOCS)
  install(
-     FILES README README.hacking
+     FILES README.md README.hacking CHANGELOG.md
      DESTINATION ${GR_PKG_DOC_DIR}
      COMPONENT "docs"
  )
diff --git a/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake b/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
index 2dab066f6acf..77cd2981154c 100644
--- a/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
+++ b/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
@@ -1,6 +1,6 @@
---- cmake/Modules/FindUSB.cmake.orig	2016-09-02 04:16:12 UTC
+--- cmake/Modules/FindUSB.cmake.orig	2018-06-13 21:42:48 UTC
 +++ cmake/Modules/FindUSB.cmake
-@@ -22,6 +22,19 @@ else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRA
+@@ -22,6 +22,19 @@ else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
    set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
    message(STATUS "libusb-1.0 not found.")
  endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
diff --git a/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake b/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake
deleted file mode 100644
index a9848e7379ad..000000000000
--- a/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/Modules/GrBoost.cmake.orig	2016-09-02 04:16:12 UTC
-+++ cmake/Modules/GrBoost.cmake
-@@ -59,6 +59,8 @@ if(MSVC)
- endif(MSVC)
- 
- find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
-+message(status "Boost_FOUND = ${Boost_FOUND})
-+message(status "Boost_LIBRARIES = ${Boost_LIBRARIES})
- 
- # This does not allow us to disable specific versions. It is used
- # internally by cmake to know the formation newer versions. As newer
diff --git a/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake b/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
index 7bd24f810f7b..c314af51059b 100644
--- a/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
+++ b/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
@@ -1,11 +1,11 @@
---- cmake/Modules/GrMiscUtils.cmake.orig	2016-09-02 04:16:12 UTC
+--- cmake/Modules/GrMiscUtils.cmake.orig	2018-06-13 21:42:48 UTC
 +++ cmake/Modules/GrMiscUtils.cmake
 @@ -148,7 +148,31 @@ function(GR_LIBRARY_FOO target)
          ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_DEVEL_COMPONENT}   # .lib file
          RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .dll file
      )
 +    
-+
+ 
 +    if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 +        #create .la file
 +        GR_LIBTOOL(TARGET ${target} DESTINATION ${GR_LIBRARY_DIR})
@@ -20,7 +20,7 @@
 +            COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} "${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so.${MAJOR_VERSION}"
 +            COMMAND ${CMAKE_COMMAND} -E touch ${target_name} #so the symlinks point to something valid so cmake 2.6 will install
 +        )
- 
++
 +        #and install the extra symlinks
 +        install(
 +            FILES
diff --git a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
index 3d33d605a7fb..5f505b0b6606 100644
--- a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
+++ b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
@@ -1,6 +1,6 @@
---- docs/doxygen/Doxyfile.in.orig	2016-09-02 04:16:12 UTC
+--- docs/doxygen/Doxyfile.in.orig	2018-06-13 21:42:48 UTC
 +++ docs/doxygen/Doxyfile.in
-@@ -1891,7 +1891,7 @@ DOT_FONTSIZE           = 10
+@@ -1880,7 +1880,7 @@ DOT_FONTSIZE           = 10
  # If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
  # set the path where dot can find it.
  
diff --git a/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt
deleted file mode 100644
index 38f8afe4e4a3..000000000000
--- a/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- gr-audio/doc/CMakeLists.txt.orig	2016-09-02 04:16:12 UTC
-+++ gr-audio/doc/CMakeLists.txt
-@@ -17,7 +17,9 @@
- # the Free Software Foundation, Inc., 51 Franklin Street,
- # Boston, MA 02110-1301, USA.
- 
-+if(ENABLE_DOCS)
- install(
-     FILES README.audio
-     DESTINATION ${GR_PKG_DOC_DIR}
- )
-+endif(ENABLE_DOCS)
diff --git a/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
deleted file mode 100644
index d2bae2fca05e..000000000000
--- a/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- gr-digital/doc/CMakeLists.txt.orig	2017-02-27 23:19:00 UTC
-+++ gr-digital/doc/CMakeLists.txt
-@@ -17,7 +17,9 @@
- # the Free Software Foundation, Inc., 51 Franklin Street,
- # Boston, MA 02110-1301, USA.
- 
-+if(ENABLE_DOCS)
- install(
-     FILES README.digital
-     DESTINATION ${GR_PKG_DOC_DIR}
- )
-+endif(ENABLE_DOCS)
diff --git a/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt
deleted file mode 100644
index d841db050efd..000000000000
--- a/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- gr-fcd/doc/CMakeLists.txt.orig	2016-09-02 04:16:14 UTC
-+++ gr-fcd/doc/CMakeLists.txt
-@@ -17,7 +17,9 @@
- # the Free Software Foundation, Inc., 51 Franklin Street,
- # Boston, MA 02110-1301, USA.
- 
-+if(ENABLE_DOCS)
- install(
-     FILES README.fcd
-     DESTINATION ${GR_PKG_DOC_DIR}
- )
-+endif(ENABLE_DOCS)
diff --git a/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt b/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt
index 57961746df34..160a6dba6a94 100644
--- a/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt
@@ -1,4 +1,4 @@
---- gr-fcd/lib/CMakeLists.txt.orig	2016-09-02 04:16:14 UTC
+--- gr-fcd/lib/CMakeLists.txt.orig	2018-06-17 18:02:35 UTC
 +++ gr-fcd/lib/CMakeLists.txt
 @@ -32,6 +32,7 @@ include_directories(
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
@@ -8,14 +8,14 @@
  )
  
  link_directories(
-@@ -90,6 +91,10 @@ add_library(gnuradio-fcd SHARED ${gr_fcd
+@@ -91,6 +92,10 @@ endif()
+ add_library(gnuradio-fcd SHARED ${gr_fcd_sources})
  if (LINUX)
    list(APPEND fcd_libs rt)
- endif()
++endif()
 +if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 +  message( "--- Adding iconv library for FreeBSD")
 +  list(APPEND fcd_libs ${ICONV_LIBRARY})
-+endif()
+ endif()
  target_link_libraries(gnuradio-fcd ${fcd_libs} ${LOG4CPP_LIBRARIES})
  
- 
diff --git a/comms/gnuradio/files/patch-gr-uhd_examples_c++_CMakeLists.txt b/comms/gnuradio/files/patch-gr-uhd_examples_c++_CMakeLists.txt
new file mode 100644
index 000000000000..7068fca81b33
--- /dev/null
+++ b/comms/gnuradio/files/patch-gr-uhd_examples_c++_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- gr-uhd/examples/c++/CMakeLists.txt.orig	2018-06-13 21:42:48 UTC
++++ gr-uhd/examples/c++/CMakeLists.txt
+@@ -35,7 +35,7 @@ link_directories(${Boost_LIBRARY_DIRS})
+ # Build executable
+ ########################################################################
+ add_executable(tags_demo tags_demo.cc)
+-target_link_libraries(tags_demo gnuradio-uhd)
++target_link_libraries(tags_demo gnuradio-uhd -lpthread)
+ 
+ INSTALL(TARGETS
+     tags_demo
diff --git a/comms/gnuradio/files/patch-volk_CMakeLists.txt b/comms/gnuradio/files/patch-volk_CMakeLists.txt
index 8d0aca1de2c7..22f66761b3f1 100644
--- a/comms/gnuradio/files/patch-volk_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-volk_CMakeLists.txt
@@ -1,6 +1,6 @@
---- volk/CMakeLists.txt.orig	2016-09-02 04:16:13 UTC
+--- volk/CMakeLists.txt.orig	2018-06-13 21:42:48 UTC
 +++ volk/CMakeLists.txt
-@@ -140,7 +140,7 @@ configure_file(
+@@ -153,7 +153,7 @@ configure_file(
  
  install(
      FILES ${CMAKE_CURRENT_BINARY_DIR}/volk.pc
diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist
index 6888761c595e..389e77dee49d 100644
--- a/comms/gnuradio/pkg-plist
+++ b/comms/gnuradio/pkg-plist
@@ -229,6 +229,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
@@ -359,6 +360,7 @@ 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
@@ -441,6 +443,7 @@ 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
@@ -465,6 +468,7 @@ 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
@@ -506,6 +510,9 @@ 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/dtv/api.h
 include/gnuradio/dtv/atsc_consts.h
 include/gnuradio/dtv/atsc_deinterleaver.h
@@ -523,6 +530,7 @@ 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
@@ -672,6 +680,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
@@ -800,6 +810,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
@@ -809,6 +821,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/channels_swig.i
 include/gnuradio/swig/channels_swig_doc.i
@@ -1001,6 +1021,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_%%MAJOR_VERSION%%2fc_dot_prod_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_16i_branch_4_state_8.h
@@ -1023,6 +1044,8 @@ 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_%%MAJOR_VERSION%%2f_64f_add_64f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_64f_multiply_64f.h
 include/volk/volk_%%MAJOR_VERSION%%2f_8u_polarbutterfly_%%MAJOR_VERSION%%2f.h
 include/volk/volk_%%MAJOR_VERSION%%2f_8u_polarbutterflypuppet_%%MAJOR_VERSION%%2f.h
 include/volk/volk_%%MAJOR_VERSION%%2f_accumulator_s%%MAJOR_VERSION%%2f.h
@@ -1044,9 +1067,11 @@ include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_calc_spectral_noise_f
 include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_convert_16i.h
 include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_convert_%%MAJOR_VERSION%%2i.h
 include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_convert_8i.h
+include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_mod_rangepuppet_%%MAJOR_VERSION%%2f.h
 include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_multiply_%%MAJOR_VERSION%%2f.h
 include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_normalize.h
 include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_power_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_mod_range_%%MAJOR_VERSION%%2f.h
 include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_stddev_%%MAJOR_VERSION%%2f.h
 include/volk/volk_%%MAJOR_VERSION%%2f_sin_%%MAJOR_VERSION%%2f.h
 include/volk/volk_%%MAJOR_VERSION%%2f_sqrt_%%MAJOR_VERSION%%2f.h
@@ -1066,6 +1091,7 @@ include/volk/volk_%%MAJOR_VERSION%%2f_x2_pow_%%MAJOR_VERSION%%2f.h
 include/volk/volk_%%MAJOR_VERSION%%2f_x2_s%%MAJOR_VERSION%%2f_interleave_16ic.h
 include/volk/volk_%%MAJOR_VERSION%%2f_x2_subtract_%%MAJOR_VERSION%%2f.h
 include/volk/volk_%%MAJOR_VERSION%%2f_x%%MAJOR_VERSION%%_sum_of_poly_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_%%MAJOR_VERSION%%2f_add_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_%%MAJOR_VERSION%%2fc_%%MAJOR_VERSION%%2f_dot_prod_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_%%MAJOR_VERSION%%2fc_%%MAJOR_VERSION%%2f_multiply_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_%%MAJOR_VERSION%%2fc_conjugate_%%MAJOR_VERSION%%2fc.h
@@ -1088,6 +1114,7 @@ include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_x2_power_spectral_de
 include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2fc_multiply_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2fc_rotatorpuppet_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2fc_x2_rotator_%%MAJOR_VERSION%%2fc.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_x2_add_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_%%MAJOR_VERSION%%2fc_x2_conjugate_dot_prod_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_%%MAJOR_VERSION%%2fc_x2_divide_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_%%MAJOR_VERSION%%2fc_x2_dot_prod_%%MAJOR_VERSION%%2fc.h
@@ -1102,9 +1129,12 @@ include/volk/volk_%%MAJOR_VERSION%%2u_byteswap.h
 include/volk/volk_%%MAJOR_VERSION%%2u_byteswappuppet_%%MAJOR_VERSION%%2u.h
 include/volk/volk_%%MAJOR_VERSION%%2u_popcnt.h
 include/volk/volk_%%MAJOR_VERSION%%2u_popcntpuppet_%%MAJOR_VERSION%%2u.h
+include/volk/volk_%%MAJOR_VERSION%%2u_reverse_%%MAJOR_VERSION%%2u.h
 include/volk/volk_64f_convert_%%MAJOR_VERSION%%2f.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
@@ -1132,9 +1162,12 @@ include/volk/volk_malloc.h
 include/volk/volk_neon_intrinsics.h
 include/volk/volk_prefs.h
 include/volk/volk_sse%%MAJOR_VERSION%%_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/FindFFTW%%MAJOR_VERSION%%f.cmake
@@ -1235,7 +1268,7 @@ lib/libgnuradio-wxgui.so
 lib/libgnuradio-wxgui.so.%%MAJOR_VERSION%%
 lib/libgnuradio-wxgui.so.%%PORTVERSION%%
 lib/libvolk.so
-lib/libvolk.so.1.%%MAJOR_VERSION%%
+lib/libvolk.so.1.4
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.%%PYTHON_PYOEXTENSION%%
@@ -1298,10 +1331,15 @@ lib/libvolk.so.1.%%MAJOR_VERSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig0.so
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig1.so
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig10.so
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig2.so
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig%%MAJOR_VERSION%%.so
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig4.so
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig5.so
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig6.so
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig7.so
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig8.so
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig9.so
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig.%%PYTHON_PYOEXTENSION%%
@@ -1311,6 +1349,9 @@ lib/libvolk.so.1.%%MAJOR_VERSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig1.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig1.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig1.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig10.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig10.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig10.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.%%PYTHON_PYOEXTENSION%%
@@ -1323,6 +1364,18 @@ lib/libvolk.so.1.%%MAJOR_VERSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig5.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig5.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig5.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig6.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig6.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig6.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig7.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig7.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig7.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig8.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig8.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig8.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig9.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig9.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig9.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/parse_file_metadata.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/parse_file_metadata.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/parse_file_metadata.%%PYTHON_PYOEXTENSION%%
@@ -1754,6 +1807,9 @@ lib/libvolk.so.1.%%MAJOR_VERSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/extract_docs.py
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/extract_docs.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/extract_docs.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/hide_bokeh_gui_options_if_not_installed.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/hide_bokeh_gui_options_if_not_installed.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/hide_bokeh_gui_options_if_not_installed.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/odict.py
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/odict.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/odict.%%PYTHON_PYOEXTENSION%%
@@ -1841,6 +1897,7 @@ lib/libvolk.so.1.%%MAJOR_VERSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/external_editor.py
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/external_editor.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/external_editor.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/icon.png
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/main.py
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/main.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/main.%%PYTHON_PYOEXTENSION%%
@@ -2257,9 +2314,12 @@ libdata/pkgconfig/gr-wxgui.pc
 libdata/pkgconfig/volk.pc
 libexec/gnuradio/grc_setup_freedesktop
 %%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.fcd
 %%PORTDOCS%%%%DOCSDIR%%/README.fec
 %%PORTDOCS%%%%DOCSDIR%%/README.fft
 %%PORTDOCS%%%%DOCSDIR%%/README.filter
@@ -2314,6 +2374,9 @@ libexec/gnuradio/grc_setup_freedesktop
 %%DATADIR%%/examples/digital/demod/mpsk_demod.grc
 %%DATADIR%%/examples/digital/demod/pam_sync.grc
 %%DATADIR%%/examples/digital/demod/pam_timing.grc
+%%DATADIR%%/examples/digital/demod/symbol_sync_test_complex.grc
+%%DATADIR%%/examples/digital/demod/symbol_sync_test_float.grc
+%%DATADIR%%/examples/digital/demod/symbol_sync_test_float_ted_gain.m
 %%DATADIR%%/examples/digital/demod/test_corr_and_sync.grc
 %%DATADIR%%/examples/digital/demod/test_corr_est.grc
 %%DATADIR%%/examples/digital/demod/uhd_corr_and_sync_rx.grc
@@ -2368,6 +2431,7 @@ libexec/gnuradio/grc_setup_freedesktop
 %%DATADIR%%/examples/digital/packet/uhd_packet_tx_tun.grc
 %%DATADIR%%/examples/digital/run_length.py
 %%DATADIR%%/examples/digital/snr_estimators.py
+%%DATADIR%%/examples/dtv/README.atsc
 %%DATADIR%%/examples/dtv/README.catv
 %%DATADIR%%/examples/dtv/README.dvbs
 %%DATADIR%%/examples/dtv/README.dvbs2
@@ -2382,11 +2446,39 @@ libexec/gnuradio/grc_setup_freedesktop
 %%DATADIR%%/examples/dtv/dvbt_tx_8k.grc
 %%DATADIR%%/examples/dtv/file_atsc_rx.grc
 %%DATADIR%%/examples/dtv/file_atsc_tx.grc
+%%DATADIR%%/examples/dtv/germany-g1.grc
+%%DATADIR%%/examples/dtv/germany-g10.grc
+%%DATADIR%%/examples/dtv/germany-g2.grc
+%%DATADIR%%/examples/dtv/germany-g%%MAJOR_VERSION%%.grc
+%%DATADIR%%/examples/dtv/germany-g4.grc
+%%DATADIR%%/examples/dtv/germany-g5.grc
+%%DATADIR%%/examples/dtv/germany-g6.grc
+%%DATADIR%%/examples/dtv/germany-g7.grc
+%%DATADIR%%/examples/dtv/germany-g8.grc
+%%DATADIR%%/examples/dtv/germany-g9.grc
 %%DATADIR%%/examples/dtv/uhd_atsc_capture.grc
+%%DATADIR%%/examples/dtv/uhd_atsc_tx.grc
 %%DATADIR%%/examples/dtv/uhd_rx_atsc.grc
+%%DATADIR%%/examples/dtv/vv001-cr%%MAJOR_VERSION%%5.grc
 %%DATADIR%%/examples/dtv/vv00%%MAJOR_VERSION%%-cr2%%MAJOR_VERSION%%.grc
+%%DATADIR%%/examples/dtv/vv004-8kfft.grc
+%%DATADIR%%/examples/dtv/vv005-8kfft.grc
+%%DATADIR%%/examples/dtv/vv007-16kfft.grc
+%%DATADIR%%/examples/dtv/vv008-16kfft.grc
 %%DATADIR%%/examples/dtv/vv009-4kfft.grc
+%%DATADIR%%/examples/dtv/vv010-2kfft.grc
+%%DATADIR%%/examples/dtv/vv011-1kfft.grc
+%%DATADIR%%/examples/dtv/vv012-64qam45.grc
+%%DATADIR%%/examples/dtv/vv01%%MAJOR_VERSION%%-64qam56.grc
+%%DATADIR%%/examples/dtv/vv014-64qam%%MAJOR_VERSION%%4.grc
+%%DATADIR%%/examples/dtv/vv015-8kfft.grc
+%%DATADIR%%/examples/dtv/vv016-256qam%%MAJOR_VERSION%%4.grc
+%%DATADIR%%/examples/dtv/vv017-paprtr.grc
 %%DATADIR%%/examples/dtv/vv018-miso.grc
+%%DATADIR%%/examples/dtv/vv019-norot.grc
+%%DATADIR%%/examples/dtv/vv0%%MAJOR_VERSION%%4-dtg016.grc
+%%DATADIR%%/examples/dtv/vv0%%MAJOR_VERSION%%5-dtg052.grc
+%%DATADIR%%/examples/dtv/vv0%%MAJOR_VERSION%%6-dtg091.grc
 %%DATADIR%%/examples/fcd/fcd_apt_rx.grc
 %%DATADIR%%/examples/fcd/fcd_fft.grc
 %%DATADIR%%/examples/fcd/fcd_nfm_rx
@@ -2590,6 +2682,7 @@ libexec/gnuradio/grc_setup_freedesktop
 %%DATADIR%%/grc/blocks/analog_fm_deemph.xml
 %%DATADIR%%/grc/blocks/analog_fm_demod_cf.xml
 %%DATADIR%%/grc/blocks/analog_fm_preemph.xml
+%%DATADIR%%/grc/blocks/analog_fmdet_cf.xml
 %%DATADIR%%/grc/blocks/analog_frequency_modulator_fc.xml
 %%DATADIR%%/grc/blocks/analog_nbfm_rx.xml
 %%DATADIR%%/grc/blocks/analog_nbfm_tx.xml
@@ -2650,6 +2743,7 @@ libexec/gnuradio/grc_setup_freedesktop
 %%DATADIR%%/grc/blocks/blocks_delay.xml
 %%DATADIR%%/grc/blocks/blocks_divide_XX.xml
 %%DATADIR%%/grc/blocks/blocks_endian_swap.xml
+%%DATADIR%%/grc/blocks/blocks_exponentiate_const_cci.xml
 %%DATADIR%%/grc/blocks/blocks_file_descriptor_sink.xml
 %%DATADIR%%/grc/blocks/blocks_file_descriptor_source.xml
 %%DATADIR%%/grc/blocks/blocks_file_meta_sink.xml
@@ -2728,6 +2822,7 @@ libexec/gnuradio/grc_setup_freedesktop
 %%DATADIR%%/grc/blocks/blocks_tag_debug.xml
 %%DATADIR%%/grc/blocks/blocks_tag_gate.xml
 %%DATADIR%%/grc/blocks/blocks_tag_object.xml
+%%DATADIR%%/grc/blocks/blocks_tag_share.xml
 %%DATADIR%%/grc/blocks/blocks_tagged_file_sink.xml
 %%DATADIR%%/grc/blocks/blocks_tagged_stream_align.xml
 %%DATADIR%%/grc/blocks/blocks_tagged_stream_multiply_length.xml
@@ -2791,7 +2886,7 @@ libexec/gnuradio/grc_setup_freedesktop
 %%DATADIR%%/grc/blocks/digital_constellation_soft_decoder_cf.xml
 %%DATADIR%%/grc/blocks/digital_corr_est_cc.xml
 %%DATADIR%%/grc/blocks/digital_correlate_access_code_bb.xml
-%%DATADIR%%/grc/blocks/digital_correlate_access_code_tag_bb.xml
+%%DATADIR%%/grc/blocks/digital_correlate_access_code_tag_xx.xml
 %%DATADIR%%/grc/blocks/digital_correlate_access_code_xx_ts.xml
 %%DATADIR%%/grc/blocks/digital_correlate_and_sync_cc.xml
 %%DATADIR%%/grc/blocks/digital_costas_loop_cc.xml
@@ -2856,6 +2951,7 @@ libexec/gnuradio/grc_setup_freedesktop
 %%DATADIR%%/grc/blocks/digital_scrambler_bb.xml
 %%DATADIR%%/grc/blocks/digital_simple_correlator.xml
 %%DATADIR%%/grc/blocks/digital_simple_framer.xml
+%%DATADIR%%/grc/blocks/digital_symbol_sync_xx.xml
 %%DATADIR%%/grc/blocks/dtv_atsc_deinterleaver.xml
 %%DATADIR%%/grc/blocks/dtv_atsc_depad.xml
 %%DATADIR%%/grc/blocks/dtv_atsc_derandomizer.xml