Changeset 47716


Ignore:
Timestamp:
Mar 4, 2009, 1:25:16 PM (11 years ago)
Author:
ryandesign@…
Message:

cairo, cairo-devel, pango, pango-devel: Quartz and ATSUI features are now optional via a new +quartz variant; fixes #16778 and should help #15626

Location:
trunk/dports
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/graphics/cairo-devel/Portfile

    r47543 r47716  
    77set my_name             cairo
    88version                 1.7.6
    9 revision                3
     9revision                4
    1010categories              graphics
    1111maintainers             ryandesign
     
    108108}
    109109
     110platform macosx {}
     111variant quartz requires macosx description {Add Quartz graphics interface} {
     112    if {${os.major} < 8} {
     113        ui_msg "cairo's Quartz support is only available on Mac OS X 10.4 or greater"
     114        return -code error "incompatible Mac OS X version"
     115    }
     116    configure.args-delete \
     117        --disable-quartz \
     118        --disable-quartz-font \
     119        --disable-quartz-image
     120    configure.args-append \
     121        --enable-quartz \
     122        --enable-quartz-font \
     123        --enable-quartz-image
     124}
     125
    110126variant no_x11 conflicts glitz x11_xcb {
    111127    depends_lib-delete \
     
    128144}
    129145
    130 platform macosx {
    131     if {${os.major} > 7} {
    132         configure.args-delete \
    133             --disable-quartz \
    134             --disable-quartz-font \
    135             --disable-quartz-image \
    136        
    137         configure.args-append \
    138             --enable-quartz \
    139             --enable-quartz-font \
    140             --enable-quartz-image \
    141     }
    142 }
    143 
    144146livecheck.check         regex
    145147livecheck.url           ${homepage}news/
  • trunk/dports/graphics/cairo/Portfile

    r47541 r47716  
    77set my_name             cairo
    88version                 1.8.6
    9 revision                3
     9revision                4
    1010categories              graphics
    1111maintainers             ryandesign
     
    108108}
    109109
     110platform macosx {}
     111variant quartz requires macosx description {Add Quartz graphics interface} {
     112    if {${os.major} < 8} {
     113        ui_msg "cairo's Quartz support is only available on Mac OS X 10.4 or greater"
     114        return -code error "incompatible Mac OS X version"
     115    }
     116    configure.args-delete \
     117        --disable-quartz \
     118        --disable-quartz-font \
     119        --disable-quartz-image
     120    configure.args-append \
     121        --enable-quartz \
     122        --enable-quartz-font \
     123        --enable-quartz-image
     124}
     125
    110126variant no_x11 conflicts glitz x11_xcb {
    111127    depends_lib-delete \
     
    128144}
    129145
    130 platform macosx {
    131     if {${os.major} > 7} {
    132         configure.args-delete \
    133             --disable-quartz \
    134             --disable-quartz-font \
    135             --disable-quartz-image \
    136        
    137         configure.args-append \
    138             --enable-quartz \
    139             --enable-quartz-font \
    140             --enable-quartz-image \
    141     }
    142 }
    143 
    144146test.run                yes
    145147test.target             check
  • trunk/dports/x11/pango-devel/Portfile

    r45603 r47716  
    66set my_name             pango
    77version                 1.21.6
    8 revision                2
     8revision                3
    99set branch              [join [lrange [split ${version} .] 0 1] .]
    1010categories              x11
     
    4444configure.ccache        no
    4545
     46platform macosx {}
     47variant quartz requires macosx description {Add Quartz graphics interface} {}
     48
    4649pre-configure {
    4750    set glib_minimum_version 2.17.3
     
    5558    if {[rpm-vercomp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
    5659        return -code error "pango ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
     60    }
     61   
     62    set cairo_quartz_pc ${prefix}/lib/pkgconfig/cairo-quartz.pc
     63    if {[variant_isset quartz]} {
     64        if {![file exists ${cairo_quartz_pc}]} {
     65            ui_msg "To install pango with the quartz variant, cairo must be installed with the quartz variant."
     66            return -code error "incompatible cairo installation"
     67        }
     68    } else {
     69        if {[file exists ${cairo_quartz_pc}]} {
     70            ui_msg "To install pango without the quartz variant, cairo must be installed without the quartz variant."
     71            return -code error "incompatible cairo installation"
     72        }
    5773    }
    5874}
  • trunk/dports/x11/pango/Portfile

    r47527 r47716  
    55name                    pango
    66version                 1.22.4
    7 revision                2
     7revision                3
    88set branch              [join [lrange [split ${version} .] 0 1] .]
    99categories              x11
     
    4141configure.ccache        no
    4242
     43platform macosx {}
     44variant quartz requires macosx description {Add Quartz graphics interface} {}
     45
    4346pre-configure {
    4447    set glib_minimum_version 2.17.3
     
    5255    if {[rpm-vercomp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
    5356        return -code error "pango ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
     57    }
     58   
     59    set cairo_quartz_pc ${prefix}/lib/pkgconfig/cairo-quartz.pc
     60    if {[variant_isset quartz]} {
     61        if {![file exists ${cairo_quartz_pc}]} {
     62            ui_msg "To install pango with the quartz variant, cairo must be installed with the quartz variant."
     63            return -code error "incompatible cairo installation"
     64        }
     65    } else {
     66        if {[file exists ${cairo_quartz_pc}]} {
     67            ui_msg "To install pango without the quartz variant, cairo must be installed without the quartz variant."
     68            return -code error "incompatible cairo installation"
     69        }
    5470    }
    5571}
Note: See TracChangeset for help on using the changeset viewer.