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

[michaelld at macports.org]

Revision: 125045
          https://trac.macports.org/changeset/125045
Author:   michaelld at macports.org
Date:     2014-09-03 06:26:57 -0700 (Wed, 03 Sep 2014)
Log Message:
-----------
gnuradio:
+ update devel to 01deede3 and next to 3c93a4d2, both 20140902;
+ revert reordering of subports, because they work this way (and did not the other way).

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

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2014-09-03 13:24:29 UTC (rev 125044)
+++ trunk/dports/science/gnuradio/Portfile	2014-09-03 13:26:57 UTC (rev 125045)
@@ -20,6 +20,38 @@
 
 dist_subdir         gnuradio
 
+# set top-level versions for release, devel, and next
+
+set major           3
+set minor_base      7
+set patch           5
+set minor_next      [expr {${minor_base} + 1}]
+set patch_devel     [expr {${patch} + 1}]
+set branch_base     [join "${major} ${minor_base}" .]
+set base_version    [join "${branch_base} ${patch}" .]
+set devel_version   [join "${branch_base} ${patch_devel}" .]
+set next_version    [join "${major} ${minor_next}" .]
+
+if {${subport} eq ${name}} {
+
+    github.setup    gnuradio gnuradio ${base_version} v
+
+    long_description    ${description}: \
+        This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
+
+    conflicts       gnuradio-legacy gnuradio-next gnuradio-devel
+
+    checksums \
+        rmd160 0b04edbc816210ed40607b29fa8c93ba9902c8f2 \
+        sha256 5a573d7b84a09bb9549f7a8f08e9909ef1d71b16d8eeb446c6b153a175d46e16
+
+    # overload the github livecheck regex to look for versions that
+    # are just numbers and '.', no letters (e.g., "3.7.3git").
+
+    livecheck.regex archive/[join ${github.tag_prefix} ""](\[0-9\.\]+)${extract.suffix}
+
+}
+
 subport gnuradio-legacy {
 
     name            gnuradio-legacy
@@ -64,52 +96,20 @@
 
 }
 
-# set top-level versions for release, delel, and next
-
-set major           3
-set minor_base      7
-set patch           5
-set minor_next      [expr {${minor_base} + 1}]
-set patch_devel     [expr {${patch} + 1}]
-set branch_base     [join "${major} ${minor_base}" .]
-set base_version    [join "${branch_base} ${patch}" .]
-set devel_version   [join "${branch_base} ${patch_devel}" .]
-set next_version    [join "${major} ${minor_next}" .]
-
-if {${subport} eq ${name}} {
-
-    github.setup    gnuradio gnuradio ${base_version} v
-
-    long_description    ${description}: \
-        This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
-
-    conflicts       gnuradio-legacy gnuradio-next gnuradio-devel
-
-    checksums \
-        rmd160 0b04edbc816210ed40607b29fa8c93ba9902c8f2 \
-        sha256 5a573d7b84a09bb9549f7a8f08e9909ef1d71b16d8eeb446c6b153a175d46e16
-
-    # overload the github livecheck regex to look for versions that
-    # are just numbers and '.', no letters (e.g., "3.7.3git").
-
-    livecheck.regex archive/[join ${github.tag_prefix} ""](\[0-9\.\]+)${extract.suffix}
-
-}
-
 subport gnuradio-devel {
 
     long_description    ${description}: \
         This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly.  This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release.  This port may or not compile or function correctly, as it represents a work in progress.  If it does not work, check back in a few days.  Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
 
     name                gnuradio-devel
-    github.setup        gnuradio gnuradio 1a1f502b5dc4fa10d471a49795dddd54a9b4e444
-    version             ${devel_version}_20140830
+    github.setup        gnuradio gnuradio 01deede32858ef9e2fe4cc937f3245b5b0e6d7c9
+    version             ${devel_version}_20140902
 
     conflicts           gnuradio-legacy gnuradio gnuradio-next
 
     checksums \
-        rmd160 48a055185cc9c89a7f5ec769378744b701de1853 \
-        sha256 7cf7ba618d38be4c43eb74487961a4c1121342fe2a48e0057f4f538d4b54df66
+        rmd160 591e07ebe862388c787c78a394bda842998ae660 \
+        sha256 a86a4526b558b2bb7050ffa1088fef0cd0f98e0768c5535594db3f7de8ad3d8d
 
 }
 
@@ -119,14 +119,14 @@
         This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly.  This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel.  This port may or not compile or function correctly, as it represents a work in progress.  If it does not work, check back in a few days.  Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
 
     name                gnuradio-next
-    github.setup        gnuradio gnuradio dd52842b4b4164191e7a949787dac5d56cbfb1a4
-    version             ${next_version}_20140830
+    github.setup        gnuradio gnuradio 3c93a4d24f036ea999f0657a2bf81a3841c51f2a
+    version             ${next_version}_20140902
 
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
 
     checksums \
-        rmd160 da052c1a6e6d811b21daaeefe3c0a16d1f2c4263 \
-        sha256 e37ffc214c3ec2adab33175da80f364ad0a1a2b790258f3c9bc6e220d2abe1a0
+        rmd160 eed82e78118a672b5c40f156dbbca75544100dc5 \
+        sha256 22da828677077d5eb1b53ada43ca72150917eec8c039b2c38dc8290e16eb50ed
 
     # overload the github livecheck URL with the correct branch
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140903/ef360e80/attachment.html>