<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/7eaf80b7b19b1b4d5b590f0854329b54c4ec6bd9">https://github.com/macports/macports-ports/commit/7eaf80b7b19b1b4d5b590f0854329b54c4ec6bd9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7eaf80b7b19 vim, MacVim: update to vim version 9.1.0000
</span>7eaf80b7b19 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7eaf80b7b19b1b4d5b590f0854329b54c4ec6bd9
</span>Author: Thomas Nyman <thomas.nyman@iki.fi>
AuthorDate: Sun Jan 21 21:00:21 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> vim, MacVim: update to vim version 9.1.0000
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update Vim to v9.1.0000
</span><span style='display:block; white-space:pre;color:#404040;'> * update MacVim to release-179
</span><span style='display:block; white-space:pre;color:#404040;'> * remove fallback version for macOS 10.10 and earlier (https://trac.macports.org/ticket/67209)
</span>---
editors/MacVim/Portfile | 10 +++++-----
editors/vim/Portfile | 34 ++++++----------------------------
editors/vim/files/patch-python3.diff | 11 -----------
3 files changed, 11 insertions(+), 44 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 7503931fbc2..93ce247a4ae 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;'>@@ -7,8 +7,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> # The vim port should always follow the patch level used in the MacVim port. This
# is because they both share the same set of configuration files and ensures
# that the user's configuration files will always work with both.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set vim_version 9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set release 178
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set vim_version 9.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set release 179
</span> github.setup macvim-dev macvim ${release} release-
revision 0
name MacVim
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ long_description \
</span>
homepage https://macvim.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 792e03eac8d6741fe4ac9f7b9098327407a0507b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 eaa765e53963fbe6d2e0c1b48f0416e9fa7c0013f5b2d25a66d7a159281d3748 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24958039
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 692664e7643b05385025b01bf32133c2651d8aff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1b58bfff65afb3cf448c7134afcaf156d16d982f28288f7595a41a458b00cd6c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 25330222
</span>
depends_lib port:ncurses \
port:gettext \
<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 aa3ceb502ad..71ba652eed4 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;'>@@ -6,29 +6,10 @@ PortGroup github 1.0
</span> # The vim port should always follow the patch level used in the MacVim port. This
# is because they both share the same set of configuration files and ensures
# that the user's configuration files will always work with both.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set vim_version 9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} <= 14} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fallback to previous port version, for 10.10 and earlier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/67209
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set vim_patchlevel 0472
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set port_revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 ee809eb300deaf735c86b6e5b7f4bc4a8fe79a41 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7185577d6cd3708b62b2079b69a29215bb6a6048070d34e960d2d565c18b8a9b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 16851486
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set vim_patchlevel 1897
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set port_revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 03c9bc4d54789cbec843fbfbfa342de2f6af4384 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8b86cfb2b609e7a7e386b88a89b01522354990d4eef27e7001cc607d49d62ebf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17268335
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set vim_version 9.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set vim_patchlevel 0000
</span> github.setup vim vim ${vim_version}.${vim_patchlevel} v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision ${port_revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories editors
platforms darwin freebsd
license Vim GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +22,9 @@ long_description Vim is an advanced text editor that seeks to provide the\
</span>
homepage https://www.vim.org/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 aed3a40e2fb0a96fc22c554b2fd102fb3369d560 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f0cdc73963122d052a666d88f787ec5b295f75ebdc3dfa5aa5a48f8afa92d98f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17604158
</span>
depends_lib-append port:ncurses \
port:gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,12 +130,6 @@ foreach s ${pythons_suffixes} {
</span> patchfiles-append patch-python.diff
} else {
configure.args-append --enable-python3interp --with-python3-command=${prefix}/bin/python${v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp \"${vim_version}.${vim_patchlevel}\" 9.0.1441] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info \"Vim patchlevel < 1441, python3 patch needed\"
</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;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info \"Vim patchlevel >= 1441, no python3 patch needed\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
depends_lib-append port:${p}
use_autoconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/files/patch-python3.diff b/editors/vim/files/patch-python3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 71850da4c01..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/files/patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/configure.ac 2021-04-05 15:48:50.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2021-04-05 15:48:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1577,7 +1577,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "python3_LIBS='$(LIBS)'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "python3_SYSLIBS='$(SYSLIBS)'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @echo "python3_INSTSONAME='$(INSTSONAME)'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @echo "python3_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eof
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl -- delete the lines from make about Entering/Leaving directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
</span></pre><pre style='margin:0'>
</pre>