<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/0ba1c078a4a6294bf4da4953ebff9dc65c0c669e">https://github.com/macports/macports-ports/commit/0ba1c078a4a6294bf4da4953ebff9dc65c0c669e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0ba1c078a4a6294bf4da4953ebff9dc65c0c669e
</span>Author: Andrew Zhou <0az@afzhou.com>
AuthorDate: Thu Sep 24 14:37:39 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> vim: Update to 8.2.1719
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-Authored-By: Rainer Müller <raimue@macports.org>
</span>---
editors/vim/Portfile | 12 +++++-------
editors/vim/files/patch-tcl.diff | 17 +++++++++++------
editors/vim/files/patch-xcode12.diff | 28 ----------------------------
3 files changed, 16 insertions(+), 41 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 4c36fccc49f..68db496c3fd 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;'>@@ -2,8 +2,8 @@ PortSystem 1.0
</span> PortGroup github 1.0
name vim
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set vim_version 8.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set vim_patchlevel 2234
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set vim_version 8.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set vim_patchlevel 1719
</span> github.setup vim vim ${vim_version}.${vim_patchlevel} v
categories editors
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,16 +17,14 @@ long_description \
</span>
homepage http://www.vim.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8dcac709773878f1e6d1108fb66c0e84d40a7aed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e84b732784beef1c414e1c340db3cc712dc8aad909c2b1e9d9dd9cd3a5242e6d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14584470
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c2580b2bbd62a5008fc851a6d52a72f32f4351ed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 50ee34b1f138571da4d64ace5fee4c2b5e5233c3e56110e84e451e262c2ea27c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15170693
</span>
depends_lib port:ncurses \
port:gettext \
port:libiconv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-xcode12.diff
</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/patch-tcl.diff b/editors/vim/files/patch-tcl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4959e51d591..fbed4706999 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,20 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/configure.ac.orig 2017-11-10 11:54:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2017-11-10 11:57:09.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1783,12 +1783,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac 2020-09-20 22:43:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac 2020-10-01 17:56:55.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1813,14 +1813,7 @@
</span> tcldll=`echo 'puts libtcl[[info tclversion]][[info sharedlibextension]]' | $vi_cv_path_tcl -`
AC_MSG_CHECKING(for location of Tcl include)
- if test "x$MACOS_X" != "xyes"; then
- tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
- else
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl For all macOS, use the value from TCL in case use of, say, homebrew
</span> - dnl For Mac OS X 10.3, use the OS-provided framework location
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl For Mac OS X 10.14, the OS-provided framework location doesn't contain the headers, so also check the Xcode SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /System/Library/Frameworks/Tcl.framework/Headers `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework/Versions/Current/Headers"
</span> - fi
+ tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver"
TCL_INC=
for try in $tclinc; do
if test -f "$try/tcl.h"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1803,13 +1798,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1835,16 +1828,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;background:#e0e0e0;'>@@ -22,8 +24,11 @@
</span> - tclcnf=`echo $tclinc | sed s/include/lib/g`
- tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
- else
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl For all macOS, use the value from TCL in case use of, say, homebrew
</span> - dnl For Mac OS X 10.3, use the OS-provided framework location
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- tclcnf="/System/Library/Frameworks/Tcl.framework"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl For Mac OS X 10.14, the OS-provided framework location doesn't contain the headers, so also check the Xcode SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tclcnf=`echo $tclinc | sed s/include/lib/g`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tclcnf="$tclcnf /System/Library/Frameworks/Tcl.framework `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework"
</span> - fi
+ tclcnf=`echo $tclinc | sed s/include/lib/g`
+ tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/files/patch-xcode12.diff b/editors/vim/files/patch-xcode12.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5de2ad30e89..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/files/patch-xcode12.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: https://github.com/vim/vim/commit/bd7f7c123db58dd7f50f4d1391577686d2f1bcc6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/auto/configure src/auto/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9c9a719d81a..41b29c2623f 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;'>-@@ -12106,7 +12106,7 @@ if test "x$olibs" = "x$LIBS"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "checking for tgetent()... " >&6; }
</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;'>-+int tgetent(char *, const char *);
</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;'>-diff --git src/configure.ac src/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 19ce4c7a5f3..598d73c8dfc 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;'>-@@ -3510,7 +3510,7 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$olibs" = "x$LIBS"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING([for tgetent()])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_TRY_LINK([],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_TRY_LINK([int tgetent(char *, const char *);],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist");],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT(yes),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([NOT FOUND!
</span></pre><pre style='margin:0'>
</pre>