(pkgsrc)

 - Following patch added to give sphinx-build name (with ${PYVERSSUFFIX) attached)
   gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
 - Depending doxygen-1.8.9.1nb1 now
 - gnuradio-doxygen is updated 3.7.5.2nb1 to 3.7.6
(upstream)
 - Update gnuradio-* from 3.7.5.2 to 3.7.6
  ---------------------------------------
GNU Radio releases 3.7.6 and 3.7.5.2 are available for download:

   (several tens of lines omitted for URL and List of contributors)

Release 3.7.5.2 is a bug-fix only maintenance patch following 3.7.5.1,
and will be the last one for the 3.7.5 release.  Release 3.7.6
incorporates all these fixes and adds significant new features.

10 files changed, 203 insertions, 34 deletions

diff --git a/ham/gnuradio-companion/PLIST b/ham/gnuradio-companion/PLIST
index e96c31d508c..1cb41eac091 100644
--- a/ham/gnuradio-companion/PLIST
+++ b/ham/gnuradio-companion/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/10/28 06:41:20 mef Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/03/07 05:10:45 mef Exp $
 bin/gnuradio-companion
 ${PYSITELIB}/gnuradio/grc/__init__.py
 ${PYSITELIB}/gnuradio/grc/__init__.pyc
@@ -34,6 +34,7 @@ ${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
@@ -141,9 +142,6 @@ ${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/convert_hier.py
-${PYSITELIB}/gnuradio/grc/python/convert_hier.pyc
-${PYSITELIB}/gnuradio/grc/python/convert_hier.pyo
 ${PYSITELIB}/gnuradio/grc/python/default_flow_graph.grc
 ${PYSITELIB}/gnuradio/grc/python/expr_utils.py
 ${PYSITELIB}/gnuradio/grc/python/expr_utils.pyc
@@ -190,6 +188,8 @@ share/gnuradio/grc/blocks/bus_source.xml
 share/gnuradio/grc/blocks/bus_structure_sink.xml
 share/gnuradio/grc/blocks/bus_structure_source.xml
 share/gnuradio/grc/blocks/dummy.xml
+share/gnuradio/grc/blocks/gr_message_domain.xml
+share/gnuradio/grc/blocks/gr_stream_domain.xml
 share/gnuradio/grc/blocks/import.xml
 share/gnuradio/grc/blocks/note.xml
 share/gnuradio/grc/blocks/options.xml
diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common
index af696916381..d4598db2cb4 100644
--- a/ham/gnuradio-core/Makefile.common
+++ b/ham/gnuradio-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2015/01/26 00:43:45 mef Exp $
+# $NetBSD: Makefile.common,v 1.7 2015/03/07 05:10:45 mef Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -33,8 +33,7 @@
 
 DISTNAME?=	gnuradio-${VERSION}
 CATEGORIES+=	ham
-#ASTER_SITES?=	http://gnuradio.org/releases/gnuradio/
-MASTER_SITES?=	http://s3-dist.gnuradio.org/
+MASTER_SITES=  http://s3-dist.gnuradio.org/
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE?=	http://www.gnu.org/software/gnuradio/
@@ -108,6 +107,12 @@ SUBST_FILES.alsa+=	gr-audio/lib/CMakeLists.txt
 SUBST_SED.alsa=		-e 's,@@ALSA@@,${ALSA_ENABLED},'
 SUBST_STAGE.alsa=	post-patch
 
+SUBST_CLASSES+=		pyvers
+SUBST_FILES.pyvers=	cmake/Modules/FindSphinx.cmake
+SUBST_MESSAGE.pyvers=	Fix SPHINX_EXECUTABLE NAMES(sphinx-build)
+SUBST_VARS.pyvers+=	PYVERSSUFFIX
+SUBST_STAGE.pyvers=	pre-configure
+
 # REPLACE_PYTHON is some 600 files
 .include	"../../ham/gnuradio-core/files/REPLACE_PYTHON"
 
diff --git a/ham/gnuradio-core/Makefile.version b/ham/gnuradio-core/Makefile.version
index 82bf2592f9b..7f4947b2571 100644
--- a/ham/gnuradio-core/Makefile.version
+++ b/ham/gnuradio-core/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.4 2015/01/24 12:22:05 mef Exp $
+# $NetBSD: Makefile.version,v 1.5 2015/03/07 05:10:45 mef Exp $
 
-VERSION=        3.7.5.2
+VERSION=        3.7.6
diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST
index 834f211a47f..2cae50bbebc 100644
--- a/ham/gnuradio-core/PLIST
+++ b/ham/gnuradio-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2015/01/27 06:01:44 dbj Exp $
+@comment $NetBSD: PLIST,v 1.19 2015/03/07 05:10:45 mef Exp $
 bin/gnuradio-config-info
 bin/gr_filter_design
 bin/volk-config-info
@@ -494,12 +494,19 @@ 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_16u_byteswap.h
+include/volk/volk_16u_byteswappuppet_16u.h
 include/volk/volk_32f_accumulator_s32f.h
+include/volk/volk_32f_acos_32f.h
+include/volk/volk_32f_asin_32f.h
+include/volk/volk_32f_atan_32f.h
 include/volk/volk_32f_binary_slicer_32i.h
 include/volk/volk_32f_binary_slicer_8i.h
 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_invsqrt_32f.h
+include/volk/volk_32f_log2_32f.h
 include/volk/volk_32f_s32f_32f_fm_detect_32f.h
 include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f.h
 include/volk/volk_32f_s32f_convert_16i.h
@@ -509,8 +516,11 @@ 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_stddev_32f.h
+include/volk/volk_32f_sin_32f.h
 include/volk/volk_32f_sqrt_32f.h
 include/volk/volk_32f_stddev_and_mean_32f_x2.h
+include/volk/volk_32f_tan_32f.h
+include/volk/volk_32f_tanh_32f.h
 include/volk/volk_32f_x2_add_32f.h
 include/volk/volk_32f_x2_divide_32f.h
 include/volk/volk_32f_x2_dot_prod_16i.h
@@ -519,6 +529,7 @@ include/volk/volk_32f_x2_interleave_32fc.h
 include/volk/volk_32f_x2_max_32f.h
 include/volk/volk_32f_x2_min_32f.h
 include/volk/volk_32f_x2_multiply_32f.h
+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
@@ -552,12 +563,16 @@ include/volk/volk_32i_s32f_convert_32f.h
 include/volk/volk_32i_x2_and_32i.h
 include/volk/volk_32i_x2_or_32i.h
 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_64f_convert_32f.h
 include/volk/volk_64f_x2_max_64f.h
 include/volk/volk_64f_x2_min_64f.h
 include/volk/volk_64u_byteswap.h
+include/volk/volk_64u_byteswappuppet_64u.h
 include/volk/volk_64u_popcnt.h
+include/volk/volk_64u_popcntpuppet_64u.h
 include/volk/volk_8i_convert_16i.h
 include/volk/volk_8i_s32f_convert_32f.h
 include/volk/volk_8ic_deinterleave_16i_x2.h
@@ -898,6 +913,8 @@ share/gnuradio/examples/audio/multi_tone.py
 share/gnuradio/examples/audio/noise.py
 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/vector_source_with_tags.grc
 share/gnuradio/examples/filter/channelize.py
 share/gnuradio/examples/filter/chirp_channelize.py
 share/gnuradio/examples/filter/decimate.py
diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo
index 00df106080c..641a7798627 100644
--- a/ham/gnuradio-core/distinfo
+++ b/ham/gnuradio-core/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.19 2015/01/24 12:22:05 mef Exp $
+$NetBSD: distinfo,v 1.20 2015/03/07 05:10:45 mef Exp $
 
-SHA1 (gnuradio-3.7.5.2.tar.gz) = 9cbd04c0cf205e51bbed47c09ee0cb4861d1f885
-RMD160 (gnuradio-3.7.5.2.tar.gz) = ffff01d148b73ca498ea786a3d9f95996c53cb32
-Size (gnuradio-3.7.5.2.tar.gz) = 3550717 bytes
+SHA1 (gnuradio-3.7.6.tar.gz) = aaec56a3b9bfcf6bba1e4f7a9336579171811554
+RMD160 (gnuradio-3.7.6.tar.gz) = c0726c1c709c5414d4efa698f5396e6173862727
+Size (gnuradio-3.7.6.tar.gz) = 3579734 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
diff --git a/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake b/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
new file mode 100644
index 00000000000..4473cd6c75a
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
@@ -0,0 +1,17 @@
+$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.
+(The problem without this fix is in gnuradio-doxygen).
+
+--- cmake/Modules/FindSphinx.cmake.orig	2013-05-02 08:57:50.000000000 +0900
++++ cmake/Modules/FindSphinx.cmake	2015-03-06 22:08:44.000000000 +0900
+@@ -19,7 +19,7 @@
+ # (To distribute this file outside of CMake, substitute the full
+ #  License text for the above reference.)
+ 
+-find_program(SPHINX_EXECUTABLE NAMES sphinx-build
++find_program(SPHINX_EXECUTABLE NAMES sphinx-build@PYVERSSUFFIX@
+   HINTS
+   $ENV{SPHINX_DIR}
+   PATH_SUFFIXES bin
diff --git a/ham/gnuradio-doxygen/Makefile b/ham/gnuradio-doxygen/Makefile
index 1addfca0b4e..304e126b348 100644
--- a/ham/gnuradio-doxygen/Makefile
+++ b/ham/gnuradio-doxygen/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/01/28 00:57:27 mef Exp $
+# $NetBSD: Makefile,v 1.5 2015/03/07 05:10:45 mef Exp $
 
 PKGNAME=	gnuradio-doxygen-${VERSION}
-PKGREVISION=	1
 COMMENT=	Doxygen documentation of GNU Radio
 
 .include	"../../ham/gnuradio-core/Makefile.common"
diff --git a/ham/gnuradio-doxygen/PLIST b/ham/gnuradio-doxygen/PLIST
index f224b6f3436..aef0651edfd 100644
--- a/ham/gnuradio-doxygen/PLIST
+++ b/ham/gnuradio-doxygen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/01/31 00:28:19 mef Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/03/07 05:10:45 mef Exp $
 share/doc/gnuradio-${PKGVERSION}/dial_tone.py
 share/doc/gnuradio-${PKGVERSION}/fm_demod.py
 share/doc/gnuradio-${PKGVERSION}/fm_rx.grc
@@ -3304,6 +3304,7 @@ share/doc/gnuradio-${PKGVERSION}/html/consts_8h__dep__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/consts_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/consts_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/control__loop_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/control__loop_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/control__loop_8h__dep__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/control__loop_8h__dep__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/control__loop_8h__dep__incl.png
@@ -6210,7 +6211,9 @@ share/doc/gnuradio-${PKGVERSION}/html/navtreeindex45.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex46.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex47.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex48.js
+share/doc/gnuradio-${PKGVERSION}/html/navtreeindex49.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex5.js
+share/doc/gnuradio-${PKGVERSION}/html/navtreeindex50.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex6.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex7.js
 share/doc/gnuradio-${PKGVERSION}/html/navtreeindex8.js
@@ -8676,15 +8679,41 @@ share/doc/gnuradio-${PKGVERSION}/html/volk__16ic__s32f__magnitude__32f_8h__incl.
 share/doc/gnuradio-${PKGVERSION}/html/volk__16ic__s32f__magnitude__32f_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswap_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswap_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswap_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswap_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswap_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswap_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswap_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswap_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswap_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswappuppet__16u_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswappuppet__16u_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswappuppet__16u_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswappuppet__16u_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__16u__byteswappuppet__16u_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__accumulator__s32f_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__accumulator__s32f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__accumulator__s32f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__accumulator__s32f_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__accumulator__s32f_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__acos__32f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__acos__32f_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__acos__32f_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__acos__32f_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__acos__32f_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__acos__32f_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__asin__32f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__asin__32f_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__asin__32f_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__asin__32f_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__asin__32f_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__asin__32f_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__atan__32f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__atan__32f_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__atan__32f_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__atan__32f_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__atan__32f_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__atan__32f_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__binary__slicer__32i_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__binary__slicer__32i_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__binary__slicer__8i_8h.html
@@ -8695,6 +8724,18 @@ share/doc/gnuradio-${PKGVERSION}/html/volk__32f__convert__64f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__convert__64f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__convert__64f_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__convert__64f_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__cos__32f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__cos__32f_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__cos__32f_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__cos__32f_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__cos__32f_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__cos__32f_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__expfast__32f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__expfast__32f_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__expfast__32f_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__expfast__32f_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__expfast__32f_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__expfast__32f_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__index__max__16u_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__index__max__16u_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__index__max__16u_8h__incl.md5
@@ -8706,6 +8747,12 @@ share/doc/gnuradio-${PKGVERSION}/html/volk__32f__invsqrt__32f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__invsqrt__32f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__invsqrt__32f_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__invsqrt__32f_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__log2__32f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__log2__32f_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__log2__32f_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__log2__32f_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__log2__32f_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__log2__32f_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__s32f__32f__fm__detect__32f_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__s32f__32f__fm__detect__32f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__s32f__32f__fm__detect__32f_8h__incl.md5
@@ -8755,6 +8802,12 @@ share/doc/gnuradio-${PKGVERSION}/html/volk__32f__s32f__stddev__32f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__s32f__stddev__32f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__s32f__stddev__32f_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__s32f__stddev__32f_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__sin__32f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__sin__32f_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__sin__32f_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__sin__32f_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__sin__32f_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__sin__32f_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__sqrt__32f_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__sqrt__32f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__sqrt__32f_8h__incl.md5
@@ -8765,6 +8818,17 @@ share/doc/gnuradio-${PKGVERSION}/html/volk__32f__stddev__and__mean__32f__x2_8h__
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__stddev__and__mean__32f__x2_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__stddev__and__mean__32f__x2_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__stddev__and__mean__32f__x2_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__tan__32f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__tan__32f_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__tan__32f_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__tan__32f_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__tan__32f_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__tan__32f_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__tanh__32f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__tanh__32f_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__tanh__32f_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__tanh__32f_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__tanh__32f_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__add__32f_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__add__32f_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__add__32f_8h__incl.map
@@ -8808,6 +8872,12 @@ share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__multiply__32f_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__multiply__32f_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__multiply__32f_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__multiply__32f_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__pow__32f_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__pow__32f_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__pow__32f_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__pow__32f_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__pow__32f_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__pow__32f_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__s32f__interleave__16ic_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__s32f__interleave__16ic_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__32f__x2__s32f__interleave__16ic_8h__incl.md5
@@ -8986,15 +9056,31 @@ share/doc/gnuradio-${PKGVERSION}/html/volk__32i__x2__or__32i_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__32i__x2__or__32i_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswap_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswap_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswap_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswap_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswap_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswap_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswap_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswap_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswap_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswappuppet__32u_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswappuppet__32u_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswappuppet__32u_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswappuppet__32u_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__byteswappuppet__32u_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcnt_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcnt_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcnt_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcnt_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcnt_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcnt_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcnt_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcnt_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcntpuppet__32u_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcntpuppet__32u_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcntpuppet__32u_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcntpuppet__32u_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__32u__popcntpuppet__32u_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__64f__convert__32f_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__64f__convert__32f_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/volk__64f__convert__32f_8h__incl.map
@@ -9013,15 +9099,31 @@ share/doc/gnuradio-${PKGVERSION}/html/volk__64f__x2__min__64f_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__64f__x2__min__64f_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswap_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswap_8h.js
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswap_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswap_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswap_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswap_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswap_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswap_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswap_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswappuppet__64u_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswappuppet__64u_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswappuppet__64u_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswappuppet__64u_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__byteswappuppet__64u_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcnt_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcnt_8h__dep__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcnt_8h__dep__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcnt_8h__dep__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcnt_8h__incl.map
 share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcnt_8h__incl.md5
 share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcnt_8h__incl.png
 share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcnt_8h_source.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcntpuppet__64u_8h.html
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcntpuppet__64u_8h__incl.map
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcntpuppet__64u_8h__incl.md5
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcntpuppet__64u_8h__incl.png
+share/doc/gnuradio-${PKGVERSION}/html/volk__64u__popcntpuppet__64u_8h_source.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__8i__convert__16i_8h.html
 share/doc/gnuradio-${PKGVERSION}/html/volk__8i__convert__16i_8h.js
 share/doc/gnuradio-${PKGVERSION}/html/volk__8i__convert__16i_8h__incl.map
@@ -11154,12 +11256,19 @@ share/doc/gnuradio-${PKGVERSION}/xml/volk__16ic__s32f__deinterleave__32f__x2_8h.
 share/doc/gnuradio-${PKGVERSION}/xml/volk__16ic__s32f__deinterleave__real__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__16ic__s32f__magnitude__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__16u__byteswap_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__16u__byteswappuppet__16u_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__accumulator__s32f_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__acos__32f_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__asin__32f_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__atan__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__binary__slicer__32i_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__binary__slicer__8i_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__convert__64f_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__cos__32f_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__expfast__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__index__max__16u_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__invsqrt__32f_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__log2__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__s32f__32f__fm__detect__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__s32f__calc__spectral__noise__floor__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__s32f__convert__16i_8h.xml
@@ -11169,8 +11278,11 @@ share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__s32f__multiply__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__s32f__normalize_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__s32f__power__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__s32f__stddev__32f_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__sin__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__sqrt__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__stddev__and__mean__32f__x2_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__tan__32f_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__tanh__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__x2__add__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__x2__divide__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__x2__dot__prod__16i_8h.xml
@@ -11179,6 +11291,7 @@ share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__x2__interleave__32fc_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__x2__max__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__x2__min__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__x2__multiply__32f_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__x2__pow__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__x2__s32f__interleave__16ic_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__x2__subtract__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32f__x3__sum__of__poly__32f_8h.xml
@@ -11212,12 +11325,16 @@ share/doc/gnuradio-${PKGVERSION}/xml/volk__32i__s32f__convert__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32i__x2__and__32i_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32i__x2__or__32i_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32u__byteswap_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32u__byteswappuppet__32u_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__32u__popcnt_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__32u__popcntpuppet__32u_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__64f__convert__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__64f__x2__max__64f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__64f__x2__min__64f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__64u__byteswap_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__64u__byteswappuppet__64u_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__64u__popcnt_8h.xml
+share/doc/gnuradio-${PKGVERSION}/xml/volk__64u__popcntpuppet__64u_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__8i__convert__16i_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__8i__s32f__convert__32f_8h.xml
 share/doc/gnuradio-${PKGVERSION}/xml/volk__8ic__deinterleave__16i__x2_8h.xml
diff --git a/ham/gnuradio-qtgui/PLIST b/ham/gnuradio-qtgui/PLIST
index cd932580819..52996abb134 100644
--- a/ham/gnuradio-qtgui/PLIST
+++ b/ham/gnuradio-qtgui/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2014/10/28 16:59:33 mef Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/03/07 05:10:45 mef Exp $
 bin/gr_constellation_plot
 bin/gr_psd_plot_b
 bin/gr_psd_plot_c
 bin/gr_psd_plot_f
 bin/gr_psd_plot_i
 bin/gr_psd_plot_s
+bin/gr_spectrogram_plot
 bin/gr_spectrogram_plot_b
 bin/gr_spectrogram_plot_c
 bin/gr_spectrogram_plot_f
@@ -17,7 +18,6 @@ bin/gr_time_plot_i
 bin/gr_time_plot_s
 bin/gr_time_raster_b
 bin/gr_time_raster_f
-share/examples/gnuradio/conf.d/gr-qtgui.conf
 include/gnuradio/qtgui/CMakeLists.txt
 include/gnuradio/qtgui/ConstellationDisplayPlot.h
 include/gnuradio/qtgui/DisplayPlot.h
@@ -109,6 +109,7 @@ ${PYSITELIB}/gnuradio/qtgui/qtgui_swig.py
 ${PYSITELIB}/gnuradio/qtgui/qtgui_swig.pyc
 ${PYSITELIB}/gnuradio/qtgui/qtgui_swig.pyo
 share/doc/gnuradio-${PKGVERSION}/README.qtgui
+share/examples/gnuradio/conf.d/gr-qtgui.conf
 share/gnuradio/examples/qt-gui/alt.qss
 share/gnuradio/examples/qt-gui/dark.qss
 share/gnuradio/examples/qt-gui/pyqt_const_c.py
diff --git a/ham/gnuradio-trellis/PLIST b/ham/gnuradio-trellis/PLIST
index 6dd1e1ca436..a33f93390a9 100644
--- a/ham/gnuradio-trellis/PLIST
+++ b/ham/gnuradio-trellis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2015/01/03 14:18:13 mef Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/03/07 05:10:45 mef Exp $
 include/gnuradio/swig/trellis_swig.i
 include/gnuradio/swig/trellis_swig_doc.i
 include/gnuradio/trellis/api.h
@@ -75,45 +75,57 @@ ${PYSITELIB}/gnuradio/trellis/__init__.py
 ${PYSITELIB}/gnuradio/trellis/__init__.pyc
 ${PYSITELIB}/gnuradio/trellis/__init__.pyo
 ${PYSITELIB}/gnuradio/trellis/_trellis_swig.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
+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
-share/doc/gnuradio-${PKGVERSION}/html/gr-trellis.html
 share/gnuradio/examples/trellis/README
+share/gnuradio/examples/trellis/fsm_files/awgn1o1_16rsc.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn1o1_4rsc.fsm
 share/gnuradio/examples/trellis/fsm_files/awgn1o2_128.fsm
 share/gnuradio/examples/trellis/fsm_files/awgn1o2_16.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn1o2_16rsc.fsm
 share/gnuradio/examples/trellis/fsm_files/awgn1o2_4.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn1o2_4rsc.fsm
 share/gnuradio/examples/trellis/fsm_files/awgn1o2_8.fsm
 share/gnuradio/examples/trellis/fsm_files/awgn2o3_16.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_16ungerboeck.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_16ungerboecka.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_32ungerboeck.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_32ungerboecka.fsm
 share/gnuradio/examples/trellis/fsm_files/awgn2o3_4.fsm
 share/gnuradio/examples/trellis/fsm_files/awgn2o3_4_msb.fsm
 share/gnuradio/examples/trellis/fsm_files/awgn2o3_4_msbG.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_4ungerboeck.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_4ungerboecka.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_64ungerboeck.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_64ungerboecka.fsm
 share/gnuradio/examples/trellis/fsm_files/awgn2o3_8.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_8ungerboeck.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_8ungerboecka.fsm
 share/gnuradio/examples/trellis/fsm_files/awgn2o4_4.fsm
 share/gnuradio/examples/trellis/fsm_files/disconnected.fsm
+share/gnuradio/examples/trellis/fsm_files/irregular.fsm
+share/gnuradio/examples/trellis/fsm_files/joint_16_16.fsm
+share/gnuradio/examples/trellis/fsm_files/joint_4_16.fsm
 share/gnuradio/examples/trellis/fsm_files/rep3.fsm
 share/gnuradio/examples/trellis/fsm_files/rep5.fsm
 share/gnuradio/examples/trellis/fsm_files/simple.fsm
-share/gnuradio/examples/trellis/fsm_utils.py
+share/gnuradio/examples/trellis/fsm_files/uncoded4.fsm
 share/gnuradio/examples/trellis/interference_cancellation.grc
 share/gnuradio/examples/trellis/pccc.grc
-share/gnuradio/examples/trellis/pccc1.grc
 share/gnuradio/examples/trellis/readme.txt
 share/gnuradio/examples/trellis/sccc.grc
-share/gnuradio/examples/trellis/sccc1.grc
-share/gnuradio/examples/trellis/test_sccc_hard.py
-share/gnuradio/examples/trellis/test_sccc_soft.py
-share/gnuradio/examples/trellis/test_sccc_turbo.py
+share/gnuradio/examples/trellis/tcm.grc
+share/gnuradio/examples/trellis/test_cpm.py
 share/gnuradio/examples/trellis/test_tcm.py
-share/gnuradio/examples/trellis/test_tcm_combined.py
-share/gnuradio/examples/trellis/test_tcm_parallel.py
-share/gnuradio/examples/trellis/test_turbo_equalization.py
-share/gnuradio/examples/trellis/test_turbo_equalization1.py
-share/gnuradio/examples/trellis/test_turbo_equalization2.py
-share/gnuradio/examples/trellis/test_viterbi_equalization.py
-share/gnuradio/examples/trellis/test_viterbi_equalization1.py
+share/gnuradio/examples/trellis/turbo_equalization.grc
+share/gnuradio/examples/trellis/viterbi_equalization.grc
 share/gnuradio/grc/blocks/trellis_encoder_xx.xml
 share/gnuradio/grc/blocks/trellis_metrics_x.xml
 share/gnuradio/grc/blocks/trellis_pccc_decoder_combined_xx.xml