Update gnuradio-examples to 0.5:

	* examples now use new usrp library
	* many bug fixes

3 files changed, 53 insertions, 45 deletions

diff --git a/ham/gnuradio-examples/Makefile b/ham/gnuradio-examples/Makefile
index bb5ca3ab695..6e46257e5b5 100644
--- a/ham/gnuradio-examples/Makefile
+++ b/ham/gnuradio-examples/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2005/10/11 12:02:14 wulf Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/11 11:51:38 wulf Exp $
 
-DISTNAME=	gnuradio-examples-0.4
+DISTNAME=	gnuradio-examples-0.5
 COMMENT=	GUI framework for GNU Radio based on wxPython
 COMMENT=	Examples for GNU Radio
 
@@ -11,47 +11,51 @@ PYTHON_PATCH_SCRIPTS+=	python/audio/dial_tone.py
 PYTHON_PATCH_SCRIPTS+=	python/audio/mono_tone.py
 PYTHON_PATCH_SCRIPTS+=	python/audio/multi_tone.py
 PYTHON_PATCH_SCRIPTS+=	python/audio/spectrum_inversion.py
-PYTHON_PATCH_SCRIPTS+=	python/gmsk/ggmsk-test.py
-PYTHON_PATCH_SCRIPTS+=	python/gmsk/gmsk-test.py
-PYTHON_PATCH_SCRIPTS+=	python/gmsk/rx.py
-PYTHON_PATCH_SCRIPTS+=	python/gmsk/tx.py
+PYTHON_PATCH_SCRIPTS+=	python/audio/test_resampler.py
+PYTHON_PATCH_SCRIPTS+=	python/digital_voice/encdec.py
+PYTHON_PATCH_SCRIPTS+=  python/gmsk2/benchmark_gmsk_rx.py
+PYTHON_PATCH_SCRIPTS+=  python/gmsk2/benchmark_gmsk_tx.py
+PYTHON_PATCH_SCRIPTS+=  python/gmsk2/gen_whitener.py
+PYTHON_PATCH_SCRIPTS+=  python/gmsk2/gmsk_test.py
+PYTHON_PATCH_SCRIPTS+=  python/gmsk2/pick_bitrate.py
+PYTHON_PATCH_SCRIPTS+=  python/gmsk2/receive_path.py
+PYTHON_PATCH_SCRIPTS+=  python/gmsk2/transmit_path.py
+PYTHON_PATCH_SCRIPTS+=  python/gmsk2/tunnel_ip_null_mac.py
 PYTHON_PATCH_SCRIPTS+=	python/mc4020/fm_demod.py
 PYTHON_PATCH_SCRIPTS+=	python/mc4020/mc4020_fft.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/am_rcv.py
+PYTHON_PATCH_SCRIPTS+=	python/usrp/ayfabtu.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/benchmark_usb.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/dbs_debug.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/dbs_fft.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/dbs_nbfm.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/dsb_tx.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/fm_tx4.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/fsk_loopback.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/fsk_rx.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/fsk_tx.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/max_power.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/nbfm_ptt_quick_and_dirty.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/nbfm_rcv.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/test_counting.py
+PYTHON_PATCH_SCRIPTS+=  python/usrp/test_counting.py
+PYTHON_PATCH_SCRIPTS+=  python/usrp/test_dft_analysis.py
+PYTHON_PATCH_SCRIPTS+=  python/usrp/test_dft_synth.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/test_digital_loopback_counting.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/test_digital_loopback_lfsr.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/tvrx_debug.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/tvrx_wfm_rcv_gui.py
+PYTHON_PATCH_SCRIPTS+=	python/usrp/tvrx_am_rcv_gui.py
+PYTHON_PATCH_SCRIPTS+=	python/usrp/tvrx_tv_rcv.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/tweak_adc_offset.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_fft.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_fft_simple.py
+PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_fft_old.py
+PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_nbfm_ptt.py
+PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_nbfm_rcv.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_oscope.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_rx_cfile.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_rx_file.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_siggen.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/wfm_rcv.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/wfm_rcv_dual.py
+PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_wfm_rcv.py
+PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_wfm_rcv_nogui.py
+PYTHON_PATCH_SCRIPTS+=	python/usrp/usrp_wfm_rcv_pll.py
 PYTHON_PATCH_SCRIPTS+=	python/usrp/wfm_rcv_file.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/wfm_rcv_gui.py
-PYTHON_PATCH_SCRIPTS+=	python/usrp/wfm_rcv_many.py
 
 EXAMPLE_DIR=	${LOCALBASE}/share/examples/gnuradio/python
 
 do-install:
-	for file in audio gmsk mc4020 usrp;				\
+	for file in audio gmsk2 digital_voice  mc4020 usrp;		\
 	do								\
 		${INSTALL_SCRIPT_DIR} ${EXAMPLE_DIR}/$${file};		\
 		${INSTALL_SCRIPT} ${WRKSRC}/python/$${file}/*\.py	\
diff --git a/ham/gnuradio-examples/PLIST b/ham/gnuradio-examples/PLIST
index 1d53547f1a7..0e000ea6b50 100644
--- a/ham/gnuradio-examples/PLIST
+++ b/ham/gnuradio-examples/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/07 23:02:54 wulf Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/12/11 11:51:38 wulf Exp $
 share/examples/gnuradio/python/audio/audio_copy.py
 share/examples/gnuradio/python/audio/audio_play.py
 share/examples/gnuradio/python/audio/audio_to_file.py
@@ -6,44 +6,48 @@ share/examples/gnuradio/python/audio/dial_tone.py
 share/examples/gnuradio/python/audio/mono_tone.py
 share/examples/gnuradio/python/audio/multi_tone.py
 share/examples/gnuradio/python/audio/spectrum_inversion.py
-share/examples/gnuradio/python/gmsk/ggmsk-test.py
-share/examples/gnuradio/python/gmsk/gmsk-test.py
-share/examples/gnuradio/python/gmsk/rx.py
-share/examples/gnuradio/python/gmsk/tx.py
+share/examples/gnuradio/python/audio/test_resampler.py
+share/examples/gnuradio/python/digital_voice/encdec.py
+share/examples/gnuradio/python/gmsk2/benchmark_gmsk_rx.py
+share/examples/gnuradio/python/gmsk2/benchmark_gmsk_tx.py
+share/examples/gnuradio/python/gmsk2/gen_whitener.py
+share/examples/gnuradio/python/gmsk2/gmsk_test.py
+share/examples/gnuradio/python/gmsk2/pick_bitrate.py
+share/examples/gnuradio/python/gmsk2/receive_path.py
+share/examples/gnuradio/python/gmsk2/transmit_path.py
+share/examples/gnuradio/python/gmsk2/tunnel_ip_null_mac.py
 share/examples/gnuradio/python/mc4020/fm_demod.py
 share/examples/gnuradio/python/mc4020/mc4020_fft.py
 share/examples/gnuradio/python/usrp/am_rcv.py
+share/examples/gnuradio/python/usrp/ayfabtu.py
 share/examples/gnuradio/python/usrp/benchmark_usb.py
-share/examples/gnuradio/python/usrp/dbs_debug.py
-share/examples/gnuradio/python/usrp/dbs_fft.py
-share/examples/gnuradio/python/usrp/dbs_nbfm.py
-share/examples/gnuradio/python/usrp/dsb_tx.py
 share/examples/gnuradio/python/usrp/fm_tx4.py
 share/examples/gnuradio/python/usrp/fsk_loopback.py
 share/examples/gnuradio/python/usrp/fsk_rx.py
 share/examples/gnuradio/python/usrp/fsk_tx.py
 share/examples/gnuradio/python/usrp/max_power.py
-share/examples/gnuradio/python/usrp/nbfm_ptt_quick_and_dirty.py
-share/examples/gnuradio/python/usrp/nbfm_rcv.py
 share/examples/gnuradio/python/usrp/test_counting.py
 share/examples/gnuradio/python/usrp/test_digital_loopback_counting.py
 share/examples/gnuradio/python/usrp/test_digital_loopback_lfsr.py
-share/examples/gnuradio/python/usrp/tvrx_debug.py
-share/examples/gnuradio/python/usrp/tvrx_wfm_rcv_gui.py
-share/examples/gnuradio/python/usrp/tweak_adc_offset.py
+share/examples/gnuradio/python/usrp/test_dft_analysis.py
+share/examples/gnuradio/python/usrp/test_dft_synth.py
+share/examples/gnuradio/python/usrp/tvrx_am_rcv_gui.py
+share/examples/gnuradio/python/usrp/tvrx_tv_rcv.py
 share/examples/gnuradio/python/usrp/usrp_fft.py
-share/examples/gnuradio/python/usrp/usrp_fft_simple.py
+share/examples/gnuradio/python/usrp/usrp_fft_old.py
+share/examples/gnuradio/python/usrp/usrp_nbfm_ptt.py
+share/examples/gnuradio/python/usrp/usrp_nbfm_rcv.py
 share/examples/gnuradio/python/usrp/usrp_oscope.py
 share/examples/gnuradio/python/usrp/usrp_rx_cfile.py
 share/examples/gnuradio/python/usrp/usrp_rx_file.py
 share/examples/gnuradio/python/usrp/usrp_siggen.py
-share/examples/gnuradio/python/usrp/wfm_rcv.py
-share/examples/gnuradio/python/usrp/wfm_rcv_dual.py
+share/examples/gnuradio/python/usrp/usrp_wfm_rcv_nogui.py
+share/examples/gnuradio/python/usrp/usrp_wfm_rcv.py
+share/examples/gnuradio/python/usrp/usrp_wfm_rcv_pll.py
 share/examples/gnuradio/python/usrp/wfm_rcv_file.py
-share/examples/gnuradio/python/usrp/wfm_rcv_gui.py
-share/examples/gnuradio/python/usrp/wfm_rcv_many.py
 @dirrm share/examples/gnuradio/python/audio
-@dirrm share/examples/gnuradio/python/gmsk
+@dirrm share/examples/gnuradio/python/digital_voice
+@dirrm share/examples/gnuradio/python/gmsk2
 @dirrm share/examples/gnuradio/python/mc4020
 @dirrm share/examples/gnuradio/python/usrp
 @dirrm share/examples/gnuradio/python
diff --git a/ham/gnuradio-examples/distinfo b/ham/gnuradio-examples/distinfo
index b1943dd0c67..32e46526c13 100644
--- a/ham/gnuradio-examples/distinfo
+++ b/ham/gnuradio-examples/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/07 23:02:54 wulf Exp $
+$NetBSD: distinfo,v 1.2 2005/12/11 11:51:39 wulf Exp $
 
-SHA1 (gnuradio-examples-0.4.tar.gz) = b3d6640659f91e9ae34fcf415a493830b43154ce
-RMD160 (gnuradio-examples-0.4.tar.gz) = ba545a191a84d1a6a82e27feaf1dc1f684f6166a
-Size (gnuradio-examples-0.4.tar.gz) = 176118 bytes
+SHA1 (gnuradio-examples-0.5.tar.gz) = 8b913cb8f54bd492071083d2126a0ec212a8cb1c
+RMD160 (gnuradio-examples-0.5.tar.gz) = 8066ee07750c7b482c8bf64a4d4d25f080d18e41
+Size (gnuradio-examples-0.5.tar.gz) = 194909 bytes