Updated gnuradio-audio-oss to 3.0.4:

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

4 files changed, 34 insertions, 10 deletions

diff --git a/ham/gnuradio-audio-oss/Makefile b/ham/gnuradio-audio-oss/Makefile
index cdefd331778..94536ccf4af 100644
--- a/ham/gnuradio-audio-oss/Makefile
+++ b/ham/gnuradio-audio-oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/11/13 16:34:45 wulf Exp $
+# $NetBSD: Makefile,v 1.8 2007/08/08 03:00:39 wulf Exp $
 
 PKGNAME=	gnuradio-audio-oss-${VERSION}
 COMMENT=	Open Sound System support for GNU Radio
@@ -9,6 +9,7 @@ CONF_FILES+=	${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf
 CONFIGURE_ARGS+=--enable-gr-audio-oss
 
 PYTHON_PATCH_SCRIPTS+=	gr-audio-oss/src/qa_oss.py
+LDFLAGS = -lgnuradio-core
 
 .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 f9a1f33301f..37d9b224111 100644
--- a/ham/gnuradio-audio-oss/PLIST
+++ b/ham/gnuradio-audio-oss/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/27 03:04:26 wulf Exp $
-${PYSITELIB}/gnuradio/_audio_oss.la
-${PYSITELIB}/gnuradio/audio_oss.pyo
-${PYSITELIB}/gnuradio/audio_oss.py
-${PYSITELIB}/gnuradio/audio_oss.pyc
+@comment $NetBSD: PLIST,v 1.3 2007/08/08 03:00:39 wulf Exp $
 include/gnuradio/audio_oss_sink.h
 include/gnuradio/audio_oss_source.h
 include/gnuradio/swig/audio_oss.i
+${PYSITELIB}/gnuradio/_audio_oss.la
+${PYSITELIB}/gnuradio/audio_oss.py
+${PYSITELIB}/gnuradio/audio_oss.pyc
+${PYSITELIB}/gnuradio/audio_oss.pyo
 share/examples/gnuradio/conf.d/gr-audio-oss.conf
diff --git a/ham/gnuradio-audio-oss/distinfo b/ham/gnuradio-audio-oss/distinfo
index 0bdf4342d7a..fb22089804e 100644
--- a/ham/gnuradio-audio-oss/distinfo
+++ b/ham/gnuradio-audio-oss/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/11/13 16:34:45 wulf Exp $
+$NetBSD: distinfo,v 1.5 2007/08/08 03:00:39 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-audio-oss/patches/patch-aa b/ham/gnuradio-audio-oss/patches/patch-aa
new file mode 100644
index 00000000000..02b36566f63
--- /dev/null
+++ b/ham/gnuradio-audio-oss/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2007/08/08 03:00:39 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.