cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to vim-9.0.1151

Browse Source 
use a newer lua for the lua flavour
This commit is contained in:
sthen 2023-01-06 18:23:08 +00:00
parent eef638c10b
commit d9c8b26a02
6 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editors/vim/Makefile
View File

@ -1,8 +1,9 @@
COMMENT-main= vi clone, many additional features
COMMENT-lang= vi clone, NLS subpackage
# careful with PLISTs if updating
V= 9.0.0976
# careful with PLISTs if updating; it usually works best if you use
# a gui flavour rather than no_x11
V= 9.0.1151
GH_ACCOUNT= vim
GH_PROJECT= vim
GH_TAGNAME= v$V
@ -67,7 +68,7 @@ MAKE_FLAGS+= STRIP=:
.if ${FLAVOR:Mlua}
MODULES+= lang/lua
MODLUA_VERSION= 5.1
MODLUA_VERSION= 5.3
CONFIGURE_ENV+= vi_cv_path_plain_lua=${MODLUA_BIN}
CONFIGURE_ARGS+= --enable-luainterp \
--with-lua-prefix=${LOCALBASE}
@ -82,11 +83,9 @@ WANTLIB+= perl
.if ${FLAVOR:Mpython3}
MODULES+= lang/python
MODPY_MAJOR_VERSION = 3
CONFIGURE_ENV+= vi_cv_path_python3=${MODPY_BIN}
CONFIGURE_ARGS+= --enable-python3interp=yes \
--enable-pythoninterp=no \
--with-python3-config-dir=${MODPY_LIBDIR}/config-${MODPY_VERSION}m
--enable-pythoninterp=no
LIB_DEPENDS+= ${MODPY_LIB_DEPENDS}
WANTLIB+= ${MODPY_WANTLIB}
.endif

4
editors/vim/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (vim-9.0.0976.tar.gz) = wwdjOn5jkFguQbI0y6g9gJeG9YYsib8qQCROxfgL/aw=
SHA256 (vim-9.0.1151.tar.gz) = 0Y2lWTtsd+/MVGPDmFNaPEelAKleCsxV3wMxQIfzyGc=
SHA256 (vim-colorschemes-20220522.tar.gz) = ZLEncSHAesz6zZtKXY0zromtzA86ebdfJtLzpUxjMOw=
SIZE (vim-9.0.0976.tar.gz) = 16840393
SIZE (vim-9.0.1151.tar.gz) = 16922895
SIZE (vim-colorschemes-20220522.tar.gz) = 66041

2
editors/vim/patches/patch-runtime_filetype_vim
View File

@ -10,7 +10,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 |
@@ -1158,7 +1158,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
@@ -1165,7 +1165,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
au BufNewFile,BufRead .mailcap,mailcap setf mailcap
" Makefile

22
editors/vim/patches/patch-runtime_syntax_fstab_vim
View File

@ -1,12 +1,26 @@
recognise wxallowed as a keyword
don't highlight device-node errors, the fsDeviceError regex trips on
our duid format in /etc/fstab
Index: runtime/syntax/fstab.vim
--- runtime/syntax/fstab.vim.orig
+++ runtime/syntax/fstab.vim
@@ -141,7 +141,7 @@ syn match fsOptionsKeywords contained /\<\%(dir\|file\
syn match fsOptionsKeywords contained /\<\%(session\|part\)=/ nextgroup=fsOptionsNumber
@@ -34,7 +34,7 @@ syn match fsOperator /[,=:#]/
" Device
syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
-syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
+"syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts devtmpfs sysfs usbfs
syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
@@ -221,7 +221,7 @@ syn match fsOptionsKeywords contained /\<\%(prjjquota\
syn keyword fsOptionsKeyWords contained gc_merge nogc_merge disable_roll_forward no_heap disable_ext_identify inline_xattr noinline_xattr inline_data noinline_data inline_dentry noinline_dentry flush_merge fastboot extent_cache noextent_cache data_flush offusrjquota offgrpjquota offprjjquota test_dummy_encryption checkpoint_merge nocheckpoint_merge compress_chksum compress_cache inlinecrypt atgc
" Options: ffs
-syn keyword fsOptionsKeyWords contained noperm softdep
+syn keyword fsOptionsKeyWords contained noperm softdep wxallowed
" Options: hpfs
syn match fsOptionsKeywords contained /\<case=/ nextgroup=fsOptionsHpfsCase
" Options: gfs2
syn match fsOptionsKeywords contained /\<\%(lockproto\|locktable\)=/ nextgroup=fsOptionsString

4
editors/vim/patches/patch-src_configure_ac
View File

@ -1,7 +1,7 @@
Index: src/configure.ac
--- src/configure.ac.orig
+++ src/configure.ac
@@ -669,10 +669,10 @@ if test "$enable_luainterp" = "yes" -o "$enable_luaint
@@ -671,10 +671,10 @@ if test "$enable_luainterp" = "yes" -o "$enable_luaint
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
@ -15,7 +15,7 @@ Index: src/configure.ac
else
AC_MSG_RESULT(no)
@@ -716,9 +716,9 @@ if test "$enable_luainterp" = "yes" -o "$enable_luaint
@@ -718,9 +718,9 @@ if test "$enable_luainterp" = "yes" -o "$enable_luaint
else
if test "X$LUA_INC" != "X"; then
dnl Test alternate location using version

13
editors/vim/pkg/PLIST-main
View File

@ -147,6 +147,7 @@ share/vim/${P}/compiler/dartdoc.vim
share/vim/${P}/compiler/dartfmt.vim
share/vim/${P}/compiler/decada.vim
share/vim/${P}/compiler/dot.vim
share/vim/${P}/compiler/dotnet.vim
share/vim/${P}/compiler/erlang.vim
share/vim/${P}/compiler/eruby.vim
share/vim/${P}/compiler/eslint.vim
@ -231,6 +232,10 @@ share/vim/${P}/compiler/xmllint.vim
share/vim/${P}/compiler/xmlwf.vim
share/vim/${P}/compiler/xo.vim
share/vim/${P}/compiler/yamllint.vim
share/vim/${P}/compiler/zig.vim
share/vim/${P}/compiler/zig_build.vim
share/vim/${P}/compiler/zig_build_exe.vim
share/vim/${P}/compiler/zig_test.vim
share/vim/${P}/compiler/zsh.vim
share/vim/${P}/defaults.vim
share/vim/${P}/delmenu.vim
@ -384,6 +389,7 @@ share/vim/${P}/doc/version9.txt
share/vim/${P}/doc/vi_diff.txt
share/vim/${P}/doc/vim2html.pl
share/vim/${P}/doc/vim9.txt
share/vim/${P}/doc/vim9class.txt
share/vim/${P}/doc/visual.txt
share/vim/${P}/doc/windows.txt
share/vim/${P}/doc/workshop.txt
@ -675,6 +681,7 @@ share/vim/${P}/ftplugin/xs.vim
share/vim/${P}/ftplugin/xsd.vim
share/vim/${P}/ftplugin/xslt.vim
share/vim/${P}/ftplugin/yaml.vim
share/vim/${P}/ftplugin/zig.vim
share/vim/${P}/ftplugin/zimbu.vim
share/vim/${P}/ftplugin/zsh.vim
share/vim/${P}/ftplugof.vim
@ -833,6 +840,7 @@ share/vim/${P}/indent/xsd.vim
share/vim/${P}/indent/xslt.vim
share/vim/${P}/indent/yacc.vim
share/vim/${P}/indent/yaml.vim
share/vim/${P}/indent/zig.vim
share/vim/${P}/indent/zimbu.vim
share/vim/${P}/indent/zsh.vim
share/vim/${P}/indoff.vim
@ -1433,6 +1441,7 @@ share/vim/${P}/syntax/netrc.vim
share/vim/${P}/syntax/netrw.vim
share/vim/${P}/syntax/nginx.vim
share/vim/${P}/syntax/ninja.vim
share/vim/${P}/syntax/nix.vim
share/vim/${P}/syntax/nosyntax.vim
share/vim/${P}/syntax/nqc.vim
share/vim/${P}/syntax/nroff.vim
@ -1566,6 +1575,7 @@ share/vim/${P}/syntax/shared/context-data-context.vim
share/vim/${P}/syntax/shared/context-data-interfaces.vim
share/vim/${P}/syntax/shared/context-data-metafun.vim
share/vim/${P}/syntax/shared/context-data-tex.vim
share/vim/${P}/syntax/shared/hgcommitDiff.vim
share/vim/${P}/syntax/shared/typescriptcommon.vim
share/vim/${P}/syntax/sicad.vim
share/vim/${P}/syntax/sieve.vim
@ -1702,6 +1712,7 @@ share/vim/${P}/syntax/vsejcl.vim
share/vim/${P}/syntax/vue.vim
share/vim/${P}/syntax/wast.vim
share/vim/${P}/syntax/wdiff.vim
share/vim/${P}/syntax/wdl.vim
share/vim/${P}/syntax/web.vim
share/vim/${P}/syntax/webmacro.vim
share/vim/${P}/syntax/wget.vim
@ -1731,7 +1742,9 @@ share/vim/${P}/syntax/xxd.vim
share/vim/${P}/syntax/yacc.vim
share/vim/${P}/syntax/yaml.vim
share/vim/${P}/syntax/z8a.vim
share/vim/${P}/syntax/zig.vim
share/vim/${P}/syntax/zimbu.vim
share/vim/${P}/syntax/zir.vim
share/vim/${P}/syntax/zsh.vim
share/vim/${P}/tools/
share/vim/${P}/tools/README.txt