update to vim-8.2.534

This commit is contained in:
sthen 2020-04-09 20:07:47 +00:00
parent e792299e87
commit 8470d501aa
5 changed files with 26 additions and 25 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.197 2020/03/05 20:53:13 sthen Exp $
# $OpenBSD: Makefile,v 1.198 2020/04/09 20:07:47 sthen Exp $
COMMENT-main= vi clone, many additional features
COMMENT-lang= vi clone, NLS subpackage
V= 8.2.0356
V= 8.2.0534
GH_ACCOUNT= vim
GH_PROJECT= vim
GH_TAGNAME= v$V

View File

@ -1,2 +1,2 @@
SHA256 (vim-8.2.0356.tar.gz) = PuJVy9+9YQbWrdhhTg56X2nXNghar6NLVOr1BzUPx0o=
SIZE (vim-8.2.0356.tar.gz) = 14841910
SHA256 (vim-8.2.0534.tar.gz) = 41YhKSOdoRpSzKwCeoUmlZBKP/wQy1WnfXev0CVibfo=
SIZE (vim-8.2.0534.tar.gz) = 14896072

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-runtime_filetype_vim,v 1.21 2020/02/14 10:59:55 sthen Exp $
$OpenBSD: patch-runtime_filetype_vim,v 1.22 2020/04/09 20:07:47 sthen Exp $
Index: runtime/filetype.vim
--- runtime/filetype.vim.orig
+++ runtime/filetype.vim
@@ -468,7 +468,7 @@ au BufNewFile,BufRead dict.conf,.dictrc setf dictconf
@@ -471,7 +471,7 @@ au BufNewFile,BufRead dict.conf,.dictrc setf dictconf
au BufNewFile,BufRead dictd.conf setf dictdconf
" Diff files
@ -12,7 +12,7 @@ Index: runtime/filetype.vim
au BufNewFile,BufRead *.patch
\ if getline(1) =~ '^From [0-9a-f]\{40\} Mon Sep 17 00:00:00 2001$' |
\ setf gitsendemail |
@@ -944,7 +944,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
@@ -947,7 +947,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
au BufNewFile,BufRead .mailcap,mailcap setf mailcap
" Makefile

View File

@ -1,30 +1,30 @@
$OpenBSD: patch-runtime_syntax_make_vim,v 1.10 2020/02/14 10:59:55 sthen Exp $
$OpenBSD: patch-runtime_syntax_make_vim,v 1.11 2020/04/09 20:07:47 sthen Exp $
Index: runtime/syntax/make.vim
--- runtime/syntax/make.vim.orig
+++ runtime/syntax/make.vim
@@ -24,6 +24,9 @@ syn match makeInclude "^ *[-s]\=include\s.*$"
@@ -54,10 +54,10 @@ syn match makeTarget "^[~A-Za-z0-9_./$()%*@-][A-Za-z0
\ skipnl nextgroup=makeCommands,makeCommandError
syn region makeSpecTarget transparent matchgroup=makeSpecTarget
- \ start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*:\{1,2}[^:=]"rs=e-1
+ \ start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\|MAIN\)\>\s*:\{1,2}[^:=]"rs=e-1
\ end="[^\\]$" keepend
\ contains=makeIdent,makeSpecTarget,makeNextLine,makeComment skipnl nextGroup=makeCommands
-syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*::\=\s*$"
+syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\|MAIN\)\>\s*::\=\s*$"
\ contains=makeIdent,makeComment
\ skipnl nextgroup=makeCommands,makeCommandError
@@ -74,15 +74,18 @@ syn match makeInclude "^ *[-s]\=include\s.*$"
syn match makeStatement "^ *vpath"
syn match makeExport "^ *\(export\|unexport\)\>"
syn match makeOverride "^ *override"
+" BSD directives
+syn match makePreCondit "^\. *\(if\|else\|endif\|ifdef\|ifndef\|ifmake\|ifnmake\|elif\|elifdef\|for\|endfor\|undef\)\>"
+syn match makeInclude "^ *\. *include"
hi link makeOverride makeStatement
hi link makeExport makeStatement
@@ -56,8 +59,8 @@ syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:[^
syn region makeTarget transparent matchgroup=makeTarget start="^[~A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1 end=";"re=e-1,me=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment,makeDString skipnl nextGroup=makeCommands
syn match makeTarget "^[~A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$" contains=makeIdent,makeSpecTarget,makeComment skipnl nextgroup=makeCommands,makeCommandError
-syn region makeSpecTarget transparent matchgroup=makeSpecTarget start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*:\{1,2}[^:=]"rs=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment skipnl nextGroup=makeCommands
-syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*::\=\s*$" contains=makeIdent,makeComment skipnl nextgroup=makeCommands,makeCommandError
+syn region makeSpecTarget transparent matchgroup=makeSpecTarget start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\|MAIN\)\>\s*:\{1,2}[^:=]"rs=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment skipnl nextGroup=makeCommands
+syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\|MAIN\)\>\s*::\=\s*$" contains=makeIdent,makeComment skipnl nextgroup=makeCommands,makeCommandError
syn match makeCommandError "^\s\+\S.*" contained
syn region makeCommands start=";"hs=s+1 start="^\t" end="^[^\t#]"me=e-1,re=e-1 end="^$" contained contains=makeCmdNextLine,makeSpecial,makeComment,makeIdent,makePreCondit,makeDefine,makeDString,makeSString nextgroup=makeCommandError
@@ -69,10 +72,10 @@ syn match makeStatement contained "(\(abspath\|addpref
" Statements / Functions (GNU make)
syn match makeStatement contained "(\(abspath\|addprefix\|addsuffix\|and\|basename\|call\|dir\|error\|eval\|file\|filter-out\|filter\|findstring\|firstword\|flavor\|foreach\|guile\|if\|info\|join\|lastword\|notdir\|or\|origin\|patsubst\|realpath\|shell\|sort\|strip\|subst\|suffix\|value\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1
" Comment
if exists("make_microsoft")

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.35 2020/03/05 20:53:13 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.36 2020/04/09 20:07:47 sthen Exp $
@pkgpath ${BASE_PKGPATH}
%%gtk2%%
bin/ex
@ -946,6 +946,7 @@ share/vim/${P}/syntax/bdf.vim
share/vim/${P}/syntax/bib.vim
share/vim/${P}/syntax/bindzone.vim
share/vim/${P}/syntax/blank.vim
share/vim/${P}/syntax/bsdl.vim
share/vim/${P}/syntax/bst.vim
share/vim/${P}/syntax/btm.vim
share/vim/${P}/syntax/bzl.vim