Changeset 146366


Ignore:
Timestamp:
Mar 6, 2016, 1:17:29 PM (3 years ago)
Author:
mojca@…
Message:

wxWidgets: move some files to a different port (closes #50768)

  • wxWidgets-common
    • new port with m4 and bakefiles from the latest release
  • wxWidgets_select
    • remove m4 and bakefiles
  • wxWidgets-2.8, wxWidgets-3.0
    • remove livecheck from subports
    • adjust livecheck for version 3.0 (avoid 3.1.x)
    • remove m4 and bakefiles from port select
    • auto-generate files for port select
  • wxgtk-3.0
    • add variants quartz and x11

See also #47755.

Location:
trunk/dports
Files:
3 added
6 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/graphics/wxWidgets-2.8/Portfile

    r132857 r146366  
    1010name                wxWidgets-2.8
    1111version             2.8.12
    12 revision            2
     12revision            3
    1313set branch          [join [lrange [split ${version} .] 0 1] .]
    1414set wxpythonsubset  wxPython-2.8.12.1-MacPorts-subset
     
    7070                    port:expat
    7171
    72 depends_run         port:wxWidgets_select
     72depends_run         port:wxWidgets-common\
     73                    port:wxWidgets_select
    7374
     75set selectdir       ${workpath}/select
    7476select.group        wxWidgets
    75 select.file         ${filespath}/${subport}
     77select.file         ${selectdir}/${subport}
    7678
    7779archcheck.files     lib/libjpeg.dylib \
     
    9395    reinplace "s|@@ARCHS@@|[get_canonical_archflags]|g" ${patch.dir}/configure
    9496    reinplace "s|@@PREFIX@@|${prefix}|g"                ${patch.dir}/configure
     97
     98    file mkdir ${selectdir}
     99    system "echo \"${wxWidgets.wxdir}/wx-config\n${wxWidgets.wxdir}/wxrc-${branch}\" > ${select.file}"
    95100}
    96101
     
    165170    set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${installtype}-${branch}
    166171    ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
    167 
    168     xinstall -m 755 -d ${destroot}${prefix}/share/bakefile/presets
    169172}
    170 
    171 destroot.keepdirs ${destroot}${prefix}/share/bakefile/presets
    172173
    173174variant aui description {add support for AUI docking library} {
     
    184185}
    185186
    186 # when version 3.0 gets released, the livecheck won't be valid any more
    187 livecheck.type      regex
    188 livecheck.url       ${homepage}/downloads/
    189 livecheck.regex     Previous Stable Release.*(2\\.8\\.\[0-9\]+)
     187
     188if {${subport} eq ${name}} {
     189    # when version 3.2 gets released, the livecheck might not be valid any more
     190    livecheck.type  regex
     191    livecheck.url   ${homepage}/downloads/
     192    livecheck.regex Previous Stable Release.*(2\\.8\\.\[0-9\]+)
     193} else {
     194    livecheck.type  none
     195}
  • trunk/dports/graphics/wxWidgets-3.0/Portfile

    r138534 r146366  
    1212subport             wxgtk-3.0 {}
    1313version             3.0.2
    14 revision            3
     14revision            4
    1515set wxpython_ver    3.0.2.0
    1616# when revbumping remember to change the revision also for wxPython-3.0
     
    2727    wxWidgets.use   wxPython-3.0
    2828    version         3.0.2
    29     revision        4
     29    revision        5
    3030} elseif {${subport} eq "wxgtk-3.0"} {
    3131    # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
     
    8080}
    8181
    82 depends_run         port:wxWidgets_select
    83 
     82depends_run         port:wxWidgets-common \
     83                    port:wxWidgets_select
     84
     85set selectdir       ${workpath}/select
    8486select.group        wxWidgets
    85 select.file         ${filespath}/${subport}
     87select.file         ${selectdir}/${subport}
    8688
    8789worksrcdir          ${distname}-${version}/build
     
    9597post-patch {
    9698    reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
     99
     100    file mkdir ${selectdir}
     101    system "echo \"${wxWidgets.wxdir}/wx-config\n${wxWidgets.wxdir}/wxrc-${branch}\" > ${select.file}"
    97102}
    98103
     
    149154    #
    150155    # patch-sdl.diff: the patch allows using --with-sdl
    151     patchfiles-append       patch-sdl.diff
     156    # patch-gtk-quartz.diff: avoid build failure for wxgtk3 +quartz (the patch is not yet complete)
     157    patchfiles-append       patch-sdl.diff \
     158                            patch-gtk-quartz.diff
    152159
    153160    depends_build-append    port:pkgconfig
     
    169176        configure.args-append   --with-gtk=3
    170177    #}
    171     #variant quartz conflicts x11 {
    172     #    require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
    173     #    require_active_variants gtk3 quartz
    174     #}
    175     #variant x11 conflicts quartz {
     178    variant quartz conflicts x11 description "(Doesn't work properly yet)" {
     179       require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
     180       require_active_variants gtk3 quartz
     181    }
     182    variant x11 conflicts quartz {
    176183        depends_lib-append  port:mesa port:libGLU
    177184        require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
    178185        require_active_variants gtk3 x11
    179     #}
     186    }
    180187    #if{![variant_isset gtk2] && ![variant_isset gtk3]} {
    181188    #    default_variants-append +gtk3
    182189    #}
    183     #if{![variant_isset quartz] && ![variant_isset x11]} {
    184     #    default_variants-append +quartz
    185     #}
     190    if {![variant_isset quartz] && ![variant_isset x11]} {
     191        if {[active_variants gtk3 quartz ""]} {
     192            default_variants-append +quartz
     193        } else {
     194            default_variants-append +x11
     195        }
     196    }
    186197    #if{[variant_isset gtk2]} {
    187198    #    if{[variant_isset quartz]} {
     
    202213    set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${branch}
    203214    ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
    204     xinstall -m 755 -d ${destroot}${prefix}/share/bakefile/presets
    205 }
    206 
    207 destroot.keepdirs ${destroot}${prefix}/share/bakefile/presets
     215}
    208216
    209217variant universal {
     
    231239}
    232240
    233 livecheck.type      regex
    234 livecheck.url       ${homepage}/downloads/
    235 livecheck.regex     Release.*(\[23\]\\.\[0-9\]\\.\[0-9\]+)
     241if {${subport} eq ${name}} {
     242    livecheck.type  regex
     243    livecheck.url   ${homepage}/downloads/
     244    livecheck.regex Release.*(3\\.0\\.\[0-9\]+)
     245} else {
     246    livecheck.type  none
     247}
  • trunk/dports/sysutils/wxWidgets_select/Portfile

    r110235 r146366  
    88name                wxWidgets_select
    99version             1.0
     10revision            1
    1011categories          sysutils graphics
    1112platforms           darwin
  • trunk/dports/sysutils/wxWidgets_select/files/base

    r110235 r146366  
    11bin/wx-config
    22bin/wxrc
    3 share/aclocal/wxwin.m4
    4 share/bakefile/presets/wx.bkl
    5 share/bakefile/presets/wx_presets.py
    6 share/bakefile/presets/wx_unix.bkl
    7 share/bakefile/presets/wx_win32.bkl
    8 share/bakefile/presets/wx_xrc.bkl
  • trunk/dports/sysutils/wxWidgets_select/files/none

    r110235 r146366  
    11-
    22-
    3 -
    4 -
    5 -
    6 -
    7 -
    8 -
Note: See TracChangeset for help on using the changeset viewer.