Ticket #50768: wxWidgets-common.diff

File wxWidgets-common.diff, 13.4 KB (added by mojca (Mojca Miklavec), 9 years ago)

move common files to a separate port

  • graphics/wxWidgets-2.8/Portfile

     
    99
    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
    1515
    … …  
    6969                    port:libiconv \
    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 \
    7880                    lib/libtiff.dylib \
    … …  
    9294post-patch {
    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
    97102configure.cmd       ../configure
    … …  
    164169    # maybe not needed
    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}
    170173
    171 destroot.keepdirs ${destroot}${prefix}/share/bakefile/presets
    172 
    173174variant aui description {add support for AUI docking library} {
    174175    configure.args-append    --enable-aui
    175176}

  • graphics/wxWidgets-2.8/files/wxWidgets-2.8

     
    1 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/2.8/bin/wx-config
    2 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/2.8/bin/wxrc-2.8
    3 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/2.8/share/aclocal/wxwin.m4
    4 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/2.8/share/bakefile/presets/wx.bkl
    5 -
    6 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/2.8/share/bakefile/presets/wx_unix.bkl
    7 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/2.8/share/bakefile/presets/wx_win32.bkl
    8 -

  • graphics/wxWidgets-2.8/files/wxgtk-2.8

     
    1 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/bin/wx-config
    2 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/bin/wxrc-2.8
    3 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/share/aclocal/wxwin.m4
    4 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/share/bakefile/presets/wx.bkl
    5 -
    6 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/share/bakefile/presets/wx_unix.bkl
    7 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/2.8/share/bakefile/presets/wx_win32.bkl
    8 -

  • graphics/wxWidgets-3.0/Portfile

     
    1111subport             wxPython-3.0 {}
    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
    1717
    … …  
    2626} elseif {${subport} eq "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
    3232    # wxgtk-3.0 is here mainly for testing purposes
    … …  
    7979    }
    8080}
    8181
    82 depends_run         port:wxWidgets_select
     82depends_run         port:wxWidgets-common \
     83                    port:wxWidgets_select
    8384
     85set selectdir       ${workpath}/select
    8486select.group        wxWidgets
    85 select.file         ${filespath}/${subport}
     87select.file         ${selectdir}/${subport}
    8688
    8789worksrcdir          ${distname}-${version}/build
    8890
    … …  
    9496
    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
    99104configure.cmd       ../configure
    … …  
    201206post-destroot {
    202207    set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${branch}
    203208    ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
    204     xinstall -m 755 -d ${destroot}${prefix}/share/bakefile/presets
    205209}
    206210
    207 destroot.keepdirs ${destroot}${prefix}/share/bakefile/presets
    208 
    209211variant universal {
    210212    set archs [join ${configure.universal_archs} ,]
    211213    # --disable-precomp-headers is automatically selected with cocoa, but not with gtk
    … …  
    232234
    233235livecheck.type      regex
    234236livecheck.url       ${homepage}/downloads/
    235 livecheck.regex     Release.*(\[23\]\\.\[0-9\]\\.\[0-9\]+)
     237livecheck.regex     Release.*(3\\.0\\.\[0-9\]+)

  • graphics/wxWidgets-3.0/files/wxPython-3.0

     
    1 ${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/bin/wx-config
    2 ${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/bin/wxrc-3.0
    3 ${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/aclocal/wxwin.m4
    4 ${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx.bkl
    5 ${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_presets.py
    6 ${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_unix.bkl
    7 ${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_win32.bkl
    8 ${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_xrc.bkl

  • graphics/wxWidgets-3.0/files/wxWidgets-3.0

     
    1 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/bin/wx-config
    2 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/bin/wxrc-3.0
    3 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/aclocal/wxwin.m4
    4 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/bakefile/presets/wx.bkl
    5 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/bakefile/presets/wx_presets.py
    6 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/bakefile/presets/wx_unix.bkl
    7 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/bakefile/presets/wx_win32.bkl
    8 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/bakefile/presets/wx_xrc.bkl

  • graphics/wxWidgets-3.0/files/wxWidgets-3.0-libcxx

     
    1 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0-libcxx/bin/wx-config
    2 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0-libcxx/bin/wxrc-3.0
    3 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0-libcxx/share/aclocal/wxwin.m4
    4 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0-libcxx/share/bakefile/presets/wx.bkl
    5 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0-libcxx/share/bakefile/presets/wx_presets.py
    6 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0-libcxx/share/bakefile/presets/wx_unix.bkl
    7 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0-libcxx/share/bakefile/presets/wx_win32.bkl
    8 ${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0-libcxx/share/bakefile/presets/wx_xrc.bkl

  • graphics/wxWidgets-3.0/files/wxgtk-3.0

     
    1 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/bin/wx-config
    2 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/bin/wxrc-3.0
    3 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/aclocal/wxwin.m4
    4 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/bakefile/presets/wx.bkl
    5 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/bakefile/presets/wx_presets.py
    6 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/bakefile/presets/wx_unix.bkl
    7 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/bakefile/presets/wx_win32.bkl
    8 ${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/bakefile/presets/wx_xrc.bkl

  • graphics/wxWidgets-common/Portfile

     
     1# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
     2# $Id$
     3
     4PortSystem          1.0
     5
     6name                wxWidgets-common
     7version             3.1.0
     8
     9categories          graphics devel
     10platforms           darwin
     11license             wxwidgets-3.1
     12maintainers         mojca jwa openmaintainer
     13
     14master_sites        https://raw.githubusercontent.com/wxWidgets/wxWidgets/v${version}/:main \
     15                    https://raw.githubusercontent.com/wxWidgets/wxWidgets/v${version}/build/bakefiles/wxpresets/presets/:bake
     16
     17# potentially more files in the future
     18distfiles           wxwin.m4:main \
     19                    wx.bkl:bake \
     20                    wx_presets.py:bake \
     21                    wx_unix.bkl:bake \
     22                    wx_win32.bkl:bake \
     23                    wx_xrc.bkl:bake \
     24
     25extract.only
     26
     27dist_subdir         wxWidgets/${version}
     28
     29checksums           wxwin.m4 \
     30                    rmd160  efd174cb60fed37da1581cf226b68c236e60aa78 \
     31                    sha256  f4d9a0bcdee2065956c7c1a928ac2c285fc8302d1d9423188006b17c36b1d535 \
     32                    wx.bkl \
     33                    rmd160  9f4bcff4a36b0f53039cdbb41978a2e6a2863d91 \
     34                    sha256  59fe0a38c46f885412ce76e0a2959acf947d468db7332af2299713051f8392ad \
     35                    wx_presets.py \
     36                    rmd160  a640c4c7fc6f7568d3af4ff37a3f1bb7bb771024 \
     37                    sha256  b306047d3668ddaf5c178f5dcf66342983bd564a5fa43a23997a837f3103aadb \
     38                    wx_unix.bkl \
     39                    rmd160  db4e42372ec0a73f76285eef4af7fdc10aa51e58 \
     40                    sha256  8fdda613c2cbe7c2f8a9c213fc24227151c535efee4c1d85ff0a6b77bd0dc059 \
     41                    wx_win32.bkl \
     42                    rmd160  54a0405b68166aa6e2bc9c8bea70dffb6cda8285 \
     43                    sha256  7514af88ed6882ee791f279c840810d5a98cc73b0397e969726b3fb631243cd5 \
     44                    wx_xrc.bkl \
     45                    rmd160  059754a4f42fca46e392bdae4aa8611b5c895232 \
     46                    sha256  6d801e0d5759fbf4a06f07ffcc7defcbf2e1a5b241b36ac68cf44646efb829e8
     47
     48use_configure       no
     49build {}
     50
     51destroot {
     52    xinstall -m 755 -d ${destroot}${prefix}/share/aclocal
     53    xinstall -m 755 -d ${destroot}${prefix}/share/bakefile/presets
     54    xinstall -m 644 ${distpath}/wxwin.m4 ${destroot}${prefix}/share/aclocal
     55    foreach f {wx.bkl wx_presets.py wx_unix.bkl wx_win32.bkl wx_xrc.bkl} {
     56        xinstall -m 644 ${distpath}/${f} ${destroot}${prefix}/share/bakefile/presets
     57    }
     58}
     59
     60# TODO: pre-activate step to clean up any remainings/leftovers

  • sysutils/wxWidgets_select/Portfile 

    Property changes on: graphics/wxWidgets-common/Portfile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
     
    77
    88name                wxWidgets_select
    99version             1.0
     10revision            1
    1011categories          sysutils graphics
    1112platforms           darwin
    1213maintainers         nomaintainer

  • sysutils/wxWidgets_select/files/base

     
    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

  • sysutils/wxWidgets_select/files/none

     
    11-
    22-
    3 -
    4 -
    5 -
    6 -
    7 -
    8 -