- Upgrade to gnuradio 3.2.2

Reviewed by:	lrk _at_ ovillatx dot sytes dot net

20 files changed, 254 insertions, 62 deletions

diff --git a/comms/gnuradio/files/patch-configure.ac b/comms/gnuradio/files/patch-configure.ac
new file mode 100644
index 000000000000..3651959dde8b
--- /dev/null
+++ b/comms/gnuradio/files/patch-configure.ac
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2011-02-19 19:06:13.000000000 -0500
++++ configure.ac	2011-02-19 19:06:22.000000000 -0500
+@@ -327,7 +327,6 @@
+ GRC_GR_UTILS                    dnl this must come after GRC_GR_WXGUI
+ GRC_GNURADIO_EXAMPLES		dnl must come after all GRC_GR_*
+ GRC_GRC
+-GRC_DOCS			dnl must be last
+ 
+ # Each component is now either to be built, was skipped, will be
+ # included from pre-installed libraries and includes, or failed
diff --git a/comms/gnuradio/files/patch-gnuradio-core_Makefile.in b/comms/gnuradio/files/patch-gnuradio-core_Makefile.in
index 113ee1a32f4d..4dd2e3fe4c52 100644
--- a/comms/gnuradio/files/patch-gnuradio-core_Makefile.in
+++ b/comms/gnuradio/files/patch-gnuradio-core_Makefile.in
@@ -1,20 +1,15 @@
---- gnuradio-core/Makefile.in.orig	2008-08-23 20:37:32.000000000 -0400
-+++ gnuradio-core/Makefile.in	2010-11-16 14:44:47.000000000 -0500
-@@ -561,14 +561,13 @@
- # Base directory for example applications
- exampledir = $(datadir)/gnuradio/examples
- EXTRA_DIST = \
--	gnuradio-core.conf		\
+--- gnuradio-core/Makefile.in.orig	2009-07-06 02:19:52.000000000 -0400
++++ gnuradio-core/Makefile.in	2011-02-20 17:41:49.000000000 -0500
+@@ -714,10 +714,10 @@
  	gnuradio-core.pc.in
  
--SUBDIRS = src doc
+ SUBDIRS = src
 -pkgconfigdir = $(libdir)/pkgconfig
-+SUBDIRS = src
 +pkgconfigdir = %%LIBDATA%%/pkgconfig
  pkgconfig_DATA = gnuradio-core.pc
- etcdir = $(sysconfdir)/gnuradio/conf.d
--etc_DATA = gnuradio-core.conf
-+etc_DATA =
+ etcdir = $(gr_sysconfdir)
+-dist_etc_DATA = gnuradio-core.conf
++dist_etc_DATA =
  all: all-recursive
  
  .SUFFIXES:
diff --git a/comms/gnuradio/files/patch-gnuradio-core_src_lib_general_Makefile.in b/comms/gnuradio/files/patch-gnuradio-core_src_lib_general_Makefile.in
new file mode 100644
index 000000000000..f669de3929ec
--- /dev/null
+++ b/comms/gnuradio/files/patch-gnuradio-core_src_lib_general_Makefile.in
@@ -0,0 +1,26 @@
+--- gnuradio-core/src/lib/general/Makefile.in.orig	2009-05-23 18:40:55.000000000 -0400
++++ gnuradio-core/src/lib/general/Makefile.in	2009-05-27 07:38:13.000000000 -0400
+@@ -227,19 +227,19 @@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++COMPILE = $(CC) $(DEFS) $(OMNITHREAD_INCLUDES) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	--mode=compile $(CC) $(DEFS) $(OMNITHREAD_INCLUDES) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++CXXCOMPILE = $(CXX) $(DEFS) $(OMNITHREAD_INCLUDES) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	--mode=compile $(CXX) $(DEFS) $(OMNITHREAD_INCLUDES) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
diff --git a/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_Makefile.in b/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_Makefile.in
new file mode 100644
index 000000000000..3db8f98eebc4
--- /dev/null
+++ b/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_Makefile.in
@@ -0,0 +1,15 @@
+--- gnuradio-core/src/lib/io/Makefile.in.orig	2009-05-27 08:39:29.000000000 -0400
++++ gnuradio-core/src/lib/io/Makefile.in	2009-05-27 08:42:41.000000000 -0400
+@@ -177,10 +177,10 @@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++CXXCOMPILE = $(CXX) $(DEFS) $(OMNITHREAD_INCLUDES) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	--mode=compile $(CXX) $(DEFS) $(OMNITHREAD_INCLUDES) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
diff --git a/comms/gnuradio/files/patch-gnuradio-core_src_lib_reed-solomon_Makefile.in b/comms/gnuradio/files/patch-gnuradio-core_src_lib_reed-solomon_Makefile.in
new file mode 100644
index 000000000000..19d21800be71
--- /dev/null
+++ b/comms/gnuradio/files/patch-gnuradio-core_src_lib_reed-solomon_Makefile.in
@@ -0,0 +1,13 @@
+--- gnuradio-core/src/lib/reed-solomon/Makefile.in.orig	2009-05-25 10:18:13.000000000 -0400
++++ gnuradio-core/src/lib/reed-solomon/Makefile.in	2009-05-25 10:21:35.000000000 -0400
+@@ -656,8 +656,8 @@
+ 
+ # This used to be set in configure.ac but is now defined here for all 
+ # Makefiles when this fragment is included.
+-STD_DEFINES_AND_INCLUDES = $(DEFINES) $(BOOST_CPPFLAGS) \
+-	$(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
++STD_DEFINES_AND_INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) \
++	$(BOOST_CPPFLAGS) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
+ 
+ 
+ # when including for compilation from pre-installed libraries and such,
diff --git a/comms/gnuradio/files/patch-gnuradio-core_src_lib_runtime_Makefile.in b/comms/gnuradio/files/patch-gnuradio-core_src_lib_runtime_Makefile.in
new file mode 100644
index 000000000000..26e6bd4b7be7
--- /dev/null
+++ b/comms/gnuradio/files/patch-gnuradio-core_src_lib_runtime_Makefile.in
@@ -0,0 +1,13 @@
+--- gnuradio-core/src/lib/runtime/Makefile.in.orig	2009-05-25 07:52:27.000000000 -0400
++++ gnuradio-core/src/lib/runtime/Makefile.in	2009-05-25 07:53:03.000000000 -0400
+@@ -673,8 +673,8 @@
+ 
+ # This used to be set in configure.ac but is now defined here for all 
+ # Makefiles when this fragment is included.
+-STD_DEFINES_AND_INCLUDES = $(DEFINES) $(BOOST_CPPFLAGS) \
+-	$(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
++STD_DEFINES_AND_INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) \
++	$(BOOST_CPPFLAGS) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
+ 
+ 
+ # when including for compilation from pre-installed libraries and such,
diff --git a/comms/gnuradio/files/patch-gnuradio-core_src_lib_swig_Makefile.in b/comms/gnuradio/files/patch-gnuradio-core_src_lib_swig_Makefile.in
new file mode 100644
index 000000000000..28ad4d3e8a59
--- /dev/null
+++ b/comms/gnuradio/files/patch-gnuradio-core_src_lib_swig_Makefile.in
@@ -0,0 +1,53 @@
+--- gnuradio-core/src/lib/swig/Makefile.in.orig	2009-07-06 02:19:53.000000000 -0400
++++ gnuradio-core/src/lib/swig/Makefile.in	2011-02-20 17:44:51.000000000 -0500
+@@ -140,7 +140,7 @@
+ 	$(swiginclude_HEADERS) $(top_srcdir)/Makefile.common \
+ 	$(top_srcdir)/Makefile.swig
+ subdir = gnuradio-core/src/lib/swig
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++ACLOCAL=true
+ am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \
+ 	$(top_srcdir)/config/acx_pthread.m4 \
+ 	$(top_srcdir)/config/ax_boost_base.m4 \
+@@ -369,7 +369,7 @@
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-ACLOCAL = @ACLOCAL@
++ACLOCAL=true
+ ALLOCA = @ALLOCA@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_CPPFLAGS = @ALSA_CPPFLAGS@
+@@ -378,9 +378,9 @@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
++AUTOCONF=true
++AUTOHEADER=true
++AUTOMAKE=true
+ AWK = @AWK@
+ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+ BOOST_CXXFLAGS = @BOOST_CXXFLAGS@
+@@ -828,8 +828,8 @@
+ 
+ # This used to be set in configure.ac but is now defined here for all 
+ # Makefiles when this fragment is included.
+-STD_DEFINES_AND_INCLUDES = $(DEFINES) $(BOOST_CPPFLAGS) \
+-	$(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
++STD_DEFINES_AND_INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) \
++	$(BOOST_CPPFLAGS) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
+ 
+ 
+ # when including for compilation from pre-installed libraries and such,
+@@ -886,7 +886,7 @@
+ COMPILE_MBH = $(RUN_GUILE) $(top_srcdir)/mblock/src/scheme/gnuradio/compile-mbh.scm
+ 
+ # Base directory for example applications
+-exampledir = $(datadir)/gnuradio/examples
++exampledir = $(datadir)/examples/gnuradio
+ gr_docdir = $(docdir)-$(VERSION)
+ 
+ # System configuration files
diff --git a/comms/gnuradio/files/patch-gnuradio-core_src_lib_viterbi_Makefile.in b/comms/gnuradio/files/patch-gnuradio-core_src_lib_viterbi_Makefile.in
new file mode 100644
index 000000000000..3c7efdf0763e
--- /dev/null
+++ b/comms/gnuradio/files/patch-gnuradio-core_src_lib_viterbi_Makefile.in
@@ -0,0 +1,13 @@
+--- gnuradio-core/src/lib/viterbi/Makefile.in.orig	2009-05-25 12:19:07.000000000 -0400
++++ gnuradio-core/src/lib/viterbi/Makefile.in	2009-05-25 12:19:28.000000000 -0400
+@@ -657,8 +657,8 @@
+ 
+ # This used to be set in configure.ac but is now defined here for all 
+ # Makefiles when this fragment is included.
+-STD_DEFINES_AND_INCLUDES = $(DEFINES) $(BOOST_CPPFLAGS) \
+-	$(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
++STD_DEFINES_AND_INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) \
++	$(BOOST_CPPFLAGS) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
+ 
+ 
+ # when including for compilation from pre-installed libraries and such,
diff --git a/comms/gnuradio/files/patch-gr-atsc_Makefile.in b/comms/gnuradio/files/patch-gr-atsc_Makefile.in
deleted file mode 100644
index e67254a41420..000000000000
--- a/comms/gnuradio/files/patch-gr-atsc_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- gr-atsc/Makefile.in.orig	2008-08-23 20:37:36.000000000 -0400
-+++ gr-atsc/Makefile.in	2008-08-24 07:01:14.000000000 -0400
-@@ -556,10 +556,10 @@
- RM = $(RM_PROG) -f
- 
- # Base directory for example applications
--exampledir = $(datadir)/gnuradio/examples
-+exampledir = $(datadir)/examples/gnuradio
- SUBDIRS = src
- DIST_SUBDIRS = src doc
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = %%LIBDATA%%/pkgconfig
- pkgconfig_DATA = 
- all: all-recursive
- 
diff --git a/comms/gnuradio/files/patch-gr-audio-oss_Makefile.in b/comms/gnuradio/files/patch-gr-audio-oss_Makefile.in
index b9b7c53d56f6..946fb943ea9d 100644
--- a/comms/gnuradio/files/patch-gr-audio-oss_Makefile.in
+++ b/comms/gnuradio/files/patch-gr-audio-oss_Makefile.in
@@ -1,17 +1,11 @@
---- gr-audio-oss/Makefile.in.orig	2008-08-23 20:37:37.000000000 -0400
-+++ gr-audio-oss/Makefile.in	2008-08-24 07:02:01.000000000 -0400
-@@ -558,12 +558,11 @@
- 
- # Base directory for example applications
- exampledir = $(datadir)/gnuradio/examples
--EXTRA_DIST = \
--	gr-audio-oss.conf
-+EXTRA_DIST =
- 
+--- gr-audio-oss/Makefile.in.orig	2009-07-06 02:19:55.000000000 -0400
++++ gr-audio-oss/Makefile.in	2011-02-20 17:48:07.000000000 -0500
+@@ -710,7 +710,7 @@
+ MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT
  SUBDIRS = src
- etcdir = $(sysconfdir)/gnuradio/conf.d
--etc_DATA = gr-audio-oss.conf
-+etc_DATA =
+ etcdir = $(gr_sysconfdir)
+-dist_etc_DATA = gr-audio-oss.conf
++dist_etc_DATA =
  all: all-recursive
  
  .SUFFIXES:
diff --git a/comms/gnuradio/files/patch-gr-trellis_Makefile.in b/comms/gnuradio/files/patch-gr-trellis_Makefile.in
index 5cb46f7686f4..a11ea5cd86b2 100644
--- a/comms/gnuradio/files/patch-gr-trellis_Makefile.in
+++ b/comms/gnuradio/files/patch-gr-trellis_Makefile.in
@@ -1,9 +1,9 @@
---- gr-trellis/Makefile.in.orig	2008-08-23 20:37:42.000000000 -0400
-+++ gr-trellis/Makefile.in	2008-08-24 07:02:53.000000000 -0400
-@@ -548,7 +548,7 @@
- 
- # Base directory for example applications
- exampledir = $(datadir)/gnuradio/examples
+--- gr-trellis/Makefile.in.orig	2009-07-06 02:20:00.000000000 -0400
++++ gr-trellis/Makefile.in	2011-02-20 17:49:16.000000000 -0500
+@@ -698,7 +698,7 @@
+ # Other common defines; use "+=" to add to these
+ STAMPS = 
+ MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT
 -SUBDIRS = src doc
 +SUBDIRS = src
  all: all-recursive
diff --git a/comms/gnuradio/files/patch-gr-usrp_Makefile.in b/comms/gnuradio/files/patch-gr-usrp_Makefile.in
new file mode 100644
index 000000000000..af909319b450
--- /dev/null
+++ b/comms/gnuradio/files/patch-gr-usrp_Makefile.in
@@ -0,0 +1,11 @@
+--- gr-usrp/Makefile.in.orig	2009-07-06 02:20:00.000000000 -0400
++++ gr-usrp/Makefile.in	2011-02-20 17:50:39.000000000 -0500
+@@ -713,7 +713,7 @@
+ 	gnuradio-usrp.pc.in
+ 
+ SUBDIRS = src apps
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = %%LIBDATA%%/pkgconfig
+ pkgconfig_DATA = gnuradio-usrp.pc
+ all: all-recursive
+ 
diff --git a/comms/gnuradio/files/patch-gr-wxgui_Makefile.in b/comms/gnuradio/files/patch-gr-wxgui_Makefile.in
index 7851a7b21e1f..be867aeeaa4a 100644
--- a/comms/gnuradio/files/patch-gr-wxgui_Makefile.in
+++ b/comms/gnuradio/files/patch-gr-wxgui_Makefile.in
@@ -1,16 +1,12 @@
---- gr-wxgui/Makefile.in.orig	2008-08-23 20:37:43.000000000 -0400
-+++ gr-wxgui/Makefile.in	2008-08-24 07:03:34.000000000 -0400
-@@ -560,11 +560,11 @@
+--- gr-wxgui/Makefile.in.orig	2009-07-06 02:20:01.000000000 -0400
++++ gr-wxgui/Makefile.in	2011-02-20 18:00:25.000000000 -0500
+@@ -717,8 +717,8 @@
  
- # Base directory for example applications
- exampledir = $(datadir)/gnuradio/examples
--EXTRA_DIST = gr-wxgui.conf gr-wxgui.pc.in
-+EXTRA_DIST = gr-wxgui.pc.in
  SUBDIRS = src
- etcdir = $(sysconfdir)/gnuradio/conf.d
--etc_DATA = gr-wxgui.conf
+ etcdir = $(gr_sysconfdir)
+-dist_etc_DATA = gr-wxgui.conf
 -pkgconfigdir = $(libdir)/pkgconfig
-+etc_DATA =
++dist_etc_DATA =
 +pkgconfigdir = %%LIBDATA%%/pkgconfig
  pkgconfig_DATA = gr-wxgui.pc
  all: all-recursive
diff --git a/comms/gnuradio/files/patch-grc_Makefile.in b/comms/gnuradio/files/patch-grc_Makefile.in
new file mode 100644
index 000000000000..5f56a0bbe108
--- /dev/null
+++ b/comms/gnuradio/files/patch-grc_Makefile.in
@@ -0,0 +1,11 @@
+--- grc/Makefile.in.orig	2011-02-21 00:21:58.000000000 -0500
++++ grc/Makefile.in	2011-02-21 00:22:10.000000000 -0500
+@@ -741,7 +741,7 @@
+ ourpythondir = $(grc_src_prefix)
+ ourpython_PYTHON = __init__.py
+ etcdir = $(gr_sysconfdir)
+-dist_etc_DATA = grc.conf
++dist_etc_DATA = 
+ EXTRA_DIST = \
+ 	$(srcdir)/__init__.py.in \
+ 	$(srcdir)/grc.conf.in
diff --git a/comms/gnuradio/files/patch-gruel_Makefile.in b/comms/gnuradio/files/patch-gruel_Makefile.in
new file mode 100644
index 000000000000..328cbfc548e0
--- /dev/null
+++ b/comms/gnuradio/files/patch-gruel_Makefile.in
@@ -0,0 +1,11 @@
+--- gruel/Makefile.in.orig	2009-07-06 02:20:02.000000000 -0400
++++ gruel/Makefile.in	2011-02-20 18:01:12.000000000 -0500
+@@ -712,7 +712,7 @@
+     gruel.pc.in
+ 
+ SUBDIRS = src
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = %%LIBDATA%%/pkgconfig
+ pkgconfig_DATA = gruel.pc
+ all: all-recursive
+ 
diff --git a/comms/gnuradio/files/patch-mblock_Makefile.in b/comms/gnuradio/files/patch-mblock_Makefile.in
new file mode 100644
index 000000000000..2caf58593768
--- /dev/null
+++ b/comms/gnuradio/files/patch-mblock_Makefile.in
@@ -0,0 +1,11 @@
+--- mblock/Makefile.in.orig	2009-07-06 02:20:03.000000000 -0400
++++ mblock/Makefile.in	2011-02-20 18:01:52.000000000 -0500
+@@ -712,7 +712,7 @@
+ 
+ SUBDIRS = src
+ DIST_SUBDIRS = src doc
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = %%LIBDATA%%/pkgconfig
+ pkgconfig_DATA = mblock.pc
+ all: all-recursive
+ 
diff --git a/comms/gnuradio/files/patch-omnithread_Makefile.in b/comms/gnuradio/files/patch-omnithread_Makefile.in
index e3ecc4f62f2f..1b3bd484aeb3 100644
--- a/comms/gnuradio/files/patch-omnithread_Makefile.in
+++ b/comms/gnuradio/files/patch-omnithread_Makefile.in
@@ -1,6 +1,6 @@
---- omnithread/Makefile.in.orig	2008-08-23 20:37:43.000000000 -0400
-+++ omnithread/Makefile.in	2008-08-24 07:04:18.000000000 -0400
-@@ -605,7 +605,7 @@
+--- omnithread/Makefile.in.orig	2009-07-06 02:20:03.000000000 -0400
++++ omnithread/Makefile.in	2011-02-20 18:03:05.000000000 -0500
+@@ -762,7 +762,7 @@
  libgromnithread_la_LIBADD = \
  	$(PTHREAD_LIBS)
  
diff --git a/comms/gnuradio/files/patch-pmt_Makefile.in b/comms/gnuradio/files/patch-pmt_Makefile.in
new file mode 100644
index 000000000000..6bc15e52518c
--- /dev/null
+++ b/comms/gnuradio/files/patch-pmt_Makefile.in
@@ -0,0 +1,11 @@
+--- pmt/Makefile.in.orig	2009-07-06 02:20:03.000000000 -0400
++++ pmt/Makefile.in	2011-02-20 18:03:37.000000000 -0500
+@@ -710,7 +710,7 @@
+ EXTRA_DIST = pmt.pc.in
+ SUBDIRS = src
+ DIST_SUBDIRS = src doc
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = %%LIBDATA%%/pkgconfig
+ pkgconfig_DATA = pmt.pc
+ all: all-recursive
+ 
diff --git a/comms/gnuradio/files/patch-usrp_Makefile.in b/comms/gnuradio/files/patch-usrp_Makefile.in
index 31c7b66b25d1..226f0394516d 100644
--- a/comms/gnuradio/files/patch-usrp_Makefile.in
+++ b/comms/gnuradio/files/patch-usrp_Makefile.in
@@ -1,6 +1,6 @@
---- usrp/Makefile.in.orig	2008-08-23 20:37:44.000000000 -0400
-+++ usrp/Makefile.in	2008-08-24 07:05:02.000000000 -0400
-@@ -473,8 +473,8 @@
+--- usrp/Makefile.in.orig	2009-05-23 18:41:07.000000000 -0400
++++ usrp/Makefile.in	2009-05-24 13:04:53.000000000 -0400
+@@ -594,8 +594,8 @@
  	usrp.iss.in \
  	usrp.inf
  
diff --git a/comms/gnuradio/files/patch-usrp_host_lib_legacy_usrp_prims.cc b/comms/gnuradio/files/patch-usrp_host_lib_legacy_usrp_prims.cc
new file mode 100644
index 000000000000..005e746deefa
--- /dev/null
+++ b/comms/gnuradio/files/patch-usrp_host_lib_legacy_usrp_prims.cc
@@ -0,0 +1,24 @@
+--- usrp/host/lib/legacy/usrp_prims.cc.orig	2009-01-13 08:53:35.000000000 -0600
++++ usrp/host/lib/legacy/usrp_prims.cc	2009-01-13 19:19:08.000000000 -0600
+@@ -129,16 +129,14 @@
+ // able to get from a usb_dev_handle back to a usb_device, and the
+ // right way to do this is buried in a non-installed include file.
+ 
++// Modified 13 Jan 09 for libusb20
++
++
+ static struct usb_device *
+ dev_handle_to_dev (usb_dev_handle *udh)
+ {
+-  struct usb_dev_handle_kludge {
+-    int			 fd;
+-    struct usb_bus	*bus;
+-    struct usb_device	*device;
+-  };
+-
+-  return ((struct usb_dev_handle_kludge *) udh)->device;
++  return (usb_device(udh));
++//xxx
+ }
+ 
+ // ----------------------------------------------------------------