[106737] trunk/dports/science/gr-osmosdr

[michaelld at macports.org]

Revision: 106737
          https://trac.macports.org/changeset/106737
Author:   michaelld at macports.org
Date:     2013-06-06 18:13:03 -0700 (Thu, 06 Jun 2013)
Log Message:
-----------
gr-osmosdr:
* better temporary patch;
* update to latest;
* add +hackrf variant to include that new port.

Modified Paths:
--------------
    trunk/dports/science/gr-osmosdr/Portfile
    trunk/dports/science/gr-osmosdr/files/patch-lib-CMakeLists.txt.diff

Modified: trunk/dports/science/gr-osmosdr/Portfile
===================================================================
--- trunk/dports/science/gr-osmosdr/Portfile	2013-06-06 23:04:14 UTC (rev 106736)
+++ trunk/dports/science/gr-osmosdr/Portfile	2013-06-07 01:13:03 UTC (rev 106737)
@@ -50,11 +50,11 @@
     long_description    ${description}: \
         This port is kept up with the gr-osmosdr GIT 'master' branch, which is typically updated weekly to monthly, providing compatibility with GNU Radio release 3.7 API, the gnuradio-next port.  ${description_common}
 
-    version             20130602
+    version             20130605
 
     fetch.type          git
     git.url             git://git.osmocom.org/gr-osmosdr
-    git.branch          40ca42013b6165c6681d810c7aa175b53b5704f6
+    git.branch          86b906a0190f25412f66530a7afa325971f2dfe4
 
     conflicts           gr-osmosdr
 
@@ -148,7 +148,7 @@
 
 # shortcut to installing all variants except Python
 
-variant full requires docs uhd swig \
+variant full requires docs uhd swig hackrf \
     description {Enable all variants except +debug and +universal} {}
 
 variant docs description "Install ${name} documentation" {
@@ -222,3 +222,16 @@
         -DSWIG_EXECUTABLE=
 
 }
+
+variant hackrf description "Install ${name} with support for hackrf" {
+
+    depends_lib-append port:hackrf
+    configure.args-append -DENABLE_HACKRF=ON
+
+}
+
+if {![variant_isset hackrf]} {
+
+    configure.args-append -DENABLE_HACKRF=OFF
+
+}

Modified: trunk/dports/science/gr-osmosdr/files/patch-lib-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/gr-osmosdr/files/patch-lib-CMakeLists.txt.diff	2013-06-06 23:04:14 UTC (rev 106736)
+++ trunk/dports/science/gr-osmosdr/files/patch-lib-CMakeLists.txt.diff	2013-06-07 01:13:03 UTC (rev 106737)
@@ -1,10 +1,37 @@
---- lib/CMakeLists.txt.orig	2013-06-04 21:37:21.000000000 -0400
-+++ lib/CMakeLists.txt	2013-06-04 21:37:39.000000000 -0400
-@@ -46,6 +46,7 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -143,7 +143,7 @@ set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
+ ########################################################################
+ # Find build dependencies
+ ########################################################################
+-set(GR_REQUIRED_COMPONENTS RUNTIME BLOCKS)
++set(GR_REQUIRED_COMPONENTS RUNTIME PMT BLOCKS)
+ find_package(Gnuradio "3.7.0")
+ find_package(GnuradioIQBalance)
+ find_package(UHD)
+@@ -167,11 +167,15 @@ include_directories(
+     ${CMAKE_SOURCE_DIR}/lib
+     ${Boost_INCLUDE_DIRS}
+     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
++    ${GNURADIO_PMT_INCLUDE_DIRS}
++    ${GNURADIO_BLOCKS_INCLUDE_DIRS}
+ )
+
+ link_directories(
+     ${Boost_LIBRARY_DIRS}
+     ${GNURADIO_RUNTIME_LIBRARY_DIRS}
++    ${GNURADIO_PMT_LIBRARY_DIRS}
++    ${GNURADIO_BLOCKS_LIBRARY_DIRS}
+ )
+
+ # Set component parameters
+--- lib/CMakeLists.txt
++++ lib/CMakeLists.txt
+@@ -45,6 +45,7 @@ GR_OSMOSDR_APPEND_SRCS(
+ GR_OSMOSDR_APPEND_LIBS(
      ${Boost_LIBRARIES}
      ${GNURADIO_RUNTIME_LIBRARIES}
++    ${GNURADIO_PMT_LIBRARIES}
      ${GNURADIO_BLOCKS_LIBRARIES}
-+    -lgnuradio-pmt
  )
- 
- ########################################################################
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130606/e9dd1fda/attachment.html>