<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/35198990c3630519d6356ad3232a0d6176971162">https://github.com/macports/macports-ports/commit/35198990c3630519d6356ad3232a0d6176971162</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 35198990c36 vim, MacVim: update to vim version 9.0.1677
</span>35198990c36 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 35198990c3630519d6356ad3232a0d6176971162
</span>Author: Thomas Nyman <thomas.nyman@iki.fi>
AuthorDate: Sat Sep 2 22:17:39 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> vim, MacVim: update to vim version 9.0.1677
</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.1677
</span><span style='display:block; white-space:pre;color:#404040;'> * update MacVim to release-177
</span><span style='display:block; white-space:pre;color:#404040;'> * change homepage to new official website at https://macvim.org
</span><span style='display:block; white-space:pre;color:#404040;'> * remove obsolete patchfile from MacVim as Vim now sets the Python3
</span><span style='display:block; white-space:pre;color:#404040;'> library patch relative to the python framework prefix since v9.0.1441
</span><span style='display:block; white-space:pre;color:#404040;'> (vim/vim@b6ebe5af74a965d703eb8ee66a07c97b0bbe6e58)
</span>---
editors/MacVim/Portfile | 11 +++---
editors/MacVim/files/patch-python.diff | 6 ++--
editors/MacVim/files/patch-python3.diff | 11 ------
.../MacVim/files/patch-remove-Homebrew-python.diff | 10 +++---
editors/MacVim/files/patch-remove-updater.diff | 39 ++++++++++++++++------
editors/MacVim/files/patch-tcl.diff | 4 +--
editors/vim/Portfile | 8 ++---
7 files changed, 47 insertions(+), 42 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 d72510af7e5..777710ff44e 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,7 +8,7 @@ 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 176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set release 177
</span> github.setup macvim-dev macvim ${release} release-
revision 0
name MacVim
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,11 +23,11 @@ long_description \
</span> MacVim is a port of the text editor Vim to macOS that is meant to \
integrate seamlessly with the native user interface.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://macvim-dev.github.io/macvim/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://macvim.org
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3843bc52dc43cdb772ada0c4246858f3d5274359 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c77767ab6c5c2a2c3d16d7efe5c6e5d21b9da72e834175579cbd2e6c4a503509 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 25075572
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 36c16994eedfc40c1e477ee9ab90b623e68cbcab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a942786b67486d906ef5ec75ee3bf896b9433a1fde4cd835215445aa3d6a9dbe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24759057
</span>
depends_lib port:ncurses \
port:gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +141,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;'>- patchfiles-append patch-python3.diff
</span> }
depends_lib-append port:${p}
use_autoconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-python.diff b/editors/MacVim/files/patch-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 51c55621d2a..0d67712253a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/configure.ac 2021-04-05 15:12:39.000000000 +0200
+++ src/configure.ac 2021-04-05 15:12:49.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1404,7 +1404,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1429,7 +1429,7 @@
</span> @echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1412,13 +1412,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1437,13 +1437,6 @@
</span> dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f -- "${tmp_mkf}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@
</span> vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
dnl -- Check if the path contained in python_LINKFORSHARED is
dnl usable for vim build. If not, make and try other
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1442,7 +1435,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1467,7 +1460,6 @@
</span> vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
dnl remove -ltermcap, it can conflict with an earlier -lncurses
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-python3.diff b/editors/MacVim/files/patch-python3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2ee7eb03899..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/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;'>-@@ -1663,7 +1663,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><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 db96db3271c..6451bfa071c 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;'>@@ -27,12 +27,12 @@
</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.10/Python")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- " MacPorts python 3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.10/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.10/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if filereadable("/opt/local/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;'>+- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.11/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.11/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.10/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.11/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 fceec9bedbc..56b82678231 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;'>@@ -28,10 +28,29 @@
</span> </connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -205,49 +201,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <rect key="frame" x="-2" y="0.0" width="187" height="17"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Resizing window:" id="ExQ-6y-pyN" userLabel="Window resizing:">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -212,66 +208,6 @@
</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;'>+ </customView>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <customView id="nRD-BI-GeM" userLabel="Launch behavior">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <rect key="frame" x="20" y="64" width="444" height="17"/>
</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;'>+- <subviews>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <button toolTip="Show a "What's New" page right after updating to a new version with the latest release notes." id="bxV-yy-NJC">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <rect key="frame" x="188" y="-1" width="258" height="18"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <buttonCell key="cell" type="check" title="Show what's new after updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="ai9-b7-6iD">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <font key="font" metaFont="system"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </buttonCell>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <binding destination="58" name="value" keyPath="values.MMShowWhatsNewOnStartup" id="LjF-Lv-00h"/>
</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="qpS-3j-8OG">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <rect key="frame" x="-2" y="0.0" width="187" height="17"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="When MacVim launches:" id="S5x-il-vbq">
</span> - <font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,10 +90,8 @@
</span> - <binding destination="58" name="value" keyPath="values.SUAutomaticallyUpdate" id="kyZ-ah-zKf"/>
- </connections>
- </button>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="124">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <rect key="frame" x="-2" y="19" width="187" height="17"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="When MacVim launches:" id="976">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <font key="font" metaFont="system"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </subviews>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </customView>
</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="137.5" y="-27"/>
</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/MacVim/files/patch-tcl.diff b/editors/MacVim/files/patch-tcl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a1a62d23b2..faff7876a2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-tcl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-tcl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/configure.ac 2021-04-05 15:12:49.000000000 +0200
+++ src/configure.ac 2021-04-05 15:17:45.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1995,14 +1995,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2023,14 +2015,7 @@
</span> tcldll=`echo 'puts libtcl[[info tclversion]][[info sharedlibextension]]' | $vi_cv_path_tcl -`
AC_MSG_CHECKING(for location of Tcl include)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span> TCL_INC=
for try in $tclinc; do
if test -f "$try/tcl.h"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2017,16 +2010,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2045,16 +2030,8 @@
</span> fi
if test -z "$SKIP_TCL"; then
AC_MSG_CHECKING(for location of tclConfig.sh script)
<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 32b9e6522cb..c7d796e5b75 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 1499
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vim_patchlevel 1677
</span> set port_revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 10d9edf0b19197771722e4a2fcf2e36021c34fa6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3db98ddcbb8628ec9818da50353c4dd08d62938c80c71d38062250205310cdc3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17010976
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9a62a3612177c661462dd218b305f92fc036d9f2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 996766187b040b67fe13721e1601584fcf5e89f3ff9d5986be87c3fd1fe5d7c5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17069893
</span> }
github.setup vim vim ${vim_version}.${vim_patchlevel} v
</pre><pre style='margin:0'>
</pre>