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

2 files changed, 24 insertions, 17 deletions

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