4 files changed, 10 insertions, 29 deletions
diff --git a/ham/gnuradio-radio-astronomy/Makefile b/ham/gnuradio-radio-astronomy/Makefile
index 7d2b9752b76..55f9f695820 100644
--- a/ham/gnuradio-radio-astronomy/Makefile
+++ b/ham/gnuradio-radio-astronomy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/07/14 12:56:06 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/08/12 12:21:40 markd Exp $
 
 PKGNAME=	gnuradio-radio-astronomy-${VERSION}
 COMMENT=	GNU Radio module for radio astronomy
@@ -8,6 +8,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../meta-pkgs/gnuradio/Makefile.common"
 
 CONFIGURE_ARGS+=--enable-gr-radio-astronomy
+CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
 #DEPENDS+=	${PYPKGPREFIX}-ephem>=3.7b:../../math/py-ephem
 
diff --git a/ham/gnuradio-radio-astronomy/PLIST b/ham/gnuradio-radio-astronomy/PLIST
index e5c11172a4a..68362082917 100644
--- a/ham/gnuradio-radio-astronomy/PLIST
+++ b/ham/gnuradio-radio-astronomy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/13 17:27:57 wulf Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:21:40 markd Exp $
 bin/usrp_psr_receiver.py
 bin/usrp_ra_receiver.py
 include/gnuradio/swig/ra.i
@@ -15,3 +15,6 @@ ${PYSITELIB}/gnuradio/wxgui/ra_fftsink.pyo
 ${PYSITELIB}/gnuradio/wxgui/ra_stripchartsink.py
 ${PYSITELIB}/gnuradio/wxgui/ra_stripchartsink.pyc
 ${PYSITELIB}/gnuradio/wxgui/ra_stripchartsink.pyo
+${PYSITELIB}/gnuradio/wxgui/ra_waterfallsink.py
+${PYSITELIB}/gnuradio/wxgui/ra_waterfallsink.pyc
+${PYSITELIB}/gnuradio/wxgui/ra_waterfallsink.pyo
diff --git a/ham/gnuradio-radio-astronomy/distinfo b/ham/gnuradio-radio-astronomy/distinfo
index a90f7773922..70b6cae6e9c 100644
--- a/ham/gnuradio-radio-astronomy/distinfo
+++ b/ham/gnuradio-radio-astronomy/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2007/08/08 14:45:07 wulf Exp $
+$NetBSD: distinfo,v 1.4 2009/08/12 12:21:40 markd Exp $
 
-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) = 2dd396d139b02a1991825956d4a7d5e6376ca135
+SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
+RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
+Size (gnuradio-3.2.tar.gz) = 6864952 bytes
diff --git a/ham/gnuradio-radio-astronomy/patches/patch-aa b/ham/gnuradio-radio-astronomy/patches/patch-aa
deleted file mode 100644
index 40a9a1525d6..00000000000
--- a/ham/gnuradio-radio-astronomy/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/08/08 14:45:08 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 = -lusrp
- 
- # This used to be set in configure.ac but is now defined here for all 
- # Makefiles when this fragment is included.