Updated gnuradio-wxgui to 3.0.4:

        * Updated license to GPLv3
	* Fixed shared memory leak on NetBSD
	* Many bug fixes

4 files changed, 31 insertions, 8 deletions

diff --git a/ham/gnuradio-wxgui/PLIST b/ham/gnuradio-wxgui/PLIST
index fe209336de9..598cab30e9a 100644
--- a/ham/gnuradio-wxgui/PLIST
+++ b/ham/gnuradio-wxgui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/27 03:16:09 wulf Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/08/08 03:23:20 wulf Exp $
 ${PYSITELIB}/gnuradio/wxgui/__init__.py
 ${PYSITELIB}/gnuradio/wxgui/__init__.pyc
 ${PYSITELIB}/gnuradio/wxgui/__init__.pyo
@@ -6,8 +6,8 @@ ${PYSITELIB}/gnuradio/wxgui/fftsink.py
 ${PYSITELIB}/gnuradio/wxgui/fftsink.pyc
 ${PYSITELIB}/gnuradio/wxgui/fftsink.pyo
 ${PYSITELIB}/gnuradio/wxgui/form.py
-${PYSITELIB}/gnuradio/wxgui/form.pyo
 ${PYSITELIB}/gnuradio/wxgui/form.pyc
+${PYSITELIB}/gnuradio/wxgui/form.pyo
 ${PYSITELIB}/gnuradio/wxgui/plot.py
 ${PYSITELIB}/gnuradio/wxgui/plot.pyc
 ${PYSITELIB}/gnuradio/wxgui/plot.pyo
diff --git a/ham/gnuradio-wxgui/buildlink3.mk b/ham/gnuradio-wxgui/buildlink3.mk
index f7b9bba24a0..9bd64ee6105 100644
--- a/ham/gnuradio-wxgui/buildlink3.mk
+++ b/ham/gnuradio-wxgui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/11/13 17:45:09 wulf Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/08/08 03:23:20 wulf Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNURADIO_WXGUI_BUILDLINK3_MK:=	${GNURADIO_WXGUI_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gnuradio-wxgui
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnuradio-wxgui
 
 .if ${GNURADIO_WXGUI_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.gnuradio-wxgui+=	gnuradio-wxgui>=3.0.1
+BUILDLINK_API_DEPENDS.gnuradio-wxgui+=	gnuradio-wxgui>=3.0.4
 BUILDLINK_PKGSRCDIR.gnuradio-wxgui?=	../../ham/gnuradio-wxgui
 .endif	# GNURADIO_WXGUI_BUILDLINK3_MK
 
diff --git a/ham/gnuradio-wxgui/distinfo b/ham/gnuradio-wxgui/distinfo
index b2bdf890acb..d1514c3410b 100644
--- a/ham/gnuradio-wxgui/distinfo
+++ b/ham/gnuradio-wxgui/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/11/13 17:45:09 wulf Exp $
+$NetBSD: distinfo,v 1.5 2007/08/08 03:23:20 wulf Exp $
 
-SHA1 (gnuradio-3.0.2.tar.gz) = 9d9a0e22c9e4fd9735f62c0145b9ceb61a33f9c2
-RMD160 (gnuradio-3.0.2.tar.gz) = 3ff771c2d13d680fb76d7ca82a6a11678c7069ae
-Size (gnuradio-3.0.2.tar.gz) = 3190212 bytes
+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) = a9853ef7d300793afb76e7958a6fcae11629315d
diff --git a/ham/gnuradio-wxgui/patches/patch-aa b/ham/gnuradio-wxgui/patches/patch-aa
new file mode 100644
index 00000000000..627e55308a3
--- /dev/null
+++ b/ham/gnuradio-wxgui/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2007/08/08 03:23:20 wulf Exp $
+
+--- Makefile.common.orig	2007-08-08 04:40:14.000000000 +0930
++++ Makefile.common	2007-08-08 04:40:47.000000000 +0930
+@@ -52,7 +52,7 @@
+ 	            $(FFTW3F_CFLAGS)
+ 
+ # How to link in GNU Radio core library from inside the tree
+-GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
++GNURADIO_CORE_LA = -lgnuradio-core
+ 
+ # This is a dependency for many swig operations
+ GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+@@ -60,7 +60,7 @@
+ # How to link in the USRP library from inside the tree
+ USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
+ 		-I$(top_srcdir)/usrp/firmware/include
+-USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la
++USRP_LA = -libusrp
+ 
+ # This used to be set in configure.ac but is now defined here for all 
+ # Makefiles when this fragment is included.