update gnuradio to version 3.3.0

build: refactor GR_GIT and GR_VERSION
Make C++ shared libraries versioned
howto: make versioned libraries
Changes to gr_udp_{source,sink} for MinGW
Ignore ENOPROTOOPT return from setsockopt(SO_LINGER)
Use getaddrinfo in gr_udp_{source,sink}
Discard data in gr_udp_sink until receiver is started.
Updates to udp source/sink (select(), wait, cleanup)
Merge branch 'master' into udp
Rework UDP source and sink, with incompatible API changes
Merge branch 'master' into udp
Flush pending errors in gr_udp_sink on disconnect()
Add additional conditionalization of networking includes
Use -1 as file descriptor "not open" value instead of 0
Identify memory leaks that occur on error conditions
Correct update of d_temp_offset (parallel construction)
Move initialization of select timeout
Defend against a peer that sends an invalid message length.
Return immediately when using d_residual.
Simplify USE_SELECT usage
Add USRP2 clock source parameter to GRC blocks.
grc: update UDP source and sink block wrappers
gnuradio-core: allow swig to handle exceptions in UDP source/sink
gnuradio-core: update copyrights
libvrt: remove from 3.3 API.
Merge remote branch 'gnuradio/wip/udp_source_sink'
Fix erroneous file modes
usrp2-firmware: fix missing files in tarball
Merge remote branch 'ets/grc-usrp2-clock-source'
howto: fix make check for win32, darwin (untested)
Remove bogus check for existence of prefix directory.
Update incorrectly checked in Makefile.am
Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP1.
Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP2.
Fixed issue with with wrong Makefile.am files being copied
Including bitshark_rx.h header file for USRP2 build
Updated db_bitshark_rx.c to the proper version that includes the
Once and for all, here is the properly updated Makefile.am for the apps
Updated to allow BURX support to be built into standard txrx.bin
usrp: Cleanup for merge of bitshark daughterboard code
Change default bandwidth to 25 MHz to match maximum USRP2 bandwidth
Merge branch 'master' into wip/burx_support
Merge remote branch 'nldudok1/gr-wxgui_emulate_analog' into master
gr-wxgui: Renamed "emulate analog" feature to "use persistence"
gr-wxgui: update copyrights
gnuradio-core: Disable (temporarily) interpolator tap calculation
build: force use of ltmain.sh from libtool 2.2.6b
build: use correct comment delimiter
build: distribute version controlled ltmain.sh in tarball
Merge remote branch 'bitshark/burx_support' into wip/burx_support
Revert "build: force use of ltmain.sh from libtool 2.2.6b"
Revert "build: distribute version controlled ltmain.sh in tarball"
Merge branch 'wip/burx_support'
gnuradio-core: removed gr.dd_mpsk_sync_cc block as obsolete
grc: rename execution binary from 'grc' to 'gnuradio-companion'
Update revision to release 3.3.0-rc1, update autotools
Add analog CRT screen afterglow emulation for gr-wxgui

23 files changed, 406 insertions, 254 deletions

diff --git a/ham/gnuradio-audio-jack/PLIST b/ham/gnuradio-audio-jack/PLIST
index 22ea341778f..722526b0f78 100644
--- a/ham/gnuradio-audio-jack/PLIST
+++ b/ham/gnuradio-audio-jack/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2007/08/08 02:58:45 wulf Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/09/15 09:38:43 markd Exp $
 include/gnuradio/audio_jack_sink.h
 include/gnuradio/audio_jack_source.h
 include/gnuradio/swig/audio_jack.i
+lib/libgnuradio-audio-jack.la
+lib/pkgconfig/gnuradio-audio-jack.pc
 ${PYSITELIB}/gnuradio/_audio_jack.la
 ${PYSITELIB}/gnuradio/audio_jack.py
 ${PYSITELIB}/gnuradio/audio_jack.pyc
diff --git a/ham/gnuradio-audio-oss/Makefile b/ham/gnuradio-audio-oss/Makefile
index 0b5998a2fe7..287541af31b 100644
--- a/ham/gnuradio-audio-oss/Makefile
+++ b/ham/gnuradio-audio-oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/08/12 12:21:39 markd Exp $
+# $NetBSD: Makefile,v 1.12 2010/09/15 09:38:43 markd Exp $
 
 PKGNAME=	gnuradio-audio-oss-${VERSION}
 COMMENT=	Open Sound System support for GNU Radio
@@ -12,7 +12,7 @@ CONFIGURE_ARGS+=--enable-gr-audio-oss
 CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
 PYTHON_PATCH_SCRIPTS+=	gr-audio-oss/src/qa_oss.py
-LDFLAGS = -lgnuradio-core ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+#LDFLAGS = -lgnuradio-core ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../ham/gnuradio-core/buildlink3.mk"
diff --git a/ham/gnuradio-audio-oss/PLIST b/ham/gnuradio-audio-oss/PLIST
index 37d9b224111..0c0754dbac3 100644
--- a/ham/gnuradio-audio-oss/PLIST
+++ b/ham/gnuradio-audio-oss/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2007/08/08 03:00:39 wulf Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/09/15 09:38:43 markd Exp $
 include/gnuradio/audio_oss_sink.h
 include/gnuradio/audio_oss_source.h
 include/gnuradio/swig/audio_oss.i
+lib/libgnuradio-audio-oss.la
+lib/pkgconfig/gnuradio-audio-oss.pc
 ${PYSITELIB}/gnuradio/_audio_oss.la
 ${PYSITELIB}/gnuradio/audio_oss.py
 ${PYSITELIB}/gnuradio/audio_oss.pyc
diff --git a/ham/gnuradio-audio-portaudio/PLIST b/ham/gnuradio-audio-portaudio/PLIST
index 3ea7af06672..bc038ffb3b4 100644
--- a/ham/gnuradio-audio-portaudio/PLIST
+++ b/ham/gnuradio-audio-portaudio/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2007/08/08 03:02:23 wulf Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/09/15 09:38:43 markd Exp $
 include/gnuradio/audio_portaudio_sink.h
 include/gnuradio/audio_portaudio_source.h
 include/gnuradio/swig/audio_portaudio.i
+lib/libgnuradio-audio-portaudio.la
+lib/pkgconfig/gnuradio-audio-portaudio.pc
 ${PYSITELIB}/gnuradio/_audio_portaudio.la
 ${PYSITELIB}/gnuradio/audio_portaudio.py
 ${PYSITELIB}/gnuradio/audio_portaudio.pyc
diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile
index 5a127a97a01..49892b522bd 100644
--- a/ham/gnuradio-core/Makefile
+++ b/ham/gnuradio-core/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2010/08/22 20:44:31 markd Exp $
+# $NetBSD: Makefile,v 1.24 2010/09/15 09:38:43 markd Exp $
 
 PKGNAME=	gnuradio-core-${VERSION}
-PKGREVISION=	4
 COMMENT=	Runtime system and DSP blocks for GNU Radio
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -15,9 +14,6 @@ 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
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/doc/xml/doxy2swig.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/general/generate_all.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/general/generate_common.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/general/gen_sine_table.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/filter/generate_gr_fir_XXX.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/filter/generate_all.py
@@ -33,7 +29,6 @@ PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/benchmark_filters.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_correlate_access_code.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_add_v_and_friends.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_agc.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_basic_flow_graph.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_cma_equalizer.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_complex_to_xxx.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_fft_filter.py
@@ -43,7 +38,6 @@ PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_diff_encoder.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_diff_phasor_cc.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_frequency_modulator.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_filter_delay_fc.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_flow_graph.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_interp_fir_filter.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_fsk_stuff.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_goertzel.py
diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST
index 860e0a40bdf..6303d921e9e 100644
--- a/ham/gnuradio-core/PLIST
+++ b/ham/gnuradio-core/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2009/12/30 21:13:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/09/15 09:38:43 markd Exp $
+bin/gnuradio-config-info
 include/gnuradio/ccomplex_dotprod_generic.h
 include/gnuradio/ccomplex_dotprod_x86.h
 include/gnuradio/complex_dotprod_generic.h
@@ -21,6 +22,7 @@ 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_additive_scrambler_bb.h
 include/gnuradio/gr_agc2_cc.h
 include/gnuradio/gr_agc2_ff.h
 include/gnuradio/gr_agc_cc.h
@@ -62,7 +64,9 @@ include/gnuradio/gr_complex.h
 include/gnuradio/gr_complex_to_interleaved_short.h
 include/gnuradio/gr_complex_to_xxx.h
 include/gnuradio/gr_conjugate_cc.h
+include/gnuradio/gr_constants.h
 include/gnuradio/gr_constellation_decoder_cb.h
+include/gnuradio/gr_copy.h
 include/gnuradio/gr_correlate_access_code_bb.h
 include/gnuradio/gr_costas_loop_cc.h
 include/gnuradio/gr_count_bits.h
@@ -70,7 +74,6 @@ 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
@@ -127,6 +130,7 @@ 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_fll_band_edge_cc.h
 include/gnuradio/gr_float_to_char.h
 include/gnuradio/gr_float_to_complex.h
 include/gnuradio/gr_float_to_short.h
@@ -190,6 +194,7 @@ 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_accepter.h
 include/gnuradio/gr_msg_handler.h
 include/gnuradio/gr_msg_queue.h
 include/gnuradio/gr_multiply_cc.h
@@ -244,13 +249,18 @@ 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_pfb_arb_resampler_ccf.h
+include/gnuradio/gr_pfb_channelizer_ccf.h
+include/gnuradio/gr_pfb_clock_sync_ccf.h
+include/gnuradio/gr_pfb_clock_sync_fff.h
+include/gnuradio/gr_pfb_decimator_ccf.h
+include/gnuradio/gr_pfb_interpolator_ccf.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
@@ -370,6 +380,8 @@ include/gnuradio/gri_agc_ff.h
 include/gnuradio/gri_char_to_float.h
 include/gnuradio/gri_debugger_hook.h
 include/gnuradio/gri_fft.h
+include/gnuradio/gri_fft_filter_ccc_generic.h
+include/gnuradio/gri_fft_filter_fff_generic.h
 include/gnuradio/gri_float_to_char.h
 include/gnuradio/gri_float_to_short.h
 include/gnuradio/gri_float_to_uchar.h
@@ -380,7 +392,6 @@ 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
 include/gnuradio/gri_mmse_fir_interpolator.h
 include/gnuradio/gri_mmse_fir_interpolator_cc.h
 include/gnuradio/gri_short_to_float.h
@@ -398,14 +409,6 @@ 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
-include/gnuradio/ot_nt.h
-include/gnuradio/ot_posix.h
-include/gnuradio/ot_pthread_nt.h
-include/gnuradio/ot_solaris.h
 include/gnuradio/ppio.h
 include/gnuradio/ppio_ppdev.h
 include/gnuradio/qa_filter.h
@@ -441,6 +444,7 @@ 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_additive_scrambler_bb.i
 include/gnuradio/swig/gr_agc2_cc.i
 include/gnuradio/swig/gr_agc2_ff.i
 include/gnuradio/swig/gr_agc_cc.i
@@ -478,13 +482,14 @@ include/gnuradio/swig/gr_cma_equalizer_cc.i
 include/gnuradio/swig/gr_complex_to_interleaved_short.i
 include/gnuradio/swig/gr_complex_to_xxx.i
 include/gnuradio/swig/gr_conjugate_cc.i
+include/gnuradio/swig/gr_constants.i
 include/gnuradio/swig/gr_constellation_decoder_cb.i
+include/gnuradio/swig/gr_copy.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
@@ -521,6 +526,7 @@ include/gnuradio/swig/gr_fir_filter_fff.i
 include/gnuradio/swig/gr_fir_filter_fsf.i
 include/gnuradio/swig/gr_fir_filter_scc.i
 include/gnuradio/swig/gr_firdes.i
+include/gnuradio/swig/gr_fll_band_edge_cc.i
 include/gnuradio/swig/gr_float_to_char.i
 include/gnuradio/swig/gr_float_to_complex.i
 include/gnuradio/swig/gr_float_to_short.i
@@ -624,12 +630,17 @@ 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_pfb_arb_resampler_ccf.i
+include/gnuradio/swig/gr_pfb_channelizer_ccf.i
+include/gnuradio/swig/gr_pfb_clock_sync_ccf.i
+include/gnuradio/swig/gr_pfb_clock_sync_fff.i
+include/gnuradio/swig/gr_pfb_decimator_ccf.i
+include/gnuradio/swig/gr_pfb_interpolator_ccf.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
@@ -732,16 +743,22 @@ include/gnuradio/swig/ppio.i
 include/gnuradio/swig/runtime.i
 include/gnuradio/swig/sdr_1000.i
 include/gruel/inet.h
+include/gruel/msg_accepter.h
+include/gruel/msg_accepter_msgq.h
+include/gruel/msg_passing.h
+include/gruel/msg_queue.h
+include/gruel/pmt.h
+include/gruel/pmt_pool.h
+include/gruel/pmt_serial_tags.h
+include/gruel/pmt_sugar.h
 include/gruel/realtime.h
 include/gruel/sys_pri.h
+include/gruel/thread.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
@@ -770,9 +787,15 @@ ${PYSITELIB}/gnuradio/blks2impl/d8psk.pyo
 ${PYSITELIB}/gnuradio/blks2impl/dbpsk.py
 ${PYSITELIB}/gnuradio/blks2impl/dbpsk.pyc
 ${PYSITELIB}/gnuradio/blks2impl/dbpsk.pyo
+${PYSITELIB}/gnuradio/blks2impl/dbpsk2.py
+${PYSITELIB}/gnuradio/blks2impl/dbpsk2.pyc
+${PYSITELIB}/gnuradio/blks2impl/dbpsk2.pyo
 ${PYSITELIB}/gnuradio/blks2impl/dqpsk.py
 ${PYSITELIB}/gnuradio/blks2impl/dqpsk.pyc
 ${PYSITELIB}/gnuradio/blks2impl/dqpsk.pyo
+${PYSITELIB}/gnuradio/blks2impl/dqpsk2.py
+${PYSITELIB}/gnuradio/blks2impl/dqpsk2.pyc
+${PYSITELIB}/gnuradio/blks2impl/dqpsk2.pyo
 ${PYSITELIB}/gnuradio/blks2impl/filterbank.py
 ${PYSITELIB}/gnuradio/blks2impl/filterbank.pyc
 ${PYSITELIB}/gnuradio/blks2impl/filterbank.pyo
@@ -782,6 +805,9 @@ ${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/generic_usrp.py
+${PYSITELIB}/gnuradio/blks2impl/generic_usrp.pyc
+${PYSITELIB}/gnuradio/blks2impl/generic_usrp.pyo
 ${PYSITELIB}/gnuradio/blks2impl/gmsk.py
 ${PYSITELIB}/gnuradio/blks2impl/gmsk.pyc
 ${PYSITELIB}/gnuradio/blks2impl/gmsk.pyo
@@ -812,6 +838,18 @@ ${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/pfb_arb_resampler.py
+${PYSITELIB}/gnuradio/blks2impl/pfb_arb_resampler.pyc
+${PYSITELIB}/gnuradio/blks2impl/pfb_arb_resampler.pyo
+${PYSITELIB}/gnuradio/blks2impl/pfb_channelizer.py
+${PYSITELIB}/gnuradio/blks2impl/pfb_channelizer.pyc
+${PYSITELIB}/gnuradio/blks2impl/pfb_channelizer.pyo
+${PYSITELIB}/gnuradio/blks2impl/pfb_decimator.py
+${PYSITELIB}/gnuradio/blks2impl/pfb_decimator.pyc
+${PYSITELIB}/gnuradio/blks2impl/pfb_decimator.pyo
+${PYSITELIB}/gnuradio/blks2impl/pfb_interpolator.py
+${PYSITELIB}/gnuradio/blks2impl/pfb_interpolator.pyc
+${PYSITELIB}/gnuradio/blks2impl/pfb_interpolator.pyo
 ${PYSITELIB}/gnuradio/blks2impl/pkt.py
 ${PYSITELIB}/gnuradio/blks2impl/pkt.pyc
 ${PYSITELIB}/gnuradio/blks2impl/pkt.pyo
@@ -950,6 +988,9 @@ ${PYSITELIB}/gnuradio/gruimpl/lmx2306.pyo
 ${PYSITELIB}/gnuradio/gruimpl/mathmisc.py
 ${PYSITELIB}/gnuradio/gruimpl/mathmisc.pyc
 ${PYSITELIB}/gnuradio/gruimpl/mathmisc.pyo
+${PYSITELIB}/gnuradio/gruimpl/msgq_runner.py
+${PYSITELIB}/gnuradio/gruimpl/msgq_runner.pyc
+${PYSITELIB}/gnuradio/gruimpl/msgq_runner.pyo
 ${PYSITELIB}/gnuradio/gruimpl/os_read_exactly.py
 ${PYSITELIB}/gnuradio/gruimpl/os_read_exactly.pyc
 ${PYSITELIB}/gnuradio/gruimpl/os_read_exactly.pyo
@@ -965,6 +1006,9 @@ ${PYSITELIB}/gnuradio/gruimpl/socket_stuff.pyo
 ${PYSITELIB}/gnuradio/modulation_utils.py
 ${PYSITELIB}/gnuradio/modulation_utils.pyc
 ${PYSITELIB}/gnuradio/modulation_utils.pyo
+${PYSITELIB}/gnuradio/modulation_utils2.py
+${PYSITELIB}/gnuradio/modulation_utils2.pyc
+${PYSITELIB}/gnuradio/modulation_utils2.pyo
 ${PYSITELIB}/gnuradio/ofdm_packet_utils.py
 ${PYSITELIB}/gnuradio/ofdm_packet_utils.pyc
 ${PYSITELIB}/gnuradio/ofdm_packet_utils.pyo
@@ -974,7 +1018,13 @@ ${PYSITELIB}/gnuradio/optfir.pyo
 ${PYSITELIB}/gnuradio/packet_utils.py
 ${PYSITELIB}/gnuradio/packet_utils.pyc
 ${PYSITELIB}/gnuradio/packet_utils.pyo
+${PYSITELIB}/gnuradio/usrp_options.py
+${PYSITELIB}/gnuradio/usrp_options.pyc
+${PYSITELIB}/gnuradio/usrp_options.pyo
 ${PYSITELIB}/gnuradio/window.py
 ${PYSITELIB}/gnuradio/window.pyc
 ${PYSITELIB}/gnuradio/window.pyo
 share/examples/gnuradio/conf.d/gnuradio-core.conf
+share/gnuradio/macros-etc.scm
+share/gnuradio/pmt-serial-tags.scm
+share/gnuradio/pmt-serialize.scm
diff --git a/ham/gnuradio-examples/Makefile b/ham/gnuradio-examples/Makefile
index 3f018922a97..f8c7ccd33cf 100644
--- a/ham/gnuradio-examples/Makefile
+++ b/ham/gnuradio-examples/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2010/09/14 11:02:06 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/09/15 09:38:44 markd Exp $
 
 PKGNAME=	gnuradio-examples-${VERSION}
-PKGREVISION=	4
 COMMENT=	GUI framework for GNU Radio based on wxPython
 COMMENT=	Examples for GNU Radio
 
@@ -21,30 +20,13 @@ PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/audio_copy.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/audio_fft.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/audio_play.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/audio_to_file.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/dial_squelch.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/dial_tone.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/dialtone_v.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/mono_tone.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/multi_tone.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/spectrum_inversion.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/test_resampler.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/fsm_utils.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_sccc_hard.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_sccc_soft.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_sccc_turbo.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_tcm.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_tcm1.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_tcm2.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_tcm_combined.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_tcm_parallel.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_turbo_equalization.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_turbo_equalization1.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_turbo_equalization2.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_viterbi_equalization.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/channel-coding/test_viterbi_equalization1.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/benchmark_rx.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/benchmark_tx.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/fusb_options.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/gen_whitener.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/pick_bitrate.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/receive_path.py
@@ -58,40 +40,6 @@ PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/multi-antenna/multi_file.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/multi-antenna/multi_scope.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/multi_usrp/multi_usrp_oscope.py
 PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/multi_usrp/multi_usrp_rx_cfile.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/networking/measurement_slave.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/am_rcv.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/ayfabtu.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/ayfabtu.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/benchmark_usb.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/dsb_tx.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/flexrf_debug.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/flexrf_siggen.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/fm_tx4.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/max_power.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/siggen_min2.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/test_counting.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/test_dft_analysis.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/test_dft_synth.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/test_digital_loopback_counting.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/test_digital_loopback_lfsr.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/tvrx_am_rcv_gui.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_fft.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_fft_old.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_nbfm_rcv.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_oscope.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_rx_cfile.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_rx_nogui.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_siggen.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_tv_rcv.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_tv_rcv_nogui.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_wfm_rcv.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/usrp_wxapt_rcv.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/usrp/wfm_rcv_file.py
 
 do-install:
 	set -e;								\
diff --git a/ham/gnuradio-examples/PLIST b/ham/gnuradio-examples/PLIST
index 46609495fbc..62b14b6dfe4 100644
--- a/ham/gnuradio-examples/PLIST
+++ b/ham/gnuradio-examples/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/08/12 12:21:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/09/15 09:38:44 markd Exp $
 share/examples/gnuradio/python/apps/README
 share/examples/gnuradio/python/apps/hf_explorer/README
 share/examples/gnuradio/python/apps/hf_explorer/hfx2.py
@@ -33,20 +33,24 @@ share/examples/gnuradio/python/digital-bert/receive_path.py
 share/examples/gnuradio/python/digital-bert/transmit_path.py
 share/examples/gnuradio/python/digital/README
 share/examples/gnuradio/python/digital/benchmark_loopback.py
+share/examples/gnuradio/python/digital/benchmark_qt_loopback.py
+share/examples/gnuradio/python/digital/benchmark_qt_rx.py
 share/examples/gnuradio/python/digital/benchmark_rx.py
 share/examples/gnuradio/python/digital/benchmark_tx.py
 share/examples/gnuradio/python/digital/gen_whitener.py
-share/examples/gnuradio/python/digital/generic_usrp.py
 share/examples/gnuradio/python/digital/pick_bitrate.py
+share/examples/gnuradio/python/digital/qt_digital_window.py
+share/examples/gnuradio/python/digital/qt_digital_window.ui
+share/examples/gnuradio/python/digital/qt_rx_window.py
+share/examples/gnuradio/python/digital/qt_rx_window.ui
 share/examples/gnuradio/python/digital/receive_path.py
-share/examples/gnuradio/python/digital/receive_path_lb.py
 share/examples/gnuradio/python/digital/run_length.py
 share/examples/gnuradio/python/digital/rx_voice.py
 share/examples/gnuradio/python/digital/transmit_path.py
-share/examples/gnuradio/python/digital/transmit_path_lb.py
 share/examples/gnuradio/python/digital/tunnel.py
 share/examples/gnuradio/python/digital/tx_voice.py
-share/examples/gnuradio/python/digital/usrp_options.py
+share/examples/gnuradio/python/digital/usrp_receive_path.py
+share/examples/gnuradio/python/digital/usrp_transmit_path.py
 share/examples/gnuradio/python/digital_voice/cvsd_test.py
 share/examples/gnuradio/python/digital_voice/encdec.py
 share/examples/gnuradio/python/mp-sched/README
@@ -79,6 +83,12 @@ share/examples/gnuradio/python/ofdm/plot_ofdm.m
 share/examples/gnuradio/python/ofdm/receive_path.py
 share/examples/gnuradio/python/ofdm/transmit_path.py
 share/examples/gnuradio/python/ofdm/tunnel.py
+share/examples/gnuradio/python/pfb/channelize.py
+share/examples/gnuradio/python/pfb/chirp_channelize.py
+share/examples/gnuradio/python/pfb/decimate.py
+share/examples/gnuradio/python/pfb/fmtest.py
+share/examples/gnuradio/python/pfb/interpolate.py
+share/examples/gnuradio/python/pfb/resampler_demo.grc
 share/examples/gnuradio/python/usrp/fm_tx4.py
 share/examples/gnuradio/python/usrp/fm_tx_2_daughterboards.py
 share/examples/gnuradio/python/usrp/max_power.py
@@ -99,4 +109,7 @@ share/examples/gnuradio/python/usrp/usrp_wfm_rcv_nogui.py
 share/examples/gnuradio/python/usrp/usrp_wfm_rcv_pll.py
 share/examples/gnuradio/python/usrp/usrp_wfm_rcv_sca.py
 share/examples/gnuradio/python/usrp/usrp_wxapt_rcv.py
+share/examples/gnuradio/python/usrp2/qt_wfm_interface.py
+share/examples/gnuradio/python/usrp2/qt_wfm_interface.ui
+share/examples/gnuradio/python/usrp2/usrp2_wfm_qt.py
 share/examples/gnuradio/python/usrp2/usrp2_wfm_rcv.py
diff --git a/ham/gnuradio-gsm/PLIST b/ham/gnuradio-gsm/PLIST
index 5f39ce72bb2..ad301e44101 100644
--- a/ham/gnuradio-gsm/PLIST
+++ b/ham/gnuradio-gsm/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:00:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/09/15 09:38:44 markd Exp $
 include/gnuradio/gsm_fr_decode_ps.h
 include/gnuradio/gsm_fr_encode_sp.h
 include/gnuradio/swig/gsm_full_rate.i
+lib/libgnuradio-gsm-fr-vocoder.la
+lib/pkgconfig/gnuradio-gsm-fr-vocoder.pc
 ${PYSITELIB}/gnuradio/vocoder/__init__.py
 ${PYSITELIB}/gnuradio/vocoder/__init__.pyc
 ${PYSITELIB}/gnuradio/vocoder/__init__.pyo
diff --git a/ham/gnuradio-howto/Makefile b/ham/gnuradio-howto/Makefile
index af8a9db12be..5e160290ffd 100644
--- a/ham/gnuradio-howto/Makefile
+++ b/ham/gnuradio-howto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/09/11 16:23:29 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/09/15 09:38:44 markd Exp $
 
 DISTNAME=	gr-howto-write-a-block-${VERSION}
 CATEGORIES=	ham
@@ -13,9 +13,6 @@ DISTINFO_FILE=		${.CURDIR}/distinfo
 PATCHDIR=		${.CURDIR}/patches
 
 PY_PATCHPLIST=  yes
-PYTHON_PATCH_SCRIPTS+=	src/python/qa_howto.py
-PYTHON_PATCH_SCRIPTS+=	doc/qa_howto_1.py
-PYTHON_PATCH_SCRIPTS+=	doc/make_numbered_listing.py
 
 .include "../../ham/gnuradio-core/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/gnuradio-howto/PLIST b/ham/gnuradio-howto/PLIST
index bc1d79e6c8a..5b45c0d8f09 100644
--- a/ham/gnuradio-howto/PLIST
+++ b/ham/gnuradio-howto/PLIST
@@ -1,8 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2007/08/08 03:13:37 wulf Exp $
-include/gnuradio/howto_square2_ff.h
-include/gnuradio/howto_square_ff.h
-include/gnuradio/swig/howto.i
-${PYSITELIB}/gnuradio/_howto.la
-${PYSITELIB}/gnuradio/howto.py
-${PYSITELIB}/gnuradio/howto.pyc
-${PYSITELIB}/gnuradio/howto.pyo
+@comment $NetBSD: PLIST,v 1.3 2010/09/15 09:38:44 markd Exp $
+bin/howto_square.py
+include/howto/howto_square2_ff.h
+include/howto/howto_square_ff.h
+include/howto/swig/howto.i
+include/howto/swig/howto_square2_ff.i
+include/howto/swig/howto_square_ff.i
+lib/libgnuradio-howto.la
+${PYSITELIB}/howto/__init__.py
+${PYSITELIB}/howto/__init__.pyc
+${PYSITELIB}/howto/__init__.pyo
+${PYSITELIB}/howto/_howto_swig.la
+${PYSITELIB}/howto/howto_swig.py
+${PYSITELIB}/howto/howto_swig.pyc
+${PYSITELIB}/howto/howto_swig.pyo
+share/gnuradio/grc/blocks/howto_square2_ff.xml
+share/gnuradio/grc/blocks/howto_square_ff.xml
diff --git a/ham/gnuradio-howto/distinfo b/ham/gnuradio-howto/distinfo
index 2cbf412a6d2..8d310a9ea86 100644
--- a/ham/gnuradio-howto/distinfo
+++ b/ham/gnuradio-howto/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/08/12 12:21:40 markd Exp $
+$NetBSD: distinfo,v 1.8 2010/09/15 09:38:44 markd Exp $
 
-SHA1 (gr-howto-write-a-block-3.2.tar.gz) = 6ab7f12c1c6f071db395f12bfcdf56c9acfbaada
-RMD160 (gr-howto-write-a-block-3.2.tar.gz) = 19c42d3029242478c091d4f724a0b8b7e2135d10
-Size (gr-howto-write-a-block-3.2.tar.gz) = 400018 bytes
+SHA1 (gr-howto-write-a-block-3.3.0.tar.gz) = dbf5b2538066c019f09850368e7583453cb093a5
+RMD160 (gr-howto-write-a-block-3.3.0.tar.gz) = 9e0bab8346a0828dcdbc9b7c6b51a756fd4a0c69
+Size (gr-howto-write-a-block-3.3.0.tar.gz) = 415280 bytes
+SHA1 (patch-aa) = b3dea570d91c59178622dabdc61b8620c42fd8bd
diff --git a/ham/gnuradio-howto/patches/patch-aa b/ham/gnuradio-howto/patches/patch-aa
new file mode 100644
index 00000000000..636dc06d99c
--- /dev/null
+++ b/ham/gnuradio-howto/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.3 2010/09/15 09:38:44 markd Exp $
+
+--- configure.orig	2010-06-03 07:17:38.000000000 +0000
++++ configure
+@@ -2798,12 +2798,12 @@ $as_echo "not found" >&6; }
+   fi
+ 
+ 
+-    if test "$MINOR_VERSION" == "git"; then
++    if test "$MINOR_VERSION" = "git"; then
+                 RELEASE=$GIT_DESCRIBE
+     DOCVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION
+     LIBVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION
+   else
+-    if test "$MAINT_VERSION" == "git" ; then
++    if test "$MAINT_VERSION" = "git" ; then
+                         RELEASE=$GIT_DESCRIBE
+       DOCVER=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION$MAINT_VERSION
+       LIBVER=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION$MAINT_VERSION
diff --git a/ham/gnuradio-radio-astronomy/Makefile b/ham/gnuradio-radio-astronomy/Makefile
index 7d146ecbdeb..d6ab9a1fb6d 100644
--- a/ham/gnuradio-radio-astronomy/Makefile
+++ b/ham/gnuradio-radio-astronomy/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2010/09/14 11:02:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/09/15 09:38:44 markd Exp $
 
 PKGNAME=	gnuradio-radio-astronomy-${VERSION}
-PKGREVISION=	6
 COMMENT=	GNU Radio module for radio astronomy
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/ham/gnuradio-trellis/PLIST b/ham/gnuradio-trellis/PLIST
index 312e306df28..95077ac4550 100644
--- a/ham/gnuradio-trellis/PLIST
+++ b/ham/gnuradio-trellis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:21:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/09/15 09:38:44 markd Exp $
 include/gnuradio/base.h
 include/gnuradio/fsm.h
 include/gnuradio/interleaver.h
@@ -66,6 +66,8 @@ include/gnuradio/trellis_viterbi_combined_si.h
 include/gnuradio/trellis_viterbi_combined_ss.h
 include/gnuradio/trellis_viterbi_i.h
 include/gnuradio/trellis_viterbi_s.h
+lib/libgnuradio-trellis.la
+lib/pkgconfig/gnuradio-trellis.pc
 ${PYSITELIB}/gnuradio/_trellis.la
 ${PYSITELIB}/gnuradio/trellis.py
 ${PYSITELIB}/gnuradio/trellis.pyc
@@ -99,3 +101,4 @@ share/gnuradio/examples/trellis/test_turbo_equalization1.py
 share/gnuradio/examples/trellis/test_turbo_equalization2.py
 share/gnuradio/examples/trellis/test_viterbi_equalization.py
 share/gnuradio/examples/trellis/test_viterbi_equalization1.py
+@pkgdir share/doc/gnuradio-${PKGVERSION}/html
diff --git a/ham/gnuradio-usrp/Makefile b/ham/gnuradio-usrp/Makefile
index b225a67d046..856debeab3d 100644
--- a/ham/gnuradio-usrp/Makefile
+++ b/ham/gnuradio-usrp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2010/03/24 19:43:24 asau Exp $
+# $NetBSD: Makefile,v 1.12 2010/09/15 09:38:45 markd Exp $
 
 PKGNAME=	gnuradio-usrp-${VERSION}
-PKGREVISION=	2
 COMMENT=	USRP bindings for GNU Radio
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/ham/gnuradio-video-sdl/PLIST b/ham/gnuradio-video-sdl/PLIST
index 29ca2ee17c4..f43900cdaaf 100644
--- a/ham/gnuradio-video-sdl/PLIST
+++ b/ham/gnuradio-video-sdl/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2007/08/08 03:22:05 wulf Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/09/15 09:38:45 markd Exp $
 include/gnuradio/swig/video_sdl.i
 include/gnuradio/video_sdl_sink_s.h
 include/gnuradio/video_sdl_sink_uc.h
+lib/libgnuradio-video-sdl.la
+lib/pkgconfig/gnuradio-video-sdl.pc
 ${PYSITELIB}/gnuradio/_video_sdl.la
 ${PYSITELIB}/gnuradio/video_sdl.py
 ${PYSITELIB}/gnuradio/video_sdl.pyc
diff --git a/ham/gnuradio-wxgui/Makefile b/ham/gnuradio-wxgui/Makefile
index 97c9f68fd09..9e256cd9e00 100644
--- a/ham/gnuradio-wxgui/Makefile
+++ b/ham/gnuradio-wxgui/Makefile
@@ -1,19 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2010/09/14 11:01:08 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/09/15 09:38:45 markd Exp $
 
 PKGNAME=	gnuradio-wxgui-${VERSION}
-PKGREVISION=	4
 COMMENT=	GUI framework for GNU Radio based on wxPython
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
-
-PYTHON_PATCH_SCRIPTS+=	gr-wxgui/src/python/fftsink.py
 PYTHON_PATCH_SCRIPTS+=	gr-wxgui/src/python/form.py
 PYTHON_PATCH_SCRIPTS+=	gr-wxgui/src/python/powermate.py
-PYTHON_PATCH_SCRIPTS+=	gr-wxgui/src/python/scopesink.py
 PYTHON_PATCH_SCRIPTS+=	gr-wxgui/src/python/slider.py
-PYTHON_PATCH_SCRIPTS+=	gr-wxgui/src/python/waterfallsink.py
 
 SUBST_CLASSES+=		py-exec
 SUBST_STAGE.py-exec=	pre-configure
@@ -28,5 +22,6 @@ CONFIGURE_ARGS+=--enable-gr-wxgui
 CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
 .include "../../ham/gnuradio-core/buildlink3.mk"
+.include "../../math/py-numpy/buildlink3.mk"
 .include "../../x11/py-wxWidgets/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/gnuradio-wxgui/PLIST b/ham/gnuradio-wxgui/PLIST
index 759b4aaef4e..0b36c82139e 100644
--- a/ham/gnuradio-wxgui/PLIST
+++ b/ham/gnuradio-wxgui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/08/12 12:21:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/09/15 09:38:45 markd Exp $
 lib/pkgconfig/gr-wxgui.pc
 ${PYSITELIB}/gnuradio/wxgui/__init__.py
 ${PYSITELIB}/gnuradio/wxgui/__init__.pyc
@@ -18,18 +18,27 @@ ${PYSITELIB}/gnuradio/wxgui/constsink_gl.pyo
 ${PYSITELIB}/gnuradio/wxgui/fft_window.py
 ${PYSITELIB}/gnuradio/wxgui/fft_window.pyc
 ${PYSITELIB}/gnuradio/wxgui/fft_window.pyo
+${PYSITELIB}/gnuradio/wxgui/fftsink2.py
+${PYSITELIB}/gnuradio/wxgui/fftsink2.pyc
+${PYSITELIB}/gnuradio/wxgui/fftsink2.pyo
 ${PYSITELIB}/gnuradio/wxgui/fftsink_gl.py
 ${PYSITELIB}/gnuradio/wxgui/fftsink_gl.pyc
 ${PYSITELIB}/gnuradio/wxgui/fftsink_gl.pyo
 ${PYSITELIB}/gnuradio/wxgui/fftsink_nongl.py
 ${PYSITELIB}/gnuradio/wxgui/fftsink_nongl.pyc
 ${PYSITELIB}/gnuradio/wxgui/fftsink_nongl.pyo
-${PYSITELIB}/gnuradio/wxgui/fftsink2.py
-${PYSITELIB}/gnuradio/wxgui/fftsink2.pyc
-${PYSITELIB}/gnuradio/wxgui/fftsink2.pyo
 ${PYSITELIB}/gnuradio/wxgui/form.py
 ${PYSITELIB}/gnuradio/wxgui/form.pyc
 ${PYSITELIB}/gnuradio/wxgui/form.pyo
+${PYSITELIB}/gnuradio/wxgui/forms/__init__.py
+${PYSITELIB}/gnuradio/wxgui/forms/__init__.pyc
+${PYSITELIB}/gnuradio/wxgui/forms/__init__.pyo
+${PYSITELIB}/gnuradio/wxgui/forms/converters.py
+${PYSITELIB}/gnuradio/wxgui/forms/converters.pyc
+${PYSITELIB}/gnuradio/wxgui/forms/converters.pyo
+${PYSITELIB}/gnuradio/wxgui/forms/forms.py
+${PYSITELIB}/gnuradio/wxgui/forms/forms.pyc
+${PYSITELIB}/gnuradio/wxgui/forms/forms.pyo
 ${PYSITELIB}/gnuradio/wxgui/gui.py
 ${PYSITELIB}/gnuradio/wxgui/gui.pyc
 ${PYSITELIB}/gnuradio/wxgui/gui.pyo
@@ -81,31 +90,34 @@ ${PYSITELIB}/gnuradio/wxgui/pubsub.pyo
 ${PYSITELIB}/gnuradio/wxgui/scope_window.py
 ${PYSITELIB}/gnuradio/wxgui/scope_window.pyc
 ${PYSITELIB}/gnuradio/wxgui/scope_window.pyo
+${PYSITELIB}/gnuradio/wxgui/scopesink2.py
+${PYSITELIB}/gnuradio/wxgui/scopesink2.pyc
+${PYSITELIB}/gnuradio/wxgui/scopesink2.pyo
 ${PYSITELIB}/gnuradio/wxgui/scopesink_gl.py
 ${PYSITELIB}/gnuradio/wxgui/scopesink_gl.pyc
 ${PYSITELIB}/gnuradio/wxgui/scopesink_gl.pyo
 ${PYSITELIB}/gnuradio/wxgui/scopesink_nongl.py
 ${PYSITELIB}/gnuradio/wxgui/scopesink_nongl.pyc
 ${PYSITELIB}/gnuradio/wxgui/scopesink_nongl.pyo
-${PYSITELIB}/gnuradio/wxgui/scopesink2.py
-${PYSITELIB}/gnuradio/wxgui/scopesink2.pyc
-${PYSITELIB}/gnuradio/wxgui/scopesink2.pyo
 ${PYSITELIB}/gnuradio/wxgui/slider.py
 ${PYSITELIB}/gnuradio/wxgui/slider.pyc
 ${PYSITELIB}/gnuradio/wxgui/slider.pyo
 ${PYSITELIB}/gnuradio/wxgui/stdgui2.py
 ${PYSITELIB}/gnuradio/wxgui/stdgui2.pyc
 ${PYSITELIB}/gnuradio/wxgui/stdgui2.pyo
+${PYSITELIB}/gnuradio/wxgui/termsink.py
+${PYSITELIB}/gnuradio/wxgui/termsink.pyc
+${PYSITELIB}/gnuradio/wxgui/termsink.pyo
 ${PYSITELIB}/gnuradio/wxgui/waterfall_window.py
 ${PYSITELIB}/gnuradio/wxgui/waterfall_window.pyc
 ${PYSITELIB}/gnuradio/wxgui/waterfall_window.pyo
+${PYSITELIB}/gnuradio/wxgui/waterfallsink2.py
+${PYSITELIB}/gnuradio/wxgui/waterfallsink2.pyc
+${PYSITELIB}/gnuradio/wxgui/waterfallsink2.pyo
 ${PYSITELIB}/gnuradio/wxgui/waterfallsink_gl.py
 ${PYSITELIB}/gnuradio/wxgui/waterfallsink_gl.pyc
 ${PYSITELIB}/gnuradio/wxgui/waterfallsink_gl.pyo
 ${PYSITELIB}/gnuradio/wxgui/waterfallsink_nongl.py
 ${PYSITELIB}/gnuradio/wxgui/waterfallsink_nongl.pyc
 ${PYSITELIB}/gnuradio/wxgui/waterfallsink_nongl.pyo
-${PYSITELIB}/gnuradio/wxgui/waterfallsink2.py
-${PYSITELIB}/gnuradio/wxgui/waterfallsink2.pyc
-${PYSITELIB}/gnuradio/wxgui/waterfallsink2.pyo
 share/examples/gnuradio/conf.d/gr-wxgui.conf
diff --git a/ham/usrp-docs/Makefile b/ham/usrp-docs/Makefile
index 6222a920e30..2a221db1951 100644
--- a/ham/usrp-docs/Makefile
+++ b/ham/usrp-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2010/06/29 18:52:13 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/09/15 09:38:43 markd Exp $
 
 PKGNAME=	usrp-docs-${VERSION}
-PKGREVISION=	3
 COMMENT=	Documentation for the usrp module
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/ham/usrp-docs/PLIST b/ham/usrp-docs/PLIST
index f6bbd1a1876..b055b7795d3 100644
--- a/ham/usrp-docs/PLIST
+++ b/ham/usrp-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2010/06/29 18:52:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/09/15 09:38:43 markd Exp $
 share/doc/usrp-${PKGVERSION}/html/ad9862_8h.html
 share/doc/usrp-${PKGVERSION}/html/ad9862_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/ad9862_8h__dep__incl.md5
@@ -87,29 +87,20 @@ share/doc/usrp-${PKGVERSION}/html/class__AD4360__common.html
 share/doc/usrp-${PKGVERSION}/html/class__AD4360__common__inherit__graph.map
 share/doc/usrp-${PKGVERSION}/html/class__AD4360__common__inherit__graph.md5
 share/doc/usrp-${PKGVERSION}/html/class__AD4360__common__inherit__graph.png
-share/doc/usrp-${PKGVERSION}/html/class__ADF410X__common-members.html
-share/doc/usrp-${PKGVERSION}/html/class__ADF410X__common.html
-share/doc/usrp-${PKGVERSION}/html/class__ADF410X__common__inherit__graph.map
-share/doc/usrp-${PKGVERSION}/html/class__ADF410X__common__inherit__graph.md5
-share/doc/usrp-${PKGVERSION}/html/class__ADF410X__common__inherit__graph.png
-share/doc/usrp-${PKGVERSION}/html/class__lo__common-members.html
-share/doc/usrp-${PKGVERSION}/html/class__lo__common.html
-share/doc/usrp-${PKGVERSION}/html/class__lo__common__coll__graph.map
-share/doc/usrp-${PKGVERSION}/html/class__lo__common__coll__graph.md5
-share/doc/usrp-${PKGVERSION}/html/class__lo__common__coll__graph.png
-share/doc/usrp-${PKGVERSION}/html/class__lo__common__inherit__graph.map
-share/doc/usrp-${PKGVERSION}/html/class__lo__common__inherit__graph.md5
-share/doc/usrp-${PKGVERSION}/html/class__lo__common__inherit__graph.png
+share/doc/usrp-${PKGVERSION}/html/classadf4350-members.html
+share/doc/usrp-${PKGVERSION}/html/classadf4350.html
+share/doc/usrp-${PKGVERSION}/html/classadf4350__coll__graph.map
+share/doc/usrp-${PKGVERSION}/html/classadf4350__coll__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classadf4350__coll__graph.png
+share/doc/usrp-${PKGVERSION}/html/classadf4350__regs-members.html
+share/doc/usrp-${PKGVERSION}/html/classadf4350__regs.html
+share/doc/usrp-${PKGVERSION}/html/classadf4350__regs__coll__graph.map
+share/doc/usrp-${PKGVERSION}/html/classadf4350__regs__coll__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classadf4350__regs__coll__graph.png
 share/doc/usrp-${PKGVERSION}/html/classcircular__buffer-members.html
 share/doc/usrp-${PKGVERSION}/html/classcircular__buffer.html
-share/doc/usrp-${PKGVERSION}/html/classcircular__buffer__coll__graph.map
-share/doc/usrp-${PKGVERSION}/html/classcircular__buffer__coll__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classcircular__buffer__coll__graph.png
 share/doc/usrp-${PKGVERSION}/html/classcircular__linked__list-members.html
 share/doc/usrp-${PKGVERSION}/html/classcircular__linked__list.html
-share/doc/usrp-${PKGVERSION}/html/classcircular__linked__list__coll__graph.map
-share/doc/usrp-${PKGVERSION}/html/classcircular__linked__list__coll__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classcircular__linked__list__coll__graph.png
 share/doc/usrp-${PKGVERSION}/html/classdb__base-members.html
 share/doc/usrp-${PKGVERSION}/html/classdb__base.html
 share/doc/usrp-${PKGVERSION}/html/classdb__base__coll__graph.map
@@ -134,6 +125,14 @@ share/doc/usrp-${PKGVERSION}/html/classdb__basic__tx__coll__graph.png
 share/doc/usrp-${PKGVERSION}/html/classdb__basic__tx__inherit__graph.map
 share/doc/usrp-${PKGVERSION}/html/classdb__basic__tx__inherit__graph.md5
 share/doc/usrp-${PKGVERSION}/html/classdb__basic__tx__inherit__graph.png
+share/doc/usrp-${PKGVERSION}/html/classdb__bitshark__rx-members.html
+share/doc/usrp-${PKGVERSION}/html/classdb__bitshark__rx.html
+share/doc/usrp-${PKGVERSION}/html/classdb__bitshark__rx__coll__graph.map
+share/doc/usrp-${PKGVERSION}/html/classdb__bitshark__rx__coll__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classdb__bitshark__rx__coll__graph.png
+share/doc/usrp-${PKGVERSION}/html/classdb__bitshark__rx__inherit__graph.map
+share/doc/usrp-${PKGVERSION}/html/classdb__bitshark__rx__inherit__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classdb__bitshark__rx__inherit__graph.png
 share/doc/usrp-${PKGVERSION}/html/classdb__dbs__rx-members.html
 share/doc/usrp-${PKGVERSION}/html/classdb__dbs__rx.html
 share/doc/usrp-${PKGVERSION}/html/classdb__dbs__rx__coll__graph.map
@@ -422,22 +421,30 @@ share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__coll__graph.png
 share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__inherit__graph.map
 share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__inherit__graph.md5
 share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__inherit__graph.png
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__rx-members.html
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__rx.html
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__rx__coll__graph.map
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__rx__coll__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__rx__coll__graph.png
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__rx__inherit__graph.map
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__rx__inherit__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__rx__inherit__graph.png
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__tx-members.html
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__tx.html
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__tx__coll__graph.map
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__tx__coll__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__tx__coll__graph.png
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__tx__inherit__graph.map
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__tx__inherit__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classdb__wbx__lo__tx__inherit__graph.png
+share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__mimo-members.html
+share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__mimo.html
+share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__mimo__coll__graph.map
+share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__mimo__coll__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__mimo__coll__graph.png
+share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__mimo__inherit__graph.map
+share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__mimo__inherit__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classdb__tv__rx__mimo__inherit__graph.png
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__rx-members.html
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__rx.html
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__rx__coll__graph.map
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__rx__coll__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__rx__coll__graph.png
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__rx__inherit__graph.map
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__rx__inherit__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__rx__inherit__graph.png
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__tx-members.html
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__tx.html
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__tx__coll__graph.map
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__tx__coll__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__tx__coll__graph.png
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__tx__inherit__graph.map
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__tx__inherit__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classdb__wbxng__tx__inherit__graph.png
 share/doc/usrp-${PKGVERSION}/html/classdb__xcvr2450__base-members.html
 share/doc/usrp-${PKGVERSION}/html/classdb__xcvr2450__base.html
 share/doc/usrp-${PKGVERSION}/html/classdb__xcvr2450__base__coll__graph.map
@@ -532,6 +539,14 @@ share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__generic__inherit__graph.
 share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__inherit__graph.map
 share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__inherit__graph.md5
 share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__inherit__graph.png
+share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__libusb1-members.html
+share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__libusb1.html
+share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__libusb1__coll__graph.map
+share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__libusb1__coll__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__libusb1__coll__graph.png
+share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__libusb1__inherit__graph.map
+share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__libusb1__inherit__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__libusb1__inherit__graph.png
 share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__linux-members.html
 share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__linux.html
 share/doc/usrp-${PKGVERSION}/html/classfusb__devhandle__linux__coll__graph.map
@@ -577,6 +592,14 @@ share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__generic__inherit__graph.p
 share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__inherit__graph.map
 share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__inherit__graph.md5
 share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__inherit__graph.png
+share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__libusb1-members.html
+share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__libusb1.html
+share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__libusb1__coll__graph.map
+share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__libusb1__coll__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__libusb1__coll__graph.png
+share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__libusb1__inherit__graph.map
+share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__libusb1__inherit__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__libusb1__inherit__graph.png
 share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__linux-members.html
 share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__linux.html
 share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__linux__coll__graph.map
@@ -603,15 +626,6 @@ share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__win32__inherit__graph.md5
 share/doc/usrp-${PKGVERSION}/html/classfusb__ephandle__win32__inherit__graph.png
 share/doc/usrp-${PKGVERSION}/html/classfusb__sysconfig-members.html
 share/doc/usrp-${PKGVERSION}/html/classfusb__sysconfig.html
-share/doc/usrp-${PKGVERSION}/html/classmld__condition__t-members.html
-share/doc/usrp-${PKGVERSION}/html/classmld__condition__t.html
-share/doc/usrp-${PKGVERSION}/html/classmld__condition__t__coll__graph.map
-share/doc/usrp-${PKGVERSION}/html/classmld__condition__t__coll__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classmld__condition__t__coll__graph.png
-share/doc/usrp-${PKGVERSION}/html/classmld__mutex__t-members.html
-share/doc/usrp-${PKGVERSION}/html/classmld__mutex__t.html
-share/doc/usrp-${PKGVERSION}/html/classmld__thread__t-members.html
-share/doc/usrp-${PKGVERSION}/html/classmld__thread__t.html
 share/doc/usrp-${PKGVERSION}/html/classs__both-members.html
 share/doc/usrp-${PKGVERSION}/html/classs__both.html
 share/doc/usrp-${PKGVERSION}/html/classs__buffer-members.html
@@ -669,30 +683,30 @@ share/doc/usrp-${PKGVERSION}/html/classusrp__standard__tx__inherit__graph.md5
 share/doc/usrp-${PKGVERSION}/html/classusrp__standard__tx__inherit__graph.png
 share/doc/usrp-${PKGVERSION}/html/classusrp__tune__result-members.html
 share/doc/usrp-${PKGVERSION}/html/classusrp__tune__result.html
-share/doc/usrp-${PKGVERSION}/html/classwbx__base-members.html
-share/doc/usrp-${PKGVERSION}/html/classwbx__base.html
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__coll__graph.map
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__coll__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__coll__graph.png
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__inherit__graph.map
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__inherit__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__inherit__graph.png
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__rx-members.html
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__rx.html
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__rx__coll__graph.map
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__rx__coll__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__rx__coll__graph.png
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__rx__inherit__graph.map
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__rx__inherit__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__rx__inherit__graph.png
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__tx-members.html
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__tx.html
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__tx__coll__graph.map
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__tx__coll__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__tx__coll__graph.png
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__tx__inherit__graph.map
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__tx__inherit__graph.md5
-share/doc/usrp-${PKGVERSION}/html/classwbx__base__tx__inherit__graph.png
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base-members.html
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base.html
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__coll__graph.map
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__coll__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__coll__graph.png
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__inherit__graph.map
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__inherit__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__inherit__graph.png
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__rx-members.html
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__rx.html
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__rx__coll__graph.map
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__rx__coll__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__rx__coll__graph.png
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__rx__inherit__graph.map
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__rx__inherit__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__rx__inherit__graph.png
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__tx-members.html
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__tx.html
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__tx__coll__graph.map
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__tx__coll__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__tx__coll__graph.png
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__tx__inherit__graph.map
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__tx__inherit__graph.md5
+share/doc/usrp-${PKGVERSION}/html/classwbxng__base__tx__inherit__graph.png
 share/doc/usrp-${PKGVERSION}/html/classxcvr2450-members.html
 share/doc/usrp-${PKGVERSION}/html/classxcvr2450.html
 share/doc/usrp-${PKGVERSION}/html/classxcvr2450__coll__graph.map
@@ -735,6 +749,18 @@ share/doc/usrp-${PKGVERSION}/html/db__basic_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__basic_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__basic_8h__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__basic_8h_source.html
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8cc.html
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8cc__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8cc__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8cc__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8h.html
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8h__dep__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8h__dep__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8h__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8h__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__bitshark__rx_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__boards_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__boards_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__boards_8cc__incl.md5
@@ -819,6 +845,18 @@ share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__tv__rx_8h_source.html
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8cc.html
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8cc__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8cc__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8cc__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8h.html
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8h__dep__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8h__dep__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8h__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8h__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__tv__rx__mimo_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__util_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__util_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__util_8cc__incl.md5
@@ -831,14 +869,45 @@ share/doc/usrp-${PKGVERSION}/html/db__util_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__util_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/db__util_8h__incl.png
 share/doc/usrp-${PKGVERSION}/html/db__util_8h_source.html
-share/doc/usrp-${PKGVERSION}/html/db__wbx_8h.html
-share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__dep__incl.map
-share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__dep__incl.md5
-share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__dep__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__incl.map
-share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__incl.md5
-share/doc/usrp-${PKGVERSION}/html/db__wbx_8h__incl.png
-share/doc/usrp-${PKGVERSION}/html/db__wbx_8h_source.html
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8cc.html
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8cc__dep__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8cc__dep__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8cc__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8cc__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8cc__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8cc__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8h.html
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8h__dep__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8h__dep__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8h__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8h__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__wbxng_8h_source.html
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8cc.html
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8cc__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8cc__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8cc__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8h.html
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8h__dep__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8h__dep__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8h__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8h__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350_8h_source.html
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8cc.html
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8cc__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8cc__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8cc__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8h.html
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8h__dep__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8h__dep__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8h__incl.map
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8h__incl.md5
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/db__wbxng__adf4350__regs_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8cc.html
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/db__xcvr2450_8cc__incl.md5
@@ -912,6 +981,9 @@ share/doc/usrp-${PKGVERSION}/html/fusb_8h.html
 share/doc/usrp-${PKGVERSION}/html/fusb_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb_8h__dep__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/fusb_8h__incl.map
+share/doc/usrp-${PKGVERSION}/html/fusb_8h__incl.md5
+share/doc/usrp-${PKGVERSION}/html/fusb_8h__incl.png
 share/doc/usrp-${PKGVERSION}/html/fusb_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc.html
 share/doc/usrp-${PKGVERSION}/html/fusb__darwin_8cc__dep__incl.map
@@ -940,6 +1012,18 @@ share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h__incl.png
 share/doc/usrp-${PKGVERSION}/html/fusb__generic_8h_source.html
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8cc.html
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8cc__incl.map
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8cc__incl.md5
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8cc__incl.png
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8h.html
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8h__dep__incl.map
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8h__dep__incl.md5
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8h__incl.map
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8h__incl.md5
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/fusb__libusb1_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8cc.html
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__linux_8cc__incl.md5
@@ -972,6 +1056,10 @@ share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__generic_8cc.html
 share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__generic_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__generic_8cc__incl.md5
 share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__generic_8cc__incl.png
+share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__libusb1_8cc.html
+share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__libusb1_8cc__incl.map
+share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__libusb1_8cc__incl.md5
+share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__libusb1_8cc__incl.png
 share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__linux_8cc.html
 share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__linux_8cc__incl.map
 share/doc/usrp-${PKGVERSION}/html/fusb__sysconfig__linux_8cc__incl.md5
@@ -1007,6 +1095,7 @@ share/doc/usrp-${PKGVERSION}/html/globals_0x62.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x63.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x64.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x65.html
+share/doc/usrp-${PKGVERSION}/html/globals_0x66.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x67.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x68.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x69.html
@@ -1020,6 +1109,7 @@ share/doc/usrp-${PKGVERSION}/html/globals_0x73.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x74.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x75.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x76.html
+share/doc/usrp-${PKGVERSION}/html/globals_0x77.html
 share/doc/usrp-${PKGVERSION}/html/globals_0x78.html
 share/doc/usrp-${PKGVERSION}/html/globals_defs.html
 share/doc/usrp-${PKGVERSION}/html/globals_enum.html
@@ -1092,9 +1182,6 @@ share/doc/usrp-${PKGVERSION}/html/inherit__graph__25.png
 share/doc/usrp-${PKGVERSION}/html/inherit__graph__26.map
 share/doc/usrp-${PKGVERSION}/html/inherit__graph__26.md5
 share/doc/usrp-${PKGVERSION}/html/inherit__graph__26.png
-share/doc/usrp-${PKGVERSION}/html/inherit__graph__27.map
-share/doc/usrp-${PKGVERSION}/html/inherit__graph__27.md5
-share/doc/usrp-${PKGVERSION}/html/inherit__graph__27.png
 share/doc/usrp-${PKGVERSION}/html/inherit__graph__3.map
 share/doc/usrp-${PKGVERSION}/html/inherit__graph__3.md5
 share/doc/usrp-${PKGVERSION}/html/inherit__graph__3.png
@@ -1117,20 +1204,23 @@ share/doc/usrp-${PKGVERSION}/html/inherit__graph__9.map
 share/doc/usrp-${PKGVERSION}/html/inherit__graph__9.md5
 share/doc/usrp-${PKGVERSION}/html/inherit__graph__9.png
 share/doc/usrp-${PKGVERSION}/html/inherits.html
+share/doc/usrp-${PKGVERSION}/html/libusb__types_8h.html
+share/doc/usrp-${PKGVERSION}/html/libusb__types_8h__dep__incl.map
+share/doc/usrp-${PKGVERSION}/html/libusb__types_8h__dep__incl.md5
+share/doc/usrp-${PKGVERSION}/html/libusb__types_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/libusb__types_8h__incl.map
+share/doc/usrp-${PKGVERSION}/html/libusb__types_8h__incl.md5
+share/doc/usrp-${PKGVERSION}/html/libusb__types_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/libusb__types_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/mainpage_8dox.html
 share/doc/usrp-${PKGVERSION}/html/md5_8h.html
+share/doc/usrp-${PKGVERSION}/html/md5_8h__dep__incl.map
+share/doc/usrp-${PKGVERSION}/html/md5_8h__dep__incl.md5
+share/doc/usrp-${PKGVERSION}/html/md5_8h__dep__incl.png
 share/doc/usrp-${PKGVERSION}/html/md5_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/md5_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/md5_8h__incl.png
 share/doc/usrp-${PKGVERSION}/html/md5_8h_source.html
-share/doc/usrp-${PKGVERSION}/html/mld__threads_8h.html
-share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__dep__incl.map
-share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__dep__incl.md5
-share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__dep__incl.png
-share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__incl.map
-share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__incl.md5
-share/doc/usrp-${PKGVERSION}/html/mld__threads_8h__incl.png
-share/doc/usrp-${PKGVERSION}/html/mld__threads_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/rate__to__regval_8h.html
 share/doc/usrp-${PKGVERSION}/html/rate__to__regval_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/std__paths_8h.html
@@ -1230,13 +1320,6 @@ share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h__incl.png
 share/doc/usrp-${PKGVERSION}/html/usrp__local__sighandler_8h_source.html
-share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc.html
-share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__dep__incl.map
-share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__dep__incl.md5
-share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__dep__incl.png
-share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__incl.map
-share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__incl.md5
-share/doc/usrp-${PKGVERSION}/html/usrp__prims_8cc__incl.png
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h__dep__incl.md5
@@ -1245,6 +1328,29 @@ share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h__incl.md5
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h__incl.png
 share/doc/usrp-${PKGVERSION}/html/usrp__prims_8h_source.html
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__common_8cc.html
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__common_8cc__dep__incl.map
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__common_8cc__dep__incl.md5
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__common_8cc__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__common_8cc__incl.map
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__common_8cc__incl.md5
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__common_8cc__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__libusb0_8cc.html
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__libusb0_8cc__incl.map
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__libusb0_8cc__incl.md5
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__libusb0_8cc__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__libusb1_8cc.html
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__libusb1_8cc__incl.map
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__libusb1_8cc__incl.md5
+share/doc/usrp-${PKGVERSION}/html/usrp__prims__libusb1_8cc__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__primsi_8h.html
+share/doc/usrp-${PKGVERSION}/html/usrp__primsi_8h__dep__incl.map
+share/doc/usrp-${PKGVERSION}/html/usrp__primsi_8h__dep__incl.md5
+share/doc/usrp-${PKGVERSION}/html/usrp__primsi_8h__dep__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__primsi_8h__incl.map
+share/doc/usrp-${PKGVERSION}/html/usrp__primsi_8h__incl.md5
+share/doc/usrp-${PKGVERSION}/html/usrp__primsi_8h__incl.png
+share/doc/usrp-${PKGVERSION}/html/usrp__primsi_8h_source.html
 share/doc/usrp-${PKGVERSION}/html/usrp__slots_8h.html
 share/doc/usrp-${PKGVERSION}/html/usrp__slots_8h__dep__incl.map
 share/doc/usrp-${PKGVERSION}/html/usrp__slots_8h__dep__incl.md5
diff --git a/ham/usrp/Makefile b/ham/usrp/Makefile
index 06f6283da57..6908ba82fa6 100644
--- a/ham/usrp/Makefile
+++ b/ham/usrp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2010/03/24 19:43:24 asau Exp $
+# $NetBSD: Makefile,v 1.14 2010/09/15 09:38:43 markd Exp $
 
 PKGNAME=	usrp-${VERSION}
-PKGREVISION=	2
 COMMENT=	Non GNU Radio specific part of the USRP code base
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -17,10 +16,6 @@ PYTHON_PATCH_SCRIPTS+=	usrp/firmware/include/generate_regs.py
 PYTHON_PATCH_SCRIPTS+=	usrp/firmware/src/common/edit-gpif
 PYTHON_PATCH_SCRIPTS+=	usrp/firmware/src/common/build_eeprom.py
 PYTHON_PATCH_SCRIPTS+=	usrp/firmware/src/usrp2/edit-gpif
-PYTHON_PATCH_SCRIPTS+=	usrp/fpga/gen_makefile_extra.py
-PYTHON_PATCH_SCRIPTS+=	usrp/fpga/sdr_lib/gen_cordic_consts.py
-PYTHON_PATCH_SCRIPTS+=	usrp/fpga/toplevel/mrfm/mrfm.py
-PYTHON_PATCH_SCRIPTS+=	usrp/fpga/toplevel/mrfm/mrfm_fft.py
 PYTHON_PATCH_SCRIPTS+=	usrp/host/lib/check_data.py
 PYTHON_PATCH_SCRIPTS+=	usrp/host/lib/dump_data.py
 PYTHON_PATCH_SCRIPTS+=	usrp/host/lib/gen_usrp_dbid.py
diff --git a/ham/usrp/PLIST b/ham/usrp/PLIST
index 641cbf9bb7b..c8fed026430 100644
--- a/ham/usrp/PLIST
+++ b/ham/usrp/PLIST
@@ -1,31 +1,34 @@
-@comment $NetBSD: PLIST,v 1.10 2009/08/12 12:21:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/09/15 09:38:43 markd Exp $
 bin/usrp_cal_dc_offset
 bin/usrper
-include/db_base.h
-include/db_basic.h
-include/db_dbs_rx.h
-include/db_dtt754.h
-include/db_dtt768.h
-include/db_flexrf.h
-include/db_flexrf_mimo.h
-include/db_tv_rx.h
-include/db_util.h
-include/db_xcvr2450.h
-include/fpga_regs_common.h
-include/fpga_regs_standard.h
 include/gnuradio/swig/db_base.i
 include/gnuradio/swig/usrp_prims.i
-include/usrp_basic.h
-include/usrp_bytesex.h
-include/usrp_config.h
-include/usrp_dbid.h
-include/usrp_i2c_addr.h
-include/usrp_prims.h
-include/usrp_slots.h
-include/usrp_spi_defs.h
-include/usrp_standard.h
-include/usrp_subdev_spec.h
-include/usrp_tune_result.h
+include/usrp/db_base.h
+include/usrp/db_basic.h
+include/usrp/db_bitshark_rx.h
+include/usrp/db_dbs_rx.h
+include/usrp/db_dtt754.h
+include/usrp/db_dtt768.h
+include/usrp/db_flexrf.h
+include/usrp/db_flexrf_mimo.h
+include/usrp/db_tv_rx.h
+include/usrp/db_tv_rx_mimo.h
+include/usrp/db_wbxng.h
+include/usrp/db_xcvr2450.h
+include/usrp/fpga_regs_common.h
+include/usrp/fpga_regs_standard.h
+include/usrp/libusb_types.h
+include/usrp/usrp_basic.h
+include/usrp/usrp_bytesex.h
+include/usrp/usrp_dbid.h
+include/usrp/usrp_i2c_addr.h
+include/usrp/usrp_local_sighandler.h
+include/usrp/usrp_prims.h
+include/usrp/usrp_slots.h
+include/usrp/usrp_spi_defs.h
+include/usrp/usrp_standard.h
+include/usrp/usrp_subdev_spec.h
+include/usrp/usrp_tune_result.h
 lib/libusrp.la
 lib/pkgconfig/usrp.pc
 ${PYSITELIB}/usrpm/__init__.py