Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Feb 2018 18:23:31 +0000 (UTC)
From:      Diane Bruce <db@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r462342 - in head/comms/gnuradio: . files
Message-ID:  <201802191823.w1JINV0F062126@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: db
Date: Mon Feb 19 18:23:31 2018
New Revision: 462342
URL: https://svnweb.freebsd.org/changeset/ports/462342

Log:
  ChangeLog v3.7.11
  =================
  
  This is a feature release of the 3.7 API series, and incorporates all
  the bug fixes implemented in the 3.7.10.2 maintenance release.
  
  Contributors
  ------------
  
  The following list of people directly contributed code to this
  release and the incorporated maintenance release:
  
  * A. Maitland Bottoms <bottoms@debian.org>
  * Alexandru Csete <oz9aec@gmail.com>
  * Andrej Rode <andrej.rode@ettus.com>
  * Andy Walls <awalls.cx18@gmail.com>
  * Artem Pisarenko <ArtemPisarenko@users.noreply.github.com>
  * Bastian Bloessl <bloessl@ccs-labs.org>
  * Ben Hilburn <ben.hilburn@ettus.com>
  * Bob Iannucci <bob@sv.cmu.edu>
  * Chris Kuethe <chris.kuethe+github@gmail.com>
  * Christopher Chavez <chrischavez@gmx.us>
  * Clayton Smith <argilo@gmail.com>
  * Darek Kawamoto <darek@he360.com>
  * Ethan Trewhitt <ethan.trewhitt@gtri.gatech.edu>
  * Geof Gnieboer <gnieboer@corpcomm.net>
  * Hatsune Aru <email witheld>
  * Jacob Gilbert <mrjacobagilbert@gmail.com>
  * Jiří Pinkava <j-pi@seznam.cz>
  * Johannes Demel <demel@ant.uni-bremen.de>
  * Johannes Schmitz <johannes.schmitz1@gmail.com>
  * Johnathan Corgan <johnathan@corganlabs.com>
  * Jonathan Brucker <jonathan.brucke@gmail.com>
  * Josh Blum <josh@joshknows.com>
  * Kartik Patel <kartikpatel1995@gmail.com>
  * Konstantin Mochalov <incredible.angst@gmail.com>
  * Kyle Unice <kyle.unice@L-3com.com>
  * Marcus Müller <marcus@hostalia.de>
  * Martin Braun <martin.braun@ettus.com>
  * Michael De Nil <michael@morsemicro.com>
  * Michael Dickens <michael.dickens@ettus.com>
  * Nathan West <nathan.west@gnuradio.org>
  * Nicholas Corgan <n.corgan@gmail.com>
  * Nick Foster <bistromath@gmail.com>
  * Nicolas Cuervo <nicolas.cuervo@ettus.com>
  * Paul Cercueil <paul.cercueil@analog.com>
  * Pedro Lobo <pedro.lobo@upm.es>
  * Peter Horvath <ejcspii@gmail.com>
  * Philip Balister <philip@balister.org>
  * Ron Economos <w6rz@comcast.net>
  * Sean Nowlan <nowlans@ieee.org>
  * Sebastian Koslowski <koslowski@kit.edu>
  * Sebastian Müller <senpo@posteo.de>
  * Stephen Larew <stephen@slarew.net>
  * Sylvain Munaut <tnt@246tNt.com>
  * Thomas Habets <habets@google.com>
  * Tim O'Shea <tim.oshea753@gmail.com>
  * Tobias Blomberg <email witheld>
  
  Changes
  =======
  
  The GNU Radio project tracks changes via Github pull requests.  You
  can get details on each of the below by going to:
  
  https://github.com/gnuradio/gnuradio
  
  Note: Please see the release notes for 3.7.10.2 for details on the bug
  fixes included in this release.
  
  ### gnuradio-runtime
  
  * \#1077 Support dynamically loaded gnuradio installs (Josh Blum)
  
  ### gnuradio-companion
  
  * \#1118 Support vector types in embedded Python blocks (Clayton Smith)
  
  ### gr-audio
  
  * \#1051 Re-implemented defunct Windows audio source (Geof Gnieboer)
  * \#1052 Implemented block in Windows audio sink (Geof Gnieboer)
  
  ### gr-blocks
  
  * \#896 Added PDU block setters and GRC callbacks (Jacob Gilbert)
  * \#900 Exposed non-vector multiply const to GRC (Ron Economos)
  * \#903 Deprecated old-style message queue blocks (Johnathan Corgan)
  * \#1067 Deprecated blks2 namespace blocks (Johnathan Corgan)
  
  ### gr-digital
  
  * \#910 Deprecated correlate_and_sync block 3.8 (Johnathan Corgan)
  * \#912 Deprecated modulation blocks for 3.8 (Sebastian Müller)
  * \#1069 Improved build memory usage with swig split (Michael Dickens)
  * \#1097 Deprecated mpsk_receiver_cc block (Johnathan Corgan)
  * \#1099 Deprecated old-style OFDM receiver blocks (Martin Braun)
  
  ### gr-dtv
  
  * \#875 Added ability to cross-compile gr-dtv (Ron Economos)
  * \#876 Improved ATSC transmitter performance (Ron Economos)
  * \#894 Refactored DVB-T RS decoder to use gr-fec (Ron Economos)
  * \#898 Improved error handling and logging (Ron Economos)
  * \#900 Improved DVB-T performance (Ron Economos)
  * \#907 Updated examples to use QT (Ron Economos)
  * \#1025 Refactor DVB-T2 interleaver (Ron Economos)
  
  ### gr-filter
  
  * \#885 Added set parameter msg port to fractional resampler (Sebastian Müller)
  
  ### gr-trellis
  
  * \#908 Updated examples to use QT (Martin Braun)
  
  ### gr-uhd
  
  * \#872 Added relative phase plots to uhd_fft (Martin Braun)
  * \#1032 Replace zero-timeout double-recv() with one recv() (Martin Braun)
  * \#1053 UHD apps may now specify multiple subdevs (Martin Braun)
  * \#1101 Support TwinRX LO sharing parameters (Andrej Rode)
  * \#1139 Use UHD internal normalized gain methods (Martin Braun)
  
  ### gr-utils
  
  * \#897 Improved python docstring generation in gr_modtool

Deleted:
  head/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc
  head/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
  head/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion
Modified:
  head/comms/gnuradio/Makefile
  head/comms/gnuradio/distinfo
  head/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
  head/comms/gnuradio/pkg-plist

Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile	Mon Feb 19 18:04:10 2018	(r462341)
+++ head/comms/gnuradio/Makefile	Mon Feb 19 18:23:31 2018	(r462342)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnuradio
-PORTVERSION=	3.7.10.1
-PORTREVISION=	10
+PORTVERSION=	3.7.11
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
 		LOCAL/db
@@ -16,16 +15,17 @@ BROKEN_aarch64=		fails to compile: /usr/lib/clang/5.0.
 BROKEN_armv6=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
 BROKEN_armv7=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
 
-BUILD_DEPENDS=	sdl-config:devel/sdl12 \
-		swig3.0:devel/swig30 \
-		cheetah:devel/py-cheetah@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
-		xdg-open:devel/xdg-utils \
-		guile:lang/guile \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+		${PYNUMPY} \
+		${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${PY_FLAVOR} \
 		aconnect:audio/alsa-utils \
+		cheetah:devel/py-cheetah@${PY_FLAVOR} \
 		git:devel/git \
-		${PYNUMPY} \
-		${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${PY_FLAVOR}
+		guile:lang/guile \
+		minixmlto:textproc/minixmlto \
+		sdl-config:devel/sdl12 \
+		swig3.0:devel/swig30 \
+		xdg-open:devel/xdg-utils
 LIB_DEPENDS=	libcppunit.so:devel/cppunit \
 		libcodec2.so:audio/codec2 \
 		libfftw3.so:math/fftw3 \
@@ -45,17 +45,18 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 # volk/lib/volk_cpu.c: In function 'i_can_has_3dnow':
 # 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 pyqt:4 python:2.7 shebangfix
+USES=		cmake:outsource compiler:c11 fortran iconv perl5 pkgconfig pyqt:4 python:2.7 shebangfix
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
-CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig3.0"\
-		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
-		-DICONV_LIB:STRING="X${ICONV_LIB}" \
+CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 		-DENABLE_GR_CTRLPORT="YES" \
+		-DICONV_LIB:STRING="X${ICONV_LIB}" \
+		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DLOCALBASE:STRING="${LOCALBASE}" \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \
-		-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}"
+		-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig3.0"\
+		-DXMLTO_EXECUTABLE:STRING=minixmlto
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 MAJOR_SUB_VER=	${PORTVERSION}

Modified: head/comms/gnuradio/distinfo
==============================================================================
--- head/comms/gnuradio/distinfo	Mon Feb 19 18:04:10 2018	(r462341)
+++ head/comms/gnuradio/distinfo	Mon Feb 19 18:23:31 2018	(r462342)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482969389
-SHA256 (gnuradio-3.7.10.1.tar.gz) = 63d7b65cc4abe22f47b8f41caaf7370a0a502b91e36e29901ba03e8838ab4937
-SIZE (gnuradio-3.7.10.1.tar.gz) = 4272430
+TIMESTAMP = 1516377322
+SHA256 (gnuradio-3.7.11.tar.gz) = 87d9ba3183858efdbb237add3f9de40f7d65f25e16904a9bc8d764a7287252d4
+SIZE (gnuradio-3.7.11.tar.gz) = 4357123

Modified: head/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt	Mon Feb 19 18:04:10 2018	(r462341)
+++ head/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt	Mon Feb 19 18:23:31 2018	(r462342)
@@ -1,4 +1,4 @@
---- gr-digital/doc/CMakeLists.txt.orig	2016-09-02 04:16:13 UTC
+--- 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,

Modified: head/comms/gnuradio/pkg-plist
==============================================================================
--- head/comms/gnuradio/pkg-plist	Mon Feb 19 18:04:10 2018	(r462341)
+++ head/comms/gnuradio/pkg-plist	Mon Feb 19 18:23:31 2018	(r462342)
@@ -43,11 +43,11 @@ bin/gr_time_raster_b
 bin/gr_time_raster_f
 bin/grcc
 bin/polar_channel_construction
-%%UHD%%bin/uhd_fft
-%%UHD%%bin/uhd_rx_cfile
-%%UHD%%bin/uhd_rx_nogui
-%%UHD%%bin/uhd_siggen
-%%UHD%%bin/uhd_siggen_gui
+bin/uhd_fft
+bin/uhd_rx_cfile
+bin/uhd_rx_nogui
+bin/uhd_siggen
+bin/uhd_siggen_gui
 bin/usrp_flex
 bin/usrp_flex_all
 bin/usrp_flex_band
@@ -55,20 +55,20 @@ bin/volk-config-info
 bin/volk_modtool
 bin/volk_profile
 %%ETCDIR%%/conf.d/gnuradio-runtime.conf
-@sample %%ETCDIR%%/conf.d/gr-audio-alsa.conf
-@sample %%ETCDIR%%/conf.d/gr-audio-jack.conf
-@sample %%ETCDIR%%/conf.d/gr-audio-oss.conf
-@sample %%ETCDIR%%/conf.d/gr-audio-portaudio.conf
-@sample %%ETCDIR%%/conf.d/gr-audio.conf
-@sample %%ETCDIR%%/conf.d/gr-qtgui.conf
-@sample %%ETCDIR%%/conf.d/gr-wxgui.conf
-@sample %%ETCDIR%%/conf.d/grc.conf
-@sample %%ETCDIR%%/conf.d/modtool.conf
+%%ETCDIR%%/conf.d/gr-audio-alsa.conf
+%%ETCDIR%%/conf.d/gr-audio-jack.conf
+%%ETCDIR%%/conf.d/gr-audio-oss.conf
+%%ETCDIR%%/conf.d/gr-audio-portaudio.conf
+%%ETCDIR%%/conf.d/gr-audio.conf
+%%ETCDIR%%/conf.d/gr-qtgui.conf
+%%ETCDIR%%/conf.d/gr-wxgui.conf
+%%ETCDIR%%/conf.d/grc.conf
+%%ETCDIR%%/conf.d/modtool.conf
 include/gnuradio/analog/agc.h
 include/gnuradio/analog/agc2.h
 include/gnuradio/analog/agc2_cc.h
 include/gnuradio/analog/agc2_ff.h
-include/gnuradio/analog/agc3_cc.h
+include/gnuradio/analog/agc%%MAJOR_VERSION%%_cc.h
 include/gnuradio/analog/agc_cc.h
 include/gnuradio/analog/agc_ff.h
 include/gnuradio/analog/api.h
@@ -203,7 +203,7 @@ include/gnuradio/blocks/bin_statistics_f.h
 include/gnuradio/blocks/burst_tagger.h
 include/gnuradio/blocks/char_to_float.h
 include/gnuradio/blocks/char_to_short.h
-include/gnuradio/blocks/check_lfsr_32k_s.h
+include/gnuradio/blocks/check_lfsr_%%MAJOR_VERSION%%2k_s.h
 include/gnuradio/blocks/complex_to_arg.h
 include/gnuradio/blocks/complex_to_float.h
 include/gnuradio/blocks/complex_to_imag.h
@@ -253,8 +253,8 @@ include/gnuradio/blocks/interleaved_short_to_complex.h
 include/gnuradio/blocks/keep_m_in_n.h
 include/gnuradio/blocks/keep_one_in_n.h
 include/gnuradio/blocks/lfsr_15_1_0.h
-include/gnuradio/blocks/lfsr_32k.h
-include/gnuradio/blocks/lfsr_32k_source_s.h
+include/gnuradio/blocks/lfsr_%%MAJOR_VERSION%%2k.h
+include/gnuradio/blocks/lfsr_%%MAJOR_VERSION%%2k_source_s.h
 include/gnuradio/blocks/log2_const.h
 include/gnuradio/blocks/magphase_to_complex.h
 include/gnuradio/blocks/max_ff.h
@@ -273,6 +273,7 @@ include/gnuradio/blocks/moving_average_cc.h
 include/gnuradio/blocks/moving_average_ff.h
 include/gnuradio/blocks/moving_average_ii.h
 include/gnuradio/blocks/moving_average_ss.h
+include/gnuradio/blocks/multiply_by_tag_value_cc.h
 include/gnuradio/blocks/multiply_cc.h
 include/gnuradio/blocks/multiply_conjugate_cc.h
 include/gnuradio/blocks/multiply_const_cc.h
@@ -364,6 +365,8 @@ include/gnuradio/blocks/tagged_stream_multiply_length.
 include/gnuradio/blocks/tagged_stream_mux.h
 include/gnuradio/blocks/tagged_stream_to_pdu.h
 include/gnuradio/blocks/tags_strobe.h
+include/gnuradio/blocks/tcp_server_sink.h
+include/gnuradio/blocks/test_tag_variable_rate_ff.h
 include/gnuradio/blocks/threshold_ff.h
 include/gnuradio/blocks/throttle.h
 include/gnuradio/blocks/transcendental.h
@@ -441,9 +444,9 @@ include/gnuradio/digital/correlate_access_code_tag_bb.
 include/gnuradio/digital/correlate_and_sync_cc.h
 include/gnuradio/digital/costas_loop_cc.h
 include/gnuradio/digital/cpmmod_bc.h
-include/gnuradio/digital/crc32.h
-include/gnuradio/digital/crc32_async_bb.h
-include/gnuradio/digital/crc32_bb.h
+include/gnuradio/digital/crc%%MAJOR_VERSION%%2.h
+include/gnuradio/digital/crc%%MAJOR_VERSION%%2_async_bb.h
+include/gnuradio/digital/crc%%MAJOR_VERSION%%2_bb.h
 include/gnuradio/digital/descrambler_bb.h
 include/gnuradio/digital/diff_decoder_bb.h
 include/gnuradio/digital/diff_encoder_bb.h
@@ -455,6 +458,12 @@ include/gnuradio/digital/glfsr_source_b.h
 include/gnuradio/digital/glfsr_source_f.h
 include/gnuradio/digital/hdlc_deframer_bp.h
 include/gnuradio/digital/hdlc_framer_pb.h
+include/gnuradio/digital/header_buffer.h
+include/gnuradio/digital/header_format_base.h
+include/gnuradio/digital/header_format_counter.h
+include/gnuradio/digital/header_format_crc.h
+include/gnuradio/digital/header_format_default.h
+include/gnuradio/digital/header_format_ofdm.h
 include/gnuradio/digital/header_payload_demux.h
 include/gnuradio/digital/kurtotic_equalizer_cc.h
 include/gnuradio/digital/lfsr.h
@@ -490,6 +499,9 @@ include/gnuradio/digital/pfb_clock_sync_fff.h
 include/gnuradio/digital/pn_correlator_cc.h
 include/gnuradio/digital/probe_density_b.h
 include/gnuradio/digital/probe_mpsk_snr_est_c.h
+include/gnuradio/digital/protocol_formatter_async.h
+include/gnuradio/digital/protocol_formatter_bb.h
+include/gnuradio/digital/protocol_parser_b.h
 include/gnuradio/digital/scrambler_bb.h
 include/gnuradio/digital/simple_correlator.h
 include/gnuradio/digital/simple_framer.h
@@ -511,6 +523,11 @@ 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_frame_sync_enc_bb.h
+include/gnuradio/dtv/catv_randomizer_bb.h
+include/gnuradio/dtv/catv_reed_solomon_enc_bb.h
+include/gnuradio/dtv/catv_transport_framing_enc_bb.h
+include/gnuradio/dtv/catv_trellis_enc_bb.h
 include/gnuradio/dtv/dvb_bbheader_bb.h
 include/gnuradio/dtv/dvb_bbscrambler_bb.h
 include/gnuradio/dtv/dvb_bch_bb.h
@@ -551,14 +568,17 @@ include/gnuradio/endianness.h
 include/gnuradio/expj.h
 include/gnuradio/fcd/api.h
 include/gnuradio/fcd/source_c.h
+include/gnuradio/fec/alist.h
 include/gnuradio/fec/api.h
 include/gnuradio/fec/async_decoder.h
 include/gnuradio/fec/async_encoder.h
+include/gnuradio/fec/awgn_bp.h
 include/gnuradio/fec/ber_bf.h
 include/gnuradio/fec/cc_common.h
 include/gnuradio/fec/cc_decoder.h
 include/gnuradio/fec/cc_encoder.h
 include/gnuradio/fec/ccsds_encoder.h
+include/gnuradio/fec/cldpc.h
 include/gnuradio/fec/conv_bit_corr_bb.h
 include/gnuradio/fec/decode_ccsds_27_fb.h
 include/gnuradio/fec/decoder.h
@@ -570,6 +590,8 @@ include/gnuradio/fec/encoder.h
 include/gnuradio/fec/fec_mtrx.h
 include/gnuradio/fec/generic_decoder.h
 include/gnuradio/fec/generic_encoder.h
+include/gnuradio/fec/gf2mat.h
+include/gnuradio/fec/gf2vec.h
 include/gnuradio/fec/ldpc_G_matrix.h
 include/gnuradio/fec/ldpc_H_matrix.h
 include/gnuradio/fec/ldpc_bit_flip_decoder.h
@@ -577,6 +599,7 @@ include/gnuradio/fec/ldpc_decoder.h
 include/gnuradio/fec/ldpc_encoder.h
 include/gnuradio/fec/ldpc_gen_mtrx_encoder.h
 include/gnuradio/fec/ldpc_par_mtrx_encoder.h
+include/gnuradio/fec/maxstar.h
 include/gnuradio/fec/polar_common.h
 include/gnuradio/fec/polar_decoder_common.h
 include/gnuradio/fec/polar_decoder_sc.h
@@ -591,6 +614,9 @@ include/gnuradio/fec/repetition_encoder.h
 include/gnuradio/fec/rs.h
 include/gnuradio/fec/tagged_decoder.h
 include/gnuradio/fec/tagged_encoder.h
+include/gnuradio/fec/tpc_common.h
+include/gnuradio/fec/tpc_decoder.h
+include/gnuradio/fec/tpc_encoder.h
 include/gnuradio/fec/viterbi.h
 include/gnuradio/feval.h
 include/gnuradio/fft/api.h
@@ -714,6 +740,7 @@ include/gnuradio/qtgui/ber_sink_b.h
 include/gnuradio/qtgui/const_sink_c.h
 include/gnuradio/qtgui/constellationdisplayform.h
 include/gnuradio/qtgui/displayform.h
+include/gnuradio/qtgui/edit_box_msg.h
 include/gnuradio/qtgui/form_menus.h
 include/gnuradio/qtgui/freq_sink_c.h
 include/gnuradio/qtgui/freq_sink_f.h
@@ -776,8 +803,8 @@ include/gnuradio/swig/blocks_swig1.i
 include/gnuradio/swig/blocks_swig1_doc.i
 include/gnuradio/swig/blocks_swig2.i
 include/gnuradio/swig/blocks_swig2_doc.i
-include/gnuradio/swig/blocks_swig3.i
-include/gnuradio/swig/blocks_swig3_doc.i
+include/gnuradio/swig/blocks_swig%%MAJOR_VERSION%%.i
+include/gnuradio/swig/blocks_swig%%MAJOR_VERSION%%_doc.i
 include/gnuradio/swig/blocks_swig4.i
 include/gnuradio/swig/blocks_swig4_doc.i
 include/gnuradio/swig/blocks_swig5.i
@@ -788,8 +815,12 @@ include/gnuradio/swig/channels_swig_doc.i
 include/gnuradio/swig/complex_vec_test.i
 include/gnuradio/swig/constants.i
 include/gnuradio/swig/constellation.i
-include/gnuradio/swig/digital_swig.i
-include/gnuradio/swig/digital_swig_doc.i
+include/gnuradio/swig/digital_swig0.i
+include/gnuradio/swig/digital_swig0_doc.i
+include/gnuradio/swig/digital_swig1.i
+include/gnuradio/swig/digital_swig1_doc.i
+include/gnuradio/swig/digital_swig2.i
+include/gnuradio/swig/digital_swig2_doc.i
 include/gnuradio/swig/dtv_swig.i
 include/gnuradio/swig/dtv_swig_doc.i
 include/gnuradio/swig/fcd_swig.i
@@ -836,10 +867,12 @@ include/gnuradio/swig/sync_interpolator.i
 include/gnuradio/swig/tagged_stream_block.i
 include/gnuradio/swig/tags.i
 include/gnuradio/swig/top_block.i
-include/gnuradio/swig/trellis_swig.i
-include/gnuradio/swig/trellis_swig_doc.i
-%%UHD%%include/gnuradio/swig/uhd_swig.i
-%%UHD%%include/gnuradio/swig/uhd_swig_doc.i
+include/gnuradio/swig/trellis_swig0.i
+include/gnuradio/swig/trellis_swig0_doc.i
+include/gnuradio/swig/trellis_swig1.i
+include/gnuradio/swig/trellis_swig1_doc.i
+include/gnuradio/swig/uhd_swig.i
+include/gnuradio/swig/uhd_swig_doc.i
 include/gnuradio/swig/video_sdl_swig.i
 include/gnuradio/swig/video_sdl_swig_doc.i
 include/gnuradio/swig/vocoder_swig.i
@@ -929,11 +962,11 @@ include/gnuradio/trellis/viterbi_combined_ss.h
 include/gnuradio/trellis/viterbi_i.h
 include/gnuradio/trellis/viterbi_s.h
 include/gnuradio/types.h
-%%UHD%%include/gnuradio/uhd/amsg_source.h
-%%UHD%%include/gnuradio/uhd/api.h
-%%UHD%%include/gnuradio/uhd/usrp_block.h
-%%UHD%%include/gnuradio/uhd/usrp_sink.h
-%%UHD%%include/gnuradio/uhd/usrp_source.h
+include/gnuradio/uhd/amsg_source.h
+include/gnuradio/uhd/api.h
+include/gnuradio/uhd/usrp_block.h
+include/gnuradio/uhd/usrp_sink.h
+include/gnuradio/uhd/usrp_source.h
 include/gnuradio/unittests.h
 include/gnuradio/video_sdl/api.h
 include/gnuradio/video_sdl/sink_s.h
@@ -945,10 +978,10 @@ include/gnuradio/vocoder/cvsd_decode_bs.h
 include/gnuradio/vocoder/cvsd_encode_sb.h
 include/gnuradio/vocoder/g721_decode_bs.h
 include/gnuradio/vocoder/g721_encode_sb.h
-include/gnuradio/vocoder/g723_24_decode_bs.h
-include/gnuradio/vocoder/g723_24_encode_sb.h
-include/gnuradio/vocoder/g723_40_decode_bs.h
-include/gnuradio/vocoder/g723_40_encode_sb.h
+include/gnuradio/vocoder/g72%%MAJOR_VERSION%%_24_decode_bs.h
+include/gnuradio/vocoder/g72%%MAJOR_VERSION%%_24_encode_sb.h
+include/gnuradio/vocoder/g72%%MAJOR_VERSION%%_40_decode_bs.h
+include/gnuradio/vocoder/g72%%MAJOR_VERSION%%_40_encode_sb.h
 include/gnuradio/vocoder/gsm_fr_decode_ps.h
 include/gnuradio/vocoder/gsm_fr_encode_sp.h
 include/gnuradio/vocoder/ulaw_decode_bs.h
@@ -969,100 +1002,107 @@ include/pmt/pmt_pool.h
 include/pmt/pmt_serial_tags.h
 include/pmt/pmt_sugar.h
 include/volk/volk.h
-include/volk/volk_32f_8u_polarbutterfly_32f.h
-include/volk/volk_32f_8u_polarbutterflypuppet_32f.h
-include/volk/volk_16i_32fc_dot_prod_32fc.h
+include/volk/volk_16i_%%MAJOR_VERSION%%2fc_dot_prod_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_16i_branch_4_state_8.h
 include/volk/volk_16i_convert_8i.h
 include/volk/volk_16i_max_star_16i.h
 include/volk/volk_16i_max_star_horizontal_16i.h
 include/volk/volk_16i_permute_and_scalar_add.h
-include/volk/volk_16i_s32f_convert_32f.h
+include/volk/volk_16i_s%%MAJOR_VERSION%%2f_convert_%%MAJOR_VERSION%%2f.h
 include/volk/volk_16i_x4_quad_max_star_16i.h
 include/volk/volk_16i_x5_add_quad_16i_x4.h
+include/volk/volk_16ic_convert_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_16ic_deinterleave_16i_x2.h
 include/volk/volk_16ic_deinterleave_real_16i.h
 include/volk/volk_16ic_deinterleave_real_8i.h
 include/volk/volk_16ic_magnitude_16i.h
-include/volk/volk_16ic_s32f_deinterleave_32f_x2.h
-include/volk/volk_16ic_s32f_deinterleave_real_32f.h
-include/volk/volk_16ic_s32f_magnitude_32f.h
+include/volk/volk_16ic_s%%MAJOR_VERSION%%2f_deinterleave_%%MAJOR_VERSION%%2f_x2.h
+include/volk/volk_16ic_s%%MAJOR_VERSION%%2f_deinterleave_real_%%MAJOR_VERSION%%2f.h
+include/volk/volk_16ic_s%%MAJOR_VERSION%%2f_magnitude_%%MAJOR_VERSION%%2f.h
+include/volk/volk_16ic_x2_dot_prod_16ic.h
+include/volk/volk_16ic_x2_multiply_16ic.h
 include/volk/volk_16u_byteswap.h
 include/volk/volk_16u_byteswappuppet_16u.h
-include/volk/volk_32f_binary_slicer_32i.h
-include/volk/volk_32f_binary_slicer_8i.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_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_null_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
-include/volk/volk_32f_s32f_convert_32i.h
-include/volk/volk_32f_s32f_convert_8i.h
-include/volk/volk_32f_s32f_multiply_32f.h
-include/volk/volk_32f_s32f_normalize.h
-include/volk/volk_32f_s32f_power_32f.h
-include/volk/volk_32f_s32f_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
-include/volk/volk_32f_x2_dot_prod_32f.h
-include/volk/volk_32f_x2_fm_detectpuppet_32f.h
-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
-include/volk/volk_32fc_32f_dot_prod_32fc.h
-include/volk/volk_32fc_32f_multiply_32fc.h
-include/volk/volk_32fc_conjugate_32fc.h
-include/volk/volk_32fc_deinterleave_32f_x2.h
-include/volk/volk_32fc_deinterleave_64f_x2.h
-include/volk/volk_32fc_deinterleave_imag_32f.h
-include/volk/volk_32fc_deinterleave_real_32f.h
-include/volk/volk_32fc_deinterleave_real_64f.h
-include/volk/volk_32fc_index_max_16u.h
-include/volk/volk_32fc_magnitude_32f.h
-include/volk/volk_32fc_magnitude_squared_32f.h
-include/volk/volk_32fc_s32f_atan2_32f.h
-include/volk/volk_32fc_s32f_deinterleave_real_16i.h
-include/volk/volk_32fc_s32f_magnitude_16i.h
-include/volk/volk_32fc_s32f_power_32fc.h
-include/volk/volk_32fc_s32f_power_spectrum_32f.h
-include/volk/volk_32fc_s32f_x2_power_spectral_density_32f.h
-include/volk/volk_32fc_s32fc_multiply_32fc.h
-include/volk/volk_32fc_s32fc_rotatorpuppet_32fc.h
-include/volk/volk_32fc_s32fc_x2_rotator_32fc.h
-include/volk/volk_32fc_x2_conjugate_dot_prod_32fc.h
-include/volk/volk_32fc_x2_dot_prod_32fc.h
-include/volk/volk_32fc_x2_multiply_32fc.h
-include/volk/volk_32fc_x2_multiply_conjugate_32fc.h
-include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f.h
-include/volk/volk_32fc_x2_square_dist_32f.h
-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_%%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
+include/volk/volk_%%MAJOR_VERSION%%2f_acos_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_asin_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_atan_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_binary_slicer_%%MAJOR_VERSION%%2i.h
+include/volk/volk_%%MAJOR_VERSION%%2f_binary_slicer_8i.h
+include/volk/volk_%%MAJOR_VERSION%%2f_convert_64f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_cos_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_expfast_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_index_max_16u.h
+include/volk/volk_%%MAJOR_VERSION%%2f_index_max_%%MAJOR_VERSION%%2u.h
+include/volk/volk_%%MAJOR_VERSION%%2f_invsqrt_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_log2_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_null_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_%%MAJOR_VERSION%%2f_fm_detect_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_calc_spectral_noise_floor_%%MAJOR_VERSION%%2f.h
+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_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_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
+include/volk/volk_%%MAJOR_VERSION%%2f_stddev_and_mean_%%MAJOR_VERSION%%2f_x2.h
+include/volk/volk_%%MAJOR_VERSION%%2f_tan_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_tanh_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_x2_add_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_x2_divide_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_x2_dot_prod_16i.h
+include/volk/volk_%%MAJOR_VERSION%%2f_x2_dot_prod_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_x2_fm_detectpuppet_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_x2_interleave_%%MAJOR_VERSION%%2fc.h
+include/volk/volk_%%MAJOR_VERSION%%2f_x2_max_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_x2_min_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2f_x2_multiply_%%MAJOR_VERSION%%2f.h
+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_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
+include/volk/volk_%%MAJOR_VERSION%%2fc_convert_16ic.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_deinterleave_%%MAJOR_VERSION%%2f_x2.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_deinterleave_64f_x2.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_deinterleave_imag_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_deinterleave_real_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_deinterleave_real_64f.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_index_max_16u.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_index_max_%%MAJOR_VERSION%%2u.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_magnitude_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_magnitude_squared_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_atan2_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_deinterleave_real_16i.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_magnitude_16i.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_power_%%MAJOR_VERSION%%2fc.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_power_spectrum_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_x2_power_spectral_density_%%MAJOR_VERSION%%2f.h
+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_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
+include/volk/volk_%%MAJOR_VERSION%%2fc_x2_multiply_%%MAJOR_VERSION%%2fc.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_x2_multiply_conjugate_%%MAJOR_VERSION%%2fc.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_x2_s%%MAJOR_VERSION%%2f_square_dist_scalar_mult_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2fc_x2_square_dist_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2i_s%%MAJOR_VERSION%%2f_convert_%%MAJOR_VERSION%%2f.h
+include/volk/volk_%%MAJOR_VERSION%%2i_x2_and_%%MAJOR_VERSION%%2i.h
+include/volk/volk_%%MAJOR_VERSION%%2i_x2_or_%%MAJOR_VERSION%%2i.h
+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_64f_convert_%%MAJOR_VERSION%%2f.h
 include/volk/volk_64f_x2_max_64f.h
 include/volk/volk_64f_x2_min_64f.h
 include/volk/volk_64u_byteswap.h
@@ -1070,18 +1110,18 @@ 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_8i_s%%MAJOR_VERSION%%2f_convert_%%MAJOR_VERSION%%2f.h
 include/volk/volk_8ic_deinterleave_16i_x2.h
 include/volk/volk_8ic_deinterleave_real_16i.h
 include/volk/volk_8ic_deinterleave_real_8i.h
-include/volk/volk_8ic_s32f_deinterleave_32f_x2.h
-include/volk/volk_8ic_s32f_deinterleave_real_32f.h
+include/volk/volk_8ic_s%%MAJOR_VERSION%%2f_deinterleave_%%MAJOR_VERSION%%2f_x2.h
+include/volk/volk_8ic_s%%MAJOR_VERSION%%2f_deinterleave_real_%%MAJOR_VERSION%%2f.h
 include/volk/volk_8ic_x2_multiply_conjugate_16ic.h
-include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc.h
+include/volk/volk_8ic_x2_s%%MAJOR_VERSION%%2f_multiply_conjugate_%%MAJOR_VERSION%%2fc.h
 include/volk/volk_8u_conv_k7_r2puppet_8u.h
-include/volk/volk_8u_x3_encodepolar_8u_x2.h
-include/volk/volk_8u_x3_encodepolarpuppet_8u.h
 include/volk/volk_8u_x2_encodeframepolar_8u.h
+include/volk/volk_8u_x%%MAJOR_VERSION%%_encodepolar_8u_x2.h
+include/volk/volk_8u_x%%MAJOR_VERSION%%_encodepolarpuppet_8u.h
 include/volk/volk_8u_x4_conv_k7_r2_8u.h
 include/volk/volk_avx_intrinsics.h
 include/volk/volk_common.h
@@ -1091,13 +1131,13 @@ include/volk/volk_cpu.h
 include/volk/volk_malloc.h
 include/volk/volk_neon_intrinsics.h
 include/volk/volk_prefs.h
-include/volk/volk_sse3_intrinsics.h
+include/volk/volk_sse%%MAJOR_VERSION%%_intrinsics.h
 include/volk/volk_typedefs.h
 lib/cmake/gnuradio/CMakeMacroLibtoolFile.cmake
 lib/cmake/gnuradio/CMakeParseArgumentsCopy.cmake
 lib/cmake/gnuradio/FindALSA.cmake
 lib/cmake/gnuradio/FindCppUnit.cmake
-lib/cmake/gnuradio/FindFFTW3f.cmake
+lib/cmake/gnuradio/FindFFTW%%MAJOR_VERSION%%f.cmake
 lib/cmake/gnuradio/FindGSL.cmake
 lib/cmake/gnuradio/FindGit.cmake
 lib/cmake/gnuradio/FindJack.cmake
@@ -1129,977 +1169,1070 @@ lib/cmake/gnuradio/UseSWIG.cmake
 lib/cmake/volk/VolkConfig.cmake
 lib/cmake/volk/VolkConfigVersion.cmake
 lib/libgnuradio-analog.so
-lib/libgnuradio-analog.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-analog.so.%%MAJOR_VERSION%%
+lib/libgnuradio-analog.so.%%PORTVERSION%%
 lib/libgnuradio-atsc.so
-lib/libgnuradio-atsc.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-atsc.so.%%MAJOR_VERSION%%
+lib/libgnuradio-atsc.so.%%PORTVERSION%%
 lib/libgnuradio-audio.so
-lib/libgnuradio-audio.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-audio.so.%%MAJOR_VERSION%%
+lib/libgnuradio-audio.so.%%PORTVERSION%%
 lib/libgnuradio-blocks.so
-lib/libgnuradio-blocks.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-blocks.so.%%MAJOR_VERSION%%
+lib/libgnuradio-blocks.so.%%PORTVERSION%%
 lib/libgnuradio-channels.so
-lib/libgnuradio-channels.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-channels.so.%%MAJOR_VERSION%%
+lib/libgnuradio-channels.so.%%PORTVERSION%%
 lib/libgnuradio-digital.so
-lib/libgnuradio-digital.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-digital.so.%%MAJOR_VERSION%%
+lib/libgnuradio-digital.so.%%PORTVERSION%%
 lib/libgnuradio-dtv.so
-lib/libgnuradio-dtv.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-dtv.so.%%MAJOR_VERSION%%
+lib/libgnuradio-dtv.so.%%PORTVERSION%%
 lib/libgnuradio-fcd.so
-lib/libgnuradio-fcd.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-fcd.so.%%MAJOR_VERSION%%
+lib/libgnuradio-fcd.so.%%PORTVERSION%%
 lib/libgnuradio-fec.so
-lib/libgnuradio-fec.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-fec.so.%%MAJOR_VERSION%%
+lib/libgnuradio-fec.so.%%PORTVERSION%%
 lib/libgnuradio-fft.so
-lib/libgnuradio-fft.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-fft.so.%%MAJOR_VERSION%%
+lib/libgnuradio-fft.so.%%PORTVERSION%%
 lib/libgnuradio-filter.so
-lib/libgnuradio-filter.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-filter.so.%%MAJOR_VERSION%%
+lib/libgnuradio-filter.so.%%PORTVERSION%%
 lib/libgnuradio-noaa.so
-lib/libgnuradio-noaa.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-noaa.so.%%MAJOR_VERSION%%
+lib/libgnuradio-noaa.so.%%PORTVERSION%%
 lib/libgnuradio-pager.so
-lib/libgnuradio-pager.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-pager.so.%%MAJOR_VERSION%%
+lib/libgnuradio-pager.so.%%PORTVERSION%%
 lib/libgnuradio-pmt.so
-lib/libgnuradio-pmt.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-pmt.so.%%MAJOR_VERSION%%
+lib/libgnuradio-pmt.so.%%PORTVERSION%%
 lib/libgnuradio-qtgui.so
-lib/libgnuradio-qtgui.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-qtgui.so.%%MAJOR_VERSION%%
+lib/libgnuradio-qtgui.so.%%PORTVERSION%%
 lib/libgnuradio-runtime.so
-lib/libgnuradio-runtime.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-runtime.so.%%MAJOR_VERSION%%
+lib/libgnuradio-runtime.so.%%PORTVERSION%%
 lib/libgnuradio-trellis.so
-lib/libgnuradio-trellis.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-trellis.so.%%MAJOR_VERSION%%
-%%UHD%%lib/libgnuradio-uhd.so
-%%UHD%%lib/libgnuradio-uhd.so.%%MAJOR_SUB_VER%%
-%%UHD%%lib/libgnuradio-uhd.so.%%MAJOR_VERSION%%
+lib/libgnuradio-trellis.so.%%PORTVERSION%%
+lib/libgnuradio-uhd.so
+lib/libgnuradio-uhd.so.%%MAJOR_VERSION%%
+lib/libgnuradio-uhd.so.%%PORTVERSION%%
 lib/libgnuradio-video-sdl.so
-lib/libgnuradio-video-sdl.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-video-sdl.so.%%MAJOR_VERSION%%
+lib/libgnuradio-video-sdl.so.%%PORTVERSION%%
 lib/libgnuradio-vocoder.so
-lib/libgnuradio-vocoder.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-vocoder.so.%%MAJOR_VERSION%%
+lib/libgnuradio-vocoder.so.%%PORTVERSION%%
 lib/libgnuradio-wavelet.so
-lib/libgnuradio-wavelet.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-wavelet.so.%%MAJOR_VERSION%%
+lib/libgnuradio-wavelet.so.%%PORTVERSION%%
 lib/libgnuradio-wxgui.so
-lib/libgnuradio-wxgui.so.%%MAJOR_SUB_VER%%
 lib/libgnuradio-wxgui.so.%%MAJOR_VERSION%%
+lib/libgnuradio-wxgui.so.%%PORTVERSION%%
 lib/libvolk.so
 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.qtgui
-%%PORTDOCS%%%%DOCSDIR%%/README.uhd
-%%PORTDOCS%%%%DOCSDIR%%/README.vocoder
-%%PORTDOCS%%%%DOCSDIR%%/xml/test_tcm.py.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/test_viterbi_equalization1.py.xml
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/_analog_swig.so
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/am_demod.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/am_demod.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/am_demod.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/am_demod.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/analog_swig.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/analog_swig.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/analog_swig.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/analog_swig.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/fm_demod.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/fm_demod.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/fm_demod.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/fm_demod.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/fm_emph.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/fm_emph.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/fm_emph.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/fm_emph.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/nbfm_rx.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/nbfm_rx.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/nbfm_rx.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/nbfm_rx.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/nbfm_tx.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/nbfm_tx.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/nbfm_tx.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/nbfm_tx.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/standard_squelch.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/standard_squelch.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/standard_squelch.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/standard_squelch.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv_fmdet.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv_fmdet.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv_fmdet.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv_fmdet.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv_pll.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv_pll.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv_pll.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_rcv_pll.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_tx.py
 %%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_tx.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_tx.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/analog/wfm_tx.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/atsc/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/atsc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/atsc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/atsc/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/atsc/_atsc_swig.so
 %%PYTHON_SITELIBDIR%%/gnuradio/atsc/atsc_swig.py
 %%PYTHON_SITELIBDIR%%/gnuradio/atsc/atsc_swig.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/atsc/atsc_swig.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/atsc/atsc_swig.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/atsc/atsc_utils.py
 %%PYTHON_SITELIBDIR%%/gnuradio/atsc/atsc_utils.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/atsc/atsc_utils.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/atsc/atsc_utils.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/audio/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/audio/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/audio/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/audio/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/audio/_audio_swig.so
 %%PYTHON_SITELIBDIR%%/gnuradio/audio/audio_swig.py
 %%PYTHON_SITELIBDIR%%/gnuradio/audio/audio_swig.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/audio/audio_swig.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/audio/audio_swig.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/__init__.pyo
+%%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_swig2.so
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig3.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_swig.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig0.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig0.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig0.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig0.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig1.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig1.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig1.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig1.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig3.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig3.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig3.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig%%MAJOR_VERSION%%.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig%%MAJOR_VERSION%%.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig%%MAJOR_VERSION%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig4.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig4.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig4.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig4.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig5.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig5.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig5.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig5.%%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.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/parse_file_metadata.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/stream_to_vector_decimator.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blocks/stream_to_vector_decimator.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/stream_to_vector_decimator.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/stream_to_vector_decimator.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/_channels_swig.so
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/amp_bal.py
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/amp_bal.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/amp_bal.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/amp_bal.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/channels_swig.py
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/channels_swig.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/channels_swig.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/channels_swig.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/conj_fs_iqcorr.py
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/conj_fs_iqcorr.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/conj_fs_iqcorr.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/conj_fs_iqcorr.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_2_gen.py
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_2_gen.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_2_gen.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_3_gen.py
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_3_gen.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_3_gen.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_2_gen.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_%%MAJOR_VERSION%%_gen.py
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_%%MAJOR_VERSION%%_gen.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_%%MAJOR_VERSION%%_gen.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/impairments.py
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/impairments.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/impairments.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/impairments.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/iqbal_gen.py
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/iqbal_gen.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/iqbal_gen.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/iqbal_gen.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/phase_bal.py
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/phase_bal.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/phase_bal.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/phase_bal.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/phase_noise_gen.py
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/phase_noise_gen.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/phase_noise_gen.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/phase_noise_gen.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/quantizer.py
 %%PYTHON_SITELIBDIR%%/gnuradio/channels/quantizer.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/channels/quantizer.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/channels/quantizer.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GNURadioControlPortClient.py
 %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GNURadioControlPortClient.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GNURadioControlPortClient.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GNURadioControlPortClient.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GrDataPlotter.py
 %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GrDataPlotter.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GrDataPlotter.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GrDataPlotter.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/RPCConnection.py
 %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/RPCConnection.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/RPCConnection.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/RPCConnection.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/icon.png
 %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/monitor.py
 %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/monitor.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/monitor.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/monitor.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/_digital_swig.so
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/__init__.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/_digital_swig0.so
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/_digital_swig1.so
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/_digital_swig2.so
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/bpsk.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/bpsk.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/bpsk.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/bpsk.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/constellation_map_generator.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/constellation_map_generator.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/constellation_map_generator.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/constellation_map_generator.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/cpm.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/cpm.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/cpm.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/cpm.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/crc.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/crc.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/crc.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/crc.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig0.py
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig0.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig0.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig1.py
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig1.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig1.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig2.py
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig2.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/digital_swig2.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/generic_mod_demod.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/generic_mod_demod.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/generic_mod_demod.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/generic_mod_demod.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/gfsk.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/gfsk.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/gfsk.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/gfsk.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/gmsk.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/gmsk.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/gmsk.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/gmsk.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/modulation_utils.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/modulation_utils.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/modulation_utils.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/modulation_utils.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_packet_utils.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_packet_utils.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_packet_utils.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_packet_utils.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_receiver.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_receiver.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_receiver.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_receiver.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_fixed.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_fixed.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_fixed.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_fixed.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_ml.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_ml.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_ml.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_ml.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_pn.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_pn.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_pn.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_pn.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_pnac.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_pnac.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_pnac.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_pnac.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_txrx.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_txrx.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_txrx.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_txrx.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/packet_utils.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/packet_utils.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/packet_utils.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/packet_utils.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/pkt.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/pkt.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/pkt.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/pkt.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/psk.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/psk.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/psk.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/psk.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/psk_constellations.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/psk_constellations.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/psk_constellations.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/psk_constellations.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/qam.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/qam.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/qam.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/qam.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/qam_constellations.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/qam_constellations.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/qam_constellations.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/qam_constellations.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/qamlike.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/qamlike.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/qamlike.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/qamlike.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/qpsk.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/qpsk.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/qpsk.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/qpsk.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/soft_dec_lut_gen.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/soft_dec_lut_gen.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/soft_dec_lut_gen.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/soft_dec_lut_gen.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/alignment.py
 %%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/alignment.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/alignment.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/alignment.%%PYTHON_PYOEXTENSION%%

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802191823.w1JINV0F062126>