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

[michaelld at macports.org]

Revision: 112277
          https://trac.macports.org/changeset/112277
Author:   michaelld at macports.org
Date:     2013-10-16 07:28:15 -0700 (Wed, 16 Oct 2013)
Log Message:
-----------
gnuradio:
* update devel to 5ff223ab and next to c47713af, both 20131015;
* -really- fix cmake file install location, so that those files actually work;
* add comment about cmake file install location, for future reference.

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

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2013-10-16 14:11:25 UTC (rev 112276)
+++ trunk/dports/science/gnuradio/Portfile	2013-10-16 14:28:15 UTC (rev 112277)
@@ -23,6 +23,7 @@
 if {${subport} eq ${name}} {
 
     version         3.7.1
+    revision        1
 
     long_description    ${description}: \
         This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
@@ -45,7 +46,7 @@
 subport gnuradio-legacy {
 
     version         3.6.5.1
-    revision        2
+    revision        3
 
     long_description    ${description}: \
         This port is for GNU Radio ${version}, reflecting the final release in the 3.6 API series.  It is for legacy purposes only\; please consider updating your code to the GNU Radio 3.7 API.
@@ -72,13 +73,13 @@
     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.
 
-    version             3.7.2_20131013
+    version             3.7.2_20131015
 
     conflicts           gnuradio-legacy gnuradio gnuradio-next
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          64ca64079579c00256ba753afe49ce068c430258
+    git.branch          5ff223ab3357bdb902d3a9dd4d082c1e363876c1
 
     livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=master
     livecheck.version   ${git.branch}
@@ -91,13 +92,13 @@
     long_description    ${description}: \
         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.
 
-    version             3.8.0_20131013
+    version             3.8.0_20131015
 
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          bb9c8e6dd30e8cef97d7699ef63be041b650c3c9
+    git.branch          c47713aff3e3fb80f3d447f31f781cce4794ba1a
 
     livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=next
     livecheck.version   ${git.branch}
@@ -174,15 +175,22 @@
 
 build.post_args VERBOSE=1
 
-# fix residual cmake module install location when CMAKE_MODULES_DIR
-# does not do the whole trick
+post-destroot {
 
-post-destroot {
+    # fix residual cmake module install location when
+    # CMAKE_MODULES_DIR does not do the whole trick
+
+    # GNU Radio installs cmake files as "Config*.cmake", which has the
+    # odd behavior of requiring the files to be in a top-level shared
+    # cmake directory; for MacPorts' cmake, these are, apparently:
+    # ${prefix}/lib:${prefix}/share/cmake .  I don't know why ... but
+    # I do not want cmake files installed into the former, so move
+    # them to the latter.
+
     if {[file exists ${destroot}${prefix}/lib/cmake]} {
-        xinstall -m 755 -d ${destroot}${prefix}/share/cmake/Modules
-        foreach module [glob ${destroot}${prefix}/lib/cmake/*] {
-            move ${module} ${destroot}${prefix}/share/cmake/Modules
-        }
+        xinstall -m 755 -d ${destroot}${prefix}/share
+        move ${destroot}${prefix}/lib/cmake \
+            ${destroot}${prefix}/share
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131016/0734379a/attachment-0001.html>