Wed Dec 1 21:36:59 2021 UTC ()
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.


(wiz)
diff -r1.77 -r1.78 pkgsrc/editors/vim/Makefile
diff -r1.93 -r1.94 pkgsrc/editors/vim-gtk2/Makefile
diff -r1.21 -r1.22 pkgsrc/editors/vim-gtk3/Makefile
diff -r1.40 -r1.41 pkgsrc/editors/vim-motif/Makefile
diff -r1.194 -r1.195 pkgsrc/editors/vim-share/distinfo
diff -r1.4 -r1.5 pkgsrc/editors/vim-share/patches/patch-feature.h
diff -r1.63 -r1.64 pkgsrc/editors/vim-xaw/Makefile
cvs diff -r1.77 -r1.78 pkgsrc/editors/vim/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/vim/Makefile 2020/05/03 13:14:21 1.77
+++ pkgsrc/editors/vim/Makefile 2021/12/01 21:36:59 1.78
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.77 2020/05/03 13:14:21 morr Exp $ 1# $NetBSD: Makefile,v 1.78 2021/12/01 21:36:59 wiz Exp $
2 2
3PKGNAME= vim-${VIM_VERSION}.${VIM_PATCHLEVEL} 3PKGNAME= vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
 4PKGREVISION= 1
4 5
5COMMENT= Vim editor (vi clone) without GUI 6COMMENT= Vim editor (vi clone) without GUI
6 7
7.include "../../editors/vim-share/Makefile.common" 8.include "../../editors/vim-share/Makefile.common"
8 9
9DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share 10DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
10 11
11CONFLICTS+= vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]* 12CONFLICTS+= vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
12CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* 13CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
13 14
14CONFIGURE_ARGS+= --enable-gui=no --without-x 15CONFIGURE_ARGS+= --enable-gui=no --without-x
15CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} 16CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap}
16 17
cvs diff -r1.93 -r1.94 pkgsrc/editors/vim-gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/vim-gtk2/Makefile 2021/04/21 11:41:34 1.93
+++ pkgsrc/editors/vim-gtk2/Makefile 2021/12/01 21:36:59 1.94
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.93 2021/04/21 11:41:34 adam Exp $ 1# $NetBSD: Makefile,v 1.94 2021/12/01 21:36:59 wiz Exp $
2 2
3PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL} 3PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
4PKGREVISION= 7 4PKGREVISION= 8
5 5
6COMMENT= Vim editor (vi clone) with X11 GTK2 GUI 6COMMENT= Vim editor (vi clone) with X11 GTK2 GUI
7 7
8PKG_SUPPORTED_OPTIONS+= gnome 8PKG_SUPPORTED_OPTIONS+= gnome
9 9
10.include "../../editors/vim-share/Makefile.common" 10.include "../../editors/vim-share/Makefile.common"
11 11
12 12
13DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share 13DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
14CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]* 14CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]*
15CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* 15CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
16 16
17CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} 17CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap}
cvs diff -r1.21 -r1.22 pkgsrc/editors/vim-gtk3/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/vim-gtk3/Makefile 2020/08/17 20:18:36 1.21
+++ pkgsrc/editors/vim-gtk3/Makefile 2021/12/01 21:36:59 1.22
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.21 2020/08/17 20:18:36 leot Exp $ 1# $NetBSD: Makefile,v 1.22 2021/12/01 21:36:59 wiz Exp $
2 2
3PKGNAME= vim-gtk3-${VIM_VERSION}.${VIM_PATCHLEVEL} 3PKGNAME= vim-gtk3-${VIM_VERSION}.${VIM_PATCHLEVEL}
4PKGREVISION= 3 4PKGREVISION= 4
5 5
6COMMENT= Vim editor (vi clone) with X11 GTK3 GUI 6COMMENT= Vim editor (vi clone) with X11 GTK3 GUI
7 7
8PKG_SUPPORTED_OPTIONS+= gnome 8PKG_SUPPORTED_OPTIONS+= gnome
9 9
10.include "../../editors/vim-share/Makefile.common" 10.include "../../editors/vim-share/Makefile.common"
11 11
12 12
13DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share 13DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
14CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]* vim-gtk2-[0-9]* 14CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]* vim-gtk2-[0-9]*
15CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* 15CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
16 16
17CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} 17CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap}
cvs diff -r1.40 -r1.41 pkgsrc/editors/vim-motif/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/vim-motif/Makefile 2019/10/23 07:32:59 1.40
+++ pkgsrc/editors/vim-motif/Makefile 2021/12/01 21:36:59 1.41
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.40 2019/10/23 07:32:59 morr Exp $ 1# $NetBSD: Makefile,v 1.41 2021/12/01 21:36:59 wiz Exp $
2 2
3PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL} 3PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
 4PKGREVISION= 1
4 5
5COMMENT= Vim editor (vi clone) with X11 Motif GUI 6COMMENT= Vim editor (vi clone) with X11 Motif GUI
6 7
7.include "../../editors/vim-share/Makefile.common" 8.include "../../editors/vim-share/Makefile.common"
8 9
9DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share 10DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
10CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* 11CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
11CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* 12CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
12 13
13CONFIGURE_ARGS+= --enable-gui=motif 14CONFIGURE_ARGS+= --enable-gui=motif
14CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} 15CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap}
15 16
16CONFIGURE_ENV+= MOTIFBASE=${MOTIFBASE} 17CONFIGURE_ENV+= MOTIFBASE=${MOTIFBASE}
cvs diff -r1.194 -r1.195 pkgsrc/editors/vim-share/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/vim-share/distinfo 2021/10/26 10:21:43 1.194
+++ pkgsrc/editors/vim-share/distinfo 2021/12/01 21:36:59 1.195
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.194 2021/10/26 10:21:43 nia Exp $ 1$NetBSD: distinfo,v 1.195 2021/12/01 21:36:59 wiz Exp $
2 2
3BLAKE2s (vim-8.2.3172.tar.gz) = dd63b697b0feafefbd4f7cea0292fe68dcd207f46210e931d3dd463fe73517f3 3BLAKE2s (vim-8.2.3172.tar.gz) = dd63b697b0feafefbd4f7cea0292fe68dcd207f46210e931d3dd463fe73517f3
4SHA512 (vim-8.2.3172.tar.gz) = 3ebcd2a65e8f4a05f074d1612d4a50c90e90cd393eccd3a647dbb83d2c87a9e15b7d98dd387961c4dc7f0a2cde941b7ee63ef5f87ecb2d4086bf4a0dd1eed701 4SHA512 (vim-8.2.3172.tar.gz) = 3ebcd2a65e8f4a05f074d1612d4a50c90e90cd393eccd3a647dbb83d2c87a9e15b7d98dd387961c4dc7f0a2cde941b7ee63ef5f87ecb2d4086bf4a0dd1eed701
5Size (vim-8.2.3172.tar.gz) = 15628376 bytes 5Size (vim-8.2.3172.tar.gz) = 15628376 bytes
6SHA1 (patch-Makefile) = 342af6768ec3f5d86448a370538a3ad75e2259ee 6SHA1 (patch-Makefile) = 342af6768ec3f5d86448a370538a3ad75e2259ee
7SHA1 (patch-auto_configure) = 6517ff23cb337f2fb3874f818d5a50861942aca9 7SHA1 (patch-auto_configure) = 6517ff23cb337f2fb3874f818d5a50861942aca9
8SHA1 (patch-configure) = 4514af45a71309dabfecb8aae019fdc2e36e45b6 8SHA1 (patch-configure) = 4514af45a71309dabfecb8aae019fdc2e36e45b6
9SHA1 (patch-feature.h) = b0de1a2e9a04439ed3f39e572e32c11f7c4bfc74 9SHA1 (patch-feature.h) = a6cd7ae6267cb7e28d2a174226ccebb94b49dc16
10SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd 10SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd
cvs diff -r1.4 -r1.5 pkgsrc/editors/vim-share/patches/patch-feature.h (expand / switch to unified diff)

--- pkgsrc/editors/vim-share/patches/patch-feature.h 2020/02/23 10:39:33 1.4
+++ pkgsrc/editors/vim-share/patches/patch-feature.h 2021/12/01 21:36:59 1.5
@@ -1,22 +1,13 @@ @@ -1,22 +1,13 @@
1$NetBSD: patch-feature.h,v 1.4 2020/02/23 10:39:33 morr Exp $ 1$NetBSD: patch-feature.h,v 1.5 2021/12/01 21:36:59 wiz Exp $
2 2
3--- src/feature.h.orig 2019-12-03 21:59:23.000000000 +0000 3--- src/feature.h.orig 2019-12-03 21:59:23.000000000 +0000
4+++ src/feature.h 4+++ src/feature.h
5@@ -454,7 +454,7 @@ 
6 * (used only with NO_BUILTIN_TCAPS not defined). 
7 */ 
8 #ifdef HAVE_TGETENT 
9-// #define NO_BUILTIN_TCAPS 
10+#define NO_BUILTIN_TCAPS 
11 #endif 
12  
13 #if !defined(NO_BUILTIN_TCAPS) 
14@@ -814,7 +814,7 @@ 5@@ -814,7 +814,7 @@
15 /* 6 /*
16 * SYS_VIMRC_FILE Name of the system-wide .vimrc file. 7 * SYS_VIMRC_FILE Name of the system-wide .vimrc file.
17 */ 8 */
18-// #define SYS_VIMRC_FILE "/etc/vimrc" 9-// #define SYS_VIMRC_FILE "/etc/vimrc"
19+#define SYS_VIMRC_FILE "@PKG_SYSCONFDIR@/vimrc" 10+#define SYS_VIMRC_FILE "@PKG_SYSCONFDIR@/vimrc"
20  11
21 /* 12 /*
22 * SYS_GVIMRC_FILE Name of the system-wide .gvimrc file. 13 * SYS_GVIMRC_FILE Name of the system-wide .gvimrc file.
cvs diff -r1.63 -r1.64 pkgsrc/editors/vim-xaw/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/vim-xaw/Makefile 2019/10/23 07:32:59 1.63
+++ pkgsrc/editors/vim-xaw/Makefile 2021/12/01 21:36:59 1.64
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.63 2019/10/23 07:32:59 morr Exp $ 1# $NetBSD: Makefile,v 1.64 2021/12/01 21:36:59 wiz Exp $
2 2
3PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL} 3PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
 4PKGREVISION= 1
4COMMENT= Vim editor (vi clone) with X11 Athena GUI 5COMMENT= Vim editor (vi clone) with X11 Athena GUI
5 6
6.include "../../editors/vim-share/Makefile.common" 7.include "../../editors/vim-share/Makefile.common"
7 8
8DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share 9DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
9CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* 10CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
10CONFLICTS+= vim-motif-[0-9]* vim-kde-[0-9]* 11CONFLICTS+= vim-motif-[0-9]* vim-kde-[0-9]*
11 12
12CONFIGURE_ARGS+= --enable-gui=athena 13CONFIGURE_ARGS+= --enable-gui=athena
13CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} 14CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap}
14 15
15BUILD_TARGET= vim 16BUILD_TARGET= vim
16INSTALL_TARGET= installvimbin installvimdiff installtutorbin 17INSTALL_TARGET= installvimbin installvimdiff installtutorbin