<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/2645a328d1c84625005f25cb1d44ee01b41dcaf0">https://github.com/macports/macports-ports/commit/2645a328d1c84625005f25cb1d44ee01b41dcaf0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2645a328d1c84625005f25cb1d44ee01b41dcaf0
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Apr 5 16:32:44 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> vim: Update to version 8.2.2681
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Re-roll patches as needed
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove patch applied by upstream
</span>---
editors/vim/Portfile | 11 ++--
.../ce7be3a0e6f19bc85990bb8fcfe5e208944777b4.patch | 62 ----------------------
editors/vim/files/patch-python.diff | 10 ++--
editors/vim/files/patch-python3.diff | 6 +--
editors/vim/files/patch-src-auto-configure.diff | 11 ----
editors/vim/files/patch-tcl.diff | 8 +--
6 files changed, 16 insertions(+), 92 deletions(-)
<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 94833be8454..bfa6548ed01 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;'>@@ -4,9 +4,8 @@ PortSystem 1.0
</span> PortGroup github 1.0
set vim_version 8.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set vim_patchlevel 1719
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set vim_patchlevel 2681
</span> github.setup vim vim ${vim_version}.${vim_patchlevel} v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span>
categories editors
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,16 +19,14 @@ 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:#ffe0e0;'>-checksums rmd160 c2580b2bbd62a5008fc851a6d52a72f32f4351ed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 50ee34b1f138571da4d64ace5fee4c2b5e5233c3e56110e84e451e262c2ea27c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 15170693
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6635aee5718a31c6b692b3529fb4ea96a217eb20 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f0b8b7f013097adc9b3a40d199f4c5bc58cba9774b08bb1427ce51bd7dbf50d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15458967
</span>
depends_lib port:ncurses \
port:gettext \
port:libiconv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles ce7be3a0e6f19bc85990bb8fcfe5e208944777b4.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
set features [open ${worksrcpath}/src/feature.h a+]
puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/files/ce7be3a0e6f19bc85990bb8fcfe5e208944777b4.patch b/editors/vim/files/ce7be3a0e6f19bc85990bb8fcfe5e208944777b4.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 91eb09089c1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/files/ce7be3a0e6f19bc85990bb8fcfe5e208944777b4.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,62 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ce7be3a0e6f19bc85990bb8fcfe5e208944777b4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Bram Moolenaar <Bram@vim.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 26 Nov 2020 20:11:11 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] patch 8.2.2056: configure fails when building with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Problem: Configure fails when building with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "implicit-function-declaration" error enabled, specifically on Mac.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Solution: Declear the functions like in the source code. (suggestion by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Clemens Lang, closes #7380)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Backport [https://github.com/vim/vim/commit/ce7be3a0e6f19bc85990bb8fcfe5e208944777b4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/auto/configure | 10 +++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/configure.ac | 10 +++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/version.c | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 20 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/auto/configure b/src/auto/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 13eaea6f853..d1359485b60 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/auto/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/auto/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12350,10 +12350,18 @@ if test -c /dev/ptmx ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// These should be in stdlib.h, but it depends on _XOPEN_SOURCE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+char *ptsname(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int unlockpt(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int grantpt(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ptsname(0);grantpt(0);unlockpt(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ptsname(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ grantpt(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unlockpt(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/configure.ac b/src/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 457f2b82b13..010cc8f09ca 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3593,7 +3593,15 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING(for SVR4 ptys)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -c /dev/ptmx ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_TRY_LINK([], [ptsname(0);grantpt(0);unlockpt(0);],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_TRY_LINK([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// These should be in stdlib.h, but it depends on _XOPEN_SOURCE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+char *ptsname(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int unlockpt(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int grantpt(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ptsname(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ grantpt(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unlockpt(0);],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SVR4_PTYS),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT(no))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/files/patch-python.diff b/editors/vim/files/patch-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2e224ff8718..0e7a9a44061 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vim/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/configure.ac.orig 2018-05-23 21:53:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2018-06-12 18:37:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1237,7 +1237,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac 2021-04-05 15:12:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac 2021-04-05 15:12:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1336,7 +1336,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;'>-@@ -1245,13 +1245,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1344,13 +1344,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;'>-@@ -1275,7 +1268,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1374,7 +1367,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/vim/files/patch-python3.diff b/editors/vim/files/patch-python3.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 41242d97dea..8b8e5eca451 100644
</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;'>+++ b/editors/vim/files/patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/configure.ac.orig 2016-09-12 16:31:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2016-09-12 19:26:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1522,7 +1522,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac 2021-04-05 15:48:50.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac 2021-04-05 15:48:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1591,7 +1591,7 @@
</span> @echo "python3_LIBS='$(LIBS)'"
@echo "python3_SYSLIBS='$(SYSLIBS)'"
@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/files/patch-src-auto-configure.diff b/editors/vim/files/patch-src-auto-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0ce2f200a22..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/files/patch-src-auto-configure.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/auto/configure.orig 2013-08-04 14:01:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/auto/configure 2013-08-12 19:27:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4203,7 +4203,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MACOSX=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/files/patch-tcl.diff b/editors/vim/files/patch-tcl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fbed4706999..4d8a65524a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/files/patch-tcl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vim/files/patch-tcl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/configure.ac 2020-09-20 22:43:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2020-10-01 17:56:55.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1813,14 +1813,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac 2021-04-05 15:12:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac 2021-04-05 15:17:45.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1914,14 +1914,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;'>-@@ -1835,16 +1828,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1936,16 +1929,8 @@
</span> fi
if test -z "$SKIP_TCL"; then
AC_MSG_CHECKING(for location of tclConfig.sh script)
</pre><pre style='margin:0'>
</pre>