[107909] trunk/dports/science/gnuradio/Portfile

[michaelld at macports.org]

Revision: 107909
          https://trac.macports.org/changeset/107909
Author:   michaelld at macports.org
Date:     2013-07-08 19:12:28 -0700 (Mon, 08 Jul 2013)
Log Message:
-----------
gnuradio:
* update devel and next to latest;
* correct conflicts for devel and next;
* move requirements for all 3.7 ports to a common section;
* add py*-opengl as a runtime requirement;
* default to qwt52 instead of qwt;
* should address ticket #39677.

Modified Paths:
--------------
    trunk/dports/science/gnuradio/Portfile

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2013-07-08 22:37:16 UTC (rev 107908)
+++ trunk/dports/science/gnuradio/Portfile	2013-07-09 02:12:28 UTC (rev 107909)
@@ -20,6 +20,7 @@
 if {${subport} == ${name}} {
 
     version         3.7.0
+    revision        1
 
     long_description    ${description}: \
         This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
@@ -42,6 +43,7 @@
 subport gnuradio-legacy {
 
     version         3.6.5.1
+    revision        1
 
     long_description    ${description}: \
         This port is for GNU Radio ${version}, reflecting the final release in the 3.6 API series.  It is for legacy purposes only\; please consider updating your code to the GNU Radio 3.7 API.
@@ -68,16 +70,14 @@
     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_20130629
+    version             3.7.1_20130708
 
-    conflicts           gnuradio gnuradio-next
+    conflicts           gnuradio-legacy gnuradio gnuradio-next
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          2c05acc1ed2e64a772dfa77db78f378d45760996
+    git.branch          530e586d3f6235e0450e297689bc2271986c0727
 
-    depends_lib-append  port:log4cpp
-
     livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=master
     livecheck.version   ${git.branch}
     livecheck.regex     id=(\[a-f0-9\]+).*>master<
@@ -89,14 +89,25 @@
     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_20130629
+    version             3.8.0_20130708
 
-    conflicts           gnuradio gnuradio-devel
+    conflicts           gnuradio-legacy gnuradio gnuradio-devel
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          eada0d6fc1c8404b1b33f3b1f7a911db677e4a39
+    git.branch          73b7ac695eaf5e50722bc3a00e2e150ce74a6186
 
+    livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=next
+    livecheck.version   ${git.branch}
+    livecheck.regex     id=(\[a-f0-9\]+).*>next<
+
+}
+
+if {${subport} != "gnuradio-legacy"} {
+
+    # GNU Radio 3.7 has requirements that 3.6 does not, and provides
+    # features that 3.6 does not have.
+
     depends_lib-append  port:log4cpp
 
     variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {}
@@ -111,11 +122,6 @@
         configure.args-append -DENABLE_GR_CTRLPORT=OFF
 
     }
-
-    livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=next
-    livecheck.version   ${git.branch}
-    livecheck.regex     id=(\[a-f0-9\]+).*>next<
-
 }
 
 use_parallel_build  yes
@@ -196,6 +202,7 @@
                 port:py${s}-cheetah
 
             depends_run-append \
+                port:py${s}-opengl \
                 port:py${s}-scipy
 
             # specify the Python version to use
@@ -304,7 +311,7 @@
 
     depends_lib-append \
         port:qt4-mac \
-        path:lib/libqwt.dylib:qwt \
+        path:lib/libqwt.dylib:qwt52 \
         port:qwtplot3d
 
     configure.args-append \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130708/cf7d35bd/attachment.html>