summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/vim-share/Makefile3
-rw-r--r--editors/vim-share/PLIST15
-rw-r--r--editors/vim-share/distinfo12
-rw-r--r--editors/vim-share/patches/patch-feature.h14
-rw-r--r--editors/vim-share/version.mk8
5 files changed, 33 insertions, 19 deletions
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 2a30ad8aa51..5e5fbbaf2fc 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/10/23 07:28:31 morr Exp $
+# $NetBSD: Makefile,v 1.53 2020/02/23 10:39:33 morr Exp $
PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
COMMENT= Data files for the vim editor (vi clone)
@@ -18,6 +18,7 @@ PLIST_SUBST+= VIM_SUBDIR=${VIM_SUBDIR}
CHECK_INTERPRETER_SKIP+= share/vim/${VIM_SUBDIR}/doc/*.pl
CHECK_INTERPRETER_SKIP+= share/vim/${VIM_SUBDIR}/tools/*.pl
CHECK_INTERPRETER_SKIP+= share/vim/${VIM_SUBDIR}/tools/*.py
+CHECK_INTERPRETER_SKIP+= share/vim/${VIM_SUBDIR}/tools/*.awk
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST
index 3607b2593e6..827eae80eb2 100644
--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2019/10/23 07:28:31 morr Exp $
+@comment $NetBSD: PLIST,v 1.49 2020/02/23 10:39:33 morr Exp $
bin/xxd
man/man1/evim.1
man/man1/vim.1
@@ -281,6 +281,7 @@ share/vim/${VIM_SUBDIR}/doc/version7.txt
share/vim/${VIM_SUBDIR}/doc/version8.txt
share/vim/${VIM_SUBDIR}/doc/vi_diff.txt
share/vim/${VIM_SUBDIR}/doc/vim2html.pl
+share/vim/${VIM_SUBDIR}/doc/vim9.txt
share/vim/${VIM_SUBDIR}/doc/visual.txt
share/vim/${VIM_SUBDIR}/doc/windows.txt
share/vim/${VIM_SUBDIR}/doc/workshop.txt
@@ -410,6 +411,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/man.vim
share/vim/${VIM_SUBDIR}/ftplugin/manconf.vim
share/vim/${VIM_SUBDIR}/ftplugin/markdown.vim
share/vim/${VIM_SUBDIR}/ftplugin/matlab.vim
+share/vim/${VIM_SUBDIR}/ftplugin/meson.vim
share/vim/${VIM_SUBDIR}/ftplugin/mf.vim
share/vim/${VIM_SUBDIR}/ftplugin/mma.vim
share/vim/${VIM_SUBDIR}/ftplugin/modconf.vim
@@ -477,6 +479,8 @@ share/vim/${VIM_SUBDIR}/ftplugin/sql.vim
share/vim/${VIM_SUBDIR}/ftplugin/sshconfig.vim
share/vim/${VIM_SUBDIR}/ftplugin/sudoers.vim
share/vim/${VIM_SUBDIR}/ftplugin/svg.vim
+share/vim/${VIM_SUBDIR}/ftplugin/swift.vim
+share/vim/${VIM_SUBDIR}/ftplugin/swiftgyb.vim
share/vim/${VIM_SUBDIR}/ftplugin/sysctl.vim
share/vim/${VIM_SUBDIR}/ftplugin/systemd.vim
share/vim/${VIM_SUBDIR}/ftplugin/systemverilog.vim
@@ -579,6 +583,7 @@ share/vim/${VIM_SUBDIR}/indent/lua.vim
share/vim/${VIM_SUBDIR}/indent/mail.vim
share/vim/${VIM_SUBDIR}/indent/make.vim
share/vim/${VIM_SUBDIR}/indent/matlab.vim
+share/vim/${VIM_SUBDIR}/indent/meson.vim
share/vim/${VIM_SUBDIR}/indent/mf.vim
share/vim/${VIM_SUBDIR}/indent/mma.vim
share/vim/${VIM_SUBDIR}/indent/mp.vim
@@ -856,6 +861,7 @@ share/vim/${VIM_SUBDIR}/syntax/cweb.vim
share/vim/${VIM_SUBDIR}/syntax/cynlib.vim
share/vim/${VIM_SUBDIR}/syntax/cynpp.vim
share/vim/${VIM_SUBDIR}/syntax/d.vim
+share/vim/${VIM_SUBDIR}/syntax/dart.vim
share/vim/${VIM_SUBDIR}/syntax/datascript.vim
share/vim/${VIM_SUBDIR}/syntax/dcd.vim
share/vim/${VIM_SUBDIR}/syntax/dcl.vim
@@ -1054,6 +1060,7 @@ share/vim/${VIM_SUBDIR}/syntax/master.vim
share/vim/${VIM_SUBDIR}/syntax/matlab.vim
share/vim/${VIM_SUBDIR}/syntax/maxima.vim
share/vim/${VIM_SUBDIR}/syntax/mel.vim
+share/vim/${VIM_SUBDIR}/syntax/meson.vim
share/vim/${VIM_SUBDIR}/syntax/messages.vim
share/vim/${VIM_SUBDIR}/syntax/mf.vim
share/vim/${VIM_SUBDIR}/syntax/mgl.vim
@@ -1162,6 +1169,7 @@ share/vim/${VIM_SUBDIR}/syntax/readline.vim
share/vim/${VIM_SUBDIR}/syntax/rebol.vim
share/vim/${VIM_SUBDIR}/syntax/redif.vim
share/vim/${VIM_SUBDIR}/syntax/registry.vim
+share/vim/${VIM_SUBDIR}/syntax/rego.vim
share/vim/${VIM_SUBDIR}/syntax/remind.vim
share/vim/${VIM_SUBDIR}/syntax/resolv.vim
share/vim/${VIM_SUBDIR}/syntax/reva.vim
@@ -1204,6 +1212,7 @@ share/vim/${VIM_SUBDIR}/syntax/sgmllnx.vim
share/vim/${VIM_SUBDIR}/syntax/sh.vim
share/vim/${VIM_SUBDIR}/syntax/sicad.vim
share/vim/${VIM_SUBDIR}/syntax/sieve.vim
+share/vim/${VIM_SUBDIR}/syntax/sil.vim
share/vim/${VIM_SUBDIR}/syntax/simula.vim
share/vim/${VIM_SUBDIR}/syntax/sinda.vim
share/vim/${VIM_SUBDIR}/syntax/sindacmp.vim
@@ -1253,6 +1262,8 @@ share/vim/${VIM_SUBDIR}/syntax/strace.vim
share/vim/${VIM_SUBDIR}/syntax/sudoers.vim
share/vim/${VIM_SUBDIR}/syntax/svg.vim
share/vim/${VIM_SUBDIR}/syntax/svn.vim
+share/vim/${VIM_SUBDIR}/syntax/swift.vim
+share/vim/${VIM_SUBDIR}/syntax/swiftgyb.vim
share/vim/${VIM_SUBDIR}/syntax/syncolor.vim
share/vim/${VIM_SUBDIR}/syntax/synload.vim
share/vim/${VIM_SUBDIR}/syntax/syntax.vim
@@ -1294,6 +1305,8 @@ share/vim/${VIM_SUBDIR}/syntax/tt2.vim
share/vim/${VIM_SUBDIR}/syntax/tt2html.vim
share/vim/${VIM_SUBDIR}/syntax/tt2js.vim
share/vim/${VIM_SUBDIR}/syntax/typescript.vim
+share/vim/${VIM_SUBDIR}/syntax/typescriptcommon.vim
+share/vim/${VIM_SUBDIR}/syntax/typescriptreact.vim
share/vim/${VIM_SUBDIR}/syntax/uc.vim
share/vim/${VIM_SUBDIR}/syntax/udevconf.vim
share/vim/${VIM_SUBDIR}/syntax/udevperm.vim
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 1be9abe05fa..699e2d8c970 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.183 2019/10/23 07:28:31 morr Exp $
+$NetBSD: distinfo,v 1.184 2020/02/23 10:39:33 morr Exp $
-SHA1 (vim-8.1.2200.tar.gz) = 197745df7ea3a76886f270be6ecff04a4b677e73
-RMD160 (vim-8.1.2200.tar.gz) = 01c77b405209dffa210a1d5cbe573492ac2cbfca
-SHA512 (vim-8.1.2200.tar.gz) = a2f38275cecb370f513a6d7e001ceb3163df3d76d5c0f656b40c7473d07291df31166d2523394eb83156c65dede5ce7fb625e0615f6ff85a9ac2a6aba7d5547f
-Size (vim-8.1.2200.tar.gz) = 14517468 bytes
+SHA1 (vim-8.2.0303.tar.gz) = 10e59e5da0e073f21cd3df44ed8fb37e7cc12be2
+RMD160 (vim-8.2.0303.tar.gz) = ab0fd071ea899a3fa48869c6f8712d7d130ed870
+SHA512 (vim-8.2.0303.tar.gz) = 5205395c99f70a5aeaa85355f4b28dea0f00a3f2ac57a3d17879e0996343c263486cef87a4f3e843383d1aba4838fedb59d8491eec566159a7a44099c2f7b9b3
+Size (vim-8.2.0303.tar.gz) = 14778135 bytes
SHA1 (patch-Makefile) = 52d05da11e8b0c2ab90310e178032124033887f4
SHA1 (patch-auto_configure) = 6517ff23cb337f2fb3874f818d5a50861942aca9
SHA1 (patch-configure) = 4514af45a71309dabfecb8aae019fdc2e36e45b6
-SHA1 (patch-feature.h) = 19c5ac2d7056adf9e6e074732871abc4058a59eb
+SHA1 (patch-feature.h) = b0de1a2e9a04439ed3f39e572e32c11f7c4bfc74
SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd
diff --git a/editors/vim-share/patches/patch-feature.h b/editors/vim-share/patches/patch-feature.h
index ae88e5b23c8..5d60f4ad989 100644
--- a/editors/vim-share/patches/patch-feature.h
+++ b/editors/vim-share/patches/patch-feature.h
@@ -1,22 +1,22 @@
-$NetBSD: patch-feature.h,v 1.3 2017/01/19 09:54:56 markd Exp $
+$NetBSD: patch-feature.h,v 1.4 2020/02/23 10:39:33 morr Exp $
---- src/feature.h.orig 2014-12-23 13:34:10.000000000 +0000
+--- src/feature.h.orig 2019-12-03 21:59:23.000000000 +0000
+++ src/feature.h
-@@ -548,7 +548,7 @@
+@@ -454,7 +454,7 @@
* (used only with NO_BUILTIN_TCAPS not defined).
*/
#ifdef HAVE_TGETENT
--/* #define NO_BUILTIN_TCAPS */
+-// #define NO_BUILTIN_TCAPS
+#define NO_BUILTIN_TCAPS
#endif
#if !defined(NO_BUILTIN_TCAPS)
-@@ -931,7 +931,7 @@
+@@ -814,7 +814,7 @@
/*
* SYS_VIMRC_FILE Name of the system-wide .vimrc file.
*/
--/* #define SYS_VIMRC_FILE "/etc/vimrc" */
-+#define SYS_VIMRC_FILE "@PKG_SYSCONFDIR@/vimrc"
+-// #define SYS_VIMRC_FILE "/etc/vimrc"
++#define SYS_VIMRC_FILE "@PKG_SYSCONFDIR@/vimrc"
/*
* SYS_GVIMRC_FILE Name of the system-wide .gvimrc file.
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
index faf645d3e94..2d8e7525092 100644
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@@ -1,8 +1,8 @@
-# $NetBSD: version.mk,v 1.125 2019/10/23 07:28:31 morr Exp $
+# $NetBSD: version.mk,v 1.126 2020/02/23 10:39:33 morr Exp $
-VIM_VERSION= 8.1
-VIM_PATCHLEVEL= 2200
+VIM_VERSION= 8.2
+VIM_PATCHLEVEL= 0303
# Changelog: see http://ftp.vim.org/pub/vim/patches/8.1/
-VIM_SUBDIR= vim81
+VIM_SUBDIR= vim82
PRINT_PLIST_AWK+= { gsub(/${VIM_SUBDIR}/, "$${VIM_SUBDIR}"); print; next; }