<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/39af6751d6346701ca1bf348d2a2e626f69669df">https://github.com/macports/macports-ports/commit/39af6751d6346701ca1bf348d2a2e626f69669df</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 39af6751d63 vim, MacVim: update to vim version 9.0.1897
</span>39af6751d63 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 39af6751d6346701ca1bf348d2a2e626f69669df
</span>Author: Thomas Nyman <thomas.nyman@iki.fi>
AuthorDate: Sat Oct 14 21:08:21 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> vim, MacVim: update to vim version 9.0.1897
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update Vim to v9.0.1897
</span><span style='display:block; white-space:pre;color:#404040;'> * update MacVim to release-178
</span><span style='display:block; white-space:pre;color:#404040;'> * remove remaining pre-release software update channel description
</span><span style='display:block; white-space:pre;color:#404040;'> textfield from Advanced Settings dialog
</span>---
editors/MacVim/Portfile | 10 +++---
.../MacVim/files/patch-remove-Homebrew-python.diff | 41 +++++++++++++---------
editors/MacVim/files/patch-remove-updater.diff | 17 +++++++++
editors/vim/Portfile | 10 +++---
4 files changed, 52 insertions(+), 26 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 208a0e12b47..7503931fbc2 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,9 +8,9 @@ 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 release 177
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set release 178
</span> github.setup macvim-dev macvim ${release} release-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> name MacVim
version ${vim_version}.release${release}
categories editors
<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 36c16994eedfc40c1e477ee9ab90b623e68cbcab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a942786b67486d906ef5ec75ee3bf896b9433a1fde4cd835215445aa3d6a9dbe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24759057
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 792e03eac8d6741fe4ac9f7b9098327407a0507b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 eaa765e53963fbe6d2e0c1b48f0416e9fa7c0013f5b2d25a66d7a159281d3748 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24958039
</span>
depends_lib port:ncurses \
port:gettext \
<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 6451bfa071c..11cc751cf50 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,38 +1,47 @@
</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;'>-@@ -9,36 +9,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,45 +9,4 @@
</span> " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it.
set backspace+=indent,eol,start
-" Python2
<span style='display:block; white-space:pre;background:#ffe0e0;'>--" MacVim is configured by default to use the pre-installed System python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--" version. However, following code tries to find a Homebrew, MacPorts or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--" an installation from python.org:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" MacVim is configured by default in the binary release to use the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" pre-installed System python2 version. However, following code tries to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" find a Homebrew, MacPorts or an installation from python.org:
</span> -if exists("&pythondll") && exists("&pythonhome")
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- " Homebrew python 2.7
</span> - if filereadable("/usr/local/Frameworks/Python.framework/Versions/2.7/Python")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- " Homebrew python 2.7
</span> - set pythondll=/usr/local/Frameworks/Python.framework/Versions/2.7/Python
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " MacPorts python 2.7
</span> - elseif filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- " MacPorts python 2.7
</span> - set pythondll=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " https://www.python.org/downloads/mac-osx/
</span> - elseif filereadable("/Library/Frameworks/Python.framework/Versions/2.7/Python")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- " https://www.python.org/downloads/mac-osx/
</span> - set pythondll=/Library/Frameworks/Python.framework/Versions/2.7/Python
- endif
-endif
-
-" Python3
<span style='display:block; white-space:pre;background:#ffe0e0;'>--" MacVim is configured by default to use Homebrew python3 version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--" If this cannot be found, following code tries to find a MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--" or an installation from python.org:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" MacVim is configured by default in the binary release to set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" pythonthreedll to Homebrew python3. If it cannot be found, the following
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" code tries to find Python3 from other popular locations. Note that we are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" using "Current" for the version, because Vim supports the stable ABI and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-" therefore any new version of Python3 will work.
</span> -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.11/Python")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- " MacPorts python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.11/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.11/Python")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- " https://www.python.org/downloads/mac-osx/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.11/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " MacPorts python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " macOS default Python, installed by 'xcode-select --install'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif filereadable("/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreedll=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " https://www.python.org/downloads/mac-osx/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif filereadable("/Library/Frameworks/Python.framework/Versions/Current/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/Current/Python
</span> - endif
-endif
-
<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 91980c85531..71f508df3d5 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;'>@@ -113,3 +113,20 @@
</span> <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="826">
<rect key="frame" x="18" y="218" width="449" height="56"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -633,16 +558,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <binding destination="58" name="value" keyPath="values.MMUseInlineIm" id="1016"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </button>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="ere-oJ-WLd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <rect key="frame" x="19" y="20" width="449" height="70"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="Gdp-Ib-RGS">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <font key="font" metaFont="smallSystem"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string key="title">Opt-in to the pre-release software update channel. Sofware updater will now also download early pre-release builds that will get new features faster, but will be less tested and occasionally have stability issues or incomplete features. Use this if you want to try out new features and help provide feedbacks early on, but don't use this if you need to rely on MacVim.</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <color key="textColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </textFieldCell>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </textField>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </subviews>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <point key="canvasLocation" x="143.5" y="962.5"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customView>
</span><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 45eecead139..aa3ceb502ad 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;'>@@ -18,12 +18,12 @@ if {${os.platform} eq "darwin" && ${os.major} <= 14} {
</span> sha256 7185577d6cd3708b62b2079b69a29215bb6a6048070d34e960d2d565c18b8a9b \
size 16851486
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set vim_patchlevel 1677
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set port_revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vim_patchlevel 1897
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port_revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 9a62a3612177c661462dd218b305f92fc036d9f2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 996766187b040b67fe13721e1601584fcf5e89f3ff9d5986be87c3fd1fe5d7c5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17069893
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 03c9bc4d54789cbec843fbfbfa342de2f6af4384 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8b86cfb2b609e7a7e386b88a89b01522354990d4eef27e7001cc607d49d62ebf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17268335
</span> }
github.setup vim vim ${vim_version}.${vim_patchlevel} v
</pre><pre style='margin:0'>
</pre>