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

[michaelld at macports.org]

Revision: 138517
          https://trac.macports.org/changeset/138517
Author:   michaelld at macports.org
Date:     2015-07-10 13:22:40 -0700 (Fri, 10 Jul 2015)
Log Message:
-----------
gnuradio:
+ legacy conflicts with volk-devel too;
+ release, devel, and next can use volk or volk-devel.

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

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2015-07-10 19:56:22 UTC (rev 138516)
+++ trunk/dports/science/gnuradio/Portfile	2015-07-10 20:22:40 UTC (rev 138517)
@@ -128,7 +128,7 @@
 
     # now conflicts with the Volk port
 
-    conflicts volk
+    conflicts volk volk-devel
 
     # always enable VOLK, with or without orc
 
@@ -154,7 +154,7 @@
     }
 } else {
 
-    depends_lib-append port:volk
+    depends_lib-append path:lib/libvolk.dylib:volk
 
     configure.args-append \
         -DENABLE_INTERNAL_VOLK=OFF
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150710/a0c5d84e/attachment.html>