Ticket #46338: vim-python.patch

File vim-python.patch, 11.8 KB (added by larryv (Lawrence Velázquez), 10 years ago)

  • dports/editors/MacVim/Portfile 

    diff --git a/dports/editors/MacVim/Portfile b/dports/editors/MacVim/Portfile
index 24074ad..db7f13a 100644
    a b set vim_version 7.4 
    88set snapshot        73
    99set gitcommit       snapshot-${snapshot}
    1010version             ${vim_version}.snapshot${snapshot}
     11revision            1
    1112categories          editors
    1213platforms           darwin
    1314license             Vim GPL-2+
    … … variant perl description {Enable Perl scripting} { 
    124125    configure.args-append   --enable-perlinterp
    125126    depends_lib-append      path:bin/perl:perl5
    126127}
    127 variant python requires python25 description {Compatibility variant, requires +python25} {}
    128 variant python25 conflicts python26 python27 description {Enable Python scripting} {
    129     configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.5
    130     patchfiles-append       patch-python.diff
    131     depends_lib-append      port:python25
    132128
    133     use_autoconf yes
    134 }
    135 variant python26 conflicts python25 python27 description {Enable Python scripting} {
     129# TODO: Remove after 2015-12-26.
     130variant python25 requires python27 description {Legacy variant} {}
     131variant python31 requires python34 description {Legacy variant} {}
     132variant python32 requires python34 description {Legacy variant} {}
     133
     134variant python26 conflicts python27 description {Enable Python scripting} {
    136135    configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.6
    137136    patchfiles-append       patch-python.diff
    138137    depends_lib-append      port:python26
    139138
    140139    use_autoconf yes
    141140}
    142 variant python27 conflicts python25 python26 description {Enable Python scripting} {
     141variant python27 conflicts python26 description {Enable Python scripting} {
    143142    configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.7
    144143    patchfiles-append       patch-python.diff
    145144    depends_lib-append      port:python27
    146145
    147146    use_autoconf yes
    148147}
    149 variant python31 conflicts python32 python33 python34 description {Enable Python scripting} {
    150     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.1
    151     patchfiles-append       patch-python3.diff
    152     depends_lib-append      port:python31
    153 
    154     use_autoconf yes
    155 }
    156 variant python32 conflicts python31 python33 python34 description {Enable Python scripting} {
    157     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.2
    158     patchfiles-append       patch-python3.diff
    159     depends_lib-append      port:python32
    160 
    161     use_autoconf yes
    162     # Overwriting autoconf.cmd above removes dependency, add it again
    163     depends_build-append port:autoconf
    164 }
    165 variant python33 conflicts python31 python32 python34 description {Enable Python scripting} {
     148variant python33 conflicts python34 description {Enable Python scripting} {
    166149    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.3
    167150    patchfiles-append       patch-python3.diff
    168151    depends_lib-append      port:python33
    … … variant python33 conflicts python31 python32 python34 description {Enable Python 
    171154    # Overwriting autoconf.cmd above removes dependency, add it again
    172155    depends_build-append port:autoconf
    173156}
    174 variant python34 conflicts python31 python32 python33 description {Enable Python scripting} {
     157variant python34 conflicts python33 description {Enable Python scripting} {
    175158    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.4
    176159    patchfiles-append       patch-python3.diff
    177160    depends_lib-append      port:python34

  • dports/editors/vim-app/Portfile 

    diff --git a/dports/editors/vim-app/Portfile b/dports/editors/vim-app/Portfile
index c59d23e..27241d4 100644
    a b set realname vim 
    77set vim_version     7.4
    88set vim_patchlevel  258
    99version             ${vim_version}.${vim_patchlevel}
     10revision            1
    1011categories          editors
    1112platforms           darwin
    1213license             Vim GPL-2+
    … … variant perl description {Enable Perl scripting} { 
    430431    configure.args-append   --enable-perlinterp
    431432    depends_lib-append      path:bin/perl:perl5
    432433}
    433 variant python requires python25 description {Compatibility variant, requires +python25} {}
    434 variant python25 conflicts python26 python27 description {Enable Python scripting} {
    435     configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.5
    436     patchfiles-append       patch-python.diff
    437     depends_lib-append      port:python25
    438434
    439     use_autoconf yes
    440     # Overwriting autoconf.cmd above removes dependency, add it again
    441     depends_build-append port:autoconf
    442 }
    443 variant python26 conflicts python25 python27 description {Enable Python scripting} {
     435# TODO: Remove after 2015-12-26.
     436variant python25 requires python27 description {Legacy variant} {}
     437variant python31 requires python34 description {Legacy variant} {}
     438variant python32 requires python34 description {Legacy variant} {}
     439
     440variant python26 conflicts python27 description {Enable Python scripting} {
    444441    configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.6
    445442    patchfiles-append       patch-python.diff
    446443    depends_lib-append      port:python26
    … … variant python26 conflicts python25 python27 description {Enable Python scriptin 
    449446    # Overwriting autoconf.cmd above removes dependency, add it again
    450447    depends_build-append port:autoconf
    451448}
    452 variant python27 conflicts python25 python26 description {Enable Python scripting} {
     449variant python27 conflicts python26 description {Enable Python scripting} {
    453450    configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.7
    454451    patchfiles-append       patch-python.diff
    455452    depends_lib-append      port:python27
    … … variant python27 conflicts python25 python26 description {Enable Python scriptin 
    458455    # Overwriting autoconf.cmd above removes dependency, add it again
    459456    depends_build-append port:autoconf
    460457}
    461 variant python31 conflicts python32 python33 python34 description {Enable Python scripting} {
    462     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.1
    463     patchfiles-append       patch-python3.diff
    464     depends_lib-append      port:python31
    465 
    466     use_autoconf yes
    467     # Overwriting autoconf.cmd above removes dependency, add it again
    468     depends_build-append port:autoconf
    469 }
    470 variant python32 conflicts python31 python33 python34 description {Enable Python scripting} {
    471     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.2
    472     patchfiles-append       patch-python3.diff
    473     depends_lib-append      port:python32
    474 
    475     use_autoconf yes
    476     # Overwriting autoconf.cmd above removes dependency, add it again
    477     depends_build-append port:autoconf
    478 }
    479 variant python33 conflicts python31 python32 python34 description {Enable Python scripting} {
     458variant python33 conflicts python34 description {Enable Python scripting} {
    480459    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.3
    481460    patchfiles-append       patch-python3.diff
    482461    depends_lib-append      port:python33
    … … variant python33 conflicts python31 python32 python34 description {Enable Python 
    485464    # Overwriting autoconf.cmd above removes dependency, add it again
    486465    depends_build-append port:autoconf
    487466}
    488 variant python34 conflicts python31 python32 python33 description {Enable Python scripting} {
     467variant python34 conflicts python33 description {Enable Python scripting} {
    489468    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.4
    490469    patchfiles-append       patch-python3.diff
    491470    depends_lib-append      port:python34

  • dports/editors/vim/Portfile 

    diff --git a/dports/editors/vim/Portfile b/dports/editors/vim/Portfile
index 1ac1d31..0384f68 100644
    a b name vim 
    66set vim_version     7.4
    77set vim_patchlevel  258
    88version             ${vim_version}.${vim_patchlevel}
     9revision            1
    910categories          editors
    1011platforms           darwin freebsd
    1112license             Vim GPL-2+
    … … variant perl description {Enable Perl scripting} { 
    409410    configure.args-append   --enable-perlinterp
    410411    depends_lib-append      path:bin/perl:perl5
    411412}
    412 variant python requires python25 description {Compatibility variant, requires +python25} {}
    413 variant python25 conflicts python26 python27 description {Enable Python scripting} {
    414     configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.5
    415     patchfiles-append       patch-python.diff
    416     depends_lib-append      port:python25
    417413
    418     use_autoconf yes
    419     # Overwriting autoconf.cmd above removes dependency, add it again
    420     depends_build-append port:autoconf
    421 }
    422 variant python26 conflicts python25 python27 description {Enable Python scripting} {
     414# TODO: Remove after 2015-12-26.
     415variant python25 requires python27 description {Legacy variant} {}
     416variant python31 requires python34 description {Legacy variant} {}
     417variant python32 requires python34 description {Legacy variant} {}
     418
     419variant python26 conflicts python27 description {Enable Python scripting} {
    423420    configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.6
    424421    patchfiles-append       patch-python.diff
    425422    depends_lib-append      port:python26
    … … variant python26 conflicts python25 python27 description {Enable Python scriptin 
    428425    # Overwriting autoconf.cmd above removes dependency, add it again
    429426    depends_build-append port:autoconf
    430427}
    431 variant python27 conflicts python25 python26 description {Enable Python scripting} {
     428variant python27 conflicts python26 description {Enable Python scripting} {
    432429    configure.args-append   --enable-pythoninterp --with-python=${prefix}/bin/python2.7
    433430    patchfiles-append       patch-python.diff
    434431    depends_lib-append      port:python27
    … … variant python27 conflicts python25 python26 description {Enable Python scriptin 
    437434    # Overwriting autoconf.cmd above removes dependency, add it again
    438435    depends_build-append port:autoconf
    439436}
    440 variant python31 conflicts python32 python33 python34 description {Enable Python scripting} {
    441     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.1
    442     patchfiles-append       patch-python3.diff
    443     depends_lib-append      port:python31
    444 
    445     use_autoconf yes
    446     # Overwriting autoconf.cmd above removes dependency, add it again
    447     depends_build-append port:autoconf
    448 }
    449 variant python32 conflicts python31 python33 python34 description {Enable Python scripting} {
    450     configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.2
    451     patchfiles-append       patch-python3.diff
    452     depends_lib-append      port:python32
    453 
    454     use_autoconf yes
    455     # Overwriting autoconf.cmd above removes dependency, add it again
    456     depends_build-append port:autoconf
    457 }
    458 variant python33 conflicts python31 python32 python34 description {Enable Python scripting} {
     437variant python33 conflicts python34 description {Enable Python scripting} {
    459438    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.3
    460439    patchfiles-append       patch-python3.diff
    461440    depends_lib-append      port:python33
    … … variant python33 conflicts python31 python32 python34 description {Enable Python 
    464443    # Overwriting autoconf.cmd above removes dependency, add it again
    465444    depends_build-append port:autoconf
    466445}
    467 variant python34 conflicts python31 python32 python33 description {Enable Python scripting} {
     446variant python34 conflicts python33 description {Enable Python scripting} {
    468447    configure.args-append   --enable-python3interp --with-python3=${prefix}/bin/python3.4
    469448    patchfiles-append       patch-python3.diff
    470449    depends_lib-append      port:python34