Updated usrp to 3.0.4:

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

4 files changed, 20 insertions, 30 deletions

diff --git a/ham/usrp/PLIST b/ham/usrp/PLIST
index f9af3ae0584..889e8f6daec 100644
--- a/ham/usrp/PLIST
+++ b/ham/usrp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/11/13 18:01:29 wulf Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/08/08 03:24:47 wulf Exp $
 bin/usrp_cal_dc_offset
 bin/usrper
 include/usrp_basic.h
@@ -36,5 +36,3 @@ share/usrp/rev4/std_4rx_0tx.rbf
 @dirrm share/usrp/rev4
 @dirrm share/usrp/rev2
 @dirrm share/usrp
-@dirrm share/doc/${PKGNAME}/html
-@dirrm share/doc/${PKGNAME}
diff --git a/ham/usrp/buildlink3.mk b/ham/usrp/buildlink3.mk
index ffdf290cd62..58caf473c6f 100644
--- a/ham/usrp/buildlink3.mk
+++ b/ham/usrp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/11/13 18:01:29 wulf Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/08/08 03:24:47 wulf Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 USRP_BUILDLINK3_MK:=	${USRP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	usrp
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}usrp
 
 .if ${USRP_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.usrp+=	usrp>=3.0.2
+BUILDLINK_API_DEPENDS.usrp+=	usrp>=3.0.4
 BUILDLINK_PKGSRCDIR.usrp?=	../../ham/usrp
 .endif	# USRP_BUILDLINK3_MK
 
diff --git a/ham/usrp/distinfo b/ham/usrp/distinfo
index 8f3a36bf234..863324fb97c 100644
--- a/ham/usrp/distinfo
+++ b/ham/usrp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2006/11/13 18:32:35 wulf Exp $
+$NetBSD: distinfo,v 1.7 2007/08/08 03:24:47 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 (patch-aa) = d9ec7dd096a7be32c7e7561ce5cb3991455d4882
+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) = 69322bf8cdfb18fb6d84dda21afb81dc40ad330e
diff --git a/ham/usrp/patches/patch-aa b/ham/usrp/patches/patch-aa
index 1506c21cdf7..5391198e9e7 100644
--- a/ham/usrp/patches/patch-aa
+++ b/ham/usrp/patches/patch-aa
@@ -1,11 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2006/11/13 18:32:36 wulf Exp $
+$NetBSD: patch-aa,v 1.3 2007/08/08 03:24:47 wulf Exp $
 
---- usrp/doc/Makefile.in.orig	2006-11-14 05:52:57.000000000 +1030
-+++ usrp/doc/Makefile.in	2006-11-14 05:53:30.000000000 +1030
-@@ -745,25 +745,25 @@
- 	xmlto html-nochunks $<
+--- usrp/doc/Makefile.am.orig	2007-07-31 12:30:37.000000000 +0930
++++ usrp/doc/Makefile.am	2007-07-31 12:31:37.000000000 +0930
+@@ -54,20 +54,20 @@
+ usrp_guide.html: usrp_guide.xml
+ 	xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
  
- install-data-local:
+-install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(docdir)
 -	@for i in $(top_srcdir)/usrp/README $(top_srcdir)/usrp/ChangeLog; do \
 -		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
@@ -18,6 +19,8 @@ $NetBSD: patch-aa,v 1.2 2006/11/13 18:32:36 wulf Exp $
 -		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \
 -	done
 -	cp -r html $(DESTDIR)$(docdir)
+-
++#install-data-local:
 +#	$(mkinstalldirs) $(DESTDIR)$(docdir)
 +#	@for i in $(top_srcdir)/usrp/README $(top_srcdir)/usrp/ChangeLog; do \
 +#		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
@@ -30,18 +33,7 @@ $NetBSD: patch-aa,v 1.2 2006/11/13 18:32:36 wulf Exp $
 +#		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \
 +#	done
 +#	cp -r html $(DESTDIR)$(docdir)
- 
++#
  uninstall-local:
--	@for i in README ChangeLog; do \
--		echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
--		$(RM) $(DESTDIR)$(docdir)/$$i; \
--	done
--	$(RM) -fr $(DESTDIR)$(docdir)/html
-+#	@for i in README ChangeLog; do \
-+#		echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
-+#		$(RM) $(DESTDIR)$(docdir)/$$i; \
-+#	done
-+#	$(RM) -fr $(DESTDIR)$(docdir)/html
- 
- clean-local:
- 	$(RM) -fr latex html man xml $(DOCBOOK_HTML_FILES)
+ 	@for i in README ChangeLog; do \
+ 		echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \