Updated gnuradio to 3.0.4:

	* Updated license to GPLv3
	* Doxygen documentation covers whole tree
	* Fixed shared memory leak on NetBSD

4 files changed, 20 insertions, 8 deletions

diff --git a/meta-pkgs/gnuradio/Makefile b/meta-pkgs/gnuradio/Makefile
index 973707e7593..c04b561cab3 100644
--- a/meta-pkgs/gnuradio/Makefile
+++ b/meta-pkgs/gnuradio/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2007/05/17 12:49:34 gdt Exp $
+# $NetBSD: Makefile,v 1.9 2007/08/08 02:55:13 wulf Exp $
 
 .include	"../../meta-pkgs/gnuradio/Makefile.version"
 
 DISTNAME=       gnuradio-${VERSION}
-CATEGORIES=	meta-pkgs ham gnuradio
+CATEGORIES=	meta-pkgs ham
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 PKGREVISION=	1
@@ -12,6 +12,8 @@ MAINTAINER=	wulf@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/gnuradio/
 COMMENT=	"meta-package" for GNU Radio
 
+.include "options.mk"
+
 DEPENDS+=	gnuradio-core-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-core
 DEPENDS+=	gnuradio-core-docs-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-core-docs
 DEPENDS+=	gnuradio-audio-jack-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-audio-jack
@@ -25,8 +27,10 @@ DEPENDS+=	gnuradio-wxgui-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-wxgui
 DEPENDS+=	gnuradio-examples-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-examples
 DEPENDS+=	gnuradio-video-sdl-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-video-sdl
 DEPENDS+=	gnuradio-trellis-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-trellis
+.if !empty(PKG_OPTIONS:Mgnuradio-radio-astronomy)
 # Omit gnuradio-radio-astronomy because it has a RESTRICTED dependency.
-# DEPENDS+=	gnuradio-radio-astronomy-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-radio-astronomy
+DEPENDS+=	gnuradio-radio-astronomy-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-radio-astronomy
+.endif
 DEPENDS+=	gnuradio-howto-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-howto
 
 EXTRACT_ONLY=	# empty
diff --git a/meta-pkgs/gnuradio/Makefile.common b/meta-pkgs/gnuradio/Makefile.common
index bd46d9f2107..39fed491f89 100644
--- a/meta-pkgs/gnuradio/Makefile.common
+++ b/meta-pkgs/gnuradio/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2007/04/04 16:05:44 joerg Exp $
+# $NetBSD: Makefile.common,v 1.9 2007/08/08 02:55:13 wulf Exp $
 #
 # This Makefile fragment is included at the top of package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
@@ -6,14 +6,13 @@
 
 .include        "../../meta-pkgs/gnuradio/Makefile.version"
 
-DISTNAME=	gnuradio-${VERSION}
+DISTNAME?=	gnuradio-${VERSION}
 CATEGORIES+=	ham
 MASTER_SITES?=	http://gnuradio.org/releases/gnuradio/
 
 MAINTAINER?=	wulf@NetBSD.org
 HOMEPAGE?=	http://www.gnu.org/software/gnuradio/
 
-
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
@@ -30,4 +29,7 @@ PKG_SYSCONFSUBDIR=gnuradio/conf.d
 CONFIGURE_ARGS+=        --sysconfdir=${PREFIX}/share/examples
 CONFIGURE_ARGS+=        --disable-all-components
 
+pre-configure:
+	cd ${WRKSRC} && ./bootstrap
+
 .include "../../mk/bsd.prefs.mk"
diff --git a/meta-pkgs/gnuradio/Makefile.version b/meta-pkgs/gnuradio/Makefile.version
index 53ec810c346..ccc167f92c3 100644
--- a/meta-pkgs/gnuradio/Makefile.version
+++ b/meta-pkgs/gnuradio/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.1 2006/11/13 16:19:40 wulf Exp $
+# $NetBSD: Makefile.version,v 1.2 2007/08/08 02:55:14 wulf Exp $
 
-VERSION=        3.0.2
+VERSION=        3.0.4
diff --git a/meta-pkgs/gnuradio/options.mk b/meta-pkgs/gnuradio/options.mk
new file mode 100644
index 00000000000..e524ae2db61
--- /dev/null
+++ b/meta-pkgs/gnuradio/options.mk
@@ -0,0 +1,6 @@
+# $NetBSD: options.mk,v 1.1 2007/08/08 02:55:14 wulf Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnuradio
+PKG_SUPPORTED_OPTIONS=	gnuradio-radio-astronomy
+
+.include "../../mk/bsd.options.mk"