Changeset 112277


Ignore:
Timestamp:
Oct 16, 2013, 2:28:15 PM (6 years ago)
Author:
michaelld@…
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;
  • rev-bump release and legacy for changes to take effect.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/gnuradio/Portfile

    r112218 r112277  
    2424
    2525    version         3.7.1
     26    revision        1
    2627
    2728    long_description    ${description}: \
     
    4647
    4748    version         3.6.5.1
    48     revision        2
     49    revision        3
    4950
    5051    long_description    ${description}: \
     
    7374        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.
    7475
    75     version             3.7.2_20131013
     76    version             3.7.2_20131015
    7677
    7778    conflicts           gnuradio-legacy gnuradio gnuradio-next
     
    7980    fetch.type          git
    8081    git.url             http://git.gnuradio.org/git/gnuradio.git
    81     git.branch          64ca64079579c00256ba753afe49ce068c430258
     82    git.branch          5ff223ab3357bdb902d3a9dd4d082c1e363876c1
    8283
    8384    livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=master
     
    9293        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.
    9394
    94     version             3.8.0_20131013
     95    version             3.8.0_20131015
    9596
    9697    conflicts           gnuradio-legacy gnuradio gnuradio-devel
     
    9899    fetch.type          git
    99100    git.url             http://git.gnuradio.org/git/gnuradio.git
    100     git.branch          bb9c8e6dd30e8cef97d7699ef63be041b650c3c9
     101    git.branch          c47713aff3e3fb80f3d447f31f781cce4794ba1a
    101102
    102103    livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=next
     
    175176build.post_args VERBOSE=1
    176177
    177 # fix residual cmake module install location when CMAKE_MODULES_DIR
    178 # does not do the whole trick
    179 
    180178post-destroot {
     179
     180    # fix residual cmake module install location when
     181    # CMAKE_MODULES_DIR does not do the whole trick
     182
     183    # GNU Radio installs cmake files as "Config*.cmake", which has the
     184    # odd behavior of requiring the files to be in a top-level shared
     185    # cmake directory; for MacPorts' cmake, these are, apparently:
     186    # ${prefix}/lib:${prefix}/share/cmake .  I don't know why ... but
     187    # I do not want cmake files installed into the former, so move
     188    # them to the latter.
     189
    181190    if {[file exists ${destroot}${prefix}/lib/cmake]} {
    182         xinstall -m 755 -d ${destroot}${prefix}/share/cmake/Modules
    183         foreach module [glob ${destroot}${prefix}/lib/cmake/*] {
    184             move ${module} ${destroot}${prefix}/share/cmake/Modules
    185         }
     191        xinstall -m 755 -d ${destroot}${prefix}/share
     192        move ${destroot}${prefix}/lib/cmake \
     193            ${destroot}${prefix}/share
    186194    }
    187195}
Note: See TracChangeset for help on using the changeset viewer.