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

michaelld at macports.org michaelld at macports.org
Wed Jun 5 07:54:03 PDT 2013


Revision: 106693
          https://trac.macports.org/changeset/106693
Author:   michaelld at macports.org
Date:     2013-06-05 07:54:03 -0700 (Wed, 05 Jun 2013)
Log Message:
-----------
gr-osmosdr: more-MacPorts way to make sure this port is not used with gnuradio-next, but still allowing gnuradio and gnuradio-devel.

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

Modified: trunk/dports/science/gr-osmosdr/Portfile
===================================================================
--- trunk/dports/science/gr-osmosdr/Portfile	2013-06-05 09:15:22 UTC (rev 106692)
+++ trunk/dports/science/gr-osmosdr/Portfile	2013-06-05 14:54:03 UTC (rev 106693)
@@ -30,11 +30,15 @@
 
     conflicts           gr-osmosdr-next
 
+    # allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
+
     depends_lib-append	path:lib/libgnuradio-audio.dylib:gnuradio
 
+    # ... but not with gnuradio-next
+
     pre-fetch {
-        if {[file exists /opt/local/lib/libgnuradio-runtime.dylib]} {
-            # gnuradio-next is installed
+        if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
+            # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
             ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with gnuradio-next.  deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
             return -code error "Invalid port dependency"
         }
@@ -54,8 +58,12 @@
 
     conflicts           gr-osmosdr
 
+    # gr-osmosdr-next works with gnuradio-next only
+
     depends_lib-append	port:gnuradio-next
 
+    # temporary patch, will be fixed in a future commit
+
     patchfiles          patch-lib-CMakeLists.txt.diff
 
     livecheck.url       http://cgit.osmocom.org/cgit/gr-osmosdr/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130605/52990ee0/attachment-0001.html>


More information about the macports-changes mailing list