Update to 3.7.10.1

Note temporary hack in CMakeLists.txt to fix build with -gsl
link_directories("/usr/lib" "${LOCALBASE}/lib")
This is from a missing -L somewhere in the swig generation code that
needs to be fixed.

ChangeLog v3.7.10.1
=================

This is the first bug-fix release for v3.7.10

Contributors
------------

The following list of people directly contributed code to this
release:

 * Artem Pisarenko <ArtemPisarenko@users.noreply.github.com>
 * Ben Hilburn <ben.hilburn@ettus.com>
 * Christopher Chavez <chrischavez@gmx.us>
 * Johnathan Corgan <johnathan@corganlabs.com>
 * Jonathan Brucker <jonathan.brucke@gmail.com>
 * Nicholas Corgan <n.corgan@gmail.com>
 * Nicolas Cuervo <nicolas.cuervo@ettus.com>
 * Ron Economos <w6rz@comcast.net>
 * Sebastian Koslowski <koslowski@kit.edu>
 * Stephen Larew <stephen@slarew.net>

## Major Development Areas

This contains bug fixes primarily for GRC and DTV.

### GRC

Catch more exceptions thrown by ConfigParser when reading corrupted grc.conf files.

Fix the docstring update error for empty categories.

Fix grcc to call refactored GRC code.

Convert initially opened files to absolute paths to prevent attempting to read from tmp.

Move startup checks back in to gnuradio-companion script from grc/checks.py.

### DTV

Fix a segfault that occurs from out-of-bounds access in
dvbt_bit_inner_interleaver forecast by forecasting an enumerated list of all
input streams.

Fix VL-SNR framing.

### Digital

Enable update rate in block_recovery_mm blocks to keep tags close to the the proper clock-recovered sample time. Tag offsets will still be off between calls to work, but each work call updates the tag rate.

### Analog

Fix the derivative calculation in fmdet block.

### Builds

Fix linking GSL to gr-fec.

Use gnu99 C standard rather than gnu11 standard to maintain support for GCC 4.6.3.

### Other

Minor spelling and documentation fixes.

Fix uhd_siggen_gui when using lo_locked.

17 files changed, 273 insertions, 167 deletions

diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 6f06d7919717..314f2b94d42c 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnuradio
-PORTVERSION=	3.7.9.2
-PORTREVISION=	5
+PORTVERSION=	3.7.10.1
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
 		LOCAL/db
@@ -24,6 +23,7 @@ BUILD_DEPENDS=	sdl-config:devel/sdl12 \
 		${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem
 LIB_DEPENDS=	libcppunit.so:devel/cppunit \
+		libcodec2.so:audio/codec2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libqwt.so:x11-toolkits/qwt5 \
@@ -42,7 +42,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 # volk/lib/volk_cpu.c:62: error: can't find a register in class 'BREG' while reloading 'asm'
 # volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints
 USES=		cmake:outsource compiler:c11 iconv perl5 pkgconfig python:2.7 shebangfix
-SHEBANG_FILES=	grc/freedesktop/grc_setup_freedesktop.in
+SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in
 CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"\
 		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DICONV_LIB:STRING="X${ICONV_LIB}" \
@@ -51,8 +51,8 @@ CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"\
 		-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}"
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
-MAJOR_SUB_VER=	3.7.9.2
-DOCSDIR=	share/doc/${PORTNAME}-${MAJOR_SUB_VER}
+MAJOR_SUB_VER=	${PORTVERSION}
+DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
 USE_GNOME=	pygtk2
 USE_WX=		3.0+
 USE_QT4=	corelib gui xml qmake moc rcc uic
diff --git a/comms/gnuradio/distinfo b/comms/gnuradio/distinfo
index c822eb7bfca5..6a661a60d40a 100644
--- a/comms/gnuradio/distinfo
+++ b/comms/gnuradio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475075626
-SHA256 (gnuradio-3.7.9.2.tar.gz) = 71662ff8089b8533cd8162ecef57661ec97d0026735876b1b55d0efcf654b561
-SIZE (gnuradio-3.7.9.2.tar.gz) = 4911047
+TIMESTAMP = 1482969389
+SHA256 (gnuradio-3.7.10.1.tar.gz) = 63d7b65cc4abe22f47b8f41caaf7370a0a502b91e36e29901ba03e8838ab4937
+SIZE (gnuradio-3.7.10.1.tar.gz) = 4272430
diff --git a/comms/gnuradio/files/patch-CMakeLists.txt b/comms/gnuradio/files/patch-CMakeLists.txt
index 013592563846..22acc7ca3328 100644
--- a/comms/gnuradio/files/patch-CMakeLists.txt
+++ b/comms/gnuradio/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2016-04-11 02:35:01 UTC
+--- CMakeLists.txt.orig	2016-09-02 04:16:14 UTC
 +++ CMakeLists.txt
-@@ -29,6 +29,11 @@ cmake_minimum_required(VERSION 2.6)
+@@ -29,6 +29,12 @@ cmake_minimum_required(VERSION 2.6)
  project(gnuradio CXX C)
  enable_testing()
  
@@ -8,20 +8,23 @@
 +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)
  
-@@ -53,7 +58,7 @@ include(GrVersion) #setup version info
- # Append -O2 optimization flag for Debug builds
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O2")
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
--
+@@ -70,6 +76,10 @@ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "M
+ ELSE()
+     message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
+ ENDIF()
++#
++# This is a workaround for a missing -lgsl -L in the swig build somewhere
++# it needs to be properly fixed. - db
 +link_directories("/usr/lib" "${LOCALBASE}/lib")
- ########################################################################
- # Environment setup
- ########################################################################
-@@ -144,6 +149,14 @@ string(REPLACE "\n" " \\n" COMPILER_INFO
+ 
+ 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
  ########################################################################
  include(GrPlatform) #define LIB_SUFFIX
  set(GR_RUNTIME_DIR     bin CACHE PATH "Path to install all binaries")
@@ -36,7 +39,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")
-@@ -229,6 +242,42 @@ add_custom_target(uninstall
+@@ -276,6 +294,42 @@ add_custom_target(uninstall
  include(GrBoost)
  
  ########################################################################
@@ -79,7 +82,7 @@
  # Enable python component
  ########################################################################
  find_package(PythonLibs 2)
-@@ -354,11 +403,13 @@ GR_LOGGING()
+@@ -407,11 +461,13 @@ GR_LOGGING()
  ########################################################################
  # Distribute the README file
  ########################################################################
diff --git a/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake b/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
index 4efb096fdaca..c95446776417 100644
--- a/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
+++ b/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
@@ -1,9 +1,60 @@
---- cmake/Modules/FindUSB.cmake.orig	2015-04-13 14:32:43 UTC
+--- cmake/Modules/FindUSB.cmake.orig	2016-09-02 04:16:12 UTC
 +++ cmake/Modules/FindUSB.cmake
-@@ -23,6 +33,17 @@ else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRA
+@@ -1,20 +1,32 @@
+ if(NOT LIBUSB_FOUND)
+-  pkg_check_modules (LIBUSB_PKG libusb-1.0)
+-  find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
+-    PATHS
+-    ${LIBUSB_PKG_INCLUDE_DIRS}
+-    /usr/include/libusb-1.0
+-    /usr/include
+-    /usr/local/include
+-  )
+-
+-  find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
+-    PATHS
+-    ${LIBUSB_PKG_LIBRARY_DIRS}
+-    /usr/lib
+-    /usr/local/lib
+-  )
++  if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++    message(status "--- Looking for FreeBSD usb")
++    set (LIBUSB_INCLUDE_DIR ${LOCALBASE}/include)
++  find_library(LIBUSB_LIBRARIES NAMES usb
++      PATHS
++      ${LIBUSB_PKG_LIBRARY_DIRS}
++      /usr/lib
++    )
++  else()
++    message(status "--- LIBUSB_LIBRARIES ${LIBUSB_LIBRARIES}")
++    pkg_check_modules (LIBUSB_PKG libusb-1.0)
++    find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
++      PATHS
++      ${LIBUSB_PKG_INCLUDE_DIRS}
++      /usr/include/libusb-1.0
++      /usr/include
++      /usr/local/include
++    )
+ 
++    find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
++      PATHS
++      ${LIBUSB_PKG_LIBRARY_DIRS}
++      /usr/lib
++      /usr/local/lib
++    )
++  endif()
++message( status "--- LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR} LIBUSB_LIBRARIES ${LIBUSB_LIBRARIES}")
++  
+ if(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+   set(LIBUSB_FOUND TRUE CACHE INTERNAL "libusb-1.0 found")
+   message(STATUS "Found libusb-1.0: ${LIBUSB_INCLUDE_DIR}, ${LIBUSB_LIBRARIES}")
+@@ -22,6 +34,19 @@ else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRA
+   set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
    message(STATUS "libusb-1.0 not found.")
  endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
- 
++if(UNIX)
++  INCLUDE(CheckFunctionExists)
++endif()
 +message(status "--- Checking for libusb_get_string_descriptor")
 +set(CMAKE_REQUIRED_LIBRARIES ${LIBUSB_LIBRARIES})
 +CHECK_FUNCTION_EXISTS(libusb_get_string_descriptor HAVE_LIBUSB_GET_STRING_DESCRIPTOR)
@@ -14,7 +65,6 @@
 +else()
 +   message(status "--- libusb_get_string_descriptor Not Found")
 +endif()
-+
+ 
  mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
  
- endif(NOT LIBUSB_FOUND)
diff --git a/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake b/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake
index dd57f811f635..a9848e7379ad 100644
--- a/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake
+++ b/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake
@@ -1,6 +1,6 @@
---- cmake/Modules/GrBoost.cmake.orig	2015-04-13 14:32:43 UTC
+--- cmake/Modules/GrBoost.cmake.orig	2016-09-02 04:16:12 UTC
 +++ cmake/Modules/GrBoost.cmake
-@@ -53,6 +53,8 @@ if(MSVC)
+@@ -59,6 +59,8 @@ if(MSVC)
  endif(MSVC)
  
  find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
diff --git a/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake b/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
index a6a3a18ff6ff..7bd24f810f7b 100644
--- a/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
+++ b/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
@@ -1,4 +1,4 @@
---- cmake/Modules/GrMiscUtils.cmake.orig	2015-04-13 14:32:43 UTC
+--- cmake/Modules/GrMiscUtils.cmake.orig	2016-09-02 04:16:12 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
diff --git a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
index 3e800bde335d..3d33d605a7fb 100644
--- a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
+++ b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
@@ -1,11 +1,11 @@
---- docs/doxygen/Doxyfile.in.orig	2015-04-14 14:38:41 UTC
+--- docs/doxygen/Doxyfile.in.orig	2016-09-02 04:16:12 UTC
 +++ docs/doxygen/Doxyfile.in
 @@ -1891,7 +1891,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.
  
 -DOT_FONTPATH           =
-+DOT_FONTPATH           =	%%LOCALBASE%%/share/fonts/freefont-ttf
++DOT_FONTPATH           =	/usr/local/share/fonts/freefont-ttf
  
  # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
  # will generate a graph for each documented class showing the direct and
diff --git a/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc b/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc
index bd58565dc93f..abd76428f008 100644
--- a/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc
+++ b/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc
@@ -1,6 +1,6 @@
---- gnuradio-runtime/lib/thread/thread.cc.orig	2015-04-13 14:32:43 UTC
+--- gnuradio-runtime/lib/thread/thread.cc.orig	2016-09-02 04:16:12 UTC
 +++ gnuradio-runtime/lib/thread/thread.cc
-@@ -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)
      {
@@ -8,7 +8,7 @@
        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());
        }
@@ -16,7 +16,7 @@
      }
  
      void
-@@ -302,6 +304,7 @@ namespace gr {
+@@ -310,6 +312,7 @@ namespace gr {
      void
      thread_unbind(gr_thread_t thread)
      {
@@ -24,7 +24,7 @@
        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/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt
index 3b928f228022..38f8afe4e4a3 100644
--- a/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt
@@ -1,4 +1,4 @@
---- gr-audio/doc/CMakeLists.txt.orig	2015-04-13 14:32:43 UTC
+--- 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,
diff --git a/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
index 9ba4c01d30d5..e82b75eb011d 100644
--- a/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
@@ -1,4 +1,4 @@
---- gr-digital/doc/CMakeLists.txt.orig	2015-04-13 14:32:43 UTC
+--- gr-digital/doc/CMakeLists.txt.orig	2016-09-02 04:16:13 UTC
 +++ gr-digital/doc/CMakeLists.txt
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc b/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc
index aad743c0a9a5..d17022e8e701 100644
--- a/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc
+++ b/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc
@@ -1,4 +1,4 @@
---- gr-dtv/lib/dvbt/dvbt_reed_solomon.cc.orig	2015-08-28 14:47:45 UTC
+--- gr-dtv/lib/dvbt/dvbt_reed_solomon.cc.orig	2016-09-02 04:16:13 UTC
 +++ gr-dtv/lib/dvbt/dvbt_reed_solomon.cc
 @@ -42,7 +42,7 @@ namespace gr {
        d_p = p; d_m = m;
diff --git a/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt
index afb5beb7ae29..d841db050efd 100644
--- a/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt
@@ -1,4 +1,4 @@
---- gr-fcd/doc/CMakeLists.txt.orig	2015-04-13 14:32:43 UTC
+--- 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,
diff --git a/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt b/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt
index a24ae40a75ce..57961746df34 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	2015-04-13 14:32:43 UTC
+--- gr-fcd/lib/CMakeLists.txt.orig	2016-09-02 04:16:14 UTC
 +++ gr-fcd/lib/CMakeLists.txt
 @@ -32,6 +32,7 @@ include_directories(
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
diff --git a/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c b/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
index a85873abf7d1..09ec29f7f75f 100644
--- a/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
+++ b/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
@@ -1,4 +1,4 @@
---- gr-fcd/lib/hid/hid-libusb.c.orig	2015-04-13 14:32:43 UTC
+--- gr-fcd/lib/hid/hid-libusb.c.orig	2016-09-02 04:16:14 UTC
 +++ gr-fcd/lib/hid/hid-libusb.c
 @@ -250,8 +250,8 @@ static int get_usage(uint8_t *report_des
  }
diff --git a/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion b/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion
index 91070d67edf4..a2ddf49af4eb 100644
--- a/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion
+++ b/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion
@@ -1,7 +1,7 @@
---- grc/scripts/gnuradio-companion.orig	2015-12-27 18:10:58 UTC
+--- grc/scripts/gnuradio-companion.orig	2016-09-02 04:16:13 UTC
 +++ grc/scripts/gnuradio-companion
-@@ -23,6 +23,9 @@ import sys
- import optparse
+@@ -22,6 +22,9 @@ import os
+ import sys
  import warnings
  
 +# XXX workaround to make sure we import gcc libgcc4
diff --git a/comms/gnuradio/files/patch-volk_CMakeLists.txt b/comms/gnuradio/files/patch-volk_CMakeLists.txt
index 99f4b702ecd0..8d0aca1de2c7 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-04-08 03:47:02 UTC
+--- volk/CMakeLists.txt.orig	2016-09-02 04:16:13 UTC
 +++ volk/CMakeLists.txt
-@@ -139,7 +139,7 @@ configure_file(
+@@ -140,7 +140,7 @@ configure_file(
  
  install(
      FILES ${CMAKE_CURRENT_BINARY_DIR}/volk.pc
diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist
index b12433bc7f0a..02d06413dd4d 100644
--- a/comms/gnuradio/pkg-plist
+++ b/comms/gnuradio/pkg-plist
@@ -111,30 +111,7 @@ include/gnuradio/analog/simple_squelch_cc.h
 include/gnuradio/analog/squelch_base_cc.h
 include/gnuradio/analog/squelch_base_ff.h
 include/gnuradio/api.h
-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
 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
@@ -154,7 +131,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
@@ -171,8 +147,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
@@ -186,7 +160,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/attributes.h
 include/gnuradio/audio/api.h
 include/gnuradio/audio/sink.h
@@ -732,7 +705,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
@@ -757,7 +729,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
@@ -970,9 +941,6 @@ include/gnuradio/video_sdl/sink_uc.h
 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
@@ -1227,14 +1195,14 @@ lib/libgnuradio-wxgui.so
 lib/libgnuradio-wxgui.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-wxgui.so.%%MAJOR_VERSION%%
 lib/libvolk.so
-lib/libvolk.so.1.2.2
+lib/libvolk.so.1.%%MAJOR_VERSION%%
 %%PORTDOCS%%%%DOCSDIR%%/README.analog
 %%PORTDOCS%%%%DOCSDIR%%/README.blocks
 %%PORTDOCS%%%%DOCSDIR%%/README.channels
 %%PORTDOCS%%%%DOCSDIR%%/README.dtv
 %%PORTDOCS%%%%DOCSDIR%%/README.fec
-%%PORTDOCS%%%%DOCSDIR%%/README.fft 
-%%PORTDOCS%%%%DOCSDIR%%/README.filter 
+%%PORTDOCS%%%%DOCSDIR%%/README.fft
+%%PORTDOCS%%%%DOCSDIR%%/README.filter
 %%PORTDOCS%%%%DOCSDIR%%/README.qtgui
 %%PORTDOCS%%%%DOCSDIR%%/README.uhd
 %%PORTDOCS%%%%DOCSDIR%%/README.vocoder
@@ -1678,42 +1646,6 @@ lib/libvolk.so.1.2.2
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Block.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Block.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Block.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Connection.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Connection.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Connection.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Constants.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Constants.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Constants.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Element.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Element.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Element.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/FlowGraph.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/FlowGraph.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/FlowGraph.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Param.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Param.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Param.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/ParseXML.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/ParseXML.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/ParseXML.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Platform.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Platform.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Platform.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Port.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Port.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/Port.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/__init__.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/block_tree.dtd
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/domain.dtd
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/flow_graph.dtd
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/odict.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/odict.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/base/odict.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/ActionHandler.py
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/ActionHandler.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/ActionHandler.pyo
@@ -1756,9 +1688,6 @@ lib/libvolk.so.1.2.2
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/MainWindow.py
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/MainWindow.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/MainWindow.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/Messages.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/Messages.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/Messages.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/NotebookPage.py
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/NotebookPage.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/NotebookPage.pyo
@@ -1792,45 +1721,6 @@ lib/libvolk.so.1.2.2
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/external_editor.py
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/external_editor.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/external_editor.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Block.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Block.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Block.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Connection.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Connection.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Connection.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Constants.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Constants.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Constants.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/FlowGraph.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/FlowGraph.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/FlowGraph.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Generator.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Generator.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Generator.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Param.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Param.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Param.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Platform.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Platform.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Platform.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Port.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Port.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Port.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/__init__.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/block.dtd
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/default_flow_graph.grc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/epy_block_io.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/epy_block_io.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/epy_block_io.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/expr_utils.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/expr_utils.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/expr_utils.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/extract_docs.py
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/extract_docs.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/extract_docs.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/flow_graph.tmpl
 %%PYTHON_SITELIBDIR%%/gnuradio/gru/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/gru/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/gru/__init__.pyo
@@ -2346,11 +2236,6 @@ libexec/gnuradio/grc_setup_freedesktop
 %%DATADIR%%/examples/filter/resampler_demo.grc
 %%DATADIR%%/examples/filter/synth_filter.py
 %%DATADIR%%/examples/filter/synth_to_chan.py
-%%DATADIR%%/examples/grc/simple/variable_config.grc
-%%DATADIR%%/examples/grc/xmlrpc/readme.txt
-%%DATADIR%%/examples/grc/xmlrpc/xmlrpc_client.grc
-%%DATADIR%%/examples/grc/xmlrpc/xmlrpc_client_script.py
-%%DATADIR%%/examples/grc/xmlrpc/xmlrpc_server.grc
 %%DATADIR%%/examples/metadata/file_metadata_sink.grc
 %%DATADIR%%/examples/metadata/file_metadata_source.grc
 %%DATADIR%%/examples/metadata/file_metadata_vector_sink.grc
@@ -2460,8 +2345,6 @@ libexec/gnuradio/grc_setup_freedesktop
 %%DATADIR%%/fec/ldpc/n_1300_k_0522_gap_30.alist
 %%DATADIR%%/fec/ldpc/n_1100_k_0442_gap_24.alist
 %%DATADIR%%/fec/ldpc/n_1800_k_0902_gap_28.alist
-%%DATADIR%%/fec/ldpc/n_2400_k_1198_gap_33.alist
-%%DATADIR%%/fec/ldpc/n_2400_k_1198_gen_matrix.alist
 %%DATADIR%%/fec/ldpc/simple_g_matrix.alist
 %%DATADIR%%/grc/blocks/analog_agc2_xx.xml
 %%DATADIR%%/grc/blocks/analog_agc3_xx.xml
@@ -3055,5 +2938,175 @@ libexec/gnuradio/grc_setup_freedesktop
 %%UHD%%%%DATADIR%%/grc/blocks/uhd_usrp_sink.xml
 %%UHD%%%%DATADIR%%/grc/blocks/uhd_usrp_source.xml
 %%UHD%%libdata/pkgconfig/gnuradio-uhd.pc
+include/gnuradio/blocks/multiply_by_tag_value_cc.h
+include/gnuradio/blocks/test_tag_variable_rate_ff.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/protocol_formatter_async.h
+include/gnuradio/digital/protocol_formatter_bb.h
+include/gnuradio/digital/protocol_parser_b.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/fec/alist.h
+include/gnuradio/fec/awgn_bp.h
+include/gnuradio/fec/cldpc.h
+include/gnuradio/fec/gf2mat.h
+include/gnuradio/fec/gf2vec.h
+include/gnuradio/qtgui/edit_box_msg.h
+include/volk/volk_16ic_convert_%%MAJOR_VERSION%%2fc.h
+include/volk/volk_16ic_x2_dot_prod_16ic.h
+include/volk/volk_16ic_x2_multiply_16ic.h
+include/volk/volk_%%MAJOR_VERSION%%2f_index_max_%%MAJOR_VERSION%%2u.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_convert_16ic.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_index_max_%%MAJOR_VERSION%%2u.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_x2_divide_%%MAJOR_VERSION%%2fc.h
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/__main__.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/__main__.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/__main__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Block.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Block.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Block.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Config.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Config.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Config.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Connection.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Connection.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Connection.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Constants.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Constants.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Constants.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Element.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Element.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Element.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/FlowGraph.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/FlowGraph.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/FlowGraph.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Messages.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Messages.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Messages.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Param.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Param.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Param.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/ParseXML.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/ParseXML.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/ParseXML.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Platform.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Platform.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Platform.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Port.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Port.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/Port.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/__init__.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/block.dtd
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/block_tree.dtd
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/default_flow_graph.grc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/domain.dtd
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/flow_graph.dtd
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/generator/FlowGraphProxy.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/generator/FlowGraphProxy.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/generator/FlowGraphProxy.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/generator/Generator.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/generator/Generator.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/generator/Generator.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/generator/__init__.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/generator/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/generator/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/generator/flow_graph.tmpl
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/__init__.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/complexity.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/complexity.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/complexity.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/epy_block_io.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/epy_block_io.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/epy_block_io.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/expr_utils.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/expr_utils.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/expr_utils.pyo
+%%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.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/odict.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/odict.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/core/utils/odict.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/Config.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/Config.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/Config.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/Executor.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/Executor.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/Executor.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/VariableEditor.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/VariableEditor.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/VariableEditor.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/main.py
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/main.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/grc/main.pyo
+%%DATADIR%%/examples/blocks/test_stream_mux_tags.grc
+%%DATADIR%%/examples/digital/packet/burst_tagger.grc
+%%DATADIR%%/examples/digital/packet/example_corr_est.grc
+%%DATADIR%%/examples/digital/packet/example_corr_est_and_clock_sync.grc
+%%DATADIR%%/examples/digital/packet/example_corr_est_and_phase_sync.grc
+%%DATADIR%%/examples/digital/packet/formatter_crc.grc
+%%DATADIR%%/examples/digital/packet/formatter_ofdm.grc
+%%DATADIR%%/examples/digital/packet/packet_loopback_hier.grc
+%%DATADIR%%/examples/digital/packet/packet_rx.grc
+%%DATADIR%%/examples/digital/packet/packet_tx.grc
+%%DATADIR%%/examples/digital/packet/simple_bpsk_tx.grc
+%%DATADIR%%/examples/digital/packet/transmitter_sim_hier.grc
+%%DATADIR%%/examples/digital/packet/tx_stage0.grc
+%%DATADIR%%/examples/digital/packet/tx_stage1.grc
+%%DATADIR%%/examples/digital/packet/tx_stage2.grc
+%%DATADIR%%/examples/digital/packet/tx_stage%%MAJOR_VERSION%%.grc
+%%DATADIR%%/examples/digital/packet/tx_stage4.grc
+%%DATADIR%%/examples/digital/packet/tx_stage5.grc
+%%DATADIR%%/examples/digital/packet/tx_stage6.grc
+%%DATADIR%%/examples/digital/packet/tx_stage6a.grc
+%%DATADIR%%/examples/digital/packet/uhd_packet_rx.grc
+%%DATADIR%%/examples/digital/packet/uhd_packet_rx_tun.grc
+%%DATADIR%%/examples/digital/packet/uhd_packet_tx.grc
+%%DATADIR%%/examples/digital/packet/uhd_packet_tx_tun.grc
+%%DATADIR%%/examples/dtv/README.catv
+%%DATADIR%%/examples/dtv/README.dvbs
+%%DATADIR%%/examples/dtv/README.dvbs2
+%%DATADIR%%/examples/dtv/README.dvbt
+%%DATADIR%%/examples/dtv/README.dvbt2
+%%DATADIR%%/examples/dtv/atsc_ctrlport_monitor.py
+%%DATADIR%%/examples/dtv/catv_tx_64qam.grc
+%%DATADIR%%/examples/dtv/dvbs2_tx.grc
+%%DATADIR%%/examples/dtv/dvbs_tx.grc
+%%DATADIR%%/examples/dtv/dvbt_rx_8k.grc
+%%DATADIR%%/examples/dtv/dvbt_tx_2k.grc
+%%DATADIR%%/examples/dtv/dvbt_tx_8k.grc
+%%DATADIR%%/examples/dtv/file_atsc_rx.grc
+%%DATADIR%%/examples/dtv/file_atsc_tx.grc
+%%DATADIR%%/examples/dtv/uhd_atsc_capture.grc
+%%DATADIR%%/examples/dtv/uhd_rx_atsc.grc
+%%DATADIR%%/examples/dtv/vv00%%MAJOR_VERSION%%-cr2%%MAJOR_VERSION%%.grc
+%%DATADIR%%/examples/dtv/vv009-4kfft.grc
+%%DATADIR%%/examples/dtv/vv018-miso.grc
+%%DATADIR%%/examples/qt-gui/display_qt
+%%DATADIR%%/examples/qt-gui/test_qtgui_msg.grc
+%%DATADIR%%/grc/blocks/blocks_multiply_by_tag_value_cc.xml
+%%DATADIR%%/grc/blocks/blocks_test_tag_variable_rate_ff.xml
+%%DATADIR%%/grc/blocks/digital_protocol_formatter_async.xml
+%%DATADIR%%/grc/blocks/digital_protocol_formatter_bb.xml
+%%DATADIR%%/grc/blocks/digital_protocol_parser_b.xml
+%%DATADIR%%/grc/blocks/dtv_catv_frame_sync_enc_bb.xml
+%%DATADIR%%/grc/blocks/dtv_catv_randomizer_bb.xml
+%%DATADIR%%/grc/blocks/dtv_catv_reed_solomon_enc_bb.xml
+%%DATADIR%%/grc/blocks/dtv_catv_transport_framing_enc_bb.xml
+%%DATADIR%%/grc/blocks/dtv_catv_trellis_enc_bb.xml
+%%DATADIR%%/grc/blocks/qtgui_edit_box_msg.xml
+%%DATADIR%%/grc/blocks/variable_header_format_default.xml
 @dir include/volk/asm/neon
 @dir include/volk/asm/orc