- update to 3.1.2

- remove patches accepted by vendor

15 files changed, 248 insertions, 608 deletions

diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 00a1ac57de02..315ced4d96d2 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnuradio
-PORTVERSION=	3.1.1
-PORTREVISION=	2
+PORTVERSION=	3.1.2
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gnuradio
@@ -19,7 +18,8 @@ COMMENT=	Amateur Radio Software defined radio
 BUILD_DEPENDS=	sdcc:${PORTSDIR}/lang/sdcc \
 		sdl-config:${PORTSDIR}/devel/sdl12 \
 		swig:${PORTSDIR}/devel/swig13 \
-		cppunit-config:${PORTSDIR}/devel/cppunit
+		cppunit-config:${PORTSDIR}/devel/cppunit \
+		guile:${PORTSDIR}/lang/guile
 LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
 		fftw3f:${PORTSDIR}/math/fftw3-float \
 		usb:${PORTSDIR}/devel/libusb \
diff --git a/comms/gnuradio/distinfo b/comms/gnuradio/distinfo
index 228bf068bda1..59096c1464b7 100644
--- a/comms/gnuradio/distinfo
+++ b/comms/gnuradio/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnuradio/gnuradio-3.1.1.tar.gz) = c5df6b26928ab6da678fbc6f993ce263
-SHA256 (gnuradio/gnuradio-3.1.1.tar.gz) = f793e92cff30f15ce9615d9b27f45981201a390f7f553b5546c98f4eb8db86f4
-SIZE (gnuradio/gnuradio-3.1.1.tar.gz) = 4099838
+MD5 (gnuradio/gnuradio-3.1.2.tar.gz) = 0208be69c598b37c8a0c4f59437e55d9
+SHA256 (gnuradio/gnuradio-3.1.2.tar.gz) = f215b31c55da6f6111ab473565689eb3d0e23523a20a889efefe5ac612a8ceeb
+SIZE (gnuradio/gnuradio-3.1.2.tar.gz) = 4511089
diff --git a/comms/gnuradio/files/patch-config.h.in b/comms/gnuradio/files/patch-config.h.in
index 63d5f619764e..52b328b439f7 100644
--- a/comms/gnuradio/files/patch-config.h.in
+++ b/comms/gnuradio/files/patch-config.h.in
@@ -1,6 +1,6 @@
---- config.h.in.orig	2007-11-05 20:04:06.000000000 -0500
-+++ config.h.in	2008-01-03 13:06:14.000000000 -0500
-@@ -94,6 +94,9 @@
+--- config.h.in.orig	2008-03-24 12:19:48.000000000 -0400
++++ config.h.in	2008-03-24 16:08:42.000000000 -0400
+@@ -97,6 +97,9 @@
  /* Define to 1 if you have the <linux/ppdev.h> header file. */
  #undef HAVE_LINUX_PPDEV_H
  
diff --git a/comms/gnuradio/files/patch-configure.ac b/comms/gnuradio/files/patch-configure.ac
deleted file mode 100644
index 63a4d6a9eb65..000000000000
--- a/comms/gnuradio/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2007-11-05 19:56:01.000000000 -0500
-+++ configure.ac	2008-01-03 13:05:32.000000000 -0500
-@@ -110,7 +110,7 @@
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(fcntl.h limits.h strings.h time.h sys/ioctl.h sys/time.h unistd.h)
--AC_CHECK_HEADERS(linux/ppdev.h sys/mman.h sys/select.h sys/types.h)
-+AC_CHECK_HEADERS(linux/ppdev.h dev/ppbus/ppi.h sys/mman.h sys/select.h sys/types.h)
- AC_CHECK_HEADERS(sys/resource.h stdint.h sched.h signal.h sys/syscall.h)
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
diff --git a/comms/gnuradio/files/patch-gnuradio-core_Makefile.in b/comms/gnuradio/files/patch-gnuradio-core_Makefile.in
index fd133dc5c2dc..0f1ff50e84c2 100644
--- a/comms/gnuradio/files/patch-gnuradio-core_Makefile.in
+++ b/comms/gnuradio/files/patch-gnuradio-core_Makefile.in
@@ -1,6 +1,6 @@
---- gnuradio-core/Makefile.in.orig	2007-11-05 20:04:06.000000000 -0500
-+++ gnuradio-core/Makefile.in	2008-01-03 13:07:03.000000000 -0500
-@@ -424,14 +424,13 @@
+--- gnuradio-core/Makefile.in.orig	2008-03-24 12:49:57.000000000 -0400
++++ gnuradio-core/Makefile.in	2008-03-24 16:13:56.000000000 -0400
+@@ -546,14 +546,13 @@
  # Base directory for example applications
  exampledir = $(datadir)/gnuradio/examples
  EXTRA_DIST = \
@@ -18,15 +18,3 @@
  all: all-recursive
  
  .SUFFIXES:
-@@ -444,9 +443,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  gnuradio-core/Makefile'; \
-+	echo ' cd $(top_srcdir) && /usr/bin/true --gnu  gnuradio-core/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  gnuradio-core/Makefile
-+	  /usr/bin/true --gnu  gnuradio-core/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- 	@case '$?' in \
diff --git a/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_gr_udp_sink.h b/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_gr_udp_sink.h
deleted file mode 100644
index db3df9cd8abf..000000000000
--- a/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_gr_udp_sink.h
+++ /dev/null
@@ -1,28 +0,0 @@
---- gnuradio-core/src/lib/io/gr_udp_sink.h.orig	2008-01-03 15:48:59.000000000 -0500
-+++ gnuradio-core/src/lib/io/gr_udp_sink.h	2008-01-03 18:19:32.000000000 -0500
-@@ -27,6 +27,11 @@
- #include <omnithread.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
- 
- class gr_udp_sink;
- typedef boost::shared_ptr<gr_udp_sink> gr_udp_sink_sptr;
-@@ -70,8 +75,13 @@
-   struct in_addr d_ip_dst;          // store the destination ip info
-   unsigned short d_port_src;        // the port number to open for connections to this service
-   unsigned short d_port_dst;        // port number of the remove system
-+#ifdef BSD
-+  struct sockaddr_in    d_sockaddr_src;    // store the source sockaddr data (formatted IP address and port number)
-+  struct sockaddr_in    d_sockaddr_dst;    // store the destination sockaddr data (formatted IP address and port number)
-+#else
-   sockaddr_in    d_sockaddr_src;    // store the source sockaddr data (formatted IP address and port number)
-   sockaddr_in    d_sockaddr_dst;    // store the destination sockaddr data (formatted IP address and port number)
-+#endif
- 
-  protected:
-   /*!
diff --git a/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_gr_udp_source.h b/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_gr_udp_source.h
deleted file mode 100644
index 18c1ed8acafe..000000000000
--- a/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_gr_udp_source.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- gnuradio-core/src/lib/io/gr_udp_source.h.orig	2007-11-05 19:55:38.000000000 -0500
-+++ gnuradio-core/src/lib/io/gr_udp_source.h	2008-01-03 18:23:55.000000000 -0500
-@@ -27,6 +27,10 @@
- #include <omnithread.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
-+#include <netinet/in.h>
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
- 
- class gr_udp_source;
- typedef boost::shared_ptr<gr_udp_source> gr_udp_source_sptr;
-@@ -62,8 +66,11 @@
-   int            d_socket_rcv;    // handle to socket retuned in the accept call
-   struct in_addr d_ip_src;        // store the source IP address to use
-   unsigned short d_port_src;      // the port number to open for connections to this service
-+#ifdef BSD
-+  struct sockaddr_in    d_sockaddr_src;  // store the source sockaddr data (formatted IP address and port number)
-+#else
-   sockaddr_in    d_sockaddr_src;  // store the source sockaddr data (formatted IP address and port number)
--
-+#endif
-   char *d_temp_buff;    // hold buffer between calls
-   ssize_t d_residual;   // hold information about number of bytes stored in the temp buffer
-   size_t d_temp_offset; // point to temp buffer location offset
diff --git a/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_ppio_ppdev.cc b/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_ppio_ppdev.cc
deleted file mode 100644
index 7bbdde4ddb5f..000000000000
--- a/comms/gnuradio/files/patch-gnuradio-core_src_lib_io_ppio_ppdev.cc
+++ /dev/null
@@ -1,311 +0,0 @@
---- gnuradio-core/src/lib/io/ppio_ppdev.cc.orig	2007-11-05 19:55:38.000000000 -0500
-+++ gnuradio-core/src/lib/io/ppio_ppdev.cc	2008-01-03 13:07:44.000000000 -0500
-@@ -32,11 +32,16 @@
- #include <errno.h>
- #include <stdio.h>
- #include <stdexcept>
--#ifdef HAVE_LINUX_PPDEV_H
-+#if defined(HAVE_LINUX_PPDEV_H)
- #include <sys/ioctl.h>
- #include <linux/ppdev.h>
- #include <linux/parport.h>
- #include <sstream>
-+#elif defined(HAVE_DEV_PPBUS_PPI_H)
-+#include <sys/ioctl.h>
-+#include <dev/ppbus/ppi.h>
-+#include <dev/ppbus/ppbconf.h>
-+#include <sstream>
- #else
- // #warn "ppio_ppdev is not functional on this platform"
- #endif
-@@ -53,84 +58,138 @@
- 
- static int SP_ACTIVE_LOW_BITS	= 0x80;
- 
--#ifndef HAVE_LINUX_PPDEV_H		// use stubs
-+#if defined(HAVE_LINUX_PPDEV_H)
-+
-+// The real Linux code...
- 
- ppio_ppdev::ppio_ppdev (int which)
- {
--  std::cerr << "ppio_ppdev: Not implemented on this platform\n";
--  throw std::runtime_error ("not implmeneted");
-+  std::ostringstream filename;
-+  filename << "/dev/parport" << which;
-+  const char *c_filename = filename.str().c_str();
-+
-+  if ((d_fd = open (c_filename, O_RDWR)) < 0){
-+    int my_errno = errno;
-+    perror (c_filename);
-+    if (my_errno == ENOENT){
-+      std::cerr << "Does the device file " << c_filename << " exist?\n";
-+      std::cerr << "If not, as root execute: \n";
-+      std::cerr << "  # mknod " << c_filename << " c 99 0\n";
-+      std::cerr << "  # chmod 666 " << c_filename << std::endl;
-+    }
-+    throw std::runtime_error ("open");
-+  }
-+
-+  int mode = IEEE1284_MODE_COMPAT;
-+  if (ioctl (d_fd, PPSETMODE, &mode) != 0){
-+    perror ("ppio_ppdev: PPSETMODE");
-+    close (d_fd);
-+    throw std::runtime_error ("PPSETMODE");
-+  }
- }
- 
- ppio_ppdev::~ppio_ppdev ()
- {
-+  close (d_fd);
- }
- 
-+
- void 
- ppio_ppdev::write_data (unsigned char v)
- {
-+  if (ioctl (d_fd, PPWDATA, &v) != 0){
-+    perror ("ppio_ppdev: PPWDATA");
-+    throw std::runtime_error ("PPWDATA");
-+  }
- }
- 
- unsigned char
- ppio_ppdev::read_data ()
- {
--  return 0;
-+  unsigned char v;
-+
-+  if (ioctl (d_fd, PPRDATA, &v) != 0){
-+    perror ("ppio_ppdev: PPRDATA");
-+    throw std::runtime_error ("PPRDATA");
-+  }
-+  return v;
- }
- 
- void 
- ppio_ppdev::write_control (unsigned char v)
- {
-+  unsigned char ctrl = v ^ CP_ACTIVE_LOW_BITS;
-+  if (ioctl (d_fd, PPWCONTROL, &ctrl) != 0){
-+    perror ("ppio_ppdev: PPWCONTROL");
-+    throw std::runtime_error ("PPWCONTROL");
-+  }
- }
- 
- unsigned char
- ppio_ppdev::read_control ()
- {
--  return 0;
-+  unsigned char ctrl;
-+  if (ioctl (d_fd, PPRCONTROL, &ctrl) != 0){
-+    perror ("ppio_ppdev: PPRCONTROL");
-+    throw std::runtime_error ("PPRCONTROL");
-+  }
-+
-+  return ctrl ^ CP_ACTIVE_LOW_BITS;
- }
- 
- unsigned char
- ppio_ppdev::read_status ()
- {
--  return 0;
-+  unsigned char status;
-+  if (ioctl (d_fd, PPRSTATUS, &status) != 0){
-+    perror ("ppio_ppdev: PPRSTATUS");
-+    throw std::runtime_error ("PPRSTATUS");
-+  }
-+
-+  return status ^ SP_ACTIVE_LOW_BITS;
- }
- 
- void
- ppio_ppdev::lock ()
- {
-+  if (ioctl (d_fd, PPCLAIM) != 0){
-+    perror ("ppio_ppdev: PPCLAIM");
-+    throw std::runtime_error ("PPCLAIM");
-+  }
- }
- 
- void
- ppio_ppdev::unlock ()
- {
-+  if (ioctl (d_fd, PPRELEASE) != 0){
-+    perror ("ppio_ppdev: PPRELEASE");
-+    throw std::runtime_error ("PPRELEASE");
-+  }
- }
- 
--#else		
-+#elif defined(HAVE_DEV_PPBUS_PPI_H)
- 
--// The real code...
-+// The real FreeBSD code... (Could work on other BSDs as well)
- 
- ppio_ppdev::ppio_ppdev (int which)
- {
-   std::ostringstream filename;
--  filename << "/dev/parport" << which;
-+  filename << "/dev/ppi" << which;
-   const char *c_filename = filename.str().c_str();
--
-   if ((d_fd = open (c_filename, O_RDWR)) < 0){
-     int my_errno = errno;
-     perror (c_filename);
--    if (my_errno == ENOENT){
--      std::cerr << "Does the device file " << c_filename << " exist?\n";
--      std::cerr << "If not, as root execute: \n";
--      std::cerr << "  # mknod " << c_filename << " c 99 0\n";
--      std::cerr << "  # chmod 666 " << c_filename << std::endl;
--    }
-     throw std::runtime_error ("open");
-   }
- 
-+#if 0
-   int mode = IEEE1284_MODE_COMPAT;
-   if (ioctl (d_fd, PPSETMODE, &mode) != 0){
-     perror ("ppio_ppdev: PPSETMODE");
-     close (d_fd);
-     throw std::runtime_error ("PPSETMODE");
-   }
-+#endif
- }
- 
- ppio_ppdev::~ppio_ppdev ()
-@@ -142,9 +201,9 @@
- void 
- ppio_ppdev::write_data (unsigned char v)
- {
--  if (ioctl (d_fd, PPWDATA, &v) != 0){
--    perror ("ppio_ppdev: PPWDATA");
--    throw std::runtime_error ("PPWDATA");
-+  if (ioctl (d_fd, PPISDATA, &v) != 0){
-+    perror ("ppio_ppdev: PPISDATA");
-+    throw std::runtime_error ("PPISDATA");
-   }
- }
- 
-@@ -153,9 +212,9 @@
- {
-   unsigned char v;
- 
--  if (ioctl (d_fd, PPRDATA, &v) != 0){
--    perror ("ppio_ppdev: PPRDATA");
--    throw std::runtime_error ("PPRDATA");
-+  if (ioctl (d_fd, PPIGDATA, &v) != 0){
-+    perror ("ppio_ppdev: PPIGDATA");
-+    throw std::runtime_error ("PPIGDATA");
-   }
-   return v;
- }
-@@ -164,9 +223,9 @@
- ppio_ppdev::write_control (unsigned char v)
- {
-   unsigned char ctrl = v ^ CP_ACTIVE_LOW_BITS;
--  if (ioctl (d_fd, PPWCONTROL, &ctrl) != 0){
--    perror ("ppio_ppdev: PPWCONTROL");
--    throw std::runtime_error ("PPWCONTROL");
-+  if (ioctl (d_fd, PPISCTRL, &ctrl) != 0){
-+    perror ("ppio_ppdev: PPISCTRL");
-+    throw std::runtime_error ("PPISCTRL");
-   }
- }
- 
-@@ -174,9 +233,9 @@
- ppio_ppdev::read_control ()
- {
-   unsigned char ctrl;
--  if (ioctl (d_fd, PPRCONTROL, &ctrl) != 0){
--    perror ("ppio_ppdev: PPRCONTROL");
--    throw std::runtime_error ("PPRCONTROL");
-+  if (ioctl (d_fd, PPIGCTRL, &ctrl) != 0){
-+    perror ("ppio_ppdev: PPIGCTRL");
-+    throw std::runtime_error ("PPIGCTRL");
-   }
- 
-   return ctrl ^ CP_ACTIVE_LOW_BITS;
-@@ -186,30 +245,71 @@
- ppio_ppdev::read_status ()
- {
-   unsigned char status;
--  if (ioctl (d_fd, PPRSTATUS, &status) != 0){
--    perror ("ppio_ppdev: PPRSTATUS");
--    throw std::runtime_error ("PPRSTATUS");
-+  if (ioctl (d_fd, PPIGSTATUS, &status) != 0){
-+    perror ("ppio_ppdev: PPIGSTATUS");
-+    throw std::runtime_error ("PPIGSTATUS");
-   }
--
-   return status ^ SP_ACTIVE_LOW_BITS;
- }
- 
- void
- ppio_ppdev::lock ()
- {
--  if (ioctl (d_fd, PPCLAIM) != 0){
--    perror ("ppio_ppdev: PPCLAIM");
--    throw std::runtime_error ("PPCLAIM");
--  }
- }
- 
- void
- ppio_ppdev::unlock ()
- {
--  if (ioctl (d_fd, PPRELEASE) != 0){
--    perror ("ppio_ppdev: PPRELEASE");
--    throw std::runtime_error ("PPRELEASE");
--  }
-+}
-+#else
-+/* Apparently, non real code */
-+
-+ppio_ppdev::ppio_ppdev (int which)
-+{
-+  std::cerr << "ppio_ppdev: Not implemented on this platform\n";
-+  throw std::runtime_error ("not implmeneted");
-+}
-+
-+ppio_ppdev::~ppio_ppdev ()
-+{
-+}
-+
-+void 
-+ppio_ppdev::write_data (unsigned char v)
-+{
-+}
-+
-+unsigned char
-+ppio_ppdev::read_data ()
-+{
-+  return 0;
-+}
-+
-+void 
-+ppio_ppdev::write_control (unsigned char v)
-+{
-+}
-+
-+unsigned char
-+ppio_ppdev::read_control ()
-+{
-+  return 0;
-+}
-+
-+unsigned char
-+ppio_ppdev::read_status ()
-+{
-+  return 0;
-+}
-+
-+void
-+ppio_ppdev::lock ()
-+{
-+}
-+
-+void
-+ppio_ppdev::unlock ()
-+{
- }
- 
- #endif
diff --git a/comms/gnuradio/files/patch-gr-atsc_Makefile.in b/comms/gnuradio/files/patch-gr-atsc_Makefile.in
index 49af79bec3c7..b9b2d9484b87 100644
--- a/comms/gnuradio/files/patch-gr-atsc_Makefile.in
+++ b/comms/gnuradio/files/patch-gr-atsc_Makefile.in
@@ -1,38 +1,11 @@
---- gr-atsc/Makefile.in.orig	2008-01-05 19:15:30.000000000 -0500
-+++ gr-atsc/Makefile.in	2008-01-05 19:17:54.000000000 -0500
-@@ -79,7 +79,7 @@
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/Makefile.common ChangeLog
- subdir = gr-atsc
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+ACLOCAL=true
- am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \
- 	$(top_srcdir)/config/cppunit.m4 \
- 	$(top_srcdir)/config/gr_boost.m4 \
-@@ -159,7 +159,7 @@
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = @ACLOCAL@
-+ACLOCAL=true
- ALLOCA = @ALLOCA@
- ALSA_CFLAGS = @ALSA_CFLAGS@
- ALSA_INCLUDEDIR = @ALSA_INCLUDEDIR@
-@@ -167,9 +167,9 @@
- AMTAR = @AMTAR@
- AR = @AR@
- AS = @AS@
--AUTOCONF = @AUTOCONF@
--AUTOHEADER = @AUTOHEADER@
--AUTOMAKE = @AUTOMAKE@
-+AUTOCONF=true
-+AUTOHEADER=true
-+AUTOMAKE=true
- AWK = @AWK@
- BOOST_CFLAGS = @BOOST_CFLAGS@
- CC = @CC@
-@@ -422,7 +422,7 @@
- exampledir = $(datadir)/gnuradio/examples
+--- gr-atsc/Makefile.in.orig	2008-03-24 12:50:01.000000000 -0400
++++ gr-atsc/Makefile.in	2008-03-25 00:04:02.000000000 -0400
+@@ -541,10 +541,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
diff --git a/comms/gnuradio/files/patch-gr-audio-oss_Makefile.in b/comms/gnuradio/files/patch-gr-audio-oss_Makefile.in
index ec70acfef03c..88250351fc22 100644
--- a/comms/gnuradio/files/patch-gr-audio-oss_Makefile.in
+++ b/comms/gnuradio/files/patch-gr-audio-oss_Makefile.in
@@ -1,6 +1,6 @@
---- gr-audio-oss/Makefile.in.orig	2007-11-05 20:04:10.000000000 -0500
-+++ gr-audio-oss/Makefile.in	2008-01-03 13:11:36.000000000 -0500
-@@ -421,12 +421,11 @@
+--- gr-audio-oss/Makefile.in.orig	2008-03-24 12:50:02.000000000 -0400
++++ gr-audio-oss/Makefile.in	2008-03-24 16:20:01.000000000 -0400
+@@ -543,12 +543,11 @@
  
  # Base directory for example applications
  exampledir = $(datadir)/gnuradio/examples
diff --git a/comms/gnuradio/files/patch-gr-trellis_Makefile.in b/comms/gnuradio/files/patch-gr-trellis_Makefile.in
index 35a0e86bb1cc..c38717603cb2 100644
--- a/comms/gnuradio/files/patch-gr-trellis_Makefile.in
+++ b/comms/gnuradio/files/patch-gr-trellis_Makefile.in
@@ -1,6 +1,6 @@
---- gr-trellis/Makefile.in.orig	2007-11-05 20:04:13.000000000 -0500
-+++ gr-trellis/Makefile.in	2008-01-03 13:15:40.000000000 -0500
-@@ -411,7 +411,7 @@
+--- gr-trellis/Makefile.in.orig	2008-03-24 12:50:07.000000000 -0400
++++ gr-trellis/Makefile.in	2008-03-24 16:20:36.000000000 -0400
+@@ -533,7 +533,7 @@
  
  # Base directory for example applications
  exampledir = $(datadir)/gnuradio/examples
diff --git a/comms/gnuradio/files/patch-gr-wxgui_Makefile.in b/comms/gnuradio/files/patch-gr-wxgui_Makefile.in
index 60428b0b8d02..8a8c897a2e4b 100644
--- a/comms/gnuradio/files/patch-gr-wxgui_Makefile.in
+++ b/comms/gnuradio/files/patch-gr-wxgui_Makefile.in
@@ -1,15 +1,17 @@
---- gr-wxgui/Makefile.in.orig	2007-11-05 20:04:14.000000000 -0500
-+++ gr-wxgui/Makefile.in	2008-01-03 13:17:51.000000000 -0500
-@@ -421,10 +421,10 @@
+--- gr-wxgui/Makefile.in.orig	2008-03-24 12:50:08.000000000 -0400
++++ gr-wxgui/Makefile.in	2008-03-24 16:27:33.000000000 -0400
+@@ -545,11 +545,11 @@
  
  # Base directory for example applications
  exampledir = $(datadir)/gnuradio/examples
--EXTRA_DIST = gr-wxgui.conf
-+EXTRA_DIST =
+-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
+-pkgconfigdir = $(libdir)/pkgconfig
 +etc_DATA =
++pkgconfigdir = %%LIBDATA%%/pkgconfig
+ pkgconfig_DATA = gr-wxgui.pc
  all: all-recursive
  
- .SUFFIXES:
diff --git a/comms/gnuradio/files/patch-omnithread_Makefile.in b/comms/gnuradio/files/patch-omnithread_Makefile.in
index f725cb86345b..bf299a2dc3ce 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-01-04 20:30:56.000000000 -0500
-+++ omnithread/Makefile.in	2008-01-04 20:32:22.000000000 -0500
-@@ -463,7 +463,7 @@
+--- omnithread/Makefile.in.orig	2008-03-24 12:50:08.000000000 -0400
++++ omnithread/Makefile.in	2008-03-24 16:28:42.000000000 -0400
+@@ -587,7 +587,7 @@
  libgromnithread_la_LIBADD = \
  	$(PTHREAD_LIBS)
  
diff --git a/comms/gnuradio/files/patch-usrp_Makefile.in b/comms/gnuradio/files/patch-usrp_Makefile.in
index 9ef37e7025c1..d183571d954d 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	2007-11-05 20:04:14.000000000 -0500
-+++ usrp/Makefile.in	2008-01-03 13:19:26.000000000 -0500
-@@ -333,8 +333,8 @@
+--- usrp/Makefile.in.orig	2008-03-24 12:50:09.000000000 -0400
++++ usrp/Makefile.in	2008-03-24 16:17:54.000000000 -0400
+@@ -458,8 +458,8 @@
  	usrp.iss.in \
  	usrp.inf
  
diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist
index 6e6e753e5796..3de04f55af51 100644
--- a/comms/gnuradio/pkg-plist
+++ b/comms/gnuradio/pkg-plist
@@ -1,3 +1,14 @@
+bin/%%RELEASE%%-gpio_rx_sfile.py
+bin/%%RELEASE%%-gpio_usrp_siggen.py
+bin/%%RELEASE%%-gpio_usrp_fft.py
+bin/%%RELEASE%%-gr_plot_char.py
+bin/%%RELEASE%%-gr_plot_const.py
+bin/%%RELEASE%%-gr_plot_fft_c.py
+bin/%%RELEASE%%-gr_plot_fft_f.py
+bin/%%RELEASE%%-gr_plot_float.py
+bin/%%RELEASE%%-gr_plot_int.py
+bin/%%RELEASE%%-gr_plot_iq.py
+bin/%%RELEASE%%-gr_plot_short.py
 bin/%%RELEASE%%-usrp_cal_dc_offset
 bin/%%RELEASE%%-usrp_fft.py
 bin/%%RELEASE%%-usrp_flex.py
@@ -81,6 +92,7 @@ include/gnuradio/float_dotprod_x86.h
 include/gnuradio/fpll_btloop_coupling.h
 include/gnuradio/fsm.h
 include/gnuradio/gnuradio_swig_bug_workaround.h
+include/gnuradio/gpio_and_const_ss.h
 include/gnuradio/gr_adaptive_fir_ccf.h
 include/gnuradio/gr_add_cc.h
 include/gnuradio/gr_add_const_cc.h
@@ -104,6 +116,9 @@ include/gnuradio/gr_agc2_ff.h
 include/gnuradio/gr_agc_cc.h
 include/gnuradio/gr_agc_ff.h
 include/gnuradio/gr_align_on_samplenumbers_ss.h
+include/gnuradio/gr_and_bb.h
+include/gnuradio/gr_and_ii.h
+include/gnuradio/gr_and_ss.h
 include/gnuradio/gr_argmax_fs.h
 include/gnuradio/gr_argmax_is.h
 include/gnuradio/gr_argmax_ss.h
@@ -272,8 +287,14 @@ include/gnuradio/gr_noise_source_i.h
 include/gnuradio/gr_noise_source_s.h
 include/gnuradio/gr_noise_type.h
 include/gnuradio/gr_nop.h
+include/gnuradio/gr_not_bb.h
+include/gnuradio/gr_not_ii.h
+include/gnuradio/gr_not_ss.h
 include/gnuradio/gr_null_sink.h
 include/gnuradio/gr_null_source.h
+include/gnuradio/gr_or_bb.h
+include/gnuradio/gr_or_ii.h
+include/gnuradio/gr_or_ss.h
 include/gnuradio/gr_oscope_guts.h
 include/gnuradio/gr_oscope_sink_f.h
 include/gnuradio/gr_oscope_sink_x.h
@@ -283,6 +304,7 @@ include/gnuradio/gr_packed_to_unpacked_ii.h
 include/gnuradio/gr_packed_to_unpacked_ss.h
 include/gnuradio/gr_packet_sink.h
 include/gnuradio/gr_pagesize.h
+include/gnuradio/gr_peak_detector2_fb.h
 include/gnuradio/gr_peak_detector_fb.h
 include/gnuradio/gr_peak_detector_ib.h
 include/gnuradio/gr_peak_detector_sb.h
@@ -333,18 +355,10 @@ include/gnuradio/gr_simple_framer.h
 include/gnuradio/gr_simple_framer_sync.h
 include/gnuradio/gr_simple_squelch_cc.h
 include/gnuradio/gr_sincos.h
-include/gnuradio/gr_single_pole_avg.h
-include/gnuradio/gr_single_pole_avg_filter_ff.h
 include/gnuradio/gr_single_pole_iir.h
 include/gnuradio/gr_single_pole_iir_filter_cc.h
 include/gnuradio/gr_single_pole_iir_filter_ff.h
-include/gnuradio/gr_single_pole_rec.h
-include/gnuradio/gr_single_pole_rec_filter_ff.h
 include/gnuradio/gr_single_threaded_scheduler.h
-include/gnuradio/gr_single_zero_avg.h
-include/gnuradio/gr_single_zero_avg_filter_ff.h
-include/gnuradio/gr_single_zero_rec.h
-include/gnuradio/gr_single_zero_rec_filter_ff.h
 include/gnuradio/gr_skiphead.h
 include/gnuradio/gr_squelch_base_cc.h
 include/gnuradio/gr_squelch_base_ff.h
@@ -392,6 +406,11 @@ include/gnuradio/gr_vector_source_s.h
 include/gnuradio/gr_vector_to_stream.h
 include/gnuradio/gr_vector_to_streams.h
 include/gnuradio/gr_vmcircbuf.h
+include/gnuradio/gr_wavfile_sink.h
+include/gnuradio/gr_wavfile_source.h
+include/gnuradio/gr_xor_bb.h
+include/gnuradio/gr_xor_ii.h
+include/gnuradio/gr_xor_ss.h
 include/gnuradio/gri_add_const_ss.h
 include/gnuradio/gri_agc2_cc.h
 include/gnuradio/gri_agc2_ff.h
@@ -414,6 +433,7 @@ include/gnuradio/gri_mmse_fir_interpolator.h
 include/gnuradio/gri_mmse_fir_interpolator_cc.h
 include/gnuradio/gri_short_to_float.h
 include/gnuradio/gri_uchar_to_float.h
+include/gnuradio/gri_wavfile.h
 include/gnuradio/gsm_fr_decode_ps.h
 include/gnuradio/gsm_fr_encode_sp.h
 include/gnuradio/i2c.h
@@ -478,6 +498,7 @@ include/gnuradio/swig/general.i
 include/gnuradio/swig/gengen.i
 include/gnuradio/swig/gengen_generated.i
 include/gnuradio/swig/gnuradio.i
+include/gnuradio/swig/gpio.i
 include/gnuradio/swig/gr_adaptive_fir_ccf.i
 include/gnuradio/swig/gr_add_cc.i
 include/gnuradio/swig/gr_add_const_cc.i
@@ -501,6 +522,9 @@ include/gnuradio/swig/gr_agc2_ff.i
 include/gnuradio/swig/gr_agc_cc.i
 include/gnuradio/swig/gr_agc_ff.i
 include/gnuradio/swig/gr_align_on_samplenumbers_ss.i
+include/gnuradio/swig/gr_and_bb.i
+include/gnuradio/swig/gr_and_ii.i
+include/gnuradio/swig/gr_and_ss.i
 include/gnuradio/swig/gr_argmax_fs.i
 include/gnuradio/swig/gr_argmax_is.i
 include/gnuradio/swig/gr_argmax_ss.i
@@ -636,14 +660,21 @@ include/gnuradio/swig/gr_noise_source_f.i
 include/gnuradio/swig/gr_noise_source_i.i
 include/gnuradio/swig/gr_noise_source_s.i
 include/gnuradio/swig/gr_nop.i
+include/gnuradio/swig/gr_not_bb.i
+include/gnuradio/swig/gr_not_ii.i
+include/gnuradio/swig/gr_not_ss.i
 include/gnuradio/swig/gr_null_sink.i
 include/gnuradio/swig/gr_null_source.i
+include/gnuradio/swig/gr_or_bb.i
+include/gnuradio/swig/gr_or_ii.i
+include/gnuradio/swig/gr_or_ss.i
 include/gnuradio/swig/gr_oscope_sink.i
 include/gnuradio/swig/gr_pa_2x2_phase_combiner.i
 include/gnuradio/swig/gr_packed_to_unpacked_bb.i
 include/gnuradio/swig/gr_packed_to_unpacked_ii.i
 include/gnuradio/swig/gr_packed_to_unpacked_ss.i
 include/gnuradio/swig/gr_packet_sink.i
+include/gnuradio/swig/gr_peak_detector2_fb.i
 include/gnuradio/swig/gr_peak_detector_fb.i
 include/gnuradio/swig/gr_peak_detector_ib.i
 include/gnuradio/swig/gr_peak_detector_sb.i
@@ -684,13 +715,9 @@ include/gnuradio/swig/gr_sig_source_s.i
 include/gnuradio/swig/gr_simple_correlator.i
 include/gnuradio/swig/gr_simple_framer.i
 include/gnuradio/swig/gr_simple_squelch_cc.i
-include/gnuradio/swig/gr_single_pole_avg_filter_ff.i
 include/gnuradio/swig/gr_single_pole_iir_filter_cc.i
 include/gnuradio/swig/gr_single_pole_iir_filter_ff.i
-include/gnuradio/swig/gr_single_pole_rec_filter_ff.i
 include/gnuradio/swig/gr_single_threaded_scheduler.i
-include/gnuradio/swig/gr_single_zero_avg_filter_ff.i
-include/gnuradio/swig/gr_single_zero_rec_filter_ff.i
 include/gnuradio/swig/gr_skiphead.i
 include/gnuradio/swig/gr_squelch_base_cc.i
 include/gnuradio/swig/gr_squelch_base_ff.i
@@ -731,6 +758,11 @@ include/gnuradio/swig/gr_vector_source_i.i
 include/gnuradio/swig/gr_vector_source_s.i
 include/gnuradio/swig/gr_vector_to_stream.i
 include/gnuradio/swig/gr_vector_to_streams.i
+include/gnuradio/swig/gr_wavfile_sink.i
+include/gnuradio/swig/gr_wavfile_source.i
+include/gnuradio/swig/gr_xor_bb.i
+include/gnuradio/swig/gr_xor_ii.i
+include/gnuradio/swig/gr_xor_ss.i
 include/gnuradio/swig/gri_agc2_cc.i
 include/gnuradio/swig/gri_agc2_ff.i
 include/gnuradio/swig/gri_agc_cc.i
@@ -832,10 +864,6 @@ include/usrp_prims.h
 include/usrp_slots.h
 include/usrp_spi_defs.h
 include/usrp_standard.h
-lib/libgromnithread.so.0
-lib/libgromnithread.so
-lib/libgromnithread.la
-lib/libgromnithread.a
 lib/libgnuradio-core-qa.a
 lib/libgnuradio-core-qa.la
 lib/libgnuradio-core-qa.so
@@ -844,6 +872,10 @@ lib/libgnuradio-core.a
 lib/libgnuradio-core.la
 lib/libgnuradio-core.so
 lib/libgnuradio-core.so.0
+lib/libgromnithread.a
+lib/libgromnithread.la
+lib/libgromnithread.so
+lib/libgromnithread.so.0
 lib/libusrp.a
 lib/libusrp.la
 lib/libusrp.so
@@ -852,12 +884,14 @@ share/usrp/rev2/multi_2rxhb_2tx.rbf
 share/usrp/rev2/std.ihx
 share/usrp/rev2/std_2rxhb_2tx.rbf
 share/usrp/rev2/std_4rx_0tx.rbf
+share/usrp/rev2/usrp_gpio.rbf
 share/usrp/rev2/usrp_radar_mono.rbf
 share/usrp/rev2/usrp_sounder.rbf
 share/usrp/rev4/multi_2rxhb_2tx.rbf
 share/usrp/rev4/std.ihx
 share/usrp/rev4/std_2rxhb_2tx.rbf
 share/usrp/rev4/std_4rx_0tx.rbf
+share/usrp/rev4/usrp_gpio.rbf
 share/usrp/rev4/usrp_radar_mono.rbf
 share/usrp/rev4/usrp_sounder.rbf
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py
@@ -866,24 +900,12 @@ share/usrp/rev4/usrp_sounder.rbf
 %%PYTHON_SITELIBDIR%%/gnuradio/_atsc.a
 %%PYTHON_SITELIBDIR%%/gnuradio/_atsc.la
 %%PYTHON_SITELIBDIR%%/gnuradio/_atsc.so
-%%PYTHON_SITELIBDIR%%/gnuradio/atsc.py
-%%PYTHON_SITELIBDIR%%/gnuradio/atsc.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/atsc.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/_audio_oss.a
 %%PYTHON_SITELIBDIR%%/gnuradio/_audio_oss.la
 %%PYTHON_SITELIBDIR%%/gnuradio/_audio_oss.so
-%%PYTHON_SITELIBDIR%%/gnuradio/db_wbx.py
-%%PYTHON_SITELIBDIR%%/gnuradio/db_wbx.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/db_wbx.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/_ra.a
 %%PYTHON_SITELIBDIR%%/gnuradio/_ra.la
 %%PYTHON_SITELIBDIR%%/gnuradio/_ra.so
-%%PYTHON_SITELIBDIR%%/gnuradio/radar_mono.py
-%%PYTHON_SITELIBDIR%%/gnuradio/radar_mono.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/radar_mono.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/sounder.py
-%%PYTHON_SITELIBDIR%%/gnuradio/sounder.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/sounder.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/_trellis.a
 %%PYTHON_SITELIBDIR%%/gnuradio/_trellis.la
 %%PYTHON_SITELIBDIR%%/gnuradio/_trellis.so
@@ -893,6 +915,9 @@ share/usrp/rev4/usrp_sounder.rbf
 %%PYTHON_SITELIBDIR%%/gnuradio/_video_sdl.a
 %%PYTHON_SITELIBDIR%%/gnuradio/_video_sdl.la
 %%PYTHON_SITELIBDIR%%/gnuradio/_video_sdl.so
+%%PYTHON_SITELIBDIR%%/gnuradio/atsc.py
+%%PYTHON_SITELIBDIR%%/gnuradio/atsc.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/atsc.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/audio.py
 %%PYTHON_SITELIBDIR%%/gnuradio/audio.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/audio.pyo
@@ -905,82 +930,6 @@ share/usrp/rev4/usrp_sounder.rbf
 %%PYTHON_SITELIBDIR%%/gnuradio/blks2/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blks2/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/blks2/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/__init__.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/am_demod.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/am_demod.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/am_demod.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/channel_model.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/channel_model.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/channel_model.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/cpm.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/cpm.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/cpm.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/d8psk.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/d8psk.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/d8psk.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dbpsk.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dbpsk.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dbpsk.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dqpsk.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dqpsk.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dqpsk.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/filterbank.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/filterbank.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/filterbank.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_demod.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_demod.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_demod.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_emph.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_emph.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_emph.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/gmsk.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/gmsk.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/gmsk.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_rx.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_rx.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_rx.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_tx.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_tx.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_tx.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/pkt.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/pkt.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/pkt.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/psk.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/psk.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/psk.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam16.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam16.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam16.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam256.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam256.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam256.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam64.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam64.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam64.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam8.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam8.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam8.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/rational_resampler.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/rational_resampler.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/rational_resampler.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/standard_squelch.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/standard_squelch.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/standard_squelch.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv_pll.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv_pll.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv_pll.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_tx.py
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_tx.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_tx.pyo
-
 %%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/__init__.pyo
@@ -1056,6 +1005,81 @@ share/usrp/rev4/usrp_sounder.rbf
 %%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_tx.py
 %%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_tx.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_tx.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/__init__.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/am_demod.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/am_demod.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/am_demod.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/channel_model.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/channel_model.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/channel_model.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/cpm.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/cpm.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/cpm.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/d8psk.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/d8psk.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/d8psk.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dbpsk.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dbpsk.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dbpsk.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dqpsk.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dqpsk.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/dqpsk.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/filterbank.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/filterbank.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/filterbank.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_demod.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_demod.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_demod.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_emph.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_emph.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/fm_emph.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/gmsk.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/gmsk.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/gmsk.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_rx.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_rx.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_rx.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_tx.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_tx.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/nbfm_tx.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/pkt.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/pkt.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/pkt.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/psk.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/psk.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/psk.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam16.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam16.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam16.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam256.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam256.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam256.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam64.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam64.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam64.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam8.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam8.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/qam8.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/rational_resampler.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/rational_resampler.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/rational_resampler.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/standard_squelch.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/standard_squelch.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/standard_squelch.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv_pll.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv_pll.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_rcv_pll.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_tx.py
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_tx.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/blksimpl/wfm_tx.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/db_base.py
 %%PYTHON_SITELIBDIR%%/gnuradio/db_base.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/db_base.pyo
@@ -1077,6 +1101,9 @@ share/usrp/rev4/usrp_sounder.rbf
 %%PYTHON_SITELIBDIR%%/gnuradio/db_tv_rx.py
 %%PYTHON_SITELIBDIR%%/gnuradio/db_tv_rx.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/db_tv_rx.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/db_wbx.py
+%%PYTHON_SITELIBDIR%%/gnuradio/db_wbx.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/db_wbx.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/eng_notation.py
 %%PYTHON_SITELIBDIR%%/gnuradio/eng_notation.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/eng_notation.pyo
@@ -1086,9 +1113,21 @@ share/usrp/rev4/usrp_sounder.rbf
 %%PYTHON_SITELIBDIR%%/gnuradio/flexrf_debug_gui.py
 %%PYTHON_SITELIBDIR%%/gnuradio/flexrf_debug_gui.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/flexrf_debug_gui.pyo
-%%PYTHON_SITELIBDIR%%/gnuradio/gr_unittest.py
-%%PYTHON_SITELIBDIR%%/gnuradio/gr_unittest.pyc
-%%PYTHON_SITELIBDIR%%/gnuradio/gr_unittest.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/plot_data.py
+%%PYTHON_SITELIBDIR%%/gnuradio/plot_data.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/plot_data.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/__init__.py
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/_gpio_swig.a
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/_gpio_swig.la
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/_gpio_swig.so
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/gpio.py
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/gpio.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/gpio.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/gpio_swig.py
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/gpio_swig.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/gpio/gpio_swig.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/gr/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/gr/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/gr/__init__.pyo
@@ -1158,6 +1197,9 @@ share/usrp/rev4/usrp_sounder.rbf
 %%PYTHON_SITELIBDIR%%/gnuradio/gr/top_block.py
 %%PYTHON_SITELIBDIR%%/gnuradio/gr/top_block.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/gr/top_block.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/gr_unittest.py
+%%PYTHON_SITELIBDIR%%/gnuradio/gr_unittest.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/gr_unittest.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/gru/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/gru/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/gru/__init__.pyo
@@ -1224,6 +1266,12 @@ share/usrp/rev4/usrp_sounder.rbf
 %%PYTHON_SITELIBDIR%%/gnuradio/ra.py
 %%PYTHON_SITELIBDIR%%/gnuradio/ra.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/ra.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/radar_mono.py
+%%PYTHON_SITELIBDIR%%/gnuradio/radar_mono.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/radar_mono.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/sounder.py
+%%PYTHON_SITELIBDIR%%/gnuradio/sounder.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/sounder.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/trellis.py
 %%PYTHON_SITELIBDIR%%/gnuradio/trellis.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/trellis.pyo
@@ -1311,43 +1359,30 @@ share/usrp/rev4/usrp_sounder.rbf
 %%PYTHON_SITELIBDIR%%/usrpm/__init__.py
 %%PYTHON_SITELIBDIR%%/usrpm/__init__.pyc
 %%PYTHON_SITELIBDIR%%/usrpm/__init__.pyo
+%%PYTHON_SITELIBDIR%%/usrpm/_usrp_prims.a
+%%PYTHON_SITELIBDIR%%/usrpm/_usrp_prims.la
+%%PYTHON_SITELIBDIR%%/usrpm/_usrp_prims.so
 %%PYTHON_SITELIBDIR%%/usrpm/usrp_dbid.py
 %%PYTHON_SITELIBDIR%%/usrpm/usrp_dbid.pyc
 %%PYTHON_SITELIBDIR%%/usrpm/usrp_dbid.pyo
-%%PYTHON_SITELIBDIR%%/usrpm/_usrp_prims.so
-%%PYTHON_SITELIBDIR%%/usrpm/_usrp_prims.la
-%%PYTHON_SITELIBDIR%%/usrpm/_usrp_prims.a
 %%PYTHON_SITELIBDIR%%/usrpm/usrp_fpga_regs.py
-%%PYTHON_SITELIBDIR%%/usrpm/usrp_prims.py
 %%PYTHON_SITELIBDIR%%/usrpm/usrp_fpga_regs.pyc
-%%PYTHON_SITELIBDIR%%/usrpm/usrp_prims.pyc
 %%PYTHON_SITELIBDIR%%/usrpm/usrp_fpga_regs.pyo
+%%PYTHON_SITELIBDIR%%/usrpm/usrp_prims.py
+%%PYTHON_SITELIBDIR%%/usrpm/usrp_prims.pyc
 %%PYTHON_SITELIBDIR%%/usrpm/usrp_prims.pyo
 %%EXAMPLESDIR%%/atsc/README
 %%EXAMPLESDIR%%/atsc/btl-fsd.py
 %%EXAMPLESDIR%%/atsc/fpll.py
 %%EXAMPLESDIR%%/atsc/interp.py
-%%EXAMPLESDIR%%/atsc/xlate.py
 %%EXAMPLESDIR%%/atsc/viterbi-out.py
-%%EXAMPLESDIR%%/hf_explorer/README
-%%EXAMPLESDIR%%/hf_explorer/hfx2.py
-%%EXAMPLESDIR%%/hf_explorer/hfx_help
-%%EXAMPLESDIR%%/hf_radio/README.TXT
-%%EXAMPLESDIR%%/hf_radio/hfir.sci
-%%EXAMPLESDIR%%/hf_radio/input.py
-%%EXAMPLESDIR%%/hf_radio/output.py
-%%EXAMPLESDIR%%/hf_radio/radio.py
-%%EXAMPLESDIR%%/hf_radio/radio.xml
-%%EXAMPLESDIR%%/hf_radio/ssb_taps
-%%EXAMPLESDIR%%/hf_radio/ssbagc.py
-%%EXAMPLESDIR%%/hf_radio/ssbdemod.py
-%%EXAMPLESDIR%%/hf_radio/startup.py
-%%EXAMPLESDIR%%/hf_radio/ui.py
+%%EXAMPLESDIR%%/atsc/xlate.py
 %%EXAMPLESDIR%%/audio/audio_copy.py
 %%EXAMPLESDIR%%/audio/audio_fft.py
 %%EXAMPLESDIR%%/audio/audio_play.py
 %%EXAMPLESDIR%%/audio/audio_to_file.py
 %%EXAMPLESDIR%%/audio/dial_tone.py
+%%EXAMPLESDIR%%/audio/dial_tone_wav.py
 %%EXAMPLESDIR%%/audio/mono_tone.py
 %%EXAMPLESDIR%%/audio/multi_tone.py
 %%EXAMPLESDIR%%/audio/noise.py
@@ -1368,6 +1403,20 @@ share/usrp/rev4/usrp_sounder.rbf
 %%EXAMPLESDIR%%/digital/transmit_path_lb.py
 %%EXAMPLESDIR%%/digital/tunnel.py
 %%EXAMPLESDIR%%/digital/tx_voice.py
+%%EXAMPLESDIR%%/hf_explorer/README
+%%EXAMPLESDIR%%/hf_explorer/hfx2.py
+%%EXAMPLESDIR%%/hf_explorer/hfx_help
+%%EXAMPLESDIR%%/hf_radio/README.TXT
+%%EXAMPLESDIR%%/hf_radio/hfir.sci
+%%EXAMPLESDIR%%/hf_radio/input.py
+%%EXAMPLESDIR%%/hf_radio/output.py
+%%EXAMPLESDIR%%/hf_radio/radio.py
+%%EXAMPLESDIR%%/hf_radio/radio.xml
+%%EXAMPLESDIR%%/hf_radio/ssb_taps
+%%EXAMPLESDIR%%/hf_radio/ssbagc.py
+%%EXAMPLESDIR%%/hf_radio/ssbdemod.py
+%%EXAMPLESDIR%%/hf_radio/startup.py
+%%EXAMPLESDIR%%/hf_radio/ui.py
 %%EXAMPLESDIR%%/multi-antenna/multi_fft.py
 %%EXAMPLESDIR%%/multi-antenna/multi_file.py
 %%EXAMPLESDIR%%/multi-antenna/multi_scope.py
@@ -1380,22 +1429,7 @@ share/usrp/rev4/usrp_sounder.rbf
 %%EXAMPLESDIR%%/network/dial_tone_source.py
 %%EXAMPLESDIR%%/network/vector_sink.py
 %%EXAMPLESDIR%%/network/vector_source.py
-%%EXAMPLESDIR%%/usrp/fm_tx4.py
-%%EXAMPLESDIR%%/usrp/fm_tx_2_daughterboards.py
-%%EXAMPLESDIR%%/usrp/max_power.py
-%%EXAMPLESDIR%%/usrp/usrp_benchmark_usb.py
-%%EXAMPLESDIR%%/usrp/usrp_spectrum_sense.py
-%%EXAMPLESDIR%%/usrp/usrp_test_loop_lfsr.py
-%%EXAMPLESDIR%%/usrp/usrp_wfm_rcv_sca.py
-%%EXAMPLESDIR%%/usrp/usrp_nbfm_ptt.py
-%%EXAMPLESDIR%%/usrp/usrp_nbfm_rcv.py
-%%EXAMPLESDIR%%/usrp/usrp_tv_rcv.py
-%%EXAMPLESDIR%%/usrp/usrp_tv_rcv_nogui.py
-%%EXAMPLESDIR%%/usrp/usrp_wfm_rcv.py
-%%EXAMPLESDIR%%/usrp/usrp_wfm_rcv2_nogui.py
-%%EXAMPLESDIR%%/usrp/usrp_wfm_rcv_nogui.py
-%%EXAMPLESDIR%%/usrp/usrp_wfm_rcv_pll.py
-%%EXAMPLESDIR%%/usrp/usrp_wxapt_rcv.py
+%%EXAMPLESDIR%%/trellis/README
 %%EXAMPLESDIR%%/trellis/fsm_files/awgn1o2_128.fsm
 %%EXAMPLESDIR%%/trellis/fsm_files/awgn1o2_16.fsm
 %%EXAMPLESDIR%%/trellis/fsm_files/awgn1o2_4.fsm
@@ -1410,32 +1444,50 @@ share/usrp/rev4/usrp_sounder.rbf
 %%EXAMPLESDIR%%/trellis/fsm_files/rep3.fsm
 %%EXAMPLESDIR%%/trellis/fsm_files/rep5.fsm
 %%EXAMPLESDIR%%/trellis/fsm_files/simple.fsm
-%%EXAMPLESDIR%%/trellis/README
 %%EXAMPLESDIR%%/trellis/fsm_utils.py
+%%EXAMPLESDIR%%/trellis/test_sccc_hard.py
+%%EXAMPLESDIR%%/trellis/test_sccc_soft.py
+%%EXAMPLESDIR%%/trellis/test_sccc_turbo.py
 %%EXAMPLESDIR%%/trellis/test_tcm.py
 %%EXAMPLESDIR%%/trellis/test_tcm1.py
 %%EXAMPLESDIR%%/trellis/test_tcm2.py
-%%EXAMPLESDIR%%/trellis/test_tcm_parallel.py
 %%EXAMPLESDIR%%/trellis/test_tcm_combined.py
-%%EXAMPLESDIR%%/trellis/test_sccc_hard.py
-%%EXAMPLESDIR%%/trellis/test_sccc_soft.py
-%%EXAMPLESDIR%%/trellis/test_sccc_turbo.py
-%%EXAMPLESDIR%%/trellis/test_viterbi_equalization1.py
-%%EXAMPLESDIR%%/trellis/test_viterbi_equalization.py
+%%EXAMPLESDIR%%/trellis/test_tcm_parallel.py
 %%EXAMPLESDIR%%/trellis/test_turbo_equalization.py
 %%EXAMPLESDIR%%/trellis/test_turbo_equalization1.py
 %%EXAMPLESDIR%%/trellis/test_turbo_equalization2.py
+%%EXAMPLESDIR%%/trellis/test_viterbi_equalization.py
+%%EXAMPLESDIR%%/trellis/test_viterbi_equalization1.py
+%%EXAMPLESDIR%%/usrp/fm_tx4.py
+%%EXAMPLESDIR%%/usrp/fm_tx_2_daughterboards.py
+%%EXAMPLESDIR%%/usrp/max_power.py
+%%EXAMPLESDIR%%/usrp/test_dft_analysis.py
+%%EXAMPLESDIR%%/usrp/test_dft_synth.py
+%%EXAMPLESDIR%%/usrp/usrp_am_mw_rcv.py
+%%EXAMPLESDIR%%/usrp/usrp_benchmark_usb.py
+%%EXAMPLESDIR%%/usrp/usrp_nbfm_ptt.py
+%%EXAMPLESDIR%%/usrp/usrp_nbfm_rcv.py
+%%EXAMPLESDIR%%/usrp/usrp_spectrum_sense.py
+%%EXAMPLESDIR%%/usrp/usrp_test_loop_lfsr.py
+%%EXAMPLESDIR%%/usrp/usrp_tv_rcv.py
+%%EXAMPLESDIR%%/usrp/usrp_tv_rcv_nogui.py
+%%EXAMPLESDIR%%/usrp/usrp_wfm_rcv.py
+%%EXAMPLESDIR%%/usrp/usrp_wfm_rcv2_nogui.py
+%%EXAMPLESDIR%%/usrp/usrp_wfm_rcv_nogui.py
+%%EXAMPLESDIR%%/usrp/usrp_wfm_rcv_pll.py
+%%EXAMPLESDIR%%/usrp/usrp_wfm_rcv_sca.py
+%%EXAMPLESDIR%%/usrp/usrp_wxapt_rcv.py
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.hacking
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 libdata/pkgconfig/gnuradio-core.pc
 libdata/pkgconfig/gnuradio-omnithread.pc
 libdata/pkgconfig/usrp.pc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%/atsc
-@dirrm %%EXAMPLESDIR%%/hf_radio
-@dirrm %%EXAMPLESDIR%%/hf_explorer
 @dirrm %%EXAMPLESDIR%%/audio
 @dirrm %%EXAMPLESDIR%%/digital
+@dirrm %%EXAMPLESDIR%%/hf_explorer
+@dirrm %%EXAMPLESDIR%%/hf_radio
 @dirrm %%EXAMPLESDIR%%/multi-antenna
 @dirrm %%EXAMPLESDIR%%/multi_usrp
 @dirrm %%EXAMPLESDIR%%/network
@@ -1445,16 +1497,17 @@ libdata/pkgconfig/usrp.pc
 @dirrm %%EXAMPLESDIR%%/
 @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/blks
 @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/blks2
-@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/blksimpl
 @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/blks2impl
+@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/blksimpl
+@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/gpio
 @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/gr
 @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/gru
 @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/gruimpl
 @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/pager
 @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/vocoder
 @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/wxgui
-@dirrm %%PYTHON_SITELIBDIR%%/gnuradio
 @dirrm %%PYTHON_SITELIBDIR%%/usrpm
+@dirrm %%PYTHON_SITELIBDIR%%/gnuradio
 @dirrm include/gnuradio/swig
 @dirrm include/gnuradio
 @dirrm share/usrp/rev2