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

[michaelld at macports.org]

Revision: 120308
          https://trac.macports.org/changeset/120308
Author:   michaelld at macports.org
Date:     2014-05-22 12:22:53 -0700 (Thu, 22 May 2014)
Log Message:
-----------
gnuradio:
+ make +zeromq variant work with devel and next only;
+ make +zeromq not a default variant (experimental for now);
+ fix homepage;
+ add runtime dependency on py*-zmq;
+ fix some comments;
+ rev-bump all gnuradio ports to get changes.

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

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2014-05-22 19:20:45 UTC (rev 120307)
+++ trunk/dports/science/gnuradio/Portfile	2014-05-22 19:22:53 UTC (rev 120308)
@@ -15,7 +15,6 @@
 description         GNU Radio is Software Defined Radio (SDR)
 
 categories          science comms
-homepage            http://gnuradio.org/
 license             GPL-3
 platforms           darwin macosx
 
@@ -24,7 +23,7 @@
 if {${subport} eq ${name}} {
 
     github.setup    gnuradio gnuradio 3.7.3 v
-    revision        1
+    revision        2
 
     long_description    ${description}: \
         This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
@@ -49,7 +48,7 @@
 
     github.setup    gnuradio gnuradio 3.6.5.1 v
     name            gnuradio-legacy
-    revision        7
+    revision        8
 
     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.
@@ -96,6 +95,7 @@
 
     github.setup        gnuradio gnuradio cba2d184e2abb8a52353929a34b562ea4f9bd031
     version             3.7.4_20140520
+    revision            1
     name                gnuradio-devel
 
     conflicts           gnuradio-legacy gnuradio gnuradio-next
@@ -113,6 +113,7 @@
 
     github.setup        gnuradio gnuradio c38322bea953f6c33b530ea3b171eb3bcc39d916
     version             3.8.0_20140520
+    revision            1
     name                gnuradio-next
 
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
@@ -171,9 +172,32 @@
 
         patchfiles-append   patch-cmake-expand.devel.diff
 
+        # the zeromq variant is for devel and next only
+        # until the next release
+
+        variant zeromq description {Install GNU Radio with support for the ZeroMQ lightweight messaging kernel (EXPERIMENTAL)} {}
+
+        if {[variant_isset zeromq]} {
+
+            depends_lib-append \
+                port:cppzmq
+
+            configure.args-append \
+                -DENABLE_GR_ZEROMQ=ON
+
+        } else {
+
+            configure.args-append \
+                -DENABLE_GR_ZEROMQ=OFF
+
+        }
     }
 }
 
+# override githib PortGroup homepage setting
+
+homepage            http://gnuradio.org/
+
 use_parallel_build  yes
 
 depends_lib-append  \
@@ -239,10 +263,10 @@
 default_variants -full
 
 # per user concensus: enable all variants except +debug and +universal
-# (and, for next, except +ctrlport and +performance_counters);
+# (and, for next, except +ctrlport, +performance_counters, and +zeromq);
 
 default_variants +docs +grc +qtgui +wxgui +uhd +orc +wavelet \
-    +jack +portaudio +swig +sdl +zeromq
+    +jack +portaudio +swig +sdl
 
 # set Python variants
 
@@ -357,11 +381,25 @@
             if {[variant_exists performance_counters] && \
                 [variant_isset performance_counters]} {
 
+                # these are not checked for at configure, but are
+                # required for runtime; so use depends_run.
+
                 depends_run-append \
                     port:py${s}-pygraphviz \
                     port:py${s}-networkx
 
             }
+
+            if {[variant_exists zeromq] && \
+                [variant_isset zeromq]} {
+
+                # pyzmq is not checked for at configure, but is
+                # required for runtime; so use depends_run.
+
+                depends_run-append \
+                    port:py${s}-zmq
+
+            }
         }
     }]
 }
@@ -587,20 +625,3 @@
         -DSDL_INCLUDE_DIR=
 
 }
-
-variant zeromq description "Install GNU Radio with support for the ZeroMQ lightweight messaging kernel" {
-
-    depends_lib-append \
-        port:cppzmq
-
-    configure.args-append \
-        -DENABLE_GR_ZEROMQ=ON
-
-}
-
-if {![variant_isset sdl]} {
-
-    configure.args-append \
-        -DENABLE_GR_ZEROMQ=OFF
-
-}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140522/bb4aeec8/attachment.html>