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

[michaelld at macports.org]

Revision: 112218
          https://trac.macports.org/changeset/112218
Author:   michaelld at macports.org
Date:     2013-10-15 06:45:20 -0700 (Tue, 15 Oct 2013)
Log Message:
-----------
gnuradio:
* update devel to 64ca6407 and next to bb9c8e6d, both 20131013;
* use post-destroot to fix install location of cmake modules (temporary);
* switch sphinx to a build dependency;
* switch wxpython to a runtime dependency (for now).

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

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2013-10-15 12:12:59 UTC (rev 112217)
+++ trunk/dports/science/gnuradio/Portfile	2013-10-15 13:45:20 UTC (rev 112218)
@@ -72,13 +72,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_20131009
+    version             3.7.2_20131013
 
     conflicts           gnuradio-legacy gnuradio gnuradio-next
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          d282356db1e623bb2025748d87f5c721f7a429b3
+    git.branch          64ca64079579c00256ba753afe49ce068c430258
 
     livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=master
     livecheck.version   ${git.branch}
@@ -91,13 +91,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_20131009
+    version             3.8.0_20131013
 
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
 
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          b77276889c04fc75544dd78a462a3def560f610a
+    git.branch          bb9c8e6dd30e8cef97d7699ef63be041b650c3c9
 
     livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=next
     livecheck.version   ${git.branch}
@@ -174,11 +174,17 @@
 
 build.post_args VERBOSE=1
 
-# shortcut to installing all variants except Python
+# fix residual cmake module install location when CMAKE_MODULES_DIR
+# does not do the whole trick
 
-variant full \
-    requires docs grc qtgui wxgui uhd orc wavelet jack portaudio swig sdl \
-    description {Enable all variants except +debug and +universal (and, for next, except +ctrlport)} {}
+post-destroot {
+    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
+        }
+    }
+}
 
 # set Python variants
 
@@ -225,7 +231,7 @@
 
             if {[variant_isset docs]} {
 
-                depends_lib-append \
+                depends_build-append \
                     port:py${s}-sphinx
 
                 configure.args-append \
@@ -252,7 +258,7 @@
 
             if {[variant_isset wxgui]} {
 
-                depends_lib-append \
+                depends_run-append \
                     port:py${s}-wxpython-3.0
 
             }
@@ -489,6 +495,12 @@
 
 }
 
+# shortcut to installing all variants except Python
+
+variant full \
+    requires docs grc qtgui wxgui uhd orc wavelet jack portaudio swig sdl \
+    description {Enable all variants except +debug and +universal (and, for next, except +ctrlport)} {}
+
 # make +full the default; per user concensus
 
 default_variants-append +full
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131015/bab47355/attachment.html>