Changeset 116163 for trunk/dports/gis


Ignore:
Timestamp:
Jan 20, 2014, 1:46:28 PM (6 years ago)
Author:
mojca@…
Message:

grass: add support also for Carbon-based wxWidgets 2.8 (untested, temporary before wx3.0 support is complete)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/gis/grass/Portfile

    r116079 r116163  
    352352#       --disable-wxwidgets if there is demand for that
    353353#       grass 4.6.3 is not compatible with wxWidgets 3.0 yet
    354 variant wxwidgets30 conflicts wxgtk28 description {Use Cocoa-based wxWidgets 3.0 (experimental)} {
     354variant wxwidgets30 conflicts wxwidgets28 wxgtk28 description {Use Cocoa-based wxWidgets 3.0 (experimental)} {
    355355    wxWidgets.use         wxPython-3.0
    356356    depends_lib-append    port:${wxWidgets.port}
    357357    configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
    358358}
    359 variant wxgtk28 conflicts wxwidgets30 description {Use GTK-based wxWidgets 2.8} {
     359variant wxwidgets28 conflicts wxwidgets30 wxgtk28 description {Use Carbon-based wxWidgets 2.8} {
     360    # untested (might not work)
     361    wxWidgets.use         wxWidgets-2.8
     362    depends_lib-append    port:${wxWidgets.port}
     363    configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
     364}
     365variant wxgtk28 conflicts wxwidgets30 wxwidgets28 description {Use GTK-based wxWidgets 2.8} {
    360366    wxWidgets.use         wxGTK-2.8
    361367    depends_lib-append    port:${wxWidgets.port}
     
    363369}
    364370
    365 if {![variant_isset wxwidgets30] && ![variant_isset wxgtk28]} {
     371if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
    366372    default_variants-append +wxgtk28
    367373}
    368374if {![variant_isset python26] && ![variant_isset python27]} {
    369     if {[variant_isset wxgtk28]} {
     375    if {[variant_isset wxgtk28] || [variant_isset wxwidgets28]} {
    370376        default_variants-append +python26
    371377    } else {
     
    375381
    376382# TODO: if py27-wxpython-3.0 is installed, grass +wxgtk28 cannot be installed with +python27
    377 #       we could remove this by disabling wxpython support altogether
     383#       we could remove this limitation by disabling wxpython support altogether
    378384#       (in case there is demand for it)
    379 if {[variant_isset wxgtk28]} {
    380     if {[variant_isset python26]} {
    381         depends_lib-append port:py26-wxpython-2.8
    382         require_active_variants py26-wxpython-2.8 gtk carbon
    383     } elseif {[variant_isset python27]} {
    384         depends_lib-append port:py27-wxpython-2.8
    385         require_active_variants py27-wxpython-2.8 gtk carbon
    386     }
    387 } elseif {[variant_isset wxwidgets30]} {
     385# TODO: the code below is ugly; any suggestions for improving it are welcome
     386if {[variant_isset wxwidgets30]} {
    388387    if {[variant_isset python26]} {
    389388        depends_lib-append port:py26-wxpython-3.0
     
    391390        depends_lib-append port:py27-wxpython-3.0
    392391    }
     392} else {
     393    if {[variant_isset python26]} {
     394        depends_lib-append port:py26-wxpython-2.8
     395        if {[variant_isset wxwidgets28]} {
     396            require_active_variants py26-wxpython-2.8 carbon gtk
     397        } else {
     398            require_active_variants py26-wxpython-2.8 gtk carbon
     399        }
     400    } elseif {[variant_isset python27]} {
     401        depends_lib-append port:py27-wxpython-2.8
     402        if {[variant_isset wxwidgets28]} {
     403            require_active_variants py27-wxpython-2.8 carbon gtk
     404        } else {
     405            require_active_variants py27-wxpython-2.8 gtk carbon
     406        }
     407    }
    393408}
    394409
Note: See TracChangeset for help on using the changeset viewer.