Changeset 144830


Ignore:
Timestamp:
Jan 19, 2016, 8:16:26 PM (3 years ago)
Author:
michaelld@…
Message:

various gnuradio ports: remove legacy subports and related patches, comments, and code.

Location:
trunk/dports/science
Files:
7 deleted
18 edited

Legend:

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

    r144809 r144830  
    2828        This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
    2929
    30     conflicts       gnuradio-legacy gnuradio-next gnuradio-devel
     30    conflicts       gnuradio-next gnuradio-devel
    3131
    3232    checksums \
     
    4141}
    4242
    43 subport gnuradio-legacy {
    44 
    45     name            gnuradio-legacy
    46     github.setup    gnuradio gnuradio 3.6.5.1 v
    47     revision        16
    48 
    49     long_description    ${description}: \
    50         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.
    51 
    52     conflicts       gnuradio gnuradio-next gnuradio-devel
    53 
    54     checksums \
    55         rmd160 f5d5890fca81e5c379d32b3504976bc24b7ac12f \
    56         sha256 1af7840b9b46aaa85786bf58274da4334b84192e04990b4f3132c1a84b84956f
    57 
    58     # fix INCLUDE_DIRECTORIES path order such that internal
    59     # directories are searched before ${prefix}/include or system
    60     # ones.
    61 
    62     patchfiles-append patch-path-order.diff
    63 
    64     # add checks for xgetbv instruction and cvtpi32_ps intrinsic
    65 
    66     patchfiles-append patch-volk_lib_CMakeLists.txt.legacy.diff
    67 
    68     # fix VOLK arch generators to include clang
    69 
    70     patchfiles-append patch-volk_gen_archs.xml.legacy.diff
    71 
    72     # fix SWIG include of std_string to come before anything else,
    73     # otherwise it will not be properly defined later on.
    74 
    75     patchfiles-append patch-gnuradio-core_swig_include-std_string.i.diff
    76 
    77     # fix friend function API declaration
    78 
    79     patchfiles-append patch-gnuradio-core_src_lib_io_ppio_ppdev.h.diff
    80 
    81     # 3.6.5.1 is the last of the 3.6 API development
    82 
    83     livecheck.type  none
    84 
    85 }
    86 
    8743subport gnuradio-devel {
    8844
     
    9147
    9248    name                gnuradio-devel
    93     conflicts           gnuradio-legacy gnuradio gnuradio-next
     49    conflicts           gnuradio gnuradio-next
    9450
    9551    github.setup        gnuradio gnuradio bd69c31ef8ae402520819939194ee3060db0062d
     
    10763
    10864    name                gnuradio-next
    109     conflicts           gnuradio-legacy gnuradio gnuradio-devel
     65    conflicts           gnuradio gnuradio-devel
    11066
    11167    github.setup        gnuradio gnuradio 6f866a6f6f6eb088c6d92cf06dd257c0a748c46a
     
    12177}
    12278
    123 # Volk split off on 2015-03-29, so it is relevant for devel and next,
    124 # and will come with release 3.7.6.2 / 3.7.7. legacy will always
    125 # provide Volk.
    126 
    127 if {${subport} eq "gnuradio-legacy"} {
    128 
    129     # now conflicts with the Volk port
    130 
    131     conflicts volk volk-devel
    132 
    133     # always enable VOLK, with or without orc
    134 
    135     configure.args-append -DENABLE_VOLK=ON
    136 
    137     default_variants +orc
    138 
    139     variant orc description "Install GNU Radio Volk with support for ORC" {
    140 
    141         depends_lib-append \
    142             port:orc
    143 
    144         configure.args-append \
    145             -DORCC_EXECUTABLE=${prefix}/bin/orcc
    146 
    147     }
    148 
    149     if {![variant_isset orc]} {
    150 
    151         configure.args-append \
    152             -DORCC_EXECUTABLE=
    153 
    154     }
     79# temporary patch to fix header creation to be before dependencies
     80# are determined, such that local (to the build) headers are found
     81# before already-installed ones.
     82
     83if {${subport} eq "gnuradio"} {
     84
     85    # patches for release only
     86    patchfiles-append \
     87        patch-cmake-expand.release.diff
     88
    15589} else {
    15690
    157     # release, devel, and next can use either the Volk
    158     # release or devel port as of Volk 1.2 and GR 3.7.9.
    159 
    160     depends_lib-append path:lib/libvolk.dylib:volk
    161 
    162     # disable using internal VOLK
    163 
    164     configure.args-append \
    165         -DENABLE_INTERNAL_VOLK=OFF
    166 
    167     # can be removed 2016-Apr-01
    168 
    169     variant orc description "deprecated variant" {}
    170 
    171 }
    172 
    173 if {${subport} ne "gnuradio-legacy"} {
    174 
    175     # GNU Radio 3.7 has requirements that 3.6 does not, and provides
    176     # features that 3.6 does not have.
    177 
    178     depends_lib-append port:log4cpp
    179 
    180     # need matplotlib for polar encoder/decoder, runtime
    181     # only. This is not checked for at configure.
    182 
    183     depends_run-append port:py27-matplotlib
    184 
    185     # temporary patch to fix header creation to be before dependencies
    186     # are determined, such that local (to the build) headers are found
    187     # before already-installed ones.
    188 
    189     if {${subport} eq "gnuradio"} {
    190 
    191         # patches for release only
    192         patchfiles-append \
    193             patch-cmake-expand.release.diff
    194 
    195     } else {
    196 
    197         # patches for devel and next (which are kept aligned for now)
    198 
    199         patchfiles-append \
    200             patch-cmake-expand.devel.diff
    201 
    202     }
    203 
    204     # 3.7 API variants
    205 
    206     variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {}
    207 
    208     if {[variant_isset ctrlport]} {
    209 
    210 # as of commit 2e691d87 (2014-08-08), all CTRLPORT calls are noops
    211 # because of an issue with ICE.  So, allow +ctrlport, but it won't do
    212 # anything until this is fixed.
    213 
    214 # as of commit 621c086b (2015-04-16), CTRLPORT has been moved to using
    215 # thrift, which needs debugging when building on OSX. Just disable
    216 # CTRLPORT for now.
    217 
    218         configure.args-append -DENABLE_GR_CTRLPORT=OFF
    219 
    220     } else {
    221 
    222         configure.args-append -DENABLE_GR_CTRLPORT=OFF
    223 
    224     }
    225 
    226     variant performance_counters description {Enable support for performance counters (EXPERIMENTAL)} {}
    227 
    228     if {[variant_isset performance_counters]} {
    229 
    230         # these are not checked for at configure, but are
    231         # required for runtime; so use depends_run.
    232 
    233         depends_run-append \
    234             port:py27-pygraphviz \
    235             port:py27-networkx
    236 
    237         configure.args-append \
    238             -DENABLE_PERFORMANCE_COUNTERS=ON
    239 
    240     } else {
    241 
    242         configure.args-append \
    243             -DENABLE_PERFORMANCE_COUNTERS=OFF
    244 
    245     }
    246 
    247     variant zeromq description {Install GNU Radio with support for the ZeroMQ lightweight messaging kernel (EXPERIMENTAL)} {}
    248 
    249     if {[variant_isset zeromq]} {
    250 
    251         depends_lib-append \
    252             port:cppzmq
    253 
    254         # pyzmq is not checked for at configure, but is
    255         # required for runtime; so use depends_run.
    256 
    257         depends_run-append \
    258             port:py27-zmq
    259 
    260         configure.args-append \
    261             -DENABLE_GR_ZEROMQ=ON
    262 
    263     } else {
    264 
    265         configure.args-append \
    266             -DENABLE_GR_ZEROMQ=OFF
    267 
    268     }
     91    # patches for devel and next (which are kept aligned for now)
     92    patchfiles-append \
     93        patch-cmake-expand.devel.diff
     94
    26995}
    27096
     
    278104    port:boost \
    279105    port:cppunit \
    280     port:fftw-3-single
     106    port:fftw-3-single \
     107    port:log4cpp
     108
     109# need matplotlib for polar encoder/decoder, runtime
     110# only. This is not checked for at configure.
     111
     112depends_run-append port:py27-matplotlib
    281113
    282114# do VPATH (out of source tree) build
     
    284116cmake.out_of_source yes
    285117
    286 # remove top-level library path, such that internal libraries are used
    287 # instead of any already-installed ones.
     118# remove top-level library path, such that internal libraries
     119# are used instead of any already-installed ones.
    288120
    289121configure.ldflags-delete -L${prefix}/lib
    290122
    291 # install CMake files into this directory;
    292 # for 3.7+, but will not hurt for legacy.
     123# install CMake files into this directory.
    293124
    294125configure.args-append \
    295126    -DCMAKE_MODULES_DIR=${prefix}/share/cmake
     127
     128# release, devel, and next can use either the Volk.
     129
     130depends_lib-append path:lib/libvolk.dylib:volk
     131
     132# disable using internal VOLK
     133
     134configure.args-append \
     135    -DENABLE_INTERNAL_VOLK=OFF
    296136
    297137post-destroot {
     
    577417}
    578418
     419variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {
     420# as of commit 2e691d87 (2014-08-08), all CTRLPORT calls are noops
     421# because of an issue with ICE.  So, allow +ctrlport, but it won't do
     422# anything until this is fixed.
     423
     424# as of commit 621c086b (2015-04-16), CTRLPORT has been moved to using
     425# thrift, which needs debugging when building on OSX. Just disable
     426# CTRLPORT for now.
     427
     428    configure.args-append -DENABLE_GR_CTRLPORT=OFF
     429
     430}
     431
     432if {![variant_isset ctrlport]} {
     433
     434    configure.args-append -DENABLE_GR_CTRLPORT=OFF
     435
     436}
     437
     438variant performance_counters description {Enable support for performance counters (EXPERIMENTAL)} {
     439
     440    # these are not checked for at configure, but are
     441    # required for runtime; so use depends_run.
     442
     443    depends_run-append \
     444        port:py27-pygraphviz \
     445        port:py27-networkx
     446
     447    configure.args-append \
     448        -DENABLE_PERFORMANCE_COUNTERS=ON
     449
     450}
     451
     452if {![variant_isset performance_counters]} {
     453
     454    configure.args-append \
     455        -DENABLE_PERFORMANCE_COUNTERS=OFF
     456
     457}
     458
     459variant zeromq description {Install GNU Radio with support for the ZeroMQ lightweight messaging kernel (EXPERIMENTAL)} {
     460
     461    depends_lib-append \
     462        port:cppzmq
     463
     464    # pyzmq is not checked for at configure, but is
     465    # required for runtime; so use depends_run.
     466
     467    depends_run-append \
     468        port:py27-zmq
     469
     470    configure.args-append \
     471        -DENABLE_GR_ZEROMQ=ON
     472
     473}
     474
     475if {![variant_isset zeromq]} {
     476
     477    configure.args-append \
     478        -DENABLE_GR_ZEROMQ=OFF
     479
     480}
     481
    579482variant cxx11 description "Compile using C++11" {
    580483
  • trunk/dports/science/gr-air-modes/Portfile

    r143893 r144830  
    1616depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    1717
    18 # ... but not with gnuradio-legacy or gnuradio-next
     18# ... but not with gnuradio-next
    1919
    2020pre-fetch {
    21     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    22         # gnuradio-legacy is installed; this version of gr-air-modes does not work with gnuradio-legacy
    23         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    24         return -code error "Invalid port dependency: gnuradio-legacy"
    25     }
    2621    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    2722        # gnuradio-next is installed; this version of gr-air-modes does not work with gnuradio-next
  • trunk/dports/science/gr-ais/Portfile

    r143893 r144830  
    2020depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    2121
    22 # ... but not with gnuradio-legacy or gnuradio-next
     22# ... but not with gnuradio-next
    2323
    2424pre-fetch {
    25     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    26         # gnuradio-legacy is installed; this version of gr-ais does not work with gnuradio-legacy
    27         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    28         return -code error "Invalid port dependency: gnuradio-legacy"
    29     }
    3025    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    3126        # gnuradio-next is installed; this version of gr-ais does not work with gnuradio-next
     
    6257configure.ldflags-delete -L${prefix}/lib
    6358
    64 # install CMake files into this directory;
    65 # for 3.7+, but will not hurt for legacy.
     59# install CMake files into this directory.
    6660
    6761configure.args-append \
  • trunk/dports/science/gr-baz/Portfile

    r144397 r144830  
    88name                gr-baz
    99
    10 if {"${subport}" eq "${name}"} {
     10github.setup        balint256 gr-baz e96b4023afaf3d777784c58d95fe41a2f08dbc6c
     11version             20151125
     12revision            3
     13checksums           rmd160 6da4b15627196bdbf12ef25c7553982d14503db5 \
     14                    sha256 fc5beff2a52575099754495694dc33084608e32f81660a2833cca9cf5d94b80e
    1115
    12     github.setup        balint256 gr-baz e96b4023afaf3d777784c58d95fe41a2f08dbc6c
    13     version             20151125
    14     revision            3
    15     checksums           rmd160 6da4b15627196bdbf12ef25c7553982d14503db5 \
    16                         sha256 fc5beff2a52575099754495694dc33084608e32f81660a2833cca9cf5d94b80e
     16# allow gr-baz to work with both gnuradio and gnuradio-devel ...
    1717
    18     conflicts           gr-baz-legacy
     18depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    1919
    20     # allow gr-baz to work with both gnuradio and gnuradio-devel ...
     20# ... but not with gnuradio-next
    2121
    22     depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    23 
    24     # ... but not with gnuradio-legacy or gnuradio-next
    25 
    26     pre-fetch {
    27         if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    28             # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
    29             ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    30             return -code error "Invalid port dependency: gnuradio-legacy"
    31         }
    32         if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    33             # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
    34             ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port.  deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
    35             return -code error "Invalid port dependency: gnuradio-next"
    36         }
     22pre-fetch {
     23    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
     24        # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
     25        ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port.  deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
     26        return -code error "Invalid port dependency: gnuradio-next"
    3727    }
    38 }
    39 
    40 subport gr-baz-legacy {
    41 
    42     github.setup        balint256 gr-baz dd9540661065308eb9529b81d1580b861dd8aa0e
    43     version             20130329
    44     revision            4
    45     checksums           rmd160 06b6152d541169116219d701970fc03710e0fbba \
    46                         sha256 377a0058ec72ed963edbc65ef062180d6937d4fda334bc2e7469146f0abfd626
    47 
    48     conflicts           gr-baz
    49 
    50     # fix name from github setup
    51 
    52     name                gr-baz-legacy
    53 
    54     # requires gnuradio-legacy
    55 
    56     depends_lib-append  port:gnuradio-legacy
    5728}
    5829
  • trunk/dports/science/gr-dvbs/Portfile

    r143893 r144830  
    2929depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    3030
    31 # ... but not with gnuradio-legacy or gnuradio-next
     31# ... but not with gnuradio-next
    3232
    3333pre-fetch {
    34     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    35         # gnuradio-legacy is installed; this version of gr-dvbs does not work with gnuradio-legacy
    36         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    37         return -code error "Invalid port dependency: gnuradio-legacy"
    38     }
    3934    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    4035        # gnuradio-next is installed; this version of gr-dvbs does not work with gnuradio-next
  • trunk/dports/science/gr-dvbs2/Portfile

    r143893 r144830  
    2929depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    3030
    31 # ... but not with gnuradio-legacy or gnuradio-next
     31# ... but not with gnuradio-next
    3232
    3333pre-fetch {
    34     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    35         # gnuradio-legacy is installed; this version of gr-dvbs2 does not work with gnuradio-legacy
    36         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    37         return -code error "Invalid port dependency: gnuradio-legacy"
    38     }
    3934    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    4035        # gnuradio-next is installed; this version of gr-dvbs2 does not work with gnuradio-next
  • trunk/dports/science/gr-dvbt/Portfile

    r143893 r144830  
    3030depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    3131
    32 # ... but not with gnuradio-legacy or gnuradio-next
     32# ... but not with gnuradio-next
    3333
    3434pre-fetch {
    35     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    36         # gnuradio-legacy is installed; this version of gr-dvbt does not work with gnuradio-legacy
    37         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    38         return -code error "Invalid port dependency: gnuradio-legacy"
    39     }
    4035    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    4136        # gnuradio-next is installed; this version of gr-dvbt does not work with gnuradio-next
  • trunk/dports/science/gr-fcdproplus/Portfile

    r143893 r144830  
    2929depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    3030
    31 # ... but not with gnuradio-legacy or gnuradio-next
     31# ... but not with gnuradio-next
    3232
    3333pre-fetch {
    34     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    35         # gnuradio-legacy is installed; this version of gr-fcdproplus does not work with gnuradio-legacy
    36         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    37         return -code error "Invalid port dependency: gnuradio-legacy"
    38     }
    3934    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    4035        # gnuradio-next is installed; this version of gr-fcdproplus does not work with gnuradio-next
  • trunk/dports/science/gr-foo/Portfile

    r143893 r144830  
    1717depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    1818
    19 # ... but not with gnuradio-legacy or gnuradio-next
     19# ... but not with gnuradio-next
    2020
    2121pre-fetch {
    22     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    23         # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
    24         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    25         return -code error "Invalid port dependency: gnuradio-legacy"
    26     }
    2722    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    2823        # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
  • trunk/dports/science/gr-fosphor/Portfile

    r143893 r144830  
    9191depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
    9292
    93 # ... but not with gnuradio-legacy or gnuradio-next
     93# ... but not with gnuradio-next
    9494
    9595pre-fetch {
    96 
    97     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    98         # gnuradio-legacy is installed; this version of gr-forphor does not work with gnuradio-legacy
    99         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    100         return -code error "Invalid port dependency: gnuradio-legacy"
    101     }
    10296    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    10397        # gnuradio-next is installed; this version of gr-forphor does not work with gnuradio-next
  • trunk/dports/science/gr-ieee802-11/Portfile

    r143893 r144830  
    1717depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    1818
    19 # ... but not with gnuradio-legacy or gnuradio-next
     19# ... but not with gnuradio-next
    2020
    2121pre-fetch {
    22     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    23         # gnuradio-legacy is installed; this version of gr-ieee802-11 does not work with gnuradio-legacy
    24         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    25         return -code error "Invalid port dependency: gnuradio-legacy"
    26     }
    2722    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    2823        # gnuradio-next is installed; this version of gr-ieee802-11 does not work with gnuradio-next
  • trunk/dports/science/gr-ieee802-15-4/Portfile

    r143893 r144830  
    1717depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    1818
    19 # ... but not with gnuradio-legacy or gnuradio-next
     19# ... but not with gnuradio-next
    2020
    2121pre-fetch {
    22     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    23         # gnuradio-legacy is installed; this version of gr-ieee802-15-4 does not work with gnuradio-legacy
    24         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    25         return -code error "Invalid port dependency: gnuradio-legacy"
    26     }
    2722    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    2823        # gnuradio-next is installed; this version of gr-ieee802-15-4 does not work with gnuradio-next
  • trunk/dports/science/gr-iqbalance/Portfile

    r143893 r144830  
    1616platforms           darwin macosx
    1717
    18 if {${subport} eq ${name}} {
     18long_description    ${description}.  \
     19    This port is kept up with the gr-iqbal GIT 'master' branch, which is typically updated monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports.
    1920
    20     long_description    ${description}.  \
    21         This port is kept up with the gr-iqbal GIT 'master' branch, which is typically updated monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports.
     21set commit          44ab02f671dbc8765391a83d8186779fbb38baea
     22version             20140825
     23revision            6
     24checksums           rmd160 8ec7b22e2ac37c972c4f7df187f66830ab38cb1e \
     25                    sha256 e2c8f0ecc97eaebdf0178a5375181c957484c02985c8e3d018dac1cc14567232
    2226
    23     set commit          44ab02f671dbc8765391a83d8186779fbb38baea
    24     version             20140825
    25     revision            6
    26     checksums           rmd160 8ec7b22e2ac37c972c4f7df187f66830ab38cb1e \
    27                         sha256 e2c8f0ecc97eaebdf0178a5375181c957484c02985c8e3d018dac1cc14567232
     27distname            gr-iqbal-${commit}
     28master_sites        http://cgit.osmocom.org/gr-iqbal/snapshot/
    2829
    29     distname            gr-iqbal-${commit}
    30     master_sites        http://cgit.osmocom.org/gr-iqbal/snapshot/
     30conflicts           gr-iqbalance-legacy
    3131
    32     conflicts           gr-iqbalance-legacy
     32# allow gr-iqbalance to work with both gnuradio and gnuradio-devel ...
    3333
    34     # allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
     34depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    3535
    36     depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
     36# ... but not with gnuradio-next
    3737
    38     # ... but not with gnuradio-legacy or gnuradio-next
    39 
    40     pre-fetch {
    41         if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    42             # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
    43             ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    44             return -code error "Invalid port dependency: gnuradio-legacy"
    45         }
    46         if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    47             # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
    48             ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port.  deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
    49             return -code error "Invalid port dependency: gnuradio-next"
    50         }
     38pre-fetch {
     39    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
     40        # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
     41        ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port.  deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
     42        return -code error "Invalid port dependency: gnuradio-next"
    5143    }
    52 
    53     livecheck.url       http://cgit.osmocom.org/gr-iqbal/log/?h=master
    54     livecheck.version   ${commit}
    55     livecheck.regex     id=(\[a-f0-9\]+).*>HEAD<
    56 
    5744}
    5845
    59 subport gr-iqbalance-legacy {
    60 
    61     long_description    ${description}.  \
    62         This port is for the gr-iqbal gr3.6 branch, providing compatibility with GNU Radio release 3.6 API: the gnuradio-legacy port.
    63 
    64     set commit          bd3abaa3b55d4918acd054ea1f119c73cee625df
    65     version             20130919
    66     revision            3
    67     checksums           rmd160 f46f06b442b458d464302088498cf8100d31d287 \
    68                         sha256 ae2f8f31eb68c3864bb148b5099837bc6808388f018864d871e1bbfc0a65ed28
    69 
    70     distname            gr-iqbal-${commit}
    71     master_sites        http://cgit.osmocom.org/gr-iqbal/snapshot/
    72 
    73     conflicts           gr-iqbalance
    74 
    75     # gr-osmosdr-legacy works with gnuradio-legacy only
    76 
    77     depends_lib-append  port:gnuradio-legacy
    78 
    79     # patch to fix boost dependency
    80 
    81     patchfiles-append   patch-CMakeLists.txt_legacy.diff
    82 
    83     livecheck.url       http://cgit.osmocom.org/gr-iqbal/log/?h=gr3.6
    84     livecheck.version   ${commit}
    85     livecheck.regex     id=(\[a-f0-9\]+).*>gr3.6<
    86 
    87 }
     46livecheck.url       http://cgit.osmocom.org/gr-iqbal/log/?h=master
     47livecheck.version   ${commit}
     48livecheck.regex     id=(\[a-f0-9\]+).*>HEAD<
    8849
    8950depends_build-append port:pkgconfig
  • trunk/dports/science/gr-mac/Portfile

    r143893 r144830  
    1616depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    1717
    18 # ... but not with gnuradio-legacy or gnuradio-next
     18# ... but not with gnuradio-next
    1919
    2020pre-fetch {
    21     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    22         # gnuradio-legacy is installed; this version of gr-mac does not work with gnuradio-legacy
    23         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    24         return -code error "Invalid port dependency: gnuradio-legacy"
    25     }
    2621    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    2722        # gnuradio-next is installed; this version of gr-mac does not work with gnuradio-next
     
    5853configure.ldflags-delete -L${prefix}/lib
    5954
    60 # install CMake files into this directory;
    61 # for 3.7+, but will not hurt for legacy.
     55# install CMake files into this directory.
    6256
    6357configure.args-append \
  • trunk/dports/science/gr-osmosdr/Portfile

    r144530 r144830  
    1010
    1111description         gr-osmosdr provides support for OsmoSDR hardware within GNU Radio
     12long_description    Includes OSMO SDR support GNU Radio source and sink blocks in C++, Python, and GNU Radio Companion (grc).  This port also offers a wrapper functionality for the FunCube Dongle, FunCube Dongle Pro+, HackRF, RFSpace, Ettus UHD, and rtl-sdr radios and software.  By using gr-osmosdr source you can take advantage of a common software API in your applications independent of the underlying radio hardware. This port is kept up with the gr-osmosdr GIT 'master' branch, which is typically updated weekly to monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports.
    1213
    1314categories          science comms
     
    1617platforms           darwin macosx
    1718
    18 set description_common {Includes OSMO SDR support GNU Radio source and sink blocks in C++, Python, and GNU Radio Companion (grc).  This port also offers a wrapper functionality for the FunCube Dongle, FunCube Dongle Pro+, HackRF, RFSpace, Ettus UHD, and rtl-sdr radios and software.  By using gr-osmosdr source you can take advantage of a common software API in your applications independent of the underlying radio hardware.}
    19 
    20 if {${subport} eq ${name}} {
    21 
    22     long_description    ${description}.  \
    23         This port is kept up with the gr-osmosdr GIT 'master' branch, which is typically updated weekly to monthly, providing compatibility with GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports.  ${description_common}
    24 
    25     set commit          ac15e7897bb740d083c71bf02729467ca6528635
    26     version             20160110
    27     checksums           rmd160 8ee09be55819a797ae504bbbf9b0543f1121a310 \
     19set commit          ac15e7897bb740d083c71bf02729467ca6528635
     20version             20160110
     21checksums           rmd160 8ee09be55819a797ae504bbbf9b0543f1121a310 \
    2822                        sha256 c709fdd22c9e8484d272f576d11bcbd81b3fe80cb79be2c7b68dce38fd31f5c2
    2923
    30     distname            ${name}-${commit}
    31     master_sites        http://cgit.osmocom.org/gr-osmosdr/snapshot/
    32 
    33     conflicts           gr-osmosdr-legacy
    34 
    35     # allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
    36 
    37     depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    38 
    39     # ... but not with gnuradio-legacy or gnuradio-next
    40 
    41     pre-fetch {
    42         if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    43             # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
    44             ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    45             return -code error "Invalid port dependency: gnuradio-legacy"
    46         }
    47         if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    48             # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
    49             ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port.  deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
    50             return -code error "Invalid port dependency: gnuradio-next"
    51         }
     24distname            ${name}-${commit}
     25master_sites        http://cgit.osmocom.org/gr-osmosdr/snapshot/
     26
     27# allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
     28
     29depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
     30
     31# ... but not with gnuradio-next
     32
     33pre-fetch {
     34    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
     35        # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
     36        ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port.  deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
     37        return -code error "Invalid port dependency: gnuradio-next"
    5238    }
    53 
    54     livecheck.url       http://cgit.osmocom.org/gr-osmosdr/log/?h=master
    55     livecheck.version   ${commit}
    56     livecheck.regex     id=(\[a-f0-9\]+).*>HEAD<
    57 
    58 }
    59 
    60 subport gr-osmosdr-legacy {
    61 
    62     long_description    ${description}.  \
    63         This port is for the gr-osmosdr gr3.6 branch, providing compatibility with GNU Radio release 3.6 API: the gnuradio-legacy port.  ${description_common}
    64 
    65     set commit          c7cb045fcb091243aee3e47dd6fdfd0faba89f69
    66     version             20140503
    67     revision            12
    68     checksums           rmd160 e01366b76fbe3cdf9d7634c32b276ab73cce115e \
    69                         sha256 4d5587c677bd1e2395fec19f67a3a1a5366fe2196ceda1e1954503fb89b94d91
    70 
    71     distname            ${name}-${commit}
    72     master_sites        http://cgit.osmocom.org/gr-osmosdr/snapshot/
    73 
    74     conflicts           gr-osmosdr
    75 
    76     # gr-osmosdr-legacy works with gnuradio-legacy only
    77 
    78     depends_lib-append  port:gnuradio-legacy
    79 
    80     livecheck.url       http://cgit.osmocom.org/gr-osmosdr/log/?h=gr3.6
    81     livecheck.version   ${commit}
    82     livecheck.regex     id=(\[a-f0-9\]+).*>gr3.6<
    83 
    84 }
     39}
     40
     41livecheck.url       http://cgit.osmocom.org/gr-osmosdr/log/?h=master
     42livecheck.version   ${commit}
     43livecheck.regex     id=(\[a-f0-9\]+).*>HEAD<
    8544
    8645# do VPATH (out of source tree) build
     
    151110    # require gnuradio to also have this variant
    152111
    153     if {${subport} eq "gr-osmosdr-legacy"} {
    154 
    155         require_active_variants port:gnuradio-legacy uhd
    156 
    157     } else {
    158 
    159         require_active_variants \
    160             path:lib/libgnuradio-runtime.dylib:gnuradio uhd
    161 
    162     }
     112    require_active_variants \
     113        path:lib/libgnuradio-runtime.dylib:gnuradio uhd
    163114
    164115    configure.args-append \
     
    189140    # require gnuradio to also have this variant
    190141
    191     if {${subport} eq "gr-osmosdr-legacy"} {
    192 
    193         require_active_variants port:gnuradio-legacy swig
    194 
    195     } else {
    196 
    197         require_active_variants \
    198             path:lib/libgnuradio-runtime.dylib:gnuradio swig
    199 
    200     }
     142    require_active_variants \
     143        path:lib/libgnuradio-runtime.dylib:gnuradio swig
    201144
    202145    configure.args-append \
     
    225168}
    226169
    227 # fcdproplus works with gnuradio 3.7+ API only; it does not provide a
    228 # 3.6 API legacy version
    229 
    230 if {${subport} eq ${name}} {
    231 
    232     variant fcdproplus description "Install ${name} with support for FunCube Dongle Pro+ (fcdproplus)" {
    233 
    234         depends_lib-append port:gr-fcdproplus
    235         configure.args-append -DENABLE_FCDPP=ON
    236 
    237     }
    238 
    239     if {![variant_isset fcdproplus]} {
    240 
    241         configure.args-append -DENABLE_FCDPP=OFF
    242 
    243     }
     170variant fcdproplus description "Install ${name} with support for FunCube Dongle Pro+ (fcdproplus)" {
     171
     172    depends_lib-append port:gr-fcdproplus
     173    configure.args-append -DENABLE_FCDPP=ON
     174
     175}
     176
     177if {![variant_isset fcdproplus]} {
     178
     179    configure.args-append -DENABLE_FCDPP=OFF
     180
    244181}
    245182
  • trunk/dports/science/gr-pyqt/Portfile

    r143893 r144830  
    1616depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    1717
    18 # ... but not with gnuradio-legacy or gnuradio-next
     18# ... but not with gnuradio-next
    1919
    2020pre-fetch {
    21     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    22         # gnuradio-legacy is installed; this version of gr-pyqt does not work with gnuradio-legacy
    23         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    24         return -code error "Invalid port dependency: gnuradio-legacy"
    25     }
    2621    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    2722        # gnuradio-next is installed; this version of gr-pyqt does not work with gnuradio-next
  • trunk/dports/science/gr-rds/Portfile

    r143893 r144830  
    66PortGroup           github 1.0
    77
    8 github.setup        bastibl gr-rds 201f32bb15e738fc8491039c7176b9b1643c27e2
    9 version             20150512
    10 revision            3
    11 checksums           rmd160 8c3f95fd214dd890aedbf72b72d2de17a57688a6 \
    12                     sha256 c98efac2472fe025a6d1f62e53e513783783a4bb887ffc7a9cf4ae6155ba3a47
     8github.setup        bastibl gr-rds 74f231d60d1533e3491360eba1b4372312b55d73
     9version             20160114
     10checksums           rmd160 107f7fe75f15dbd9be8c5746b2df994a253e09c2 \
     11                    sha256 7c3941d0570ae33e34e46a4739a12c3b6e63332f16aeb8a0fefbcf1612e8c2da
    1312
    1413categories          science comms
     
    2625depends_run-append  port:gr-osmosdr
    2726
    28 # allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
     27# allow gr-rds to work with both gnuradio and gnuradio-devel ...
    2928
    3029depends_lib-append  path:lib/libgnuradio-runtime.dylib:gnuradio
    3130
    32 # ... but not with gnuradio-legacy or gnuradio-next
     31# ... but not with gnuradio-next
    3332
    3433pre-fetch {
    35     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
    36         # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
    37         ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n"
    38         return -code error "Invalid port dependency: gnuradio-legacy"
    39     }
    4034    if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
    41         # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
     35        # gnuradio-next is installed; this version of gr-rds does not work with gnuradio-next
    4236        ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port.  deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
    4337        return -code error "Invalid port dependency: gnuradio-next"
  • trunk/dports/science/volk/Portfile

    r144602 r144830  
    1414license             GPL-3
    1515platforms           darwin
    16 
    17 # gnuradio legacy still provides volk
    18 conflicts           gnuradio-legacy
    1916
    2017# common directory for storing downloaded tarballs
Note: See TracChangeset for help on using the changeset viewer.