[113219] trunk/dports/science/gr-osmosdr/Portfile

[michaelld at macports.org]

Revision: 113219
          https://trac.macports.org/changeset/113219
Author:   michaelld at macports.org
Date:     2013-11-12 08:14:02 -0800 (Tue, 12 Nov 2013)
Log Message:
-----------
gr-osmosdr:
+ use gnuradio-runtime instead of gnuradio-audio, since the former always will be installed;
+ shuffle some text;
+ fix or add comments.

Modified Paths:
--------------
    trunk/dports/science/gr-osmosdr/Portfile

Modified: trunk/dports/science/gr-osmosdr/Portfile
===================================================================
--- trunk/dports/science/gr-osmosdr/Portfile	2013-11-12 16:12:35 UTC (rev 113218)
+++ trunk/dports/science/gr-osmosdr/Portfile	2013-11-12 16:14:02 UTC (rev 113219)
@@ -32,7 +32,7 @@
 
     # allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
 
-    depends_lib-append  path:lib/libgnuradio-audio.dylib:gnuradio
+    depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
 
     # ... but not with gnuradio-legacy or gnuradio-next
 
@@ -128,9 +128,10 @@
 
             set chosen_python_suffix ${s}
 
-            # require gnuradio to also have this variant
+            # require gnuradio to also have this Python variant
+
             require_active_variants \
-                path:lib/libgnuradio-audio.dylib:gnuradio ${p}
+                path:lib/libgnuradio-runtime.dylib:gnuradio ${p}
 
             # specify the Python dependencies
 
@@ -162,11 +163,6 @@
     return -code error "Invalid variant selection"
 }
 
-# shortcut to installing all variants except Python
-
-variant full requires docs uhd swig hackrf \
-    description {Enable all variants except +debug and +universal} {}
-
 variant docs description "Install ${name} documentation" {
 
     depends_build-append \
@@ -189,13 +185,15 @@
 
 variant uhd description "Install ${name} with support for UHD" {
 
+    # allow uhd or uhd-devel
+
     depends_lib-append \
         path:lib/libuhd.dylib:uhd
 
     # require gnuradio to also have this variant
 
     require_active_variants \
-        path:lib/libgnuradio-audio.dylib:gnuradio uhd
+        path:lib/libgnuradio-runtime.dylib:gnuradio uhd
 
     configure.args-append \
         -DENABLE_UHD=ON \
@@ -225,7 +223,7 @@
     # require gnuradio to also have this variant
 
     require_active_variants \
-        path:lib/libgnuradio-audio.dylib:gnuradio swig
+        path:lib/libgnuradio-runtime.dylib:gnuradio swig
 
     configure.args-append \
         -DSWIG_EXECUTABLE=${prefix}/bin/swig
@@ -252,6 +250,11 @@
 
 }
 
+# shortcut to installing all variants except Python
+
+variant full requires docs uhd swig hackrf \
+    description {Enable all variants except +debug and +universal} {}
+
 # make +full the default; per user concensus
 
 default_variants-append +full
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131112/1c9ae80f/attachment-0001.html>