[135413] trunk/dports/science/volk/Portfile

michaelld at macports.org michaelld at macports.org
Thu Apr 23 08:54:50 PDT 2015


Revision: 135413
          https://trac.macports.org/changeset/135413
Author:   michaelld at macports.org
Date:     2015-04-23 08:54:50 -0700 (Thu, 23 Apr 2015)
Log Message:
-----------
volk: the gnuradio release port now uses port:volk, so check for the older release version in pre-extract (along with the pre-split gnuradio-devel and gnuradio-next).

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

Modified: trunk/dports/science/volk/Portfile
===================================================================
--- trunk/dports/science/volk/Portfile	2015-04-23 15:53:34 UTC (rev 135412)
+++ trunk/dports/science/volk/Portfile	2015-04-23 15:54:50 UTC (rev 135413)
@@ -11,9 +11,9 @@
 checksums           rmd160 6c212e914e35e1b198be27ecae341838ae766a0f \
                     sha256 fad182bf5cddfd0d8be7db9d440e1a49f736a8d36d56cc9d513a9dc4d7e05714
 
-# the gnuradio release and legacy stillprovide volk
+# gnuradio legacy still provides volk
 
-conflicts           gnuradio-legacy gnuradio
+conflicts           gnuradio-legacy
 
 categories          science comms
 maintainers         michaelld openmaintainer
@@ -27,7 +27,7 @@
 homepage            http://libvolk.org/
 
 depends_build-append port:pkgconfig
-depends_lib-append	 port:boost
+depends_lib-append   port:boost
 
 # temporary patch to add lib/gcc_x86_cpuid.h back to the repo, since
 # it is needed by some older GCC compilers. It does not hurt newer
@@ -147,19 +147,29 @@
 
     # tell the user to force deactivate gnuradio-(devel,next) if one
     # is active and version is before Volk was split off (20150329 for
-    # devel and next).
+    # devel and next). gnuradio 3.7.6.2+ provides this split, too (as
+    # of 2015-04-12).
 
     set not_found [catch {set installed [lindex [registry_active gnuradio-devel] 0]}]
     if {${not_found}} {
         set not_found [catch {set installed [lindex [registry_active gnuradio-next] 0]}]
     }
+    if {${not_found}} {
+        set not_found [catch {set installed [lindex [registry_active gnuradio] 0]}]
+    }
     if (!${not_found}) {
 
         set _portname [lindex ${installed} 0]
         set _version [lindex ${installed} 1]
 
-        if {[vercmp ${_version} 20150329] < 0} {
+        if {${_portname} eq "gnuradio"} {
+            set _vcmp [vercmp ${_version} 3.7.6.2]
+        } else {
+            set _vcmp [vercmp ${_version} 20150329]
+        }
 
+        if {${_vcmp} < 0} {
+
             ui_msg "\nVolk is currently installed by the port '${_portname}'."
             ui_msg "Use the command"
             ui_msg "  sudo port -f deactivate ${_portname}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150423/2821c515/attachment.html>


More information about the macports-changes mailing list