Update to gnuradio 3.2

many new features and bugfixes.

11 files changed, 367 insertions, 225 deletions

diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile
index fdd04c31fd4..f7a79da64f7 100644
--- a/ham/gnuradio-core/Makefile
+++ b/ham/gnuradio-core/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2008/03/15 15:09:54 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/08/12 12:21:39 markd Exp $
 
 PKGNAME=        gnuradio-core-${VERSION}
-PKGREVISION=	1
 COMMENT=	Runtime system and DSP blocks for GNU Radio
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -12,6 +11,8 @@ PATCHDIR=	${.CURDIR}/../../ham/gnuradio-core/patches
 
 CONF_FILES+=	${EGDIR}/gnuradio-core.conf ${PKG_SYSCONFDIR}/gnuradio-core.conf
 CONFIGURE_ARGS+=--enable-gnuradio-core
+CONFIGURE_ARGS+=--enable-omnithread
+CONFIGURE_ARGS+=--enable-gruel
 
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/swig/gen-swig-bug-fix
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/bin/microtune.py
@@ -71,8 +72,10 @@ PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/tests/test_buffers.py
 
 .include "../../devel/swig/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/cppunit/buildlink3.mk"
 .include "../../math/fftwf/buildlink3.mk"
+.include "../../math/gsl/buildlink3.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST
index 1962260340e..d7392a1f521 100644
--- a/ham/gnuradio-core/PLIST
+++ b/ham/gnuradio-core/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:00:33 joerg Exp $
-bin/microtune.py
+@comment $NetBSD: PLIST,v 1.11 2009/08/12 12:21:39 markd Exp $
 include/gnuradio/ccomplex_dotprod_generic.h
 include/gnuradio/ccomplex_dotprod_x86.h
 include/gnuradio/complex_dotprod_generic.h
@@ -22,20 +21,30 @@ include/gnuradio/gr_add_const_vss.h
 include/gnuradio/gr_add_ff.h
 include/gnuradio/gr_add_ii.h
 include/gnuradio/gr_add_ss.h
-include/gnuradio/gr_add_vcc.h
-include/gnuradio/gr_add_vff.h
-include/gnuradio/gr_add_vii.h
-include/gnuradio/gr_add_vss.h
 include/gnuradio/gr_agc2_cc.h
 include/gnuradio/gr_agc2_ff.h
 include/gnuradio/gr_agc_cc.h
 include/gnuradio/gr_agc_ff.h
 include/gnuradio/gr_align_on_samplenumbers_ss.h
+include/gnuradio/gr_altivec.h
+include/gnuradio/gr_and_bb.h
+include/gnuradio/gr_and_const_bb.h
+include/gnuradio/gr_and_const_ii.h
+include/gnuradio/gr_and_const_ss.h
+include/gnuradio/gr_and_ii.h
+include/gnuradio/gr_and_ss.h
+include/gnuradio/gr_argmax_fs.h
+include/gnuradio/gr_argmax_is.h
+include/gnuradio/gr_argmax_ss.h
+include/gnuradio/gr_basic_block.h
+include/gnuradio/gr_bin_statistics_f.h
 include/gnuradio/gr_binary_slicer_fb.h
 include/gnuradio/gr_block.h
 include/gnuradio/gr_block_detail.h
+include/gnuradio/gr_block_executor.h
 include/gnuradio/gr_buffer.h
 include/gnuradio/gr_bytes_to_syms.h
+include/gnuradio/gr_channel_model.h
 include/gnuradio/gr_char_to_float.h
 include/gnuradio/gr_check_counting_s.h
 include/gnuradio/gr_check_lfsr_32k_s.h
@@ -57,11 +66,15 @@ include/gnuradio/gr_constellation_decoder_cb.h
 include/gnuradio/gr_correlate_access_code_bb.h
 include/gnuradio/gr_costas_loop_cc.h
 include/gnuradio/gr_count_bits.h
+include/gnuradio/gr_cpfsk_bc.h
 include/gnuradio/gr_cpu.h
 include/gnuradio/gr_crc32.h
 include/gnuradio/gr_ctcss_squelch_ff.h
 include/gnuradio/gr_dd_mpsk_sync_cc.h
+include/gnuradio/gr_decode_ccsds_27_fb.h
 include/gnuradio/gr_deinterleave.h
+include/gnuradio/gr_delay.h
+include/gnuradio/gr_descrambler_bb.h
 include/gnuradio/gr_diff_decoder_bb.h
 include/gnuradio/gr_diff_encoder_bb.h
 include/gnuradio/gr_diff_phasor_cc.h
@@ -70,6 +83,8 @@ include/gnuradio/gr_divide_cc.h
 include/gnuradio/gr_divide_ff.h
 include/gnuradio/gr_divide_ii.h
 include/gnuradio/gr_divide_ss.h
+include/gnuradio/gr_dpll_bb.h
+include/gnuradio/gr_encode_ccsds_27_bb.h
 include/gnuradio/gr_endianness.h
 include/gnuradio/gr_error_handler.h
 include/gnuradio/gr_expj.h
@@ -79,10 +94,12 @@ include/gnuradio/gr_feval.h
 include/gnuradio/gr_fft_filter_ccc.h
 include/gnuradio/gr_fft_filter_fff.h
 include/gnuradio/gr_fft_vcc.h
+include/gnuradio/gr_fft_vcc_fftw.h
 include/gnuradio/gr_fft_vfc.h
 include/gnuradio/gr_file_descriptor_sink.h
 include/gnuradio/gr_file_descriptor_source.h
 include/gnuradio/gr_file_sink.h
+include/gnuradio/gr_file_sink_base.h
 include/gnuradio/gr_file_source.h
 include/gnuradio/gr_filter_delay_fc.h
 include/gnuradio/gr_fir_ccc.h
@@ -105,14 +122,19 @@ include/gnuradio/gr_fir_scc.h
 include/gnuradio/gr_fir_scc_generic.h
 include/gnuradio/gr_fir_sysconfig.h
 include/gnuradio/gr_fir_sysconfig_generic.h
+include/gnuradio/gr_fir_sysconfig_powerpc.h
 include/gnuradio/gr_fir_sysconfig_x86.h
 include/gnuradio/gr_fir_util.h
 include/gnuradio/gr_firdes.h
+include/gnuradio/gr_flat_flowgraph.h
 include/gnuradio/gr_float_to_char.h
 include/gnuradio/gr_float_to_complex.h
 include/gnuradio/gr_float_to_short.h
 include/gnuradio/gr_float_to_uchar.h
-include/gnuradio/gr_fractional_interpolator.h
+include/gnuradio/gr_flowgraph.h
+include/gnuradio/gr_fmdet_cf.h
+include/gnuradio/gr_fractional_interpolator_cc.h
+include/gnuradio/gr_fractional_interpolator_ff.h
 include/gnuradio/gr_framer_sink_1.h
 include/gnuradio/gr_freq_xlating_fir_filter_ccc.h
 include/gnuradio/gr_freq_xlating_fir_filter_ccf.h
@@ -124,10 +146,19 @@ include/gnuradio/gr_frequency_modulator_fc.h
 include/gnuradio/gr_fxpt.h
 include/gnuradio/gr_fxpt_nco.h
 include/gnuradio/gr_fxpt_vco.h
+include/gnuradio/gr_glfsr_source_b.h
+include/gnuradio/gr_glfsr_source_f.h
 include/gnuradio/gr_goertzel_fc.h
 include/gnuradio/gr_head.h
+include/gnuradio/gr_hier_block2.h
+include/gnuradio/gr_hier_block2_detail.h
 include/gnuradio/gr_hilbert_fc.h
+include/gnuradio/gr_histo_sink_f.h
 include/gnuradio/gr_iir_filter_ffd.h
+include/gnuradio/gr_integrate_cc.h
+include/gnuradio/gr_integrate_ff.h
+include/gnuradio/gr_integrate_ii.h
+include/gnuradio/gr_integrate_ss.h
 include/gnuradio/gr_interleave.h
 include/gnuradio/gr_interleaved_short_to_complex.h
 include/gnuradio/gr_interp_fir_filter_ccc.h
@@ -137,6 +168,7 @@ include/gnuradio/gr_interp_fir_filter_fff.h
 include/gnuradio/gr_interp_fir_filter_fsf.h
 include/gnuradio/gr_interp_fir_filter_scc.h
 include/gnuradio/gr_io_signature.h
+include/gnuradio/gr_iqcomp_cc.h
 include/gnuradio/gr_keep_one_in_n.h
 include/gnuradio/gr_kludge_copy.h
 include/gnuradio/gr_lfsr_32k_source_s.h
@@ -146,10 +178,18 @@ include/gnuradio/gr_local_sighandler.h
 include/gnuradio/gr_log2_const.h
 include/gnuradio/gr_map_bb.h
 include/gnuradio/gr_math.h
+include/gnuradio/gr_max_ff.h
+include/gnuradio/gr_max_ii.h
+include/gnuradio/gr_max_ss.h
 include/gnuradio/gr_message.h
 include/gnuradio/gr_message_sink.h
 include/gnuradio/gr_message_source.h
 include/gnuradio/gr_misc.h
+include/gnuradio/gr_moving_average_cc.h
+include/gnuradio/gr_moving_average_ff.h
+include/gnuradio/gr_moving_average_ii.h
+include/gnuradio/gr_moving_average_ss.h
+include/gnuradio/gr_mpsk_receiver_cc.h
 include/gnuradio/gr_msg_handler.h
 include/gnuradio/gr_msg_queue.h
 include/gnuradio/gr_multiply_cc.h
@@ -164,10 +204,6 @@ include/gnuradio/gr_multiply_const_vss.h
 include/gnuradio/gr_multiply_ff.h
 include/gnuradio/gr_multiply_ii.h
 include/gnuradio/gr_multiply_ss.h
-include/gnuradio/gr_multiply_vcc.h
-include/gnuradio/gr_multiply_vff.h
-include/gnuradio/gr_multiply_vii.h
-include/gnuradio/gr_multiply_vss.h
 include/gnuradio/gr_mute_cc.h
 include/gnuradio/gr_mute_ff.h
 include/gnuradio/gr_mute_ii.h
@@ -180,8 +216,21 @@ include/gnuradio/gr_noise_source_i.h
 include/gnuradio/gr_noise_source_s.h
 include/gnuradio/gr_noise_type.h
 include/gnuradio/gr_nop.h
+include/gnuradio/gr_not_bb.h
+include/gnuradio/gr_not_ii.h
+include/gnuradio/gr_not_ss.h
 include/gnuradio/gr_null_sink.h
 include/gnuradio/gr_null_source.h
+include/gnuradio/gr_ofdm_cyclic_prefixer.h
+include/gnuradio/gr_ofdm_demapper_vcb.h
+include/gnuradio/gr_ofdm_frame_acquisition.h
+include/gnuradio/gr_ofdm_frame_sink.h
+include/gnuradio/gr_ofdm_insert_preamble.h
+include/gnuradio/gr_ofdm_mapper_bcv.h
+include/gnuradio/gr_ofdm_sampler.h
+include/gnuradio/gr_or_bb.h
+include/gnuradio/gr_or_ii.h
+include/gnuradio/gr_or_ss.h
 include/gnuradio/gr_oscope_guts.h
 include/gnuradio/gr_oscope_sink_f.h
 include/gnuradio/gr_oscope_sink_x.h
@@ -191,19 +240,28 @@ include/gnuradio/gr_packed_to_unpacked_ii.h
 include/gnuradio/gr_packed_to_unpacked_ss.h
 include/gnuradio/gr_packet_sink.h
 include/gnuradio/gr_pagesize.h
+include/gnuradio/gr_peak_detector2_fb.h
+include/gnuradio/gr_peak_detector_fb.h
+include/gnuradio/gr_peak_detector_ib.h
+include/gnuradio/gr_peak_detector_sb.h
 include/gnuradio/gr_phase_modulator_fc.h
 include/gnuradio/gr_pll_carriertracking_cc.h
 include/gnuradio/gr_pll_freqdet_cf.h
 include/gnuradio/gr_pll_refout_cc.h
+include/gnuradio/gr_pn_correlator_cc.h
 include/gnuradio/gr_preferences.h
 include/gnuradio/gr_prefix.h
 include/gnuradio/gr_prefs.h
 include/gnuradio/gr_probe_avg_mag_sqrd_c.h
+include/gnuradio/gr_probe_avg_mag_sqrd_cf.h
 include/gnuradio/gr_probe_avg_mag_sqrd_f.h
+include/gnuradio/gr_probe_density_b.h
+include/gnuradio/gr_probe_mpsk_snr_c.h
 include/gnuradio/gr_probe_signal_f.h
 include/gnuradio/gr_pwr_squelch_cc.h
 include/gnuradio/gr_pwr_squelch_ff.h
 include/gnuradio/gr_quadrature_demod_cf.h
+include/gnuradio/gr_rail_ff.h
 include/gnuradio/gr_random.h
 include/gnuradio/gr_rational_resampler_base_ccc.h
 include/gnuradio/gr_rational_resampler_base_ccf.h
@@ -212,12 +270,22 @@ include/gnuradio/gr_rational_resampler_base_fff.h
 include/gnuradio/gr_rational_resampler_base_fsf.h
 include/gnuradio/gr_rational_resampler_base_scc.h
 include/gnuradio/gr_realtime.h
+include/gnuradio/gr_regenerate_bb.h
 include/gnuradio/gr_remez.h
+include/gnuradio/gr_repeat.h
 include/gnuradio/gr_reverse.h
 include/gnuradio/gr_rms_cf.h
 include/gnuradio/gr_rms_ff.h
 include/gnuradio/gr_rotator.h
-include/gnuradio/gr_runtime.h
+include/gnuradio/gr_runtime_types.h
+include/gnuradio/gr_sample_and_hold_bb.h
+include/gnuradio/gr_sample_and_hold_ff.h
+include/gnuradio/gr_sample_and_hold_ii.h
+include/gnuradio/gr_sample_and_hold_ss.h
+include/gnuradio/gr_scheduler.h
+include/gnuradio/gr_scheduler_sts.h
+include/gnuradio/gr_scheduler_tpb.h
+include/gnuradio/gr_scrambler_bb.h
 include/gnuradio/gr_select_handler.h
 include/gnuradio/gr_short_to_float.h
 include/gnuradio/gr_sig_source_c.h
@@ -230,25 +298,21 @@ include/gnuradio/gr_simple_framer.h
 include/gnuradio/gr_simple_framer_sync.h
 include/gnuradio/gr_simple_squelch_cc.h
 include/gnuradio/gr_sincos.h
-include/gnuradio/gr_single_pole_avg.h
-include/gnuradio/gr_single_pole_avg_filter_ff.h
 include/gnuradio/gr_single_pole_iir.h
 include/gnuradio/gr_single_pole_iir_filter_cc.h
 include/gnuradio/gr_single_pole_iir_filter_ff.h
-include/gnuradio/gr_single_pole_rec.h
-include/gnuradio/gr_single_pole_rec_filter_ff.h
 include/gnuradio/gr_single_threaded_scheduler.h
-include/gnuradio/gr_single_zero_avg.h
-include/gnuradio/gr_single_zero_avg_filter_ff.h
-include/gnuradio/gr_single_zero_rec.h
-include/gnuradio/gr_single_zero_rec_filter_ff.h
 include/gnuradio/gr_skiphead.h
+include/gnuradio/gr_sptr_magic.h
+include/gnuradio/gr_squash_ff.h
 include/gnuradio/gr_squelch_base_cc.h
 include/gnuradio/gr_squelch_base_ff.h
+include/gnuradio/gr_stream_mux.h
 include/gnuradio/gr_stream_to_streams.h
 include/gnuradio/gr_stream_to_vector.h
 include/gnuradio/gr_streams_to_stream.h
 include/gnuradio/gr_streams_to_vector.h
+include/gnuradio/gr_stretch_ff.h
 include/gnuradio/gr_sub_cc.h
 include/gnuradio/gr_sub_ff.h
 include/gnuradio/gr_sub_ii.h
@@ -262,15 +326,22 @@ include/gnuradio/gr_threshold_ff.h
 include/gnuradio/gr_throttle.h
 include/gnuradio/gr_timer.h
 include/gnuradio/gr_tmp_path.h
+include/gnuradio/gr_top_block.h
+include/gnuradio/gr_top_block_impl.h
+include/gnuradio/gr_tpb_detail.h
+include/gnuradio/gr_tpb_thread_body.h
 include/gnuradio/gr_trigger_mode.h
 include/gnuradio/gr_types.h
 include/gnuradio/gr_uchar_to_float.h
+include/gnuradio/gr_udp_sink.h
+include/gnuradio/gr_udp_source.h
 include/gnuradio/gr_unpack_k_bits_bb.h
 include/gnuradio/gr_unpacked_to_packed_bb.h
 include/gnuradio/gr_unpacked_to_packed_ii.h
 include/gnuradio/gr_unpacked_to_packed_ss.h
 include/gnuradio/gr_vco.h
 include/gnuradio/gr_vco_f.h
+include/gnuradio/gr_vec_types.h
 include/gnuradio/gr_vector_sink_b.h
 include/gnuradio/gr_vector_sink_c.h
 include/gnuradio/gr_vector_sink_f.h
@@ -284,6 +355,13 @@ include/gnuradio/gr_vector_source_s.h
 include/gnuradio/gr_vector_to_stream.h
 include/gnuradio/gr_vector_to_streams.h
 include/gnuradio/gr_vmcircbuf.h
+include/gnuradio/gr_wavelet_ff.h
+include/gnuradio/gr_wavfile_sink.h
+include/gnuradio/gr_wavfile_source.h
+include/gnuradio/gr_wvps_ff.h
+include/gnuradio/gr_xor_bb.h
+include/gnuradio/gr_xor_ii.h
+include/gnuradio/gr_xor_ss.h
 include/gnuradio/gri_add_const_ss.h
 include/gnuradio/gri_agc2_cc.h
 include/gnuradio/gri_agc2_ff.h
@@ -295,9 +373,11 @@ include/gnuradio/gri_fft.h
 include/gnuradio/gri_float_to_char.h
 include/gnuradio/gri_float_to_short.h
 include/gnuradio/gri_float_to_uchar.h
+include/gnuradio/gri_glfsr.h
 include/gnuradio/gri_goertzel.h
 include/gnuradio/gri_iir.h
 include/gnuradio/gri_interleaved_short_to_complex.h
+include/gnuradio/gri_lfsr.h
 include/gnuradio/gri_lfsr_15_1_0.h
 include/gnuradio/gri_lfsr_32k.h
 include/gnuradio/gri_logger.h
@@ -305,6 +385,7 @@ include/gnuradio/gri_mmse_fir_interpolator.h
 include/gnuradio/gri_mmse_fir_interpolator_cc.h
 include/gnuradio/gri_short_to_float.h
 include/gnuradio/gri_uchar_to_float.h
+include/gnuradio/gri_wavfile.h
 include/gnuradio/i2c.h
 include/gnuradio/i2c_bbio.h
 include/gnuradio/i2c_bbio_pp.h
@@ -317,6 +398,7 @@ include/gnuradio/microtune_4937_eval_board.h
 include/gnuradio/microtune_eval_board_defs.h
 include/gnuradio/microtune_xxxx.h
 include/gnuradio/microtune_xxxx_eval_board.h
+include/gnuradio/omni_time.h
 include/gnuradio/omnithread.h
 include/gnuradio/ot_VxThread.h
 include/gnuradio/ot_mach.h
@@ -336,8 +418,15 @@ include/gnuradio/sse_debug.h
 include/gnuradio/swig/filter.i
 include/gnuradio/swig/filter_generated.i
 include/gnuradio/swig/general.i
-include/gnuradio/swig/general_generated.i
+include/gnuradio/swig/gengen.i
+include/gnuradio/swig/gengen_generated.i
 include/gnuradio/swig/gnuradio.i
+include/gnuradio/swig/gnuradio_swig_py_filter.i
+include/gnuradio/swig/gnuradio_swig_py_general.i
+include/gnuradio/swig/gnuradio_swig_py_gengen.i
+include/gnuradio/swig/gnuradio_swig_py_hier.i
+include/gnuradio/swig/gnuradio_swig_py_io.i
+include/gnuradio/swig/gnuradio_swig_py_runtime.i
 include/gnuradio/swig/gr_adaptive_fir_ccf.i
 include/gnuradio/swig/gr_add_cc.i
 include/gnuradio/swig/gr_add_const_cc.i
@@ -352,20 +441,28 @@ include/gnuradio/swig/gr_add_const_vss.i
 include/gnuradio/swig/gr_add_ff.i
 include/gnuradio/swig/gr_add_ii.i
 include/gnuradio/swig/gr_add_ss.i
-include/gnuradio/swig/gr_add_vcc.i
-include/gnuradio/swig/gr_add_vff.i
-include/gnuradio/swig/gr_add_vii.i
-include/gnuradio/swig/gr_add_vss.i
 include/gnuradio/swig/gr_agc2_cc.i
 include/gnuradio/swig/gr_agc2_ff.i
 include/gnuradio/swig/gr_agc_cc.i
 include/gnuradio/swig/gr_agc_ff.i
 include/gnuradio/swig/gr_align_on_samplenumbers_ss.i
+include/gnuradio/swig/gr_and_bb.i
+include/gnuradio/swig/gr_and_const_bb.i
+include/gnuradio/swig/gr_and_const_ii.i
+include/gnuradio/swig/gr_and_const_ss.i
+include/gnuradio/swig/gr_and_ii.i
+include/gnuradio/swig/gr_and_ss.i
+include/gnuradio/swig/gr_argmax_fs.i
+include/gnuradio/swig/gr_argmax_is.i
+include/gnuradio/swig/gr_argmax_ss.i
+include/gnuradio/swig/gr_basic_block.i
+include/gnuradio/swig/gr_bin_statistics_f.i
 include/gnuradio/swig/gr_binary_slicer_fb.i
 include/gnuradio/swig/gr_block.i
 include/gnuradio/swig/gr_block_detail.i
 include/gnuradio/swig/gr_buffer.i
 include/gnuradio/swig/gr_bytes_to_syms.i
+include/gnuradio/swig/gr_channel_model.i
 include/gnuradio/swig/gr_char_to_float.i
 include/gnuradio/swig/gr_check_counting_s.i
 include/gnuradio/swig/gr_check_lfsr_32k_s.i
@@ -384,10 +481,14 @@ include/gnuradio/swig/gr_conjugate_cc.i
 include/gnuradio/swig/gr_constellation_decoder_cb.i
 include/gnuradio/swig/gr_correlate_access_code_bb.i
 include/gnuradio/swig/gr_costas_loop_cc.i
+include/gnuradio/swig/gr_cpfsk_bc.i
 include/gnuradio/swig/gr_crc32.i
 include/gnuradio/swig/gr_ctcss_squelch_ff.i
 include/gnuradio/swig/gr_dd_mpsk_sync_cc.i
+include/gnuradio/swig/gr_decode_ccsds_27_fb.i
 include/gnuradio/swig/gr_deinterleave.i
+include/gnuradio/swig/gr_delay.i
+include/gnuradio/swig/gr_descrambler_bb.i
 include/gnuradio/swig/gr_diff_decoder_bb.i
 include/gnuradio/swig/gr_diff_encoder_bb.i
 include/gnuradio/swig/gr_diff_phasor_cc.i
@@ -396,6 +497,8 @@ include/gnuradio/swig/gr_divide_cc.i
 include/gnuradio/swig/gr_divide_ff.i
 include/gnuradio/swig/gr_divide_ii.i
 include/gnuradio/swig/gr_divide_ss.i
+include/gnuradio/swig/gr_dpll_bb.i
+include/gnuradio/swig/gr_encode_ccsds_27_bb.i
 include/gnuradio/swig/gr_endianness.i
 include/gnuradio/swig/gr_error_handler.i
 include/gnuradio/swig/gr_fake_channel_coder_pp.i
@@ -408,6 +511,7 @@ include/gnuradio/swig/gr_fft_vfc.i
 include/gnuradio/swig/gr_file_descriptor_sink.i
 include/gnuradio/swig/gr_file_descriptor_source.i
 include/gnuradio/swig/gr_file_sink.i
+include/gnuradio/swig/gr_file_sink_base.i
 include/gnuradio/swig/gr_file_source.i
 include/gnuradio/swig/gr_filter_delay_fc.i
 include/gnuradio/swig/gr_fir_filter_ccc.i
@@ -421,6 +525,9 @@ include/gnuradio/swig/gr_float_to_char.i
 include/gnuradio/swig/gr_float_to_complex.i
 include/gnuradio/swig/gr_float_to_short.i
 include/gnuradio/swig/gr_float_to_uchar.i
+include/gnuradio/swig/gr_fmdet_cf.i
+include/gnuradio/swig/gr_fractional_interpolator_cc.i
+include/gnuradio/swig/gr_fractional_interpolator_ff.i
 include/gnuradio/swig/gr_framer_sink_1.i
 include/gnuradio/swig/gr_freq_xlating_fir_filter_ccc.i
 include/gnuradio/swig/gr_freq_xlating_fir_filter_ccf.i
@@ -429,10 +536,18 @@ include/gnuradio/swig/gr_freq_xlating_fir_filter_fcf.i
 include/gnuradio/swig/gr_freq_xlating_fir_filter_scc.i
 include/gnuradio/swig/gr_freq_xlating_fir_filter_scf.i
 include/gnuradio/swig/gr_frequency_modulator_fc.i
+include/gnuradio/swig/gr_glfsr_source_b.i
+include/gnuradio/swig/gr_glfsr_source_f.i
 include/gnuradio/swig/gr_goertzel_fc.i
 include/gnuradio/swig/gr_head.i
+include/gnuradio/swig/gr_hier_block2.i
 include/gnuradio/swig/gr_hilbert_fc.i
+include/gnuradio/swig/gr_histo_sink.i
 include/gnuradio/swig/gr_iir_filter_ffd.i
+include/gnuradio/swig/gr_integrate_cc.i
+include/gnuradio/swig/gr_integrate_ff.i
+include/gnuradio/swig/gr_integrate_ii.i
+include/gnuradio/swig/gr_integrate_ss.i
 include/gnuradio/swig/gr_interleave.i
 include/gnuradio/swig/gr_interleaved_short_to_complex.i
 include/gnuradio/swig/gr_interp_fir_filter_ccc.i
@@ -442,15 +557,24 @@ include/gnuradio/swig/gr_interp_fir_filter_fff.i
 include/gnuradio/swig/gr_interp_fir_filter_fsf.i
 include/gnuradio/swig/gr_interp_fir_filter_scc.i
 include/gnuradio/swig/gr_io_signature.i
+include/gnuradio/swig/gr_iqcomp_cc.i
 include/gnuradio/swig/gr_keep_one_in_n.i
 include/gnuradio/swig/gr_kludge_copy.i
 include/gnuradio/swig/gr_lfsr_32k_source_s.i
 include/gnuradio/swig/gr_lms_dfe_cc.i
 include/gnuradio/swig/gr_lms_dfe_ff.i
 include/gnuradio/swig/gr_map_bb.i
+include/gnuradio/swig/gr_max_ff.i
+include/gnuradio/swig/gr_max_ii.i
+include/gnuradio/swig/gr_max_ss.i
 include/gnuradio/swig/gr_message.i
 include/gnuradio/swig/gr_message_sink.i
 include/gnuradio/swig/gr_message_source.i
+include/gnuradio/swig/gr_moving_average_cc.i
+include/gnuradio/swig/gr_moving_average_ff.i
+include/gnuradio/swig/gr_moving_average_ii.i
+include/gnuradio/swig/gr_moving_average_ss.i
+include/gnuradio/swig/gr_mpsk_receiver_cc.i
 include/gnuradio/swig/gr_msg_handler.i
 include/gnuradio/swig/gr_msg_queue.i
 include/gnuradio/swig/gr_multiply_cc.i
@@ -465,10 +589,6 @@ include/gnuradio/swig/gr_multiply_const_vss.i
 include/gnuradio/swig/gr_multiply_ff.i
 include/gnuradio/swig/gr_multiply_ii.i
 include/gnuradio/swig/gr_multiply_ss.i
-include/gnuradio/swig/gr_multiply_vcc.i
-include/gnuradio/swig/gr_multiply_vff.i
-include/gnuradio/swig/gr_multiply_vii.i
-include/gnuradio/swig/gr_multiply_vss.i
 include/gnuradio/swig/gr_mute_cc.i
 include/gnuradio/swig/gr_mute_ff.i
 include/gnuradio/swig/gr_mute_ii.i
@@ -479,26 +599,48 @@ include/gnuradio/swig/gr_noise_source_f.i
 include/gnuradio/swig/gr_noise_source_i.i
 include/gnuradio/swig/gr_noise_source_s.i
 include/gnuradio/swig/gr_nop.i
+include/gnuradio/swig/gr_not_bb.i
+include/gnuradio/swig/gr_not_ii.i
+include/gnuradio/swig/gr_not_ss.i
 include/gnuradio/swig/gr_null_sink.i
 include/gnuradio/swig/gr_null_source.i
+include/gnuradio/swig/gr_ofdm_cyclic_prefixer.i
+include/gnuradio/swig/gr_ofdm_demapper_vcb.i
+include/gnuradio/swig/gr_ofdm_frame_acquisition.i
+include/gnuradio/swig/gr_ofdm_frame_sink.i
+include/gnuradio/swig/gr_ofdm_insert_preamble.i
+include/gnuradio/swig/gr_ofdm_mapper_bcv.i
+include/gnuradio/swig/gr_ofdm_sampler.i
+include/gnuradio/swig/gr_or_bb.i
+include/gnuradio/swig/gr_or_ii.i
+include/gnuradio/swig/gr_or_ss.i
 include/gnuradio/swig/gr_oscope_sink.i
 include/gnuradio/swig/gr_pa_2x2_phase_combiner.i
 include/gnuradio/swig/gr_packed_to_unpacked_bb.i
 include/gnuradio/swig/gr_packed_to_unpacked_ii.i
 include/gnuradio/swig/gr_packed_to_unpacked_ss.i
 include/gnuradio/swig/gr_packet_sink.i
+include/gnuradio/swig/gr_peak_detector2_fb.i
+include/gnuradio/swig/gr_peak_detector_fb.i
+include/gnuradio/swig/gr_peak_detector_ib.i
+include/gnuradio/swig/gr_peak_detector_sb.i
 include/gnuradio/swig/gr_phase_modulator_fc.i
 include/gnuradio/swig/gr_pll_carriertracking_cc.i
 include/gnuradio/swig/gr_pll_freqdet_cf.i
 include/gnuradio/swig/gr_pll_refout_cc.i
+include/gnuradio/swig/gr_pn_correlator_cc.i
 include/gnuradio/swig/gr_prefix.i
 include/gnuradio/swig/gr_prefs.i
 include/gnuradio/swig/gr_probe_avg_mag_sqrd_c.i
+include/gnuradio/swig/gr_probe_avg_mag_sqrd_cf.i
 include/gnuradio/swig/gr_probe_avg_mag_sqrd_f.i
+include/gnuradio/swig/gr_probe_density_b.i
+include/gnuradio/swig/gr_probe_mpsk_snr_c.i
 include/gnuradio/swig/gr_probe_signal_f.i
 include/gnuradio/swig/gr_pwr_squelch_cc.i
 include/gnuradio/swig/gr_pwr_squelch_ff.i
 include/gnuradio/swig/gr_quadrature_demod_cf.i
+include/gnuradio/swig/gr_rail_ff.i
 include/gnuradio/swig/gr_rational_resampler_base_ccc.i
 include/gnuradio/swig/gr_rational_resampler_base_ccf.i
 include/gnuradio/swig/gr_rational_resampler_base_fcc.i
@@ -506,9 +648,17 @@ include/gnuradio/swig/gr_rational_resampler_base_fff.i
 include/gnuradio/swig/gr_rational_resampler_base_fsf.i
 include/gnuradio/swig/gr_rational_resampler_base_scc.i
 include/gnuradio/swig/gr_realtime.i
+include/gnuradio/swig/gr_regenerate_bb.i
 include/gnuradio/swig/gr_remez.i
+include/gnuradio/swig/gr_repeat.i
 include/gnuradio/swig/gr_rms_cf.i
 include/gnuradio/swig/gr_rms_ff.i
+include/gnuradio/swig/gr_sample_and_hold_bb.i
+include/gnuradio/swig/gr_sample_and_hold_ff.i
+include/gnuradio/swig/gr_sample_and_hold_ii.i
+include/gnuradio/swig/gr_sample_and_hold_ss.i
+include/gnuradio/swig/gr_scrambler_bb.i
+include/gnuradio/swig/gr_shared_ptr.i
 include/gnuradio/swig/gr_short_to_float.i
 include/gnuradio/swig/gr_sig_source_c.i
 include/gnuradio/swig/gr_sig_source_f.i
@@ -517,20 +667,19 @@ include/gnuradio/swig/gr_sig_source_s.i
 include/gnuradio/swig/gr_simple_correlator.i
 include/gnuradio/swig/gr_simple_framer.i
 include/gnuradio/swig/gr_simple_squelch_cc.i
-include/gnuradio/swig/gr_single_pole_avg_filter_ff.i
 include/gnuradio/swig/gr_single_pole_iir_filter_cc.i
 include/gnuradio/swig/gr_single_pole_iir_filter_ff.i
-include/gnuradio/swig/gr_single_pole_rec_filter_ff.i
 include/gnuradio/swig/gr_single_threaded_scheduler.i
-include/gnuradio/swig/gr_single_zero_avg_filter_ff.i
-include/gnuradio/swig/gr_single_zero_rec_filter_ff.i
 include/gnuradio/swig/gr_skiphead.i
+include/gnuradio/swig/gr_squash_ff.i
 include/gnuradio/swig/gr_squelch_base_cc.i
 include/gnuradio/swig/gr_squelch_base_ff.i
+include/gnuradio/swig/gr_stream_mux.i
 include/gnuradio/swig/gr_stream_to_streams.i
 include/gnuradio/swig/gr_stream_to_vector.i
 include/gnuradio/swig/gr_streams_to_stream.i
 include/gnuradio/swig/gr_streams_to_vector.i
+include/gnuradio/swig/gr_stretch_ff.i
 include/gnuradio/swig/gr_sub_cc.i
 include/gnuradio/swig/gr_sub_ff.i
 include/gnuradio/swig/gr_sub_ii.i
@@ -542,7 +691,10 @@ include/gnuradio/swig/gr_sync_interpolator.i
 include/gnuradio/swig/gr_test.i
 include/gnuradio/swig/gr_threshold_ff.i
 include/gnuradio/swig/gr_throttle.i
+include/gnuradio/swig/gr_top_block.i
 include/gnuradio/swig/gr_uchar_to_float.i
+include/gnuradio/swig/gr_udp_sink.i
+include/gnuradio/swig/gr_udp_source.i
 include/gnuradio/swig/gr_unpack_k_bits_bb.i
 include/gnuradio/swig/gr_unpacked_to_packed_bb.i
 include/gnuradio/swig/gr_unpacked_to_packed_ii.i
@@ -560,10 +712,18 @@ include/gnuradio/swig/gr_vector_source_i.i
 include/gnuradio/swig/gr_vector_source_s.i
 include/gnuradio/swig/gr_vector_to_stream.i
 include/gnuradio/swig/gr_vector_to_streams.i
+include/gnuradio/swig/gr_wavelet_ff.i
+include/gnuradio/swig/gr_wavfile_sink.i
+include/gnuradio/swig/gr_wavfile_source.i
+include/gnuradio/swig/gr_wvps_ff.i
+include/gnuradio/swig/gr_xor_bb.i
+include/gnuradio/swig/gr_xor_ii.i
+include/gnuradio/swig/gr_xor_ss.i
 include/gnuradio/swig/gri_agc2_cc.i
 include/gnuradio/swig/gri_agc2_ff.i
 include/gnuradio/swig/gri_agc_cc.i
 include/gnuradio/swig/gri_agc_ff.i
+include/gnuradio/swig/hier.i
 include/gnuradio/swig/io.i
 include/gnuradio/swig/microtune_4702_eval_board.i
 include/gnuradio/swig/microtune_4937_eval_board.i
@@ -571,70 +731,129 @@ include/gnuradio/swig/microtune_xxxx_eval_board.i
 include/gnuradio/swig/ppio.i
 include/gnuradio/swig/runtime.i
 include/gnuradio/swig/sdr_1000.i
-include/gnuradio/swig/shared_ptr.i
+include/gruel/inet.h
+include/gruel/realtime.h
+include/gruel/sys_pri.h
+include/gruel/thread_body_wrapper.h
+include/gruel/thread_group.h
 lib/libgnuradio-core-qa.la
 lib/libgnuradio-core.la
+lib/libgromnithread.la
+lib/libgruel.la
 lib/pkgconfig/gnuradio-core.pc
+lib/pkgconfig/gnuradio-omnithread.pc
+lib/pkgconfig/gruel.pc
 ${PYSITELIB}/gnuradio/__init__.py
 ${PYSITELIB}/gnuradio/__init__.pyc
 ${PYSITELIB}/gnuradio/__init__.pyo
 ${PYSITELIB}/gnuradio/audio.py
 ${PYSITELIB}/gnuradio/audio.pyc
 ${PYSITELIB}/gnuradio/audio.pyo
-${PYSITELIB}/gnuradio/blks/__init__.py
-${PYSITELIB}/gnuradio/blks/__init__.pyc
-${PYSITELIB}/gnuradio/blks/__init__.pyo
-${PYSITELIB}/gnuradio/blksimpl/__init__.py
-${PYSITELIB}/gnuradio/blksimpl/__init__.pyc
-${PYSITELIB}/gnuradio/blksimpl/__init__.pyo
-${PYSITELIB}/gnuradio/blksimpl/am_demod.py
-${PYSITELIB}/gnuradio/blksimpl/am_demod.pyc
-${PYSITELIB}/gnuradio/blksimpl/am_demod.pyo
-${PYSITELIB}/gnuradio/blksimpl/dbpsk.py
-${PYSITELIB}/gnuradio/blksimpl/dbpsk.pyc
-${PYSITELIB}/gnuradio/blksimpl/dbpsk.pyo
-${PYSITELIB}/gnuradio/blksimpl/dqpsk.py
-${PYSITELIB}/gnuradio/blksimpl/dqpsk.pyc
-${PYSITELIB}/gnuradio/blksimpl/dqpsk.pyo
-${PYSITELIB}/gnuradio/blksimpl/filterbank.py
-${PYSITELIB}/gnuradio/blksimpl/filterbank.pyc
-${PYSITELIB}/gnuradio/blksimpl/filterbank.pyo
-${PYSITELIB}/gnuradio/blksimpl/fm_demod.py
-${PYSITELIB}/gnuradio/blksimpl/fm_demod.pyc
-${PYSITELIB}/gnuradio/blksimpl/fm_demod.pyo
-${PYSITELIB}/gnuradio/blksimpl/fm_emph.py
-${PYSITELIB}/gnuradio/blksimpl/fm_emph.pyc
-${PYSITELIB}/gnuradio/blksimpl/fm_emph.pyo
-${PYSITELIB}/gnuradio/blksimpl/gmsk.py
-${PYSITELIB}/gnuradio/blksimpl/gmsk.pyc
-${PYSITELIB}/gnuradio/blksimpl/gmsk.pyo
-${PYSITELIB}/gnuradio/blksimpl/nbfm_rx.py
-${PYSITELIB}/gnuradio/blksimpl/nbfm_rx.pyc
-${PYSITELIB}/gnuradio/blksimpl/nbfm_rx.pyo
-${PYSITELIB}/gnuradio/blksimpl/nbfm_tx.py
-${PYSITELIB}/gnuradio/blksimpl/nbfm_tx.pyc
-${PYSITELIB}/gnuradio/blksimpl/nbfm_tx.pyo
-${PYSITELIB}/gnuradio/blksimpl/pkt.py
-${PYSITELIB}/gnuradio/blksimpl/pkt.pyc
-${PYSITELIB}/gnuradio/blksimpl/pkt.pyo
-${PYSITELIB}/gnuradio/blksimpl/psk.py
-${PYSITELIB}/gnuradio/blksimpl/psk.pyc
-${PYSITELIB}/gnuradio/blksimpl/psk.pyo
-${PYSITELIB}/gnuradio/blksimpl/rational_resampler.py
-${PYSITELIB}/gnuradio/blksimpl/rational_resampler.pyc
-${PYSITELIB}/gnuradio/blksimpl/rational_resampler.pyo
-${PYSITELIB}/gnuradio/blksimpl/standard_squelch.py
-${PYSITELIB}/gnuradio/blksimpl/standard_squelch.pyc
-${PYSITELIB}/gnuradio/blksimpl/standard_squelch.pyo
-${PYSITELIB}/gnuradio/blksimpl/wfm_rcv.py
-${PYSITELIB}/gnuradio/blksimpl/wfm_rcv.pyc
-${PYSITELIB}/gnuradio/blksimpl/wfm_rcv.pyo
-${PYSITELIB}/gnuradio/blksimpl/wfm_rcv_pll.py
-${PYSITELIB}/gnuradio/blksimpl/wfm_rcv_pll.pyc
-${PYSITELIB}/gnuradio/blksimpl/wfm_rcv_pll.pyo
-${PYSITELIB}/gnuradio/blksimpl/wfm_tx.py
-${PYSITELIB}/gnuradio/blksimpl/wfm_tx.pyc
-${PYSITELIB}/gnuradio/blksimpl/wfm_tx.pyo
+${PYSITELIB}/gnuradio/blks2/__init__.py
+${PYSITELIB}/gnuradio/blks2/__init__.pyc
+${PYSITELIB}/gnuradio/blks2/__init__.pyo
+${PYSITELIB}/gnuradio/blks2impl/__init__.py
+${PYSITELIB}/gnuradio/blks2impl/__init__.pyc
+${PYSITELIB}/gnuradio/blks2impl/__init__.pyo
+${PYSITELIB}/gnuradio/blks2impl/am_demod.py
+${PYSITELIB}/gnuradio/blks2impl/am_demod.pyc
+${PYSITELIB}/gnuradio/blks2impl/am_demod.pyo
+${PYSITELIB}/gnuradio/blks2impl/channel_model.py
+${PYSITELIB}/gnuradio/blks2impl/channel_model.pyc
+${PYSITELIB}/gnuradio/blks2impl/channel_model.pyo
+${PYSITELIB}/gnuradio/blks2impl/cpm.py
+${PYSITELIB}/gnuradio/blks2impl/cpm.pyc
+${PYSITELIB}/gnuradio/blks2impl/cpm.pyo
+${PYSITELIB}/gnuradio/blks2impl/d8psk.py
+${PYSITELIB}/gnuradio/blks2impl/d8psk.pyc
+${PYSITELIB}/gnuradio/blks2impl/d8psk.pyo
+${PYSITELIB}/gnuradio/blks2impl/dbpsk.py
+${PYSITELIB}/gnuradio/blks2impl/dbpsk.pyc
+${PYSITELIB}/gnuradio/blks2impl/dbpsk.pyo
+${PYSITELIB}/gnuradio/blks2impl/dqpsk.py
+${PYSITELIB}/gnuradio/blks2impl/dqpsk.pyc
+${PYSITELIB}/gnuradio/blks2impl/dqpsk.pyo
+${PYSITELIB}/gnuradio/blks2impl/filterbank.py
+${PYSITELIB}/gnuradio/blks2impl/filterbank.pyc
+${PYSITELIB}/gnuradio/blks2impl/filterbank.pyo
+${PYSITELIB}/gnuradio/blks2impl/fm_demod.py
+${PYSITELIB}/gnuradio/blks2impl/fm_demod.pyc
+${PYSITELIB}/gnuradio/blks2impl/fm_demod.pyo
+${PYSITELIB}/gnuradio/blks2impl/fm_emph.py
+${PYSITELIB}/gnuradio/blks2impl/fm_emph.pyc
+${PYSITELIB}/gnuradio/blks2impl/fm_emph.pyo
+${PYSITELIB}/gnuradio/blks2impl/gmsk.py
+${PYSITELIB}/gnuradio/blks2impl/gmsk.pyc
+${PYSITELIB}/gnuradio/blks2impl/gmsk.pyo
+${PYSITELIB}/gnuradio/blks2impl/logpwrfft.py
+${PYSITELIB}/gnuradio/blks2impl/logpwrfft.pyc
+${PYSITELIB}/gnuradio/blks2impl/logpwrfft.pyo
+${PYSITELIB}/gnuradio/blks2impl/nbfm_rx.py
+${PYSITELIB}/gnuradio/blks2impl/nbfm_rx.pyc
+${PYSITELIB}/gnuradio/blks2impl/nbfm_rx.pyo
+${PYSITELIB}/gnuradio/blks2impl/nbfm_tx.py
+${PYSITELIB}/gnuradio/blks2impl/nbfm_tx.pyc
+${PYSITELIB}/gnuradio/blks2impl/nbfm_tx.pyo
+${PYSITELIB}/gnuradio/blks2impl/ofdm.py
+${PYSITELIB}/gnuradio/blks2impl/ofdm.pyc
+${PYSITELIB}/gnuradio/blks2impl/ofdm.pyo
+${PYSITELIB}/gnuradio/blks2impl/ofdm_receiver.py
+${PYSITELIB}/gnuradio/blks2impl/ofdm_receiver.pyc
+${PYSITELIB}/gnuradio/blks2impl/ofdm_receiver.pyo
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_fixed.py
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_fixed.pyc
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_fixed.pyo
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_ml.py
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_ml.pyc
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_ml.pyo
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_pn.py
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_pn.pyc
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_pn.pyo
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_pnac.py
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_pnac.pyc
+${PYSITELIB}/gnuradio/blks2impl/ofdm_sync_pnac.pyo
+${PYSITELIB}/gnuradio/blks2impl/pkt.py
+${PYSITELIB}/gnuradio/blks2impl/pkt.pyc
+${PYSITELIB}/gnuradio/blks2impl/pkt.pyo
+${PYSITELIB}/gnuradio/blks2impl/psk.py
+${PYSITELIB}/gnuradio/blks2impl/psk.pyc
+${PYSITELIB}/gnuradio/blks2impl/psk.pyo
+${PYSITELIB}/gnuradio/blks2impl/qam.py
+${PYSITELIB}/gnuradio/blks2impl/qam.pyc
+${PYSITELIB}/gnuradio/blks2impl/qam.pyo
+${PYSITELIB}/gnuradio/blks2impl/qam16.py
+${PYSITELIB}/gnuradio/blks2impl/qam16.pyc
+${PYSITELIB}/gnuradio/blks2impl/qam16.pyo
+${PYSITELIB}/gnuradio/blks2impl/qam256.py
+${PYSITELIB}/gnuradio/blks2impl/qam256.pyc
+${PYSITELIB}/gnuradio/blks2impl/qam256.pyo
+${PYSITELIB}/gnuradio/blks2impl/qam64.py
+${PYSITELIB}/gnuradio/blks2impl/qam64.pyc
+${PYSITELIB}/gnuradio/blks2impl/qam64.pyo
+${PYSITELIB}/gnuradio/blks2impl/qam8.py
+${PYSITELIB}/gnuradio/blks2impl/qam8.pyc
+${PYSITELIB}/gnuradio/blks2impl/qam8.pyo
+${PYSITELIB}/gnuradio/blks2impl/rational_resampler.py
+${PYSITELIB}/gnuradio/blks2impl/rational_resampler.pyc
+${PYSITELIB}/gnuradio/blks2impl/rational_resampler.pyo
+${PYSITELIB}/gnuradio/blks2impl/standard_squelch.py
+${PYSITELIB}/gnuradio/blks2impl/standard_squelch.pyc
+${PYSITELIB}/gnuradio/blks2impl/standard_squelch.pyo
+${PYSITELIB}/gnuradio/blks2impl/stream_to_vector_decimator.py
+${PYSITELIB}/gnuradio/blks2impl/stream_to_vector_decimator.pyc
+${PYSITELIB}/gnuradio/blks2impl/stream_to_vector_decimator.pyo
+${PYSITELIB}/gnuradio/blks2impl/wfm_rcv.py
+${PYSITELIB}/gnuradio/blks2impl/wfm_rcv.pyc
+${PYSITELIB}/gnuradio/blks2impl/wfm_rcv.pyo
+${PYSITELIB}/gnuradio/blks2impl/wfm_rcv_fmdet.py
+${PYSITELIB}/gnuradio/blks2impl/wfm_rcv_fmdet.pyc
+${PYSITELIB}/gnuradio/blks2impl/wfm_rcv_fmdet.pyo
+${PYSITELIB}/gnuradio/blks2impl/wfm_rcv_pll.py
+${PYSITELIB}/gnuradio/blks2impl/wfm_rcv_pll.pyc
+${PYSITELIB}/gnuradio/blks2impl/wfm_rcv_pll.pyo
+${PYSITELIB}/gnuradio/blks2impl/wfm_tx.py
+${PYSITELIB}/gnuradio/blks2impl/wfm_tx.pyc
+${PYSITELIB}/gnuradio/blks2impl/wfm_tx.pyo
 ${PYSITELIB}/gnuradio/eng_notation.py
 ${PYSITELIB}/gnuradio/eng_notation.pyc
 ${PYSITELIB}/gnuradio/eng_notation.pyo
@@ -644,16 +863,33 @@ ${PYSITELIB}/gnuradio/eng_option.pyo
 ${PYSITELIB}/gnuradio/gr/__init__.py
 ${PYSITELIB}/gnuradio/gr/__init__.pyc
 ${PYSITELIB}/gnuradio/gr/__init__.pyo
-${PYSITELIB}/gnuradio/gr/_gnuradio_swig_python.la
-${PYSITELIB}/gnuradio/gr/basic_flow_graph.py
-${PYSITELIB}/gnuradio/gr/basic_flow_graph.pyc
-${PYSITELIB}/gnuradio/gr/basic_flow_graph.pyo
+${PYSITELIB}/gnuradio/gr/_gnuradio_swig_py_filter.la
+${PYSITELIB}/gnuradio/gr/_gnuradio_swig_py_general.la
+${PYSITELIB}/gnuradio/gr/_gnuradio_swig_py_gengen.la
+${PYSITELIB}/gnuradio/gr/_gnuradio_swig_py_hier.la
+${PYSITELIB}/gnuradio/gr/_gnuradio_swig_py_io.la
+${PYSITELIB}/gnuradio/gr/_gnuradio_swig_py_runtime.la
 ${PYSITELIB}/gnuradio/gr/exceptions.py
 ${PYSITELIB}/gnuradio/gr/exceptions.pyc
 ${PYSITELIB}/gnuradio/gr/exceptions.pyo
-${PYSITELIB}/gnuradio/gr/flow_graph.py
-${PYSITELIB}/gnuradio/gr/flow_graph.pyc
-${PYSITELIB}/gnuradio/gr/flow_graph.pyo
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_filter.py
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_filter.pyc
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_filter.pyo
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_general.py
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_general.pyc
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_general.pyo
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_gengen.py
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_gengen.pyc
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_gengen.pyo
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_hier.py
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_hier.pyc
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_hier.pyo
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_io.py
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_io.pyc
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_io.pyo
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_runtime.py
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_runtime.pyc
+${PYSITELIB}/gnuradio/gr/gnuradio_swig_py_runtime.pyo
 ${PYSITELIB}/gnuradio/gr/gnuradio_swig_python.py
 ${PYSITELIB}/gnuradio/gr/gnuradio_swig_python.pyc
 ${PYSITELIB}/gnuradio/gr/gnuradio_swig_python.pyo
@@ -666,15 +902,21 @@ ${PYSITELIB}/gnuradio/gr/gr_threading_23.pyo
 ${PYSITELIB}/gnuradio/gr/gr_threading_24.py
 ${PYSITELIB}/gnuradio/gr/gr_threading_24.pyc
 ${PYSITELIB}/gnuradio/gr/gr_threading_24.pyo
-${PYSITELIB}/gnuradio/gr/hier_block.py
-${PYSITELIB}/gnuradio/gr/hier_block.pyc
-${PYSITELIB}/gnuradio/gr/hier_block.pyo
+${PYSITELIB}/gnuradio/gr/hier_block2.py
+${PYSITELIB}/gnuradio/gr/hier_block2.pyc
+${PYSITELIB}/gnuradio/gr/hier_block2.pyo
 ${PYSITELIB}/gnuradio/gr/prefs.py
 ${PYSITELIB}/gnuradio/gr/prefs.pyc
 ${PYSITELIB}/gnuradio/gr/prefs.pyo
+${PYSITELIB}/gnuradio/gr/pubsub.py
+${PYSITELIB}/gnuradio/gr/pubsub.pyc
+${PYSITELIB}/gnuradio/gr/pubsub.pyo
 ${PYSITELIB}/gnuradio/gr/scheduler.py
 ${PYSITELIB}/gnuradio/gr/scheduler.pyc
 ${PYSITELIB}/gnuradio/gr/scheduler.pyo
+${PYSITELIB}/gnuradio/gr/top_block.py
+${PYSITELIB}/gnuradio/gr/top_block.pyc
+${PYSITELIB}/gnuradio/gr/top_block.pyo
 ${PYSITELIB}/gnuradio/gr_unittest.py
 ${PYSITELIB}/gnuradio/gr_unittest.pyc
 ${PYSITELIB}/gnuradio/gr_unittest.pyo
@@ -687,6 +929,9 @@ ${PYSITELIB}/gnuradio/gruimpl/__init__.pyo
 ${PYSITELIB}/gnuradio/gruimpl/crc.py
 ${PYSITELIB}/gnuradio/gruimpl/crc.pyc
 ${PYSITELIB}/gnuradio/gruimpl/crc.pyo
+${PYSITELIB}/gnuradio/gruimpl/daemon.py
+${PYSITELIB}/gnuradio/gruimpl/daemon.pyc
+${PYSITELIB}/gnuradio/gruimpl/daemon.pyo
 ${PYSITELIB}/gnuradio/gruimpl/freqz.py
 ${PYSITELIB}/gnuradio/gruimpl/freqz.pyc
 ${PYSITELIB}/gnuradio/gruimpl/freqz.pyo
@@ -720,12 +965,18 @@ ${PYSITELIB}/gnuradio/gruimpl/socket_stuff.pyo
 ${PYSITELIB}/gnuradio/modulation_utils.py
 ${PYSITELIB}/gnuradio/modulation_utils.pyc
 ${PYSITELIB}/gnuradio/modulation_utils.pyo
+${PYSITELIB}/gnuradio/ofdm_packet_utils.py
+${PYSITELIB}/gnuradio/ofdm_packet_utils.pyc
+${PYSITELIB}/gnuradio/ofdm_packet_utils.pyo
 ${PYSITELIB}/gnuradio/optfir.py
 ${PYSITELIB}/gnuradio/optfir.pyc
 ${PYSITELIB}/gnuradio/optfir.pyo
 ${PYSITELIB}/gnuradio/packet_utils.py
 ${PYSITELIB}/gnuradio/packet_utils.pyc
 ${PYSITELIB}/gnuradio/packet_utils.pyo
+${PYSITELIB}/gnuradio/vocoder/__init__.py
+${PYSITELIB}/gnuradio/vocoder/__init__.pyc
+${PYSITELIB}/gnuradio/vocoder/__init__.pyo
 ${PYSITELIB}/gnuradio/window.py
 ${PYSITELIB}/gnuradio/window.pyc
 ${PYSITELIB}/gnuradio/window.pyo
diff --git a/ham/gnuradio-core/buildlink3.mk b/ham/gnuradio-core/buildlink3.mk
index 32ff780ee0a..fdb7abcf1f4 100644
--- a/ham/gnuradio-core/buildlink3.mk
+++ b/ham/gnuradio-core/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/08/12 12:21:39 markd Exp $
 
 BUILDLINK_TREE+=	gnuradio-core
 
@@ -10,12 +10,14 @@ BUILDLINK_PKGSRCDIR.gnuradio-core?=	../../ham/gnuradio-core
 BUILDLINK_CPPFLAGS.gnuradio-core+=    -I${BUILDLINK_PREFIX.gnuradio-core}/include/gnuradio
 
 .include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/cppunit/buildlink3.mk"
 .include "../../devel/swig/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../math/fftwf/buildlink3.mk"
+.include "../../math/gsl/buildlink3.mk"
 .endif # GNURADIO_CORE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-core
diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo
index 7aa5a1421f4..32bc0718436 100644
--- a/ham/gnuradio-core/distinfo
+++ b/ham/gnuradio-core/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.10 2008/03/15 15:09:54 joerg Exp $
+$NetBSD: distinfo,v 1.11 2009/08/12 12:21:39 markd Exp $
 
-SHA1 (gnuradio-3.0.4.tar.gz) = ce2d0bd4c5217cdda8c675c80a446ca38f274121
-RMD160 (gnuradio-3.0.4.tar.gz) = a1d4ae0495f51c5b7349dd8d1305b4bfb16056dc
-Size (gnuradio-3.0.4.tar.gz) = 3381051 bytes
-SHA1 (patch-aa) = b2fa027df5a42628db84c553cfa61f37dc7886c1
-SHA1 (patch-ab) = bacede2ccdbd1142b5fcd729963248a01977eaec
-SHA1 (patch-ac) = 348898e1e0d58c03295183ce8ce0ee4baf91bddb
-SHA1 (patch-ad) = af8bc66ee7c9856e31673e765a52a2fc56e35ebb
-SHA1 (patch-ae) = 63e3c4d08162c023efc4c0c97f2141366abc21d5
-SHA1 (patch-af) = c65df8f0d4ace5a5d5acb1450940aebdf896b00b
-SHA1 (patch-ag) = 988cc6e88ed88c4de910aafbb4e1d66a2ffead70
+SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
+RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
+Size (gnuradio-3.2.tar.gz) = 6864952 bytes
+SHA1 (patch-aa) = 08c9b0fc725bcb2f6795445cbd64af431f9ce9a1
diff --git a/ham/gnuradio-core/patches/patch-aa b/ham/gnuradio-core/patches/patch-aa
index dc6d8e919f6..6df5b21b731 100644
--- a/ham/gnuradio-core/patches/patch-aa
+++ b/ham/gnuradio-core/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2006/11/13 16:59:22 wulf Exp $
+$NetBSD: patch-aa,v 1.3 2009/08/12 12:21:40 markd Exp $
 
---- gnuradio-core/src/lib/runtime/gr_dispatcher.cc.orig	2006-09-14 07:00:04.000000000 +0930
-+++ gnuradio-core/src/lib/runtime/gr_dispatcher.cc	2006-10-13 23:21:03.000000000 +0930
-@@ -29,18 +29,17 @@
- #include <errno.h>
+--- gnuradio-core/src/lib/runtime/gr_dispatcher.cc.orig	2008-05-09 18:35:10.000000000 +1200
++++ gnuradio-core/src/lib/runtime/gr_dispatcher.cc
+@@ -30,18 +30,17 @@
+ #include <stdio.h>
  
  #ifdef HAVE_SELECT
 +#  ifdef HAVE_SYS_TIME_H
diff --git a/ham/gnuradio-core/patches/patch-ab b/ham/gnuradio-core/patches/patch-ab
deleted file mode 100644
index 7bce6b35d8a..00000000000
--- a/ham/gnuradio-core/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/11/13 16:59:22 wulf Exp $
-
---- gnuradio-core/src/lib/runtime/gr_error_handler.cc.orig	2006-09-14 07:00:04.000000000 +0930
-+++ gnuradio-core/src/lib/runtime/gr_error_handler.cc	2006-10-13 23:22:42.000000000 +0930
-@@ -53,6 +53,10 @@
- #include <io.h>
- #endif
- 
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
- static gr_error_handler	*s_default_handler = 0;
- static gr_error_handler *s_silent_handler = 0;
- 
diff --git a/ham/gnuradio-core/patches/patch-ac b/ham/gnuradio-core/patches/patch-ac
deleted file mode 100644
index 25cf63d24ba..00000000000
--- a/ham/gnuradio-core/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/11/13 16:59:22 wulf Exp $
-
---- gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc.orig	2006-09-14 07:00:04.000000000 +0930
-+++ gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc	2006-10-13 23:24:55.000000000 +0930
-@@ -32,6 +32,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <stdexcept>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
- 
- 
- gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd)
diff --git a/ham/gnuradio-core/patches/patch-ad b/ham/gnuradio-core/patches/patch-ad
deleted file mode 100644
index 21f67d9b56f..00000000000
--- a/ham/gnuradio-core/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/11/13 16:59:22 wulf Exp $
-
---- gnuradio-core/src/lib/io/gr_file_descriptor_source.cc.orig	2006-09-14 07:00:04.000000000 +0930
-+++ gnuradio-core/src/lib/io/gr_file_descriptor_source.cc	2006-10-13 23:25:54.000000000 +0930
-@@ -32,6 +32,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <stdexcept>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
- 
- 
- gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize,
diff --git a/ham/gnuradio-core/patches/patch-ae b/ham/gnuradio-core/patches/patch-ae
deleted file mode 100644
index 0ffa6624d3b..00000000000
--- a/ham/gnuradio-core/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2006/11/13 16:59:22 wulf Exp $
-
---- gnuradio-core/src/lib/io/gr_file_sink.cc.orig	2006-09-14 07:00:04.000000000 +0930
-+++ gnuradio-core/src/lib/io/gr_file_sink.cc	2006-10-13 23:26:50.000000000 +0930
-@@ -30,6 +30,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <unistd.h>
- #include <stdexcept>
- 
- // win32 (mingw/msvc) specific
diff --git a/ham/gnuradio-core/patches/patch-af b/ham/gnuradio-core/patches/patch-af
deleted file mode 100644
index 0d7d70ecb64..00000000000
--- a/ham/gnuradio-core/patches/patch-af
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-af,v 1.3 2007/08/08 03:05:05 wulf Exp $
-
---- gnuradio-core/doc/Makefile.am.orig	2007-07-29 23:41:53.000000000 +0930
-+++ gnuradio-core/doc/Makefile.am	2007-07-31 10:44:22.000000000 +0930
-@@ -52,20 +52,20 @@
- ##	done
- #	cp -r html $(docdir)
- 
--install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(docdir)
--	@for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \
--		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
--		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
--	done
--	cp -r html $(DESTDIR)$(docdir)
-+#install-data-local:
-+#	$(mkinstalldirs) $(DESTDIR)$(docdir)
-+#	@for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \
-+#		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
-+#		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
-+#	done
-+#	cp -r html $(DESTDIR)$(docdir)
- 
--uninstall-local:
--	@for i in README README.hacking; do \
--		echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
--		$(RM) $(DESTDIR)$(docdir)/$$i; \
--	done
--	$(RM) -fr $(DESTDIR)$(docdir)/html
-+#uninstall-local:
-+#	@for i in README README.hacking; do \
-+#		echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
-+#		$(RM) $(DESTDIR)$(docdir)/$$i; \
-+#	done
-+#	$(RM) -fr $(DESTDIR)$(docdir)/html
- 
- clean-local:
- 	$(RM) -fr latex html man
diff --git a/ham/gnuradio-core/patches/patch-ag b/ham/gnuradio-core/patches/patch-ag
deleted file mode 100644
index 999be1f1372..00000000000
--- a/ham/gnuradio-core/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2008/03/15 15:09:54 joerg Exp $
-
---- gnuradio-core/src/lib/general/random.h.orig	2008-03-15 15:34:46.000000000 +0100
-+++ gnuradio-core/src/lib/general/random.h
-@@ -24,8 +24,9 @@
- #define _RANDOM_H_
- 
- // we use this because some systems (solaris) define RAND_MAX as 32767
--
-+#ifndef RANDOM_MAX
- static const int RANDOM_MAX = 2147483647;
-+#endif
- 
- #include <stdlib.h>
-