git: f3da483a6b84 - main - editors/vim: Update to 8.2.3570

The branch main has been updated by adamw:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f3da483a6b8456f434c3d37d3a01ab1f109f4619

commit f3da483a6b8456f434c3d37d3a01ab1f109f4619
Author:     Adam Weinberger <adamw@FreeBSD.org>
AuthorDate: 2021-11-02 11:13:15 +0000
Commit:     Adam Weinberger <adamw@FreeBSD.org>
CommitDate: 2021-11-02 11:13:15 +0000

    editors/vim: Update to 8.2.3570
    
    Remove x11 flavor. It adds xclip support but doesn't contain a GUI,
    making it more confusing than helpful.
    
    I doubt anyone really used it, but if so then vim-athena, the simplest
    X GUI toolkit, is the one you're looking for.
---
 editors/vim/Makefile | 11 ++---------
 editors/vim/distinfo |  6 +++---
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index bf023cb49d4c..696508f53983 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,7 +1,7 @@
 # Created by: David O'Brien <obrien@cs.ucdavis.edu>
 
 PORTNAME=	vim
-PORTVERSION=	8.2.3458
+PORTVERSION=	8.2.3570
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
@@ -37,7 +37,7 @@ VIM_VER=	${PORTNAME}${PORTVERSION:R:S|.||g}
 # Flavors {{{1
 # FLAVORS are used to build various Vim GUIs. The default flavor (`vim') is
 # console-only.
-FLAVORS=	console athena gtk2 gtk3 motif x11 tiny
+FLAVORS=	console athena gtk2 gtk3 motif tiny
 FLAVOR?=	${FLAVORS:[1]}
 # Register conflicts with all other flavors
 CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:S/^/vim-/}
@@ -87,13 +87,6 @@ CONFIGURE_ENV+=	MOTIFHOME=${LOCALBASE}
 PLIST_SUB+=	GUI="" DESKTOP="@comment "
 USES+=		motif xorg
 USE_XORG=	ice sm x11 xmu xt
-
-.elif ${FLAVOR:U} == x11
-GUI=		no
-CONFIGURE_ARGS+=--enable-xim --enable-fontset --with-x
-PLIST_SUB+=	GUI="@comment " DESKTOP="@comment "
-USES+=		xorg
-USE_XORG=	ice sm x11 xt
 .endif
 
 # Options {{{1
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index b50dd2dccbca..6ea3121006a1 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632972080
-SHA256 (vim-vim-v8.2.3458_GH0.tar.gz) = 7952fb77a29a2fc369f36b8edb693dbd96ab4af66ef348b6ac168cfdacad1db6
-SIZE (vim-vim-v8.2.3458_GH0.tar.gz) = 15726913
+TIMESTAMP = 1635851305
+SHA256 (vim-vim-v8.2.3570_GH0.tar.gz) = 50e15a2c1c21ea3b9b4decd63aa158cd86d6cf4e5d48f9ab75a2167d2eeda6dd
+SIZE (vim-vim-v8.2.3570_GH0.tar.gz) = 15773288