vim,Macvim: update vim to 9.1.1128, MacVim to r181

macports · Mar 9, 2025 · e22e8cc · e22e8cc
1 parent a1a79a5
commit e22e8cc
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 25 deletions.
diff --git a/editors/MacVim/Portfile b/editors/MacVim/Portfile
@@ -8,15 +8,13 @@ PortGroup           compiler_blacklist_versions 1.0
 # 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.1
-set release         180
+set release         181
 github.setup        macvim-dev macvim ${release} release-
-# Change github.tarball_from to 'releases' or 'archive' next update
-github.tarball_from tarball
+github.tarball_from archive
 revision            0
 name                MacVim
 version             ${vim_version}.release${release}
 categories          editors
-platforms           darwin
 license             Vim GPL-2+
 maintainers         {raimue @raimue}
 
@@ -27,9 +25,9 @@ long_description \
 
 homepage            https://macvim.org
 
-checksums           rmd160  fb34366d9059f09ef73a56dd215ff504951cad42 \
-                    sha256  bcc84a691ab2344942b18d2dbedd20aab4ecd4d6ac928ac8842f6d1b0c7d70f7 \
-                    size    25822029
+checksums           rmd160  6f0b0cb3de5781073848e22681c248859129add3 \
+                    sha256  ee4127ff18f55f04b69e401fc444c94b9e4d2bf60580ed18e85b78f2e34efbd3 \
+                    size    27772511
 
 depends_lib-append  port:gettext \
                     port:libiconv \

diff --git a/editors/MacVim/files/patch-python.diff b/editors/MacVim/files/patch-python.diff
@@ -1,6 +1,6 @@
 --- src/configure.ac	2021-04-05 15:12:39.000000000 +0200
 +++ src/configure.ac	2021-04-05 15:12:49.000000000 +0200
-@@ -1429,7 +1429,7 @@
+@@ -1477,7 +1477,7 @@
  	@echo "python_SYSLIBS='$(SYSLIBS)'"
  	@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
  	@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
@@ -9,7 +9,7 @@
  	@echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
  	@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
  	@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
-@@ -1437,13 +1437,6 @@
+@@ -1485,13 +1485,6 @@
  	    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}"
@@ -23,7 +23,7 @@
  	      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
-@@ -1467,7 +1460,6 @@
+@@ -1515,7 +1508,6 @@
  	      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//`

diff --git a/editors/MacVim/files/patch-remove-updater.diff b/editors/MacVim/files/patch-remove-updater.diff
@@ -28,7 +28,7 @@
              </connections>
          </customObject>
          <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-@@ -212,66 +208,6 @@
+@@ -216,66 +212,6 @@
                          </textField>
                      </subviews>
                  </customView>
@@ -47,7 +47,7 @@
 -                                <binding destination="58" name="value" keyPath="values.MMShowWhatsNewOnStartup" id="LjF-Lv-00h"/>
 -                            </connections>
 -                        </button>
--                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="qpS-3j-8OG">
+-                        <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="qpS-3j-8OG">
 -                            <rect key="frame" x="-2" y="0.0" width="187" height="17"/>
 -                            <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
 -                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="When MacVim launches:" id="S5x-il-vbq">
@@ -93,9 +93,9 @@
 -                    </subviews>
 -                </customView>
              </subviews>
-             <point key="canvasLocation" x="137.5" y="-27"/>
+             <point key="canvasLocation" x="137.5" y="-17"/>
          </customView>
-@@ -558,17 +494,6 @@
+@@ -663,17 +599,6 @@
              <rect key="frame" x="0.0" y="0.0" width="483" height="367"/>
              <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
              <subviews>
@@ -110,14 +110,14 @@
 -                        <binding destination="58" name="value" keyPath="values.MMUpdaterPrereleaseChannel" id="Kb1-yL-bmN"/>
 -                    </connections>
 -                </button>
-                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="826">
+                 <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="826">
                      <rect key="frame" x="18" y="218" width="449" height="56"/>
                      <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-@@ -633,16 +558,6 @@
+@@ -738,16 +663,6 @@
                          <binding destination="58" name="value" keyPath="values.MMUseInlineIm" id="1016"/>
                      </connections>
                  </button>
--                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="ere-oJ-WLd">
+-                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="ere-oJ-WLd">
 -                    <rect key="frame" x="19" y="20" width="449" height="70"/>
 -                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
 -                    <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="Gdp-Ib-RGS">

diff --git a/editors/MacVim/files/patch-tcl.diff b/editors/MacVim/files/patch-tcl.diff
@@ -1,6 +1,6 @@
 --- src/configure.ac	2021-04-05 15:12:49.000000000 +0200
 +++ src/configure.ac	2021-04-05 15:17:45.000000000 +0200
-@@ -2023,14 +2015,7 @@
+@@ -2108,14 +2108,7 @@
        tcldll=`echo 'puts libtcl[[info tclversion]][[info sharedlibextension]]' | $vi_cv_path_tcl -`
 
        AC_MSG_CHECKING(for location of Tcl include)
@@ -16,7 +16,7 @@
        TCL_INC=
        for try in $tclinc; do
  	if test -f "$try/tcl.h"; then
-@@ -2045,16 +2030,8 @@
+@@ -2130,16 +2123,8 @@
        fi
        if test -z "$SKIP_TCL"; then
  	AC_MSG_CHECKING(for location of tclConfig.sh script)

diff --git a/editors/vim/Portfile b/editors/vim/Portfile
@@ -7,10 +7,9 @@ PortGroup           github 1.0
 # 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.1
-set vim_patchlevel  0727
+set vim_patchlevel  1128
 github.setup        vim vim ${vim_version}.${vim_patchlevel} v
-# Change github.tarball_from to 'releases' or 'archive' next update
-github.tarball_from tarball
+github.tarball_from archive
 revision            0
 categories          editors
 platforms           darwin freebsd
@@ -24,9 +23,9 @@ long_description    Vim is an advanced text editor that seeks to provide \
 
 homepage            https://www.vim.org
 
-checksums           rmd160  862555466b868c9d99943f29d9384c440c67711e \
-                    sha256  dfc41f36c2415acc00d1faef5e50d053be3c5a50b0c569d8ac4c73820be7c731 \
-                    size    18094755
+checksums           rmd160  c7ae828d37e0094e88bd3578ccd3ea65f9d3368c \
+                    sha256  0c1758ce4201d46683821126d23e4a07b7880033337e2461a4ed688304fe58b1 \
+                    size    18490162
 
 depends_lib-append  port:gettext \
                     port:libiconv \