[110160] users/mojca/wxports/science/gnuradio

[mojca at macports.org]

Revision: 110160
          https://trac.macports.org/changeset/110160
Author:   mojca at macports.org
Date:     2013-08-27 11:30:16 -0700 (Tue, 27 Aug 2013)
Log Message:
-----------
mojca/gnuradio: merge changes from trunk

Modified Paths:
--------------
    users/mojca/wxports/science/gnuradio/Portfile

Property Changed:
----------------
    users/mojca/wxports/science/gnuradio/


Property changes on: users/mojca/wxports/science/gnuradio
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/science/gnuradio:109365-110159

Modified: users/mojca/wxports/science/gnuradio/Portfile
===================================================================
--- users/mojca/wxports/science/gnuradio/Portfile	2013-08-27 18:27:21 UTC (rev 110159)
+++ users/mojca/wxports/science/gnuradio/Portfile	2013-08-27 18:30:16 UTC (rev 110160)
@@ -73,13 +73,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.1_20130816
+    version             3.7.1_20130825
 
     conflicts           gnuradio-legacy gnuradio gnuradio-next
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          631dd648e49da20df1f0fb825037ff28460f03a1
+    git.branch          523a53ac387a699cef4d8e784561cdcaffad39cf
 
     livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=master
     livecheck.version   ${git.branch}
@@ -92,13 +92,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_20130816
+    version             3.8.0_20130825
 
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          9be83a4d9bdfc5ab11ed0f6096306ae6d0d66254
+    git.branch          5cbef83217368679bf377ef68e16a4d1b8cb048f
 
     livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=next
     livecheck.version   ${git.branch}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130827/ac4d28cb/attachment.html>