Update GNU Radio 3.3.0 (2010-09-15) to 3.7.5

  See the thread for modularity issues etc:
  http://mail-index.netbsd.org/pkgsrc-users/2014/09/07/msg020346.html
See more info at recent  gnuradio-core/Makefile commit log, thanks.

34 files changed, 31 insertions, 622 deletions

diff --git a/meta-pkgs/gnuradio/DESCR b/meta-pkgs/gnuradio/DESCR
index d075fd44b78..729bf9fbae4 100644
--- a/meta-pkgs/gnuradio/DESCR
+++ b/meta-pkgs/gnuradio/DESCR
@@ -1,5 +1,8 @@
+Meta package for collection of gnuradio:
 GNU Radio is a collection of software that when combined with minimal hardware,
 allows the construction of radios where the actual waveforms transmitted and
 received are defined by software. What this means is that it turns the digital
 modulation schemes used in today's high performance wireless devices into
 software problems.
+
+This is a meta package to install all of the GNU Radio modules.
diff --git a/meta-pkgs/gnuradio/Makefile b/meta-pkgs/gnuradio/Makefile
index 2348c28cf85..ab0b1836f2c 100644
--- a/meta-pkgs/gnuradio/Makefile
+++ b/meta-pkgs/gnuradio/Makefile
@@ -1,37 +1,44 @@
-# $NetBSD: Makefile,v 1.14 2011/02/28 14:52:55 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2014/10/13 12:51:10 mef Exp $
 
 META_PACKAGE=	yes
 
-.include	"../../meta-pkgs/gnuradio/Makefile.version"
+.include	"../../ham/gnuradio-core/Makefile.version"
 
 DISTNAME=       gnuradio-${VERSION}
 CATEGORIES=	meta-pkgs ham
 MASTER_SITES=	# empty
 DISTFILES=	# empty
+LICENSE=	gnu-gpl-v3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/gnuradio/
-COMMENT=	"meta-package" for GNU Radio
-
-.include "options.mk"
+COMMENT=	Collection of GNU Radio (meta package, easy to install whole thing)
 
+# 21 package for now
+DEPENDS+=	gnuradio-atsc-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-atsc
+DEPENDS+=	gnuradio-channels-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-channels
+DEPENDS+=	gnuradio-companion-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-companion
 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
-DEPENDS+=	gnuradio-audio-oss-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-audio-oss
-DEPENDS+=	gnuradio-audio-portaudio-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-audio-portaudio
-DEPENDS+=	gnuradio-gsm-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-gsm
-DEPENDS+=	usrp-${VERSION}{,nb[0-9]*}:../../ham/usrp
-DEPENDS+=	usrp-docs-${VERSION}{,nb[0-9]*}:../../ham/usrp-docs
-DEPENDS+=	gnuradio-usrp-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-usrp
-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-ctrlport-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-ctrlport
+
+DEPENDS+=	gnuradio-digital-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-digital
+DEPENDS+=	gnuradio-doxygen-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-doxygen
+DEPENDS+=	gnuradio-dtv-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-dtv
+DEPENDS+=	gnuradio-fcd-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-fcd
+DEPENDS+=	gnuradio-fec-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-fec
+
+DEPENDS+=	gnuradio-noaa-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-noaa
+DEPENDS+=	gnuradio-pager-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-pager
+DEPENDS+=	gnuradio-qtgui-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-qtgui
 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
-.endif
-DEPENDS+=	gnuradio-howto-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-howto
+DEPENDS+=	gnuradio-uhd-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-uhd
+
+DEPENDS+=	gnuradio-utils-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-utils
+DEPENDS+=	gnuradio-video-sdl-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-video-sdl
+DEPENDS+=	gnuradio-vocoder-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-vocoder
+DEPENDS+=	gnuradio-wavelet-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-wavelet
+DEPENDS+=	gnuradio-wxgui-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-wxgui
+
+DEPENDS+=	gnuradio-zeromq-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-zeromq
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gnuradio/Makefile.common b/meta-pkgs/gnuradio/Makefile.common
deleted file mode 100644
index 5a105db4caa..00000000000
--- a/meta-pkgs/gnuradio/Makefile.common
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: Makefile.common,v 1.19 2014/01/05 21:30:44 wiz Exp $
-#
-# This Makefile fragment is included at the top of package Makefiles for
-# GNU Radio distributed packages (they all share common configure and build
-# settings).
-#
-# used by ham/gnuradio-audio-jack/Makefile
-# used by ham/gnuradio-audio-oss/Makefile
-# used by ham/gnuradio-audio-portaudio/Makefile
-# used by ham/gnuradio-core/Makefile
-# used by ham/gnuradio-core-docs/Makefile
-# used by ham/gnuradio-examples/Makefile
-# used by ham/gnuradio-gsm/Makefile
-# used by ham/gnuradio-howto/Makefile
-# used by ham/gnuradio-radio-astronomy/Makefile
-# used by ham/gnuradio-trellis/Makefile
-# used by ham/gnuradio-usrp/Makefile
-# used by ham/gnuradio-video-sdl/Makefile
-# used by ham/gnuradio-wxgui/Makefile
-# used by ham/usrp/Makefile
-# used by ham/usrp-docs/Makefile
-
-.include        "../../meta-pkgs/gnuradio/Makefile.version"
-
-DISTNAME?=	gnuradio-${VERSION}
-CATEGORIES+=	ham
-MASTER_SITES?=	http://gnuradio.org/releases/gnuradio/
-
-MAINTAINER?=	pkgsrc-users@NetBSD.org
-HOMEPAGE?=	http://www.gnu.org/software/gnuradio/
-LICENSE=	gnu-gpl-v3
-
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake automake autoconf pkg-config
-
-MAKE_JOBS_SAFE=	no
-
-DISTINFO_FILE=		${.CURDIR}/../../meta-pkgs/gnuradio/distinfo
-PATCHDIR=		${.CURDIR}/../../meta-pkgs/gnuradio/patches
-
-BUILD_DEPENDS+=doxygen>=1.5.1:../../devel/doxygen
-
-PY_PATCHPLIST=	yes
-
-EGDIR=		${PREFIX}/share/examples/gnuradio/conf.d
-PKG_SYSCONFSUBDIR=gnuradio/conf.d
-
-CONFIGURE_ARGS+=        --sysconfdir=${PREFIX}/share/examples
-CONFIGURE_ARGS+=        --disable-all-components
-CONFIGURE_ARGS+=	--with-boost-thread=boost_thread
-CONFIGURE_ARGS+=	--with-boost-program-options=boost_program_options
-
-pre-configure:
-.if  empty(PKGNAME:Mgnuradio-howto-*)
-	cd ${WRKSRC} && ./bootstrap
-.endif
-
-.include "../../mk/bsd.prefs.mk"
diff --git a/meta-pkgs/gnuradio/Makefile.version b/meta-pkgs/gnuradio/Makefile.version
deleted file mode 100644
index 3179968786b..00000000000
--- a/meta-pkgs/gnuradio/Makefile.version
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.version,v 1.4 2010/09/15 09:38:42 markd Exp $
-
-VERSION=        3.3.0
diff --git a/meta-pkgs/gnuradio/distinfo b/meta-pkgs/gnuradio/distinfo
deleted file mode 100644
index 9a480d832b2..00000000000
--- a/meta-pkgs/gnuradio/distinfo
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: distinfo,v 1.15 2014/08/19 13:38:49 joerg Exp $
-
-SHA1 (gnuradio-3.3.0.tar.gz) = 41d5c177b173ce73404f5fe539b013c82600f73f
-RMD160 (gnuradio-3.3.0.tar.gz) = ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-Size (gnuradio-3.3.0.tar.gz) = 6997955 bytes
-SHA1 (patch-Makefile.swig) = 752dea9c256f0a2c8c3571b52003487b785c82fc
-SHA1 (patch-aa) = 3416b3c91170db727dee0986dc60cf1943d27edf
-SHA1 (patch-ab) = f7db7741c27b3dd32eb104637b537b304234d12c
-SHA1 (patch-ac) = bfd82ea0e6dd7ed0fc5194d0027323a4adbb306b
-SHA1 (patch-ae) = 44c99528a5ae8fe10f473f0da9f1c41edaa8ba8d
-SHA1 (patch-ag) = 266dd9238e96700ca2ff9a359fb2487bd90667b7
-SHA1 (patch-ah) = 94760f365cdb84170f376b3b619e9d462d20e49f
-SHA1 (patch-ai) = 2e8291c4d8a117c9c69de0ee906fbff85485d797
-SHA1 (patch-aj) = 046fb46567fcbef58143ac3eeb2d0f1fd905618e
-SHA1 (patch-ak) = c6d2d9289600a89cd425d1bab671b080888d9c04
-SHA1 (patch-config_gr__lib64.m4) = 2263778dea1b8918033c175735f3134a6da80dc5
-SHA1 (patch-config_gr__standalone.m4) = b571e9d69ad83ecb3b65daf955e1b526f92c9ed9
-SHA1 (patch-gnuradio-core_src_lib_filter_gri__fft__filter__ccc__generic.cc) = b10f17c5d375bc4b53d2633889aed5209cd7df0f
-SHA1 (patch-gnuradio-core_src_lib_filter_gri__fft__filter__fff__generic.cc) = 1d4c2d8e1c70ab9c89274e36c1ead440773d64a2
-SHA1 (patch-gnuradio-core_src_lib_filter_qa_gri_mmse_fir_interpolator_cc.cc) = cdfa5d89b5f5d9225468e2652248a6b6da5a36b2
-SHA1 (patch-gnuradio-core_src_lib_general_ga__gr__fxpt__vco.cc) = c2cc13c9ad13c515ee786dff09468fbe0a191489
-SHA1 (patch-gnuradio-core_src_lib_general_gr__firdes.cc) = 3b7961d398d12e6540445e9b8b93f45755caa3f4
-SHA1 (patch-gnuradio-core_src_lib_general_gr__math.cc) = 81161e9576c3ec8259a20663eb991578f0ac40c3
-SHA1 (patch-gnuradio-core_src_lib_general_gr__ofdm__frame__sink.cc) = a79510940726a7d4812375ebdca58d0c29ff0fc0
-SHA1 (patch-gnuradio-core_src_lib_general_gr__ofdm__mapper__bcv.cc) = 74f8385b428540c7ec764f0841f4bedd130f99c3
-SHA1 (patch-gnuradio-core_src_lib_io_gr__file__descriptor__sink.cc) = 4ac9818b722b5fc9175c4c19fb8a8126ddf48ed2
-SHA1 (patch-gnuradio-core_src_lib_io_gr__file__descriptor__source.cc) = 54f4194ef35e206ef05a6dd35066037529250a57
-SHA1 (patch-gnuradio-core_src_lib_io_ppio__ppdev.h) = c1644ca24ce4ed792ff72e66c64f57165b4531c2
-SHA1 (patch-gnuradio-core_src_lib_io_ppio_ppdev.cc) = dd8a78c0d08c66fe4ee362e73c7be2d7c47d64bb
-SHA1 (patch-gnuradio-core_src_tests_benchmark__vco.cc) = dd09bac9c9419fb8315d66830eedd703486fafd2
-SHA1 (patch-usrp2_firmware_configure.ac) = b79c71afe3d84a15466e37e6ce858ee63c43b62e
-SHA1 (patch-usrp_host_lib_db__base.cc) = 6c069ff60c6218ddf11cfaf2aec0463434850775
-SHA1 (patch-usrp_host_swig_usrp_prims.i) = 2ff2f695a2ba8cb4237298be96833225f37cfec8
diff --git a/meta-pkgs/gnuradio/options.mk b/meta-pkgs/gnuradio/options.mk
deleted file mode 100644
index e524ae2db61..00000000000
--- a/meta-pkgs/gnuradio/options.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# $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"
diff --git a/meta-pkgs/gnuradio/patches/patch-Makefile.swig b/meta-pkgs/gnuradio/patches/patch-Makefile.swig
deleted file mode 100644
index 44b56566e04..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-Makefile.swig
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Makefile.swig,v 1.1 2013/05/11 21:37:46 joerg Exp $
-
---- Makefile.swig.orig	2013-05-10 14:15:43.000000000 +0000
-+++ Makefile.swig
-@@ -58,8 +58,7 @@ STD_SWIG_LA_LD_FLAGS =		\
- 
- ## standard SWIG library additions for library creation
- 
--STD_SWIG_LA_LIB_ADD =  		\
--	-lstdc++
-+STD_SWIG_LA_LIB_ADD =
- 
- ## standard SWIG CXXFLAGS
- ## This allows for code to be compiled with "-O1" instead of "-g -O2"
diff --git a/meta-pkgs/gnuradio/patches/patch-aa b/meta-pkgs/gnuradio/patches/patch-aa
deleted file mode 100644
index 020356e5f73..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2012/01/12 15:47:45 hans Exp $
-
---- gnuradio-core/src/lib/runtime/gr_dispatcher.cc.orig	2008-05-09 18:35:10.000000000 +1200
-+++ gnuradio-core/src/lib/runtime/gr_dispatcher.cc
-@@ -30,18 +30,17 @@
- #include <stdio.h>
- 
- #ifdef HAVE_SELECT
-+#  ifdef HAVE_SYS_TIME_H
-+#    include <sys/time.h>
-+#  endif
- #  ifdef HAVE_SYS_SELECT_H
- #    include <sys/select.h>
--#  else
--#    ifdef HAVE_SYS_TIME_H
--#      include <sys/time.h>
--#    endif
--#    ifdef HAVE_SYS_TYPES_H
--#      include <sys/types.h>
--#    endif
--#    ifdef HAVE_UNISTD_H
--#      include <unistd.h>
--#    endif
-+#  endif
-+#  ifdef HAVE_SYS_TYPES_H
-+#    include <sys/types.h>
-+#  endif
-+#  ifdef HAVE_UNISTD_H
-+#    include <unistd.h>
- #  endif
- #endif
- 
-@@ -44,6 +44,9 @@
- #  endif
- #endif
- 
-+#ifdef __sun
-+#include <string.h>		/* for memset(), used by FD_ZERO */
-+#endif
- 
- static gr_dispatcher_sptr s_singleton;
- 
diff --git a/meta-pkgs/gnuradio/patches/patch-ab b/meta-pkgs/gnuradio/patches/patch-ab
deleted file mode 100644
index e279abb0b6e..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/09/11 16:24:31 joerg Exp $
-
---- config/gr_python.m4.orig	2009-08-23 23:30:58 +0300
-+++ config/gr_python.m4	2009-08-23 23:32:15 +0300
-@@ -36,6 +36,8 @@ AC_DEFUN([PYTHON_DEVEL],[
- 	# if we're cross-compiling, asking the host python about any of
- 	# this is completely useless...
- 
-+	AC_LANG_PUSH([C])
-+
- 	if test x$cross_compiling != xno
- 	then
- 		pythondir=$with_pythondir
-@@ -124,6 +126,7 @@ print path
- 	    esac
- 
- 	    AC_SUBST(PYTHON_LDFLAGS)
-+	    AC_LANG_POP
- 	fi
- ])
- 
diff --git a/meta-pkgs/gnuradio/patches/patch-ac b/meta-pkgs/gnuradio/patches/patch-ac
deleted file mode 100644
index 2a957fe4d99..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/09/11 16:24:31 joerg Exp $
-
---- usrp/doc/Makefile.am.orig	2009-03-16 07:44:27.000000000 +1300
-+++ usrp/doc/Makefile.am
-@@ -44,7 +44,7 @@ DOCBOOK_HTML_FILES=
- all-local: dox
- endif
- 
--dist_usrp_doc_DATA = $(top_srcdir)/usrp/README
-+# dist_usrp_doc_DATA = $(top_srcdir)/usrp/README
- 
- dox: html/index.html
- html/index.html:
-@@ -56,13 +56,13 @@ docbook-html: usrp_guide.html
- usrp_guide.html: usrp_guide.xml
- 	xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
- 
--install-data-local:
--	$(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html
--	@for i in $(DOCBOOK_HTML_FILES); do \
--		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \
--		$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \
--	done
--	cp -r html $(DESTDIR)$(usrp_docdir)
-+#install-data-local:
-+#	$(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html
-+#	@for i in $(DOCBOOK_HTML_FILES); do \
-+#		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \
-+#		$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \
-+#	done
-+#	cp -r html $(DESTDIR)$(usrp_docdir)
- 
- uninstall-local:
- 	$(RM) -fr $(DESTDIR)$(usrp_docdir)/html
diff --git a/meta-pkgs/gnuradio/patches/patch-ae b/meta-pkgs/gnuradio/patches/patch-ae
deleted file mode 100644
index 5369b7a8b46..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2010/09/15 09:38:42 markd Exp $
-
---- gnuradio-core/src/python/gnuradio/Makefile.am.orig	2010-06-02 00:57:53.000000000 +0000
-+++ gnuradio-core/src/python/gnuradio/Makefile.am
-@@ -22,7 +22,7 @@
- include $(top_srcdir)/Makefile.common
- 
- if PYTHON
--SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder
-+SUBDIRS = gr gru gruimpl blks2 blks2impl
- 
- grpython_PYTHON = 			\
- 	__init__.py			\
diff --git a/meta-pkgs/gnuradio/patches/patch-ag b/meta-pkgs/gnuradio/patches/patch-ag
deleted file mode 100644
index bac76770a92..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2013/01/23 18:56:32 wiz Exp $
-
-Avoid unportable test(1) construct.
-
---- config/gr_version.m4.orig	2010-06-03 06:22:52.000000000 +0000
-+++ config/gr_version.m4
-@@ -36,7 +36,7 @@ AC_DEFUN([GR_VERSION],[
-   GR_GIT
- 
-   dnl Test if we should use git version
--  if test "$MINOR_VERSION" == "git"; then
-+  if test "$MINOR_VERSION" = "git"; then
-     dnl RELEASE: 3.3git-xxx-gxxxxxxxx
-     dnl DOCVER:  3.3git
-     dnl LIBVER:  3.3git
-@@ -44,7 +44,7 @@ AC_DEFUN([GR_VERSION],[
-     DOCVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION
-     LIBVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION
-   else
--    if test "$MAINT_VERSION" == "git" ; then
-+    if test "$MAINT_VERSION" = "git" ; then
-       dnl RELEASE: 3.3.1git-xxx-gxxxxxxxx
-       dnl DOCVER:  3.3.1git
-       dnl LIBVER:  3.3.1git
diff --git a/meta-pkgs/gnuradio/patches/patch-ah b/meta-pkgs/gnuradio/patches/patch-ah
deleted file mode 100644
index 10f59b22f82..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-ah
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2013/01/23 18:44:11 wiz Exp $
-
-First chunk: automake-1.13 compat.
-Second chunk: test(1) compat.
-
---- configure.ac.orig	2010-06-03 06:45:00.000000000 +0000
-+++ configure.ac
-@@ -19,7 +19,7 @@ dnl Boston, MA 02110-1301, USA.
- 
- AC_INIT
- AC_PREREQ(2.57)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc])
- 
- AC_CANONICAL_BUILD
-@@ -297,8 +297,8 @@ BUILD_DATE=`date -u +"%a, %d %b %Y %R:%S
- AC_SUBST(BUILD_DATE)
- 
- dnl SYSCONFDIR substitution
--if test "${sysconfdir}" == "\${prefix}/etc" ; then
--   if test "${prefix}" == "NONE" ; then
-+if test "${sysconfdir}" = "\${prefix}/etc" ; then
-+   if test "${prefix}" = "NONE" ; then
-       SYSCONFDIR=["$ac_default_prefix/etc"]
-    else
-       SYSCONFDIR=["${prefix}/etc"]
diff --git a/meta-pkgs/gnuradio/patches/patch-ai b/meta-pkgs/gnuradio/patches/patch-ai
deleted file mode 100644
index b0e5797be1e..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2010/09/15 09:38:42 markd Exp $
-
---- gnuradio-core/src/lib/io/gr_udp_sink.cc.orig	2010-06-03 06:22:52.000000000 +0000
-+++ gnuradio-core/src/lib/io/gr_udp_sink.cc
-@@ -34,6 +34,9 @@
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-+#ifdef HAVE_NETINET_IN_H
-+#include <netinet/in.h>  //usually included by <netdb.h>?
-+#endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>  //usually included by <netdb.h>?
- #endif
diff --git a/meta-pkgs/gnuradio/patches/patch-aj b/meta-pkgs/gnuradio/patches/patch-aj
deleted file mode 100644
index 6610d4aee18..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-aj
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2010/09/15 09:38:42 markd Exp $
-
---- gr-usrp/src/usrp_swig.i.orig	2010-08-22 12:32:11.000000000 +0000
-+++ gr-usrp/src/usrp_swig.i
-@@ -27,9 +27,9 @@
- %}
- 
- %include <usrp/usrp_subdev_spec.h>
--%include <usrp/db_base.i>
--%include <fpga_regs_common.h>
--%include <fpga_regs_standard.h>
-+%include <db_base.i>
-+%include <usrp/fpga_regs_common.h>
-+%include <usrp/fpga_regs_standard.h>
- %include "usrp_standard.i"
- %include "usrp_base.i"
- %include "usrp_source_base.i"
diff --git a/meta-pkgs/gnuradio/patches/patch-ak b/meta-pkgs/gnuradio/patches/patch-ak
deleted file mode 100644
index b9827ef6193..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2010/09/15 09:38:42 markd Exp $
-
---- gr-usrp/src/usrp_standard.i.orig	2010-06-01 05:04:09.000000000 +0000
-+++ gr-usrp/src/usrp_standard.i
-@@ -24,11 +24,11 @@
- 
- %{
- #include <usrp/usrp_standard.h>
--#include <usrp_spi_defs.h>
-+#include <usrp/usrp_spi_defs.h>
- #include <usrp/usrp_dbid.h>
- %}
- 
--%include <usrp_spi_defs.h>
-+%include <usrp/usrp_spi_defs.h>
- %include <usrp/usrp_dbid.h>
- 
- %constant int FPGA_MODE_NORMAL   = usrp_standard_rx::FPGA_MODE_NORMAL;
diff --git a/meta-pkgs/gnuradio/patches/patch-config_gr__lib64.m4 b/meta-pkgs/gnuradio/patches/patch-config_gr__lib64.m4
deleted file mode 100644
index 43b16421362..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-config_gr__lib64.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-config_gr__lib64.m4,v 1.1 2012/01/26 22:58:46 sbd Exp $
-
-Don't use a libdir suffix (eg. lib64) 
-
---- config/gr_lib64.m4.orig	2010-06-01 05:04:08.000000000 +0000
-+++ config/gr_lib64.m4
-@@ -58,6 +58,7 @@ AC_DEFUN([GR_LIB64],[
-   else
-     _GR_LIB64_ASK_COMPILER  
-   fi
-+  gr_libdir_suffix=""
-   AC_MSG_RESULT([$gr_libdir_suffix])
- 
- 
diff --git a/meta-pkgs/gnuradio/patches/patch-config_gr__standalone.m4 b/meta-pkgs/gnuradio/patches/patch-config_gr__standalone.m4
deleted file mode 100644
index 464e895d152..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-config_gr__standalone.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-config_gr__standalone.m4,v 1.1 2013/01/23 18:44:12 wiz Exp $
-
-automake-1.13 compat.
-
---- config/gr_standalone.m4.orig	2010-06-01 05:04:08.000000000 +0000
-+++ config/gr_standalone.m4
-@@ -32,7 +32,7 @@ m4_define([GR_STANDALONE],
-   AC_PREREQ(2.57)
-   AC_CONFIG_SRCDIR([config/gr_standalone.m4])
-   AC_CONFIG_AUX_DIR([.])	
--  AM_CONFIG_HEADER(config.h)
-+  AC_CONFIG_HEADERS(config.h)
- 
-   AC_CANONICAL_BUILD
-   AC_CANONICAL_HOST
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__ccc__generic.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__ccc__generic.cc
deleted file mode 100644
index 7238393cf53..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__ccc__generic.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_filter_gri__fft__filter__ccc__generic.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $
-
-Avoid 'error: call of overloaded <x> is ambiguous' failures.
-
---- gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.cc.orig	2010-06-01 05:04:08.000000000 +0000
-+++ gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.cc
-@@ -99,7 +99,7 @@ gri_fft_filter_ccc_generic::compute_size
- {
-   int old_fftsize = d_fftsize;
-   d_ntaps = ntaps;
--  d_fftsize = (int) (2 * pow(2.0, ceil(log(ntaps) / log(2))));
-+  d_fftsize = (int) (2 * pow(2.0, ceil(log((float)ntaps) / log((float)2))));
-   d_nsamples = d_fftsize - d_ntaps + 1;
- 
-   if (0)
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__fff__generic.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__fff__generic.cc
deleted file mode 100644
index 85b0dcb3f8f..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__fff__generic.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_filter_gri__fft__filter__fff__generic.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $
-
-Avoid 'error: call of overloaded <x> is ambiguous' failures.
-
---- gnuradio-core/src/lib/filter/gri_fft_filter_fff_generic.cc.orig	2010-06-01 05:04:08.000000000 +0000
-+++ gnuradio-core/src/lib/filter/gri_fft_filter_fff_generic.cc
-@@ -86,7 +86,7 @@ gri_fft_filter_fff_generic::compute_size
- {
-   int old_fftsize = d_fftsize;
-   d_ntaps = ntaps;
--  d_fftsize = (int) (2 * pow(2.0, ceil(log(ntaps) / log(2))));
-+  d_fftsize = (int) (2 * pow(2.0, ceil(log((float)ntaps) / log((float)2))));
-   d_nsamples = d_fftsize - d_ntaps + 1;
- 
-   if (0)
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_qa_gri_mmse_fir_interpolator_cc.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_qa_gri_mmse_fir_interpolator_cc.cc
deleted file mode 100644
index c1b26a6534f..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_qa_gri_mmse_fir_interpolator_cc.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_filter_qa_gri_mmse_fir_interpolator_cc.cc,v 1.1 2012/11/23 20:46:41 markd Exp $
-
-include <stdint.h> for intptr_t and gcc4.7
-
---- gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator_cc.cc.orig	2010-06-01 05:04:09.000000000 +0000
-+++ gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator_cc.cc
-@@ -26,6 +26,7 @@
- #include <stdio.h>
- #include <cmath>
- #include <stdexcept>
-+#include <stdint.h>
- 
- #define	NELEM(x) (sizeof (x) / sizeof (x[0]))
- 
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_ga__gr__fxpt__vco.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_ga__gr__fxpt__vco.cc
deleted file mode 100644
index 3138c8bf4d7..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_ga__gr__fxpt__vco.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_general_ga__gr__fxpt__vco.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $
-
-Avoid 'error: call of overloaded <x> is ambiguous' failures.
-
---- gnuradio-core/src/lib/general/qa_gr_fxpt_vco.cc.orig	2010-06-02 00:57:52.000000000 +0000
-+++ gnuradio-core/src/lib/general/qa_gr_fxpt_vco.cc
-@@ -53,7 +53,7 @@ qa_gr_fxpt_vco::t0 ()
-   float			input[SIN_COS_BLOCK_SIZE];
- 
-   for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){
--	  input[i] = sin(i);
-+	  input[i] = sin((float)i);
-   }
- 
-   for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){
-@@ -85,7 +85,7 @@ qa_gr_fxpt_vco::t1 ()
-   double max_error = 0;
- 
-   for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){
--	  input[i] = sin(i);
-+	  input[i] = sin((float)i);
-   }
- 
-   ref_vco.cos (ref_block, input, SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL);
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__firdes.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__firdes.cc
deleted file mode 100644
index 91282f41542..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__firdes.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_general_gr__firdes.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $
-
-Avoid 'error: call of overloaded <x> is ambiguous' failures.
-
---- gnuradio-core/src/lib/general/gr_firdes.cc.orig	2010-06-02 00:57:52.000000000 +0000
-+++ gnuradio-core/src/lib/general/gr_firdes.cc
-@@ -574,7 +574,7 @@ gr_firdes::gaussian (double gain,
-   vector<float> taps(ntaps);
-   double scale = 0;
-   double dt = 1.0/spb;
--  double s = 1.0/(sqrt(log(2)) / (2*M_PI*bt));
-+  double s = 1.0/(sqrt(log((float)2)) / (2*M_PI*bt));
-   double t0 = -0.5 * ntaps;
-   double ts;
-   for(int i=0;i<ntaps;i++)
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__math.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__math.cc
deleted file mode 100644
index 8b1e3a04d81..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__math.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_general_gr__math.cc,v 1.1 2012/01/12 15:47:45 hans Exp $
-
---- gnuradio-core/src/lib/general/gr_math.cc.orig	2010-06-03 08:45:00.000000000 +0200
-+++ gnuradio-core/src/lib/general/gr_math.cc	2011-10-12 17:08:22.292617060 +0200
-@@ -82,6 +82,16 @@ gr_isnan (double value)
- // allows zero to be signed.  The comparison `-0.0 < 0.0'  is  false,  but
- // `gr_signbit (-0.0)' will return a nonzero value.
- 
-+#ifdef __sun
-+#define signbit	sun_signbit
-+int sun_signbit (double x)
-+{
-+  if (x < 0.0)
-+    return 1;
-+  return 0;
-+}
-+#endif
-+
- #ifdef signbit
- 
- int 
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__ofdm__frame__sink.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__ofdm__frame__sink.cc
deleted file mode 100644
index 535cef9f0ae..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__ofdm__frame__sink.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_general_gr__ofdm__frame__sink.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $
-
-Avoid 'error: call of overloaded <x> is ambiguous' failures.
-
---- gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc.orig	2010-06-01 05:04:09.000000000 +0000
-+++ gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
-@@ -281,7 +281,7 @@ gr_ofdm_frame_sink::set_sym_value_out(co
- 
-   d_sym_position  = sym_position;
-   d_sym_value_out = sym_value_out;
--  d_nbits = (unsigned long)ceil(log10(d_sym_value_out.size()) / log10(2.0));
-+  d_nbits = (unsigned long)ceil(log10((double)d_sym_value_out.size()) / log10((float)2.0));
- 
-   return true;
- }
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__ofdm__mapper__bcv.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__ofdm__mapper__bcv.cc
deleted file mode 100644
index 9ca004a346f..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__ofdm__mapper__bcv.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_general_gr__ofdm__mapper__bcv.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $
-
-Avoid 'error: call of overloaded <x> is ambiguous' failures.
-
---- gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc.orig	2010-06-01 05:04:09.000000000 +0000
-+++ gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
-@@ -113,7 +113,7 @@ gr_ofdm_mapper_bcv::gr_ofdm_mapper_bcv (
-     throw std::invalid_argument("gr_ofdm_mapper_bcv: subcarriers allocated exceeds size of occupied carriers");
-   }
-   
--  d_nbits = (unsigned long)ceil(log10(d_constellation.size()) / log10(2.0));
-+  d_nbits = (unsigned long)ceil(log10((double)d_constellation.size()) / log10((float)2.0));
- }
- 
- gr_ofdm_mapper_bcv::~gr_ofdm_mapper_bcv(void)
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_gr__file__descriptor__sink.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_gr__file__descriptor__sink.cc
deleted file mode 100644
index 46ea1115f61..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_gr__file__descriptor__sink.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_io_gr__file__descriptor__sink.cc,v 1.1 2012/10/09 17:25:16 marino Exp $
-
-Fix "close not declared in this scope" error on gcc 4.7
-
---- gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc.orig	2010-06-02 00:57:52.000000000 +0000
-+++ gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc
-@@ -33,6 +33,7 @@
- #include <fcntl.h>
- #include <stdexcept>
- #include <stdio.h>
-+#include <unistd.h>
- 
- 
- gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd)
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_gr__file__descriptor__source.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_gr__file__descriptor__source.cc
deleted file mode 100644
index 4e6a86b2a9f..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_gr__file__descriptor__source.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_io_gr__file__descriptor__source.cc,v 1.1 2012/10/09 17:25:16 marino Exp $
-
-Fix "close not declared in this scope" error on gcc 4.7
-
---- gnuradio-core/src/lib/io/gr_file_descriptor_source.cc.orig	2010-06-02 00:57:52.000000000 +0000
-+++ gnuradio-core/src/lib/io/gr_file_descriptor_source.cc
-@@ -34,6 +34,7 @@
- #include <stdexcept>
- #include <stdio.h>
- #include <string.h>
-+#include <unistd.h>
- 
- 
- gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize,
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_ppio__ppdev.h b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_ppio__ppdev.h
deleted file mode 100644
index a0d5e1c3775..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_ppio__ppdev.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_io_ppio__ppdev.h,v 1.1 2013/08/17 11:17:08 joerg Exp $
-
---- gnuradio-core/src/lib/io/ppio_ppdev.h.orig	2013-08-15 17:47:21.000000000 +0000
-+++ gnuradio-core/src/lib/io/ppio_ppdev.h
-@@ -34,7 +34,7 @@ typedef boost::shared_ptr<ppio_ppdev> pp
-  */
- 
- class ppio_ppdev : public ppio {
--  friend ppio_ppdev_sptr make_ppio_ppdev (int which = 0);
-+  friend ppio_ppdev_sptr make_ppio_ppdev (int which);
-   ppio_ppdev (int which = 0);
- 
-  public:
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_ppio_ppdev.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_ppio_ppdev.cc
deleted file mode 100644
index 77f9e513653..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_io_ppio_ppdev.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_lib_io_ppio_ppdev.cc,v 1.1 2012/11/23 20:46:41 markd Exp $
-
-include <unistd.h> for close() and gcc4.7
-
---- gnuradio-core/src/lib/io/ppio_ppdev.cc.orig	2010-06-02 00:57:52.000000000 +0000
-+++ gnuradio-core/src/lib/io/ppio_ppdev.cc
-@@ -28,6 +28,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include <iostream>
- #include <errno.h>
- #include <stdio.h>
diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_tests_benchmark__vco.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_tests_benchmark__vco.cc
deleted file mode 100644
index b13e1e79a26..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_tests_benchmark__vco.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gnuradio-core_src_tests_benchmark__vco.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $
-
-Avoid 'error: call of overloaded <x> is ambiguous' failures.
-
---- gnuradio-core/src/tests/benchmark_vco.cc.orig	2010-06-02 00:57:53.000000000 +0000
-+++ gnuradio-core/src/tests/benchmark_vco.cc
-@@ -63,7 +63,7 @@ benchmark (void test (float *x, const fl
-   // touch memory
-   memset(output, 0, BLOCK_SIZE*sizeof(float));
-   for (int i = 0; i<BLOCK_SIZE; i++)
--    input[i] = sin(i);
-+    input[i] = sin((float)i);
- 
-   // get starting CPU usage
- #ifdef HAVE_SYS_RESOURCE_H
diff --git a/meta-pkgs/gnuradio/patches/patch-usrp2_firmware_configure.ac b/meta-pkgs/gnuradio/patches/patch-usrp2_firmware_configure.ac
deleted file mode 100644
index 7dafa3b7643..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-usrp2_firmware_configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-usrp2_firmware_configure.ac,v 1.1 2013/01/23 18:44:12 wiz Exp $
-
-automake-1.13 compat.
-
---- usrp2/firmware/configure.ac.orig	2010-01-23 20:52:29.000000000 +0000
-+++ usrp2/firmware/configure.ac
-@@ -17,7 +17,7 @@ dnl
- 
- AC_INIT
- AC_PREREQ(2.57)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_AUX_DIR([.])
- AC_CONFIG_SRCDIR([lib/u2_init.c])
- 
diff --git a/meta-pkgs/gnuradio/patches/patch-usrp_host_lib_db__base.cc b/meta-pkgs/gnuradio/patches/patch-usrp_host_lib_db__base.cc
deleted file mode 100644
index 8ad9a37fd2f..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-usrp_host_lib_db__base.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-usrp_host_lib_db__base.cc,v 1.1 2014/08/19 13:38:49 joerg Exp $
-
---- usrp/host/lib/db_base.cc.orig	2014-08-18 14:44:41.000000000 +0000
-+++ usrp/host/lib/db_base.cc
-@@ -25,6 +25,7 @@
- 
- #include <usrp/db_base.h>
- #include <db_base_impl.h>
-+#include <ostream>
- 
- #if 0
- tune_result::tune_result(double baseband, double dxc, double residual, bool inv)
diff --git a/meta-pkgs/gnuradio/patches/patch-usrp_host_swig_usrp_prims.i b/meta-pkgs/gnuradio/patches/patch-usrp_host_swig_usrp_prims.i
deleted file mode 100644
index 8a94c99cf96..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-usrp_host_swig_usrp_prims.i
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-usrp_host_swig_usrp_prims.i,v 1.1 2012/03/10 21:47:30 markd Exp $
-
---- usrp/host/swig/usrp_prims.i.orig	2010-06-01 05:04:09.000000000 +0000
-+++ usrp/host/swig/usrp_prims.i
-@@ -32,6 +32,10 @@
-  * Linux, *BSD and Mac OS/X.  http://libusb.sourceforge.net
-  */
- 
-+%{
-+#include <stddef.h>
-+%}
-+
- %include <stl.i>	// pick up string stuff
- 
-