<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/96086ea2088db5c80bb3cde9ea4d0dd043b27219">https://github.com/macports/macports-ports/commit/96086ea2088db5c80bb3cde9ea4d0dd043b27219</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 96086ea2088db5c80bb3cde9ea4d0dd043b27219
</span>Author: Dylan Bridgman <light@ether.org.za>
AuthorDate: Thu Nov 17 14:36:10 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> MacVim: update to 174
</span>---
editors/MacVim/Portfile | 84 +++++++++-------------
.../MacVim/files/patch-remove-Homebrew-python.diff | 16 ++---
editors/MacVim/files/patch-remove-updater.diff | 10 +--
3 files changed, 46 insertions(+), 64 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/Portfile b/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bcdea7d8f48..fc4442774f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,11 +8,11 @@ PortGroup compiler_blacklist_versions 1.0
</span> # is because they both share the same set of configuration files and ensures
# that the user's configuration files will always work with both.
set vim_version 9.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set snapshot 173
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup macvim-dev macvim ${snapshot} snapshot-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set release 174
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup macvim-dev macvim ${release} release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> name MacVim
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version ${vim_version}.snapshot${snapshot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${vim_version}.release${release}
</span> categories editors
platforms darwin
license Vim GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ long_description \
</span>
homepage https://macvim-dev.github.io/macvim/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 88e64d4c6c5352a998f92a759b2a64118f93f844 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 edf8cb0cd4215281374af95585830721d7200020a081e213ecaf92c19710381a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24213601
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5db536887934411f93238f1db1c4537b7ba17b1b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd8cfba37a7dfc9eba30fdfb9fd3b2082ca3bbc6740eac9f61964bb802415ea0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23694113
</span>
depends_lib port:ncurses \
port:gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,50 +122,32 @@ 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 310}
</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 major [string index ${s} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v ${major}.[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 {${major} == 2} {
</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} {}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-remove-Homebrew-python.diff b/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5b445a2a896..db96db3271c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,9 @@
</span> --- src/MacVim/vimrc 2021-04-01 10:32:44.000000000 +0200
+++ src/MacVim/vimrc 2021-04-05 14:56:37.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,36 +8,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " The default for 'backspace' is very confusing to new users, so change it to a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,36 +9,4 @@
</span> " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it.
set backspace+=indent,eol,start
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -" Python2
-" MacVim is configured by default to use the pre-installed System python2
-" version. However, following code tries to find a Homebrew, MacPorts or
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,12 +27,13 @@
</span> -" or an installation from python.org:
-if exists("&pythonthreedll") && exists("&pythonthreehome") &&
- \ !filereadable(&pythonthreedll)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- " MacPorts python 3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.10/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " MacPorts python 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.10/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.10/Python")
</span> - " https://www.python.org/downloads/mac-osx/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.10/Python
</span> - endif
-endif
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ " vim: sw=2 ts=2 et
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-remove-updater.diff b/editors/MacVim/files/patch-remove-updater.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index efea3aa66a1..aa08bd2cdf7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-remove-updater.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-remove-updater.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,13 +25,13 @@
</span> </connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,49 +178,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </popUpButton>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,49 +208,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </textField>
</span> </subviews>
</customView>
- <customView id="0hT-y8-Hge" userLabel="Updater">
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- <rect key="frame" x="19" y="22" width="444" height="36"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <rect key="frame" x="20" y="20" width="444" height="36"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</span> - <subviews>
- <button id="122">
- <rect key="frame" x="188" y="18" width="258" height="18"/>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,5 +73,5 @@
</span> - </subviews>
- </customView>
</subviews>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <point key="canvasLocation" x="138" y="20"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <point key="canvasLocation" x="137.5" y="21.5"/>
</span> </customView>
</pre><pre style='margin:0'>
</pre>