27 files changed, 165 insertions, 47 deletions

diff --git a/comms/gnuradio/files/patch-CMakeLists.txt b/comms/gnuradio/files/patch-CMakeLists.txt
index 38207a4445c8..09db443c8cee 100644
--- a/comms/gnuradio/files/patch-CMakeLists.txt
+++ b/comms/gnuradio/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2013-11-09 15:25:45.000000000 -0500
-+++ CMakeLists.txt	2014-02-11 20:23:20.000000000 -0500
+--- CMakeLists.txt.orig	2013-11-29 19:04:23.000000000 -0500
++++ CMakeLists.txt	2014-03-10 16:31:14.000000000 -0500
 @@ -108,6 +108,14 @@
  ########################################################################
  include(GrPlatform) #define LIB_SUFFIX
@@ -15,7 +15,7 @@
  set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
  set(GR_INCLUDE_DIR      include)
  set(GR_DATA_DIR         share)
-@@ -163,6 +171,41 @@
+@@ -163,6 +171,42 @@
  )
  
  ########################################################################
@@ -23,6 +23,7 @@
 +########################################################################
 +if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 +  message( "-- Adding iconv for FreeBSD")
++message ("-- ICONV_LIB = ${ICONV_LIB}")
 +
 +  set (ICONV_INCLUDE_DIR ${ICONV_PREFIX}/include)
 +  if (${ICONV_LIB} STREQUAL "X-liconv")
@@ -57,7 +58,7 @@
  # Enable python component
  ########################################################################
  find_package(PythonLibs 2)
-@@ -247,11 +290,13 @@
+@@ -247,11 +291,13 @@
  ########################################################################
  # Distribute the README file
  ########################################################################
diff --git a/comms/gnuradio/files/patch-cmake_Modules_FindICE-3.5.cmake b/comms/gnuradio/files/patch-cmake_Modules_FindICE-3.5.cmake
new file mode 100644
index 000000000000..fd78f321f893
--- /dev/null
+++ b/comms/gnuradio/files/patch-cmake_Modules_FindICE-3.5.cmake
@@ -0,0 +1,10 @@
+--- cmake/Modules/FindICE-3.5.cmake.orig	2013-11-26 12:55:32.000000000 -0500
++++ cmake/Modules/FindICE-3.5.cmake	2014-03-24 19:53:28.189484207 -0400
+@@ -33,7 +33,6 @@
+ # Prepare the path hint for the libraries based on the include
+ # directory found.
+ string(REGEX REPLACE "/include" "" ICE_PATH ${ICE_CONFIG_INCLUDE_DIR})
+-
+ FIND_PATH(
+   ICE_INCLUDE_DIR
+   NAMES IceUtil/IceUtil.h Ice/Ice.h
diff --git a/comms/gnuradio/files/patch-cmake_Modules_FindPortaudio.cmake b/comms/gnuradio/files/patch-cmake_Modules_FindPortaudio.cmake
index 17325c9c82ff..1cd9d5007a13 100644
--- a/comms/gnuradio/files/patch-cmake_Modules_FindPortaudio.cmake
+++ b/comms/gnuradio/files/patch-cmake_Modules_FindPortaudio.cmake
@@ -1,5 +1,5 @@
---- cmake/Modules/FindPortaudio.cmake.orig	2013-01-08 15:56:55.000000000 -0500
-+++ cmake/Modules/FindPortaudio.cmake	2013-04-23 07:47:40.000000000 -0500
+--- cmake/Modules/FindPortaudio.cmake.orig	2012-04-25 11:12:33.000000000 -0500
++++ cmake/Modules/FindPortaudio.cmake	2014-03-02 20:19:36.000000000 -0500
 @@ -6,7 +6,13 @@
  #  PORTAUDIO_LIBRARIES - Link these to use Portaudio
  
diff --git a/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake b/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
index fc67f87ebd12..bde898c3022b 100644
--- a/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
+++ b/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
@@ -1,5 +1,5 @@
---- cmake/Modules/FindUSB.cmake.orig	2012-04-09 11:38:58.000000000 -0400
-+++ cmake/Modules/FindUSB.cmake	2014-02-06 10:29:24.962247114 -0500
+--- cmake/Modules/FindUSB.cmake.orig	2012-04-09 10:38:58.000000000 -0500
++++ cmake/Modules/FindUSB.cmake	2014-03-02 20:19:39.000000000 -0500
 @@ -1,20 +1,38 @@
  if(NOT LIBUSB_FOUND)
 -  pkg_check_modules (LIBUSB_PKG libusb-1.0)
diff --git a/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake b/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake
new file mode 100644
index 000000000000..4aa86fa98dcc
--- /dev/null
+++ b/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake
@@ -0,0 +1,11 @@
+--- cmake/Modules/GrBoost.cmake.orig	2014-03-06 20:24:23.000000000 -0500
++++ cmake/Modules/GrBoost.cmake	2014-03-06 20:25:07.000000000 -0500
+@@ -53,6 +53,8 @@
+ endif(MSVC)
+ 
+ find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
++message(status "Boost_FOUND = ${Boost_FOUND})
++message(status "Boost_LIBRARIES = ${Boost_LIBRARIES})
+ 
+ # This does not allow us to disable specific versions. It is used
+ # internally by cmake to know the formation newer versions. As newer
diff --git a/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake b/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
index f2deed3089cd..b39467889cea 100644
--- a/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
+++ b/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
@@ -1,11 +1,11 @@
---- cmake/Modules/GrMiscUtils.cmake.orig	2013-01-08 15:56:55.000000000 -0500
-+++ cmake/Modules/GrMiscUtils.cmake	2013-04-21 19:05:30.000000000 -0500
+--- cmake/Modules/GrMiscUtils.cmake.orig	2013-08-28 13:27:03.000000000 -0500
++++ cmake/Modules/GrMiscUtils.cmake	2014-03-02 20:19:48.000000000 -0500
 @@ -142,7 +142,31 @@
          ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_DEVEL_COMPONENT}   # .lib file
          RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .dll file
      )
 +    
- 
++
 +    if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 +        #create .la file
 +        GR_LIBTOOL(TARGET ${target} DESTINATION ${GR_LIBRARY_DIR})
@@ -20,7 +20,7 @@
 +            COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} "${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so.${MAJOR_VERSION}"
 +            COMMAND ${CMAKE_COMMAND} -E touch ${target_name} #so the symlinks point to something valid so cmake 2.6 will install
 +        )
-+
+ 
 +        #and install the extra symlinks
 +        install(
 +            FILES
diff --git a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
index e2b477b7295a..ae4213ab62ef 100644
--- a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
+++ b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
@@ -1,5 +1,5 @@
---- docs/doxygen/Doxyfile.in.orig	2013-08-28 14:27:03.000000000 -0400
-+++ docs/doxygen/Doxyfile.in	2013-12-24 23:01:10.792101888 -0500
+--- docs/doxygen/Doxyfile.in.orig	2013-08-28 13:27:03.000000000 -0500
++++ docs/doxygen/Doxyfile.in	2014-03-02 20:19:55.000000000 -0500
 @@ -1406,7 +1406,7 @@
  # different font using DOT_FONTNAME you can set the path where dot
  # can find it using this tag.
diff --git a/comms/gnuradio/files/patch-gnuradio-runtime_CMakeLists.txt b/comms/gnuradio/files/patch-gnuradio-runtime_CMakeLists.txt
new file mode 100644
index 000000000000..0bc870bd7798
--- /dev/null
+++ b/comms/gnuradio/files/patch-gnuradio-runtime_CMakeLists.txt
@@ -0,0 +1,49 @@
+--- gnuradio-runtime/CMakeLists.txt.orig	2013-08-29 00:50:51.000000000 -0400
++++ gnuradio-runtime/CMakeLists.txt	2014-03-24 14:16:02.728878716 -0400
+@@ -133,18 +133,37 @@
+     ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf
+ @ONLY)
+ 
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++ install(
++     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf
++     DESTINATION ${GR_PREFSDIR}
++     RENAME "gnuradio-runtime.conf.sample"
++     COMPONENT "runtime_runtime"
++ )
++else()
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf
+     DESTINATION ${GR_PREFSDIR}
+     COMPONENT "runtime_runtime"
+ )
++endif()
+ 
+ if(ENABLE_GR_LOG AND HAVE_LOG4CPP)
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ install(FILES
+     ${CMAKE_CURRENT_SOURCE_DIR}/gr_log_default.conf
+     DESTINATION ${GR_CONF_DIR}/gnuradio
++    RENAME "gr_log_default.conf.sample"
+     COMPONENT "runtime_runtime"
+ )
++else()
++install(FILES
++    ${CMAKE_CURRENT_SOURCE_DIR}/gr_log_default.conf
++    DESTINATION ${GR_CONF_DIR}/gnuradio
++    COMPONENT "runtime_runtime"
++)
++endif()
++
+ endif(ENABLE_GR_LOG AND HAVE_LOG4CPP)
+ 
+ ########################################################################
+@@ -171,7 +190,7 @@
+ 
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.pc
+-    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
++    DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
+     COMPONENT "runtime_devel"
+ )
+ 
diff --git a/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc b/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc
index 192bd68ce4aa..89c5896c5c5e 100644
--- a/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc
+++ b/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc
@@ -1,5 +1,5 @@
---- gnuradio-runtime/lib/thread/thread.cc.orig	2013-08-28 14:27:03.000000000 -0400
-+++ gnuradio-runtime/lib/thread/thread.cc	2014-01-05 20:39:46.220592423 -0500
+--- gnuradio-runtime/lib/thread/thread.cc.orig	2013-08-28 13:27:03.000000000 -0500
++++ gnuradio-runtime/lib/thread/thread.cc	2014-03-02 20:19:59.000000000 -0500
 @@ -217,6 +217,7 @@
      void
      thread_bind_to_processor(gr_thread_t thread, const std::vector<int> &mask)
diff --git a/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt
index 5928493add07..c79f738d09db 100644
--- a/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt
@@ -1,5 +1,5 @@
---- gr-audio/doc/CMakeLists.txt.orig	2012-10-26 13:30:24.000000000 -0500
-+++ gr-audio/doc/CMakeLists.txt	2012-10-26 13:30:54.000000000 -0500
+--- gr-audio/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
++++ gr-audio/doc/CMakeLists.txt	2014-03-02 20:20:02.000000000 -0500
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
  # Boston, MA 02110-1301, USA.
diff --git a/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt b/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt
index b17d2d7dde97..87c07605136f 100644
--- a/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt
@@ -1,5 +1,5 @@
---- gr-audio/lib/CMakeLists.txt.orig	2014-01-06 18:25:13.000000000 -0500
-+++ gr-audio/lib/CMakeLists.txt	2014-01-08 17:25:40.000000000 -0500
+--- gr-audio/lib/CMakeLists.txt.orig	2013-08-28 14:27:03.000000000 -0400
++++ gr-audio/lib/CMakeLists.txt	2014-03-27 20:18:01.614518348 -0400
 @@ -127,8 +127,8 @@
  
  if(PORTAUDIO_FOUND)
@@ -11,3 +11,16 @@
      list(APPEND gr_audio_libs ${PORTAUDIO_LIBRARIES})
      add_definitions(${PORTAUDIO_DEFINITIONS})
      list(APPEND gr_audio_sources
+@@ -175,4 +175,12 @@
+ target_link_libraries(gnuradio-audio ${gr_audio_libs})
+ GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel")
+ 
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++foreach (audioconf ${gr_audio_confs})
++GET_FILENAME_COMPONENT(baseaudioconf ${audioconf} NAME)
++set(newaudioconf "${baseaudioconf}.sample")
++install(FILES ${audioconf} DESTINATION ${GR_PREFSDIR} RENAME ${newaudioconf} COMPONENT "audio_runtime")
++endforeach()
++else()
+ install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR} COMPONENT "audio_runtime")
++endif()
diff --git a/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
index b18cf936d88e..32c3a0070434 100644
--- a/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
@@ -1,5 +1,5 @@
---- gr-digital/doc/CMakeLists.txt.orig	2012-10-26 14:12:21.000000000 -0500
-+++ gr-digital/doc/CMakeLists.txt	2012-10-26 14:12:43.000000000 -0500
+--- gr-digital/doc/CMakeLists.txt.orig	2012-01-02 14:04:33.000000000 -0500
++++ gr-digital/doc/CMakeLists.txt	2014-03-02 20:20:09.000000000 -0500
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
  # Boston, MA 02110-1301, USA.
diff --git a/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt
index a72787b263c3..1e22c80e9cea 100644
--- a/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt
@@ -1,5 +1,5 @@
---- gr-fcd/doc/CMakeLists.txt.orig	2012-10-26 14:01:36.000000000 -0500
-+++ gr-fcd/doc/CMakeLists.txt	2012-10-26 14:02:32.000000000 -0500
+--- gr-fcd/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
++++ gr-fcd/doc/CMakeLists.txt	2014-03-02 20:20:13.000000000 -0500
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
  # Boston, MA 02110-1301, USA.
diff --git a/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt b/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt
index 83b18fa316f7..a1280ea2f3e8 100644
--- a/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt
@@ -1,5 +1,5 @@
---- gr-fcd/lib/CMakeLists.txt.orig	2013-08-28 14:27:03.000000000 -0400
-+++ gr-fcd/lib/CMakeLists.txt	2013-12-24 23:02:13.410098101 -0500
+--- gr-fcd/lib/CMakeLists.txt.orig	2013-08-28 13:27:03.000000000 -0500
++++ gr-fcd/lib/CMakeLists.txt	2014-03-02 20:20:16.000000000 -0500
 @@ -32,6 +32,7 @@
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
      ${Boost_INCLUDE_DIRS}
diff --git a/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c b/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
index 2bac6e1b7d23..bac47203df8a 100644
--- a/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
+++ b/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
@@ -1,5 +1,5 @@
 --- gr-fcd/lib/hid/hid-libusb.c.orig	2013-08-28 13:27:03.000000000 -0500
-+++ gr-fcd/lib/hid/hid-libusb.c	2014-01-16 20:59:56.000000000 -0500
++++ gr-fcd/lib/hid/hid-libusb.c	2014-03-02 20:20:18.000000000 -0500
 @@ -250,7 +250,7 @@
  }
  #endif /* INVASIVE_GET_USAGE */
diff --git a/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt
index 23071859c684..e364354239fe 100644
--- a/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt
@@ -1,5 +1,5 @@
---- gr-fft/doc/CMakeLists.txt.orig	2012-10-26 14:15:37.000000000 -0500
-+++ gr-fft/doc/CMakeLists.txt	2012-10-26 14:16:13.000000000 -0500
+--- gr-fft/doc/CMakeLists.txt.orig	2012-06-11 10:41:27.000000000 -0500
++++ gr-fft/doc/CMakeLists.txt	2014-03-02 20:20:21.000000000 -0500
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
  # Boston, MA 02110-1301, USA.
diff --git a/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt
index 47df0356df28..fc6a7c5700b1 100644
--- a/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt
@@ -1,5 +1,5 @@
---- gr-filter/doc/CMakeLists.txt.orig	2012-10-26 14:11:17.000000000 -0500
-+++ gr-filter/doc/CMakeLists.txt	2012-10-26 14:10:40.000000000 -0500
+--- gr-filter/doc/CMakeLists.txt.orig	2012-09-04 21:08:20.000000000 -0500
++++ gr-filter/doc/CMakeLists.txt	2014-03-02 20:20:23.000000000 -0500
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
  # Boston, MA 02110-1301, USA.
diff --git a/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt
index a5f13a045422..0a28d599c367 100644
--- a/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt
@@ -1,5 +1,5 @@
---- gr-qtgui/doc/CMakeLists.txt.orig	2012-10-26 14:13:45.000000000 -0500
-+++ gr-qtgui/doc/CMakeLists.txt	2012-10-26 14:14:17.000000000 -0500
+--- gr-qtgui/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
++++ gr-qtgui/doc/CMakeLists.txt	2014-03-02 20:20:26.000000000 -0500
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
  # Boston, MA 02110-1301, USA.
diff --git a/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt
index 91ab92d4ae38..ffb2bb4a296a 100644
--- a/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt
@@ -1,5 +1,5 @@
---- gr-trellis/doc/CMakeLists.txt.orig	2012-09-04 19:43:06.000000000 -0500
-+++ gr-trellis/doc/CMakeLists.txt	2012-10-26 16:40:45.000000000 -0500
+--- gr-trellis/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
++++ gr-trellis/doc/CMakeLists.txt	2014-03-02 20:20:28.000000000 -0500
 @@ -32,12 +32,14 @@
          ${CMAKE_CURRENT_SOURCE_DIR}/gr-trellis.xml
  )
diff --git a/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt b/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt
index c73fe1094b06..76b87cb45582 100644
--- a/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt
@@ -1,6 +1,6 @@
---- gr-uhd/CMakeLists.txt.orig	2013-06-04 17:35:10.000000000 -0500
-+++ gr-uhd/CMakeLists.txt	2013-06-04 17:35:23.000000000 -0500
-@@ -111,7 +111,7 @@
+--- gr-uhd/CMakeLists.txt.orig	2013-08-28 13:27:03.000000000 -0500
++++ gr-uhd/CMakeLists.txt	2014-03-02 20:20:30.000000000 -0500
+@@ -115,7 +115,7 @@
  
  install(
      FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-uhd.pc
diff --git a/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt
index 6cf9b7dafaab..2a83c2e07dd4 100644
--- a/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt
@@ -1,5 +1,5 @@
---- gr-uhd/doc/CMakeLists.txt.orig	2012-10-26 14:19:53.000000000 -0500
-+++ gr-uhd/doc/CMakeLists.txt	2012-10-26 14:20:52.000000000 -0500
+--- gr-uhd/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
++++ gr-uhd/doc/CMakeLists.txt	2014-03-02 20:20:31.000000000 -0500
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
  # Boston, MA 02110-1301, USA.
diff --git a/comms/gnuradio/files/patch-gr-utils_python_modtool_CMakeLists.txt b/comms/gnuradio/files/patch-gr-utils_python_modtool_CMakeLists.txt
new file mode 100644
index 000000000000..59c6daff9033
--- /dev/null
+++ b/comms/gnuradio/files/patch-gr-utils_python_modtool_CMakeLists.txt
@@ -0,0 +1,21 @@
+--- gr-utils/python/modtool/CMakeLists.txt.orig	2014-03-24 23:22:18.237619193 -0400
++++ gr-utils/python/modtool/CMakeLists.txt	2014-03-24 23:24:08.673612691 -0400
+@@ -56,9 +56,17 @@
+     ${CMAKE_CURRENT_BINARY_DIR}/modtool.conf
+ @ONLY)
+ 
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ install(
+     FILES ${CMAKE_CURRENT_BINARY_DIR}/modtool.conf
+     DESTINATION ${GR_PREFSDIR}
++    RENAME "modtool.conf.sample"
+     COMPONENT "utils"
+ )
+-
++else()
++install(
++    FILES ${CMAKE_CURRENT_BINARY_DIR}/modtool.conf
++    DESTINATION ${GR_PREFSDIR}
++    COMPONENT "utils"
++)
++endif()
diff --git a/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt
index 89c79e390a43..34e90f28a369 100644
--- a/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt
@@ -1,5 +1,5 @@
---- gr-vocoder/doc/CMakeLists.txt.orig	2012-10-26 16:37:48.000000000 -0500
-+++ gr-vocoder/doc/CMakeLists.txt	2012-10-26 16:38:11.000000000 -0500
+--- gr-vocoder/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
++++ gr-vocoder/doc/CMakeLists.txt	2014-03-02 20:20:35.000000000 -0500
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
  # Boston, MA 02110-1301, USA.
diff --git a/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt b/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt
index ba34dcec7ab6..4798538ad817 100644
--- a/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt
@@ -1,5 +1,5 @@
 --- gr-wxgui/CMakeLists.txt.orig	2013-11-04 13:50:36.000000000 -0500
-+++ gr-wxgui/CMakeLists.txt	2013-12-24 23:03:04.541093727 -0500
++++ gr-wxgui/CMakeLists.txt	2014-03-02 20:20:37.000000000 -0500
 @@ -106,12 +106,21 @@
  ########################################################################
  # Install the conf file
diff --git a/comms/gnuradio/files/patch-grc_CMakeLists.txt b/comms/gnuradio/files/patch-grc_CMakeLists.txt
index 100edd9f2da1..b981b02164cf 100644
--- a/comms/gnuradio/files/patch-grc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-grc_CMakeLists.txt
@@ -1,5 +1,5 @@
---- grc/CMakeLists.txt.orig	2013-05-01 18:57:50.000000000 -0500
-+++ grc/CMakeLists.txt	2013-06-07 15:33:23.000000000 -0500
+--- grc/CMakeLists.txt.orig	2013-08-28 13:27:03.000000000 -0500
++++ grc/CMakeLists.txt	2014-03-02 20:20:40.000000000 -0500
 @@ -73,11 +73,21 @@
      ${CMAKE_CURRENT_BINARY_DIR}/grc.conf
  @ONLY)
diff --git a/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion b/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion
new file mode 100644
index 000000000000..1170fb053a96
--- /dev/null
+++ b/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion
@@ -0,0 +1,13 @@
+--- grc/scripts/gnuradio-companion.orig	2014-03-27 14:30:40.047953899 -0400
++++ grc/scripts/gnuradio-companion	2014-03-27 14:31:24.523952302 -0400
+@@ -18,6 +18,10 @@
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ """
+ 
++# XXX workaround to make sure we import gcc47's libgcc_s.so not
++# the older one from base:
++from numpy.linalg import lapack_lite
++
+ import pygtk
+ pygtk.require('2.0')
+ import gtk
diff --git a/comms/gnuradio/files/patch-volk_CMakeLists.txt b/comms/gnuradio/files/patch-volk_CMakeLists.txt
index 3b555925242d..c40f2dbe8bf5 100644
--- a/comms/gnuradio/files/patch-volk_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-volk_CMakeLists.txt
@@ -1,5 +1,5 @@
---- volk/CMakeLists.txt.orig	2013-08-28 14:27:03.000000000 -0400
-+++ volk/CMakeLists.txt	2013-12-24 23:03:29.644092599 -0500
+--- volk/CMakeLists.txt.orig	2013-08-28 13:27:03.000000000 -0500
++++ volk/CMakeLists.txt	2014-03-02 20:20:43.000000000 -0500
 @@ -97,7 +97,7 @@
  
  install(