Updated gnuradio-gsm to 3.0.4:

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

3 files changed, 32 insertions, 9 deletions

diff --git a/ham/gnuradio-gsm/PLIST b/ham/gnuradio-gsm/PLIST
index fab81a817f5..4aac020627f 100644
--- a/ham/gnuradio-gsm/PLIST
+++ b/ham/gnuradio-gsm/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/07 23:29:07 wulf Exp $
-${PYSITELIB}/gnuradio/vocoder/_gsm_full_rate.la
+@comment $NetBSD: PLIST,v 1.2 2007/08/08 03:12:26 wulf Exp $
+include/gnuradio/gsm_fr_decode_ps.h
+include/gnuradio/gsm_fr_encode_sp.h
+include/gnuradio/swig/gsm_full_rate.i
 ${PYSITELIB}/gnuradio/vocoder/__init__.py
 ${PYSITELIB}/gnuradio/vocoder/__init__.pyc
 ${PYSITELIB}/gnuradio/vocoder/__init__.pyo
+${PYSITELIB}/gnuradio/vocoder/_gsm_full_rate.la
 ${PYSITELIB}/gnuradio/vocoder/gsm_full_rate.py
 ${PYSITELIB}/gnuradio/vocoder/gsm_full_rate.pyc
 ${PYSITELIB}/gnuradio/vocoder/gsm_full_rate.pyo
-include/gnuradio/gsm_fr_decode_ps.h
-include/gnuradio/gsm_fr_encode_sp.h
-include/gnuradio/swig/gsm_full_rate.i
 @dirrm ${PYSITELIB}/gnuradio/vocoder
diff --git a/ham/gnuradio-gsm/distinfo b/ham/gnuradio-gsm/distinfo
index cb419037030..95b81c212b1 100644
--- a/ham/gnuradio-gsm/distinfo
+++ b/ham/gnuradio-gsm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/11/13 17:20:56 wulf Exp $
+$NetBSD: distinfo,v 1.5 2007/08/08 03:12:26 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-gsm/patches/patch-aa b/ham/gnuradio-gsm/patches/patch-aa
new file mode 100644
index 00000000000..feda94b81db
--- /dev/null
+++ b/ham/gnuradio-gsm/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2007/08/08 03:12:26 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.