Update gnuradio-usrp to 3.0.2:

gnuradio-usrp is now synchronized with the GNU Radio release cycle

4 files changed, 37 insertions, 11 deletions

diff --git a/ham/gnuradio-usrp/Makefile b/ham/gnuradio-usrp/Makefile
index b4e7261fc83..5913ba94888 100644
--- a/ham/gnuradio-usrp/Makefile
+++ b/ham/gnuradio-usrp/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.6 2006/04/27 03:14:19 wulf Exp $
+# $NetBSD: Makefile,v 1.7 2006/11/13 18:12:41 wulf Exp $
 
-VERSION=	0.8
-DISTNAME=	gr-usrp-${VERSION}
 PKGNAME=	gnuradio-usrp-${VERSION}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 COMMENT=	USRP bindings for GNU Radio
 
-PYTHON_PATCH_SCRIPTS+=	src/flexrf_debug_gui.py
-PYTHON_PATCH_SCRIPTS+=	src/tx_debug_gui.py
+PYTHON_PATCH_SCRIPTS+=	gr-usrp/src/flexrf_debug_gui.py
+PYTHON_PATCH_SCRIPTS+=	gr-usrp/src/qa_usrp.py
+PYTHON_PATCH_SCRIPTS+=	gr-usrp/src/tx_debug_gui.py
 
 .include "../../meta-pkgs/gnuradio/Makefile.common"
 
+CONFIGURE_ARGS+=--enable-gr-usrp
+
 .include "../../ham/usrp/buildlink3.mk"
 .include "../../math/fftwf/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/gnuradio-usrp/PLIST b/ham/gnuradio-usrp/PLIST
index d1e884d050d..a7312c869ab 100644
--- a/ham/gnuradio-usrp/PLIST
+++ b/ham/gnuradio-usrp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/27 03:14:19 wulf Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/11/13 18:12:41 wulf Exp $
 include/gnuradio/swig/usrp1.i
 include/gnuradio/usrp1_sink_base.h
 include/gnuradio/usrp1_sink_c.h
@@ -40,3 +40,6 @@ ${PYSITELIB}/gnuradio/usrp.pyo
 ${PYSITELIB}/gnuradio/usrp1.py
 ${PYSITELIB}/gnuradio/usrp1.pyc
 ${PYSITELIB}/gnuradio/usrp1.pyo
+${PYSITELIB}/gnuradio/usrp_multi.py
+${PYSITELIB}/gnuradio/usrp_multi.pyc
+${PYSITELIB}/gnuradio/usrp_multi.pyo
diff --git a/ham/gnuradio-usrp/distinfo b/ham/gnuradio-usrp/distinfo
index 6bf4cc4b7a8..7c62e840e8e 100644
--- a/ham/gnuradio-usrp/distinfo
+++ b/ham/gnuradio-usrp/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2006/04/27 03:14:19 wulf Exp $
+$NetBSD: distinfo,v 1.4 2006/11/13 18:12:41 wulf Exp $
 
-SHA1 (gr-usrp-0.8.tar.gz) = c2f7db727025711b5723debc122d47fb99eb4c05
-RMD160 (gr-usrp-0.8.tar.gz) = 752feb183a42e3c58eb9553ce5ba9d9050b977d6
-Size (gr-usrp-0.8.tar.gz) = 379824 bytes
+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 (patch-aa) = 176268067dee80a8c29f6f0b24111543d231958f
diff --git a/ham/gnuradio-usrp/patches/patch-aa b/ham/gnuradio-usrp/patches/patch-aa
new file mode 100644
index 00000000000..cc530452f37
--- /dev/null
+++ b/ham/gnuradio-usrp/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2006/11/13 18:12:41 wulf Exp $
+
+--- configure.orig	2006-11-11 19:53:29.000000000 +1030
++++ configure	2006-11-11 19:54:31.000000000 +1030
+@@ -32113,17 +32113,6 @@
+ 
+ 
+     passed=yes
+-    # Don't do gr-usrp if usrp skipped
+-    # There *has* to be a better way to check if a value is in a string
+-    for dir in $skipped_dirs
+-    do
+-	if test x$dir = xusrp; then
+-	    { echo "$as_me:$LINENO: result: Component gr-usrp requires usrp, which is not being built." >&5
+-echo "${ECHO_T}Component gr-usrp requires usrp, which is not being built." >&6; }
+-	    passed=no
+-	fi
+-    done
+-
+ 
+     if test x$passed = xno; then
+         skipped_dirs="$skipped_dirs gr-usrp"