[117031] trunk/dports/science/gnuradio

[michaelld at macports.org]

Revision: 117031
          https://trac.macports.org/changeset/117031
Author:   michaelld at macports.org
Date:     2014-02-13 05:38:17 -0800 (Thu, 13 Feb 2014)
Log Message:
-----------
gnuradio: update devel to 295ba353 and next to 1e6a0dcd, both 20140211.

Modified Paths:
--------------
    trunk/dports/science/gnuradio/Portfile
    trunk/dports/science/gnuradio/files/patch-cmake-expand.diff

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2014-02-13 12:47:04 UTC (rev 117030)
+++ trunk/dports/science/gnuradio/Portfile	2014-02-13 13:38:17 UTC (rev 117031)
@@ -86,13 +86,13 @@
     long_description    ${description}: \
         This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly.  This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release.  This port may or not compile or function correctly, as it represents a work in progress.  If it does not work, check back in a few days.  Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
 
-    version             3.7.3_20140128
+    version             3.7.3_20140211
 
     conflicts           gnuradio-legacy gnuradio gnuradio-next
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          19d111e2448a58e20ff5c1c80ca69751376b2544
+    git.branch          295ba353abebfedf90ece523343bcfeea2c2149d
 
     livecheck.url       http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=master
     livecheck.version   ${git.branch}
@@ -105,13 +105,13 @@
     long_description    ${description}: \
         This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly.  This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel.  This port may or not compile or function correctly, as it represents a work in progress.  If it does not work, check back in a few days.  Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
 
-    version             3.8.0_20140128
+    version             3.8.0_20140211
 
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          aa98220e51be7c3cfb3738b8f82d4154f96e86ed
+    git.branch          1e6a0dcdb925bd38cd6e67773e6c30c32e386fd3
 
     livecheck.url       http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=next
     livecheck.version   ${git.branch}

Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-cmake-expand.diff	2014-02-13 12:47:04 UTC (rev 117030)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.diff	2014-02-13 13:38:17 UTC (rev 117031)
@@ -857,7 +857,7 @@
 -    string(REGEX REPLACE "X+" ${sig} name ${root})
 -    list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
 -  endforeach(sig)
--  
+-
 -  #create a command to generate the files
 -  add_custom_command(
 -    OUTPUT ${expanded_files_h}
@@ -924,7 +924,7 @@
 -    list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
 -    list(APPEND expanded_files_h  ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
 -  endforeach(sig)
--  
+-
 -  #create a command to generate the source files
 -  add_custom_command(
 -    OUTPUT ${expanded_files_cc}
@@ -942,15 +942,15 @@
 -    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
 -    ${root} ${root}.h.t ${ARGN}
 -  )
--  
+-
 -  #make source files depends on headers to force generation
 -  set_source_files_properties(${expanded_files_cc}
 -    PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
 -  )
--  
+-
 -  #install rules for the generated cc files
--  list(APPEND generated_sources ${expanded_files_cc})  
--  list(APPEND generated_headers ${expanded_files_h})  
+-  list(APPEND generated_sources ${expanded_files_cc})
+-  list(APPEND generated_headers ${expanded_files_h})
 -endmacro(expand_cc)
 -
 -########################################################################
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140213/fca2bc48/attachment.html>