<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d199659eca727bdac7dc3b2363bd8bcaee6a6394">https://github.com/macports/macports-ports/commit/d199659eca727bdac7dc3b2363bd8bcaee6a6394</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d199659eca727bdac7dc3b2363bd8bcaee6a6394
</span>Author: Julien Rabinow <randprefix.github@fastmail.com>
AuthorDate: Mon Feb 7 16:14:29 2022 -0800
<span style='display:block; white-space:pre;color:#404040;'> vim: refactor python variants section in portfile
</span>---
editors/vim/Portfile | 69 +++++++++++++++++++---------------------------------
1 file changed, 25 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/Portfile b/editors/vim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 993a193d016..a02a1f373f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,50 +107,31 @@ variant perl description {Enable Perl scripting} {
</span> depends_lib-append path:bin/perl:perl5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Enable Python scripting} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-pythoninterp --with-python-command=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-python.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Overwriting autoconf.cmd above removes dependency, add it again
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:autoconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python37 python38 python39 description {Enable Python scripting} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python3interp --with-python3-command=${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-python3.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Overwriting autoconf.cmd above removes dependency, add it again
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:autoconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python36 python38 python39 description {Enable Python scripting} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python3interp --with-python3-command=${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-python3.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Overwriting autoconf.cmd above removes dependency, add it again
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:autoconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python36 python37 python39 description {Enable Python scripting} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python3interp --with-python3-command=${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-python3.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Overwriting autoconf.cmd above removes dependency, add it again
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:autoconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python36 python37 python38 description {Enable Python scripting} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python3interp --with-python3-command=${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-python3.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Overwriting autoconf.cmd above removes dependency, add it again
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:autoconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_suffixes {27 36 37 38 39}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_ports {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend pythons_ports python${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p python${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [string index ${s} 0].[string range ${s} 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set i [lsearch -exact ${pythons_ports} ${p}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c [lreplace ${pythons_ports} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Enable Python scripting" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${s} < 300} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-pythoninterp --with-python-command=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-python3interp --with-python3-command=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_autoconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # overwriting autoconf.cmd above removes dependency, add it again
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:autoconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
variant ruby requires ruby18 description {Compatibility variant, requires +ruby18} {}
</pre><pre style='margin:0'>
</pre>