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

[michaelld at macports.org]

Revision: 144043
          https://trac.macports.org/changeset/144043
Author:   michaelld at macports.org
Date:     2015-12-30 11:39:49 -0800 (Wed, 30 Dec 2015)
Log Message:
-----------
gnuradio:
+ update devel to b858d8f2 and next to d2c6938b, both 20151229;
+ release, devel, and next can use either the Volk release or devel port as of Volk 1.2 and GR 3.7.9;
+ as of GR 3.7.9, all non-legacy GR ports need runtime dependency on py27-matplotlib.

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

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2015-12-30 19:11:45 UTC (rev 144042)
+++ trunk/dports/science/gnuradio/Portfile	2015-12-30 19:39:49 UTC (rev 144043)
@@ -91,11 +91,11 @@
     name                gnuradio-devel
     conflicts           gnuradio-legacy gnuradio gnuradio-next
 
-    github.setup        gnuradio gnuradio ddb1e778b5ad4a7e78132f42854cd6a2db973a2d
-    version             20151228
+    github.setup        gnuradio gnuradio b858d8f2c1351825d2ee3c3b22bef9e274a93cfb
+    version             20151229
     checksums \
-        rmd160 e51af7c81e2a09c66c38ef44468a9c93c72ab69f \
-        sha256 82cd08fba098797957823edc9320e50d35c8eb2c6392c8d7d628f28631934bf1
+        rmd160 1177a3ef81a99cf01751f80c1d444aa8aed7e3cb \
+        sha256 81e293a6686e523d9d88ef803524ed1081a460006a2ab5cf8630ffcebec96996
 
 }
 
@@ -107,11 +107,11 @@
     name                gnuradio-next
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
 
-    github.setup        gnuradio gnuradio 3ec66e9a9f141d737ce0b9b8edd51e05c3943497
-    version             20151228
+    github.setup        gnuradio gnuradio d2c6938b4922ba4942aad96bd47c1391e9516f2a
+    version             20151229
     checksums \
-        rmd160 cf62101ed23348761d76cce5d5f91d6374dbc21a \
-        sha256 5aa544348c2b4a9bccff68195b2d1533a040b5833e7b17ac4c7ba1886add7905
+        rmd160 30b7a1e3b5d6456ef93fbc555761a827f01f4f96 \
+        sha256 91c6585fe7d33a99addca26c756a36bedcda458f176c81c3fce56bd3d4480ec5
 
     # overload the github livecheck URL with the correct branch
 
@@ -153,24 +153,13 @@
     }
 } else {
 
-    if {${subport} eq "gnuradio"} {
+    # release, devel, and next can use either the Volk
+    # release or devel port as of Volk 1.2 and GR 3.7.9.
 
-        # release can use either the Volk release or devel port
-        depends_lib-append path:lib/libvolk.dylib:volk
+    depends_lib-append path:lib/libvolk.dylib:volk
 
-    } else {
+    # disable using internal VOLK
 
-        # devel and next
-
-        # use the volk-devel port
-        depends_lib-append port:volk-devel
-
-        # need matplotlib for polar encoder/decoder, runtime
-        # only. This is not checked for at configure.
-        depends_run-append port:py27-matplotlib
-
-    }
-
     configure.args-append \
         -DENABLE_INTERNAL_VOLK=OFF
 
@@ -187,6 +176,11 @@
 
     depends_lib-append port:log4cpp
 
+    # need matplotlib for polar encoder/decoder, runtime
+    # only. This is not checked for at configure.
+
+    depends_run-append port:py27-matplotlib
+
     # temporary patch to fix header creation to be before dependencies
     # are determined, such that local (to the build) headers are found
     # before already-installed ones.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151230/e19196b7/attachment.html>