vim*: do not define NO_BUILTIN_TCAPS unconditionally

This makes vim disregard color schemes. See
https://mail-index.netbsd.org/pkgsrc-bugs/2021/05/28/msg070066.html
and reading the CVS logs I couldn't find the reason it was done.

Fix from RVP.

Bump PKGREVISION.

7 files changed, 13 insertions, 19 deletions

diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index f99a0d2b743..1da28ad8ab3 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2021/04/21 11:41:34 adam Exp $
+# $NetBSD: Makefile,v 1.94 2021/12/01 21:36:59 wiz Exp $
 
 PKGNAME=	vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=	7
+PKGREVISION=	8
 
 COMMENT=	Vim editor (vi clone) with X11 GTK2 GUI
 
diff --git a/editors/vim-gtk3/Makefile b/editors/vim-gtk3/Makefile
index 7e1c19f8e02..946fe5209e2 100644
--- a/editors/vim-gtk3/Makefile
+++ b/editors/vim-gtk3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2020/08/17 20:18:36 leot Exp $
+# $NetBSD: Makefile,v 1.22 2021/12/01 21:36:59 wiz Exp $
 
 PKGNAME=	vim-gtk3-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=	3
+PKGREVISION=	4
 
 COMMENT=	Vim editor (vi clone) with X11 GTK3 GUI
 
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index f1b90a3a065..9d6c439eb55 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2019/10/23 07:32:59 morr Exp $
+# $NetBSD: Makefile,v 1.41 2021/12/01 21:36:59 wiz Exp $
 
 PKGNAME=		vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) with X11 Motif GUI
 
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 97782ae2255..23004967c7c 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.194 2021/10/26 10:21:43 nia Exp $
+$NetBSD: distinfo,v 1.195 2021/12/01 21:36:59 wiz Exp $
 
 BLAKE2s (vim-8.2.3172.tar.gz) = dd63b697b0feafefbd4f7cea0292fe68dcd207f46210e931d3dd463fe73517f3
 SHA512 (vim-8.2.3172.tar.gz) = 3ebcd2a65e8f4a05f074d1612d4a50c90e90cd393eccd3a647dbb83d2c87a9e15b7d98dd387961c4dc7f0a2cde941b7ee63ef5f87ecb2d4086bf4a0dd1eed701
@@ -6,5 +6,5 @@ Size (vim-8.2.3172.tar.gz) = 15628376 bytes
 SHA1 (patch-Makefile) = 342af6768ec3f5d86448a370538a3ad75e2259ee
 SHA1 (patch-auto_configure) = 6517ff23cb337f2fb3874f818d5a50861942aca9
 SHA1 (patch-configure) = 4514af45a71309dabfecb8aae019fdc2e36e45b6
-SHA1 (patch-feature.h) = b0de1a2e9a04439ed3f39e572e32c11f7c4bfc74
+SHA1 (patch-feature.h) = a6cd7ae6267cb7e28d2a174226ccebb94b49dc16
 SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd
diff --git a/editors/vim-share/patches/patch-feature.h b/editors/vim-share/patches/patch-feature.h
index 5d60f4ad989..2eb939e3b21 100644
--- a/editors/vim-share/patches/patch-feature.h
+++ b/editors/vim-share/patches/patch-feature.h
@@ -1,16 +1,7 @@
-$NetBSD: patch-feature.h,v 1.4 2020/02/23 10:39:33 morr Exp $
+$NetBSD: patch-feature.h,v 1.5 2021/12/01 21:36:59 wiz Exp $
 
 --- src/feature.h.orig	2019-12-03 21:59:23.000000000 +0000
 +++ src/feature.h
-@@ -454,7 +454,7 @@
-  *			(used only with NO_BUILTIN_TCAPS not defined).
-  */
- #ifdef HAVE_TGETENT
--// #define NO_BUILTIN_TCAPS
-+#define NO_BUILTIN_TCAPS
- #endif
- 
- #if !defined(NO_BUILTIN_TCAPS)
 @@ -814,7 +814,7 @@
  /*
   * SYS_VIMRC_FILE	Name of the system-wide .vimrc file.
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 0025c034040..53a8520cb41 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2019/10/23 07:32:59 morr Exp $
+# $NetBSD: Makefile,v 1.64 2021/12/01 21:36:59 wiz Exp $
 
 PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=		1
 COMMENT=		Vim editor (vi clone) with X11 Athena GUI
 
 .include		"../../editors/vim-share/Makefile.common"
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index adc3932a0f9..3824e049543 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2020/05/03 13:14:21 morr Exp $
+# $NetBSD: Makefile,v 1.78 2021/12/01 21:36:59 wiz Exp $
 
 PKGNAME=		vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) without GUI