Hi, In the time we were porting neovim-0.2.1 there has been another release, so here it is.
I'll test this more thoroughly over the next couple of days. Comments? OK? (The py-neovim update still needs to go in too.) Index: Makefile =================================================================== RCS file: /home/edd/source/OpenBSD-CVS/ports/editors/neovim/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile 21 Nov 2017 00:13:00 -0000 1.5 +++ Makefile 28 Nov 2017 21:36:40 -0000 @@ -4,8 +4,7 @@ COMMENT = continuation and extension of GH_ACCOUNT = neovim GH_PROJECT = neovim -GH_TAGNAME = v0.2.0 -REVISION = 3 +GH_TAGNAME = v0.2.2 CATEGORIES = editors devel HOMEPAGE = http://neovim.org @@ -14,12 +13,13 @@ MAINTAINER = Edd Barrett <e...@openbsd.or # Apache 2.0 + Vim License PERMIT_PACKAGE_CDROM = Yes -WANTLIB = c iconv intl m msgpackc pthread termkey unibilium util uv -WANTLIB += vterm +WANTLIB += c iconv intl ${MODLUA_WANTLIB} m msgpackc pthread termkey +WANTLIB += unibilium util uv vterm MODULES = devel/cmake \ lang/lua \ textproc/intltool + BUILD_DEPENDS = ${RUN_DEPENDS} \ devel/gperf \ devel/lpeg \ @@ -31,25 +31,26 @@ LIB_DEPENDS = devel/gettext \ devel/libvterm \ devel/msgpack \ devel/unibilium + RUN_DEPENDS += devel/libmpack/lua \ - devel/libmpack/main + devel/libmpack/main \ + devel/desktop-file-utils MAKE_FLAGS += USE_BUNDLED_DEPS=OFF -CONFIGURE_ARGS += -DLUA_PRG=${MODLUA_BIN} +CONFIGURE_ARGS += -DLUA_PRG=${MODLUA_BIN} \ + -DLUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \ + -DLUA_LIBRARIES=${MODLUA_LIB} \ + -DPREFER_LUA=ON # disables LuaJIT # Tests need gmake USE_GMAKE = Yes - -NVIM_PRG = ${WRKBUILD}/bin/nvim -SUBST_VARS += VIMPROG - -pre-test: - ${SUBST_CMD} ${WRKSRC}/src/nvim/testdir/test49.vim +# `test_startup_utf8.vim' requires either bash or zsh +TEST_DEPENDS = shells/bash # These are the "old tests". There is also a new suite, but we would need the # "busted" test suite for Lua, which is not yet ported. do-test: cd ${WRKSRC} && env LC_CTYPE=en_US.UTF-8 ${MAKE_PROGRAM} \ - -C src/nvim/testdir NVIM_PRG=${NVIM_PRG} ${MAKE_FLAGS} + -C src/nvim/testdir NVIM_PRG=${WRKBUILD}/bin/nvim ${MAKE_FLAGS} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/edd/source/OpenBSD-CVS/ports/editors/neovim/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 2 May 2017 20:58:42 -0000 1.1.1.1 +++ distinfo 28 Nov 2017 21:36:40 -0000 @@ -1,2 +1,2 @@ -SHA256 (neovim-0.2.0.tar.gz) = cuJj+dI/5gQD1TpS1MlQJrC+QowbnAK4CrVRZuo/YrU= -SIZE (neovim-0.2.0.tar.gz) = 7846467 +SHA256 (neovim-0.2.2.tar.gz) = qDjuB8yaLvit4bMaKk8tXpM54kSt5o5kVWwfS0DMxe0= +SIZE (neovim-0.2.2.tar.gz) = 8325879 Index: patches/patch-cmake_FindLibUV_cmake =================================================================== RCS file: patches/patch-cmake_FindLibUV_cmake diff -N patches/patch-cmake_FindLibUV_cmake --- patches/patch-cmake_FindLibUV_cmake 2 May 2017 20:58:42 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-cmake_FindLibUV_cmake,v 1.1.1.1 2017/05/02 20:58:42 edd Exp $ ---- cmake/FindLibUV.cmake.orig Mon May 1 21:13:23 2017 -+++ cmake/FindLibUV.cmake Tue May 2 09:45:33 2017 -@@ -65,7 +65,7 @@ if(HAVE_LIBKSTAT) - endif() - - check_library_exists(kvm kvm_open "kvm.h" HAVE_LIBKVM) --if(HAVE_LIBKVM) -+if(HAVE_LIBKVM AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") - list(APPEND LIBUV_LIBRARIES kvm) - endif() - Index: patches/patch-runtime_autoload_health_provider_vim =================================================================== RCS file: patches/patch-runtime_autoload_health_provider_vim diff -N patches/patch-runtime_autoload_health_provider_vim --- patches/patch-runtime_autoload_health_provider_vim 12 May 2017 09:56:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,69 +0,0 @@ -$OpenBSD: patch-runtime_autoload_health_provider_vim,v 1.1 2017/05/12 09:56:34 edd Exp $ - -https://github.com/neovim/neovim/pull/6721 - -Index: runtime/autoload/health/provider.vim ---- runtime/autoload/health/provider.vim.orig -+++ runtime/autoload/health/provider.vim -@@ -38,6 +38,16 @@ function! s:system_handler(jobid, data, event) dict ab - endif - endfunction - -+" Attempts to construct a shell command from an args list. -+" Only for display, to help users debug a failed command. -+function! s:shellify(cmd) abort -+ if type(a:cmd) != type([]) -+ return a:cmd -+ endif -+ return join(map(copy(a:cmd), -+ \'v:val =~# ''\m[\-.a-zA-Z_/]'' ? shellescape(v:val) : v:val'), ' ') -+endfunction -+ - " Run a system command and timeout after 30 seconds. - function! s:system(cmd, ...) abort - let stdin = a:0 ? a:1 : '' -@@ -54,8 +64,7 @@ function! s:system(cmd, ...) abort - let jobid = jobstart(a:cmd, opts) - - if jobid < 1 -- call health#report_error(printf('Command error %d: %s', jobid, -- \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd)) -+ call health#report_error(printf('Command error (job=%d): %s', jobid, s:shellify(a:cmd))) - let s:shell_error = 1 - return opts.output - endif -@@ -66,13 +75,11 @@ function! s:system(cmd, ...) abort - - let res = jobwait([jobid], 30000) - if res[0] == -1 -- call health#report_error(printf('Command timed out: %s', -- \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd)) -+ call health#report_error(printf('Command timed out: %s', s:shellify(a:cmd))) - call jobstop(jobid) - elseif s:shell_error != 0 && !ignore_error -- call health#report_error(printf('Command error (%d) %s: %s', jobid, -- \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd, -- \ opts.output)) -+ call health#report_error(printf("Command error (job=%d): %s\nOutput: %s", jobid, -+ \ s:shellify(a:cmd), opts.output)) - endif - - return opts.output -@@ -157,7 +164,7 @@ function! s:version_info(python) abort - \ ])) - - if empty(python_version) -- let python_version = 'unable to parse python response' -+ let python_version = 'unable to parse '.a:python.' response' - endif - - let nvim_path = s:trim(s:system([ -@@ -176,7 +183,7 @@ function! s:version_info(python) abort - endfunction - - " Try to get neovim.VERSION (added in 0.1.11dev). -- let nvim_version = s:system(['python', '-c', -+ let nvim_version = s:system([a:python, '-c', - \ 'from neovim import VERSION as v; '. - \ 'print("{}.{}.{}{}".format(v.major, v.minor, v.patch, v.prerelease))'], - \ '', 1, 1) Index: patches/patch-runtime_autoload_health_vim =================================================================== RCS file: patches/patch-runtime_autoload_health_vim diff -N patches/patch-runtime_autoload_health_vim --- patches/patch-runtime_autoload_health_vim 12 May 2017 09:56:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-runtime_autoload_health_vim,v 1.1 2017/05/12 09:56:34 edd Exp $ - -https://github.com/neovim/neovim/pull/6721 - -Index: runtime/autoload/health.vim ---- runtime/autoload/health.vim.orig -+++ runtime/autoload/health.vim -@@ -66,6 +66,7 @@ function! health#check(plugin_names) abort - " needed for plasticboy/vim-markdown, because it uses fdm=expr - normal! zR - setlocal nomodified -+ setlocal bufhidden=hide - redraw|echo '' - endfunction - Index: patches/patch-src_nvim_vim_h =================================================================== RCS file: patches/patch-src_nvim_vim_h diff -N patches/patch-src_nvim_vim_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_nvim_vim_h 28 Nov 2017 21:36:40 -0000 @@ -0,0 +1,18 @@ +$OpenBSD$ + +Fix opening character devices. +https://github.com/neovim/neovim/issues/7542 +https://github.com/jamessan/neovim/commit/9c58b502d85e4ac08a358d29d5bf4bdae20e8ad4 + +Index: src/nvim/vim.h +--- src/nvim/vim.h.orig ++++ src/nvim/vim.h +@@ -314,7 +314,7 @@ enum { FOLD_TEXT_LEN = 51 }; //!< buffer size for get + // Lowest number used for window ID. Cannot have this many windows per tab. + #define LOWEST_WIN_ID 1000 + +-#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(S_ISCHR) ++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)) && defined(S_ISCHR) + # define OPEN_CHR_FILES + #endif + Index: pkg/PLIST =================================================================== RCS file: /home/edd/source/OpenBSD-CVS/ports/editors/neovim/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 2 May 2017 20:58:42 -0000 1.1.1.1 +++ pkg/PLIST 28 Nov 2017 21:36:40 -0000 @@ -1,9 +1,8 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2017/05/02 20:58:42 edd Exp $ @bin bin/nvim @man man/man1/nvim.1 +share/applications/nvim.desktop share/doc/pkg-readmes/${FULLPKGNAME} -share/locale/af/ -share/locale/af/LC_MESSAGES/ share/locale/af/LC_MESSAGES/nvim.mo share/locale/ca/LC_MESSAGES/nvim.mo share/locale/cs.cp1250/ @@ -11,8 +10,6 @@ share/locale/cs.cp1250/LC_MESSAGES/ share/locale/cs.cp1250/LC_MESSAGES/nvim.mo share/locale/cs/LC_MESSAGES/nvim.mo share/locale/de/LC_MESSAGES/nvim.mo -share/locale/en_GB/ -share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/nvim.mo share/locale/eo/LC_MESSAGES/nvim.mo share/locale/es/LC_MESSAGES/nvim.mo @@ -76,7 +73,9 @@ share/nvim/runtime/autoload/netrw_gitign share/nvim/runtime/autoload/paste.vim share/nvim/runtime/autoload/phpcomplete.vim share/nvim/runtime/autoload/provider/ +share/nvim/runtime/autoload/provider.vim share/nvim/runtime/autoload/provider/clipboard.vim +share/nvim/runtime/autoload/provider/node.vim share/nvim/runtime/autoload/provider/python.vim share/nvim/runtime/autoload/provider/python3.vim share/nvim/runtime/autoload/provider/pythonx.vim @@ -88,6 +87,8 @@ share/nvim/runtime/autoload/remote/ share/nvim/runtime/autoload/remote/define.vim share/nvim/runtime/autoload/remote/host.vim share/nvim/runtime/autoload/rubycomplete.vim +share/nvim/runtime/autoload/rust.vim +share/nvim/runtime/autoload/rustfmt.vim share/nvim/runtime/autoload/shada.vim share/nvim/runtime/autoload/spellfile.vim share/nvim/runtime/autoload/sqlcomplete.vim @@ -136,6 +137,7 @@ share/nvim/runtime/compiler/ share/nvim/runtime/compiler/ant.vim share/nvim/runtime/compiler/bcc.vim share/nvim/runtime/compiler/bdf.vim +share/nvim/runtime/compiler/cargo.vim share/nvim/runtime/compiler/checkstyle.vim share/nvim/runtime/compiler/context.vim share/nvim/runtime/compiler/cs.vim @@ -186,6 +188,7 @@ share/nvim/runtime/compiler/rspec.vim share/nvim/runtime/compiler/rst.vim share/nvim/runtime/compiler/ruby.vim share/nvim/runtime/compiler/rubyunit.vim +share/nvim/runtime/compiler/rustc.vim share/nvim/runtime/compiler/sass.vim share/nvim/runtime/compiler/se.vim share/nvim/runtime/compiler/splint.vim @@ -213,13 +216,14 @@ share/nvim/runtime/doc/farsi.txt share/nvim/runtime/doc/filetype.txt share/nvim/runtime/doc/fold.txt share/nvim/runtime/doc/ft_ada.txt +share/nvim/runtime/doc/ft_rust.txt share/nvim/runtime/doc/ft_sql.txt share/nvim/runtime/doc/gui.txt share/nvim/runtime/doc/hebrew.txt share/nvim/runtime/doc/help.txt share/nvim/runtime/doc/helphelp.txt -share/nvim/runtime/doc/howto.txt share/nvim/runtime/doc/if_cscop.txt +share/nvim/runtime/doc/if_lua.txt share/nvim/runtime/doc/if_pyth.txt share/nvim/runtime/doc/if_ruby.txt share/nvim/runtime/doc/indent.txt @@ -238,7 +242,6 @@ share/nvim/runtime/doc/msgpack_rpc.txt share/nvim/runtime/doc/nvim.txt share/nvim/runtime/doc/nvim_terminal_emulator.txt share/nvim/runtime/doc/options.txt -share/nvim/runtime/doc/os_win32.txt share/nvim/runtime/doc/pattern.txt share/nvim/runtime/doc/pi_gzip.txt share/nvim/runtime/doc/pi_health.txt @@ -272,6 +275,7 @@ share/nvim/runtime/doc/tagsrch.txt share/nvim/runtime/doc/term.txt share/nvim/runtime/doc/tips.txt share/nvim/runtime/doc/uganda.txt +share/nvim/runtime/doc/ui.txt share/nvim/runtime/doc/undo.txt share/nvim/runtime/doc/usr_01.txt share/nvim/runtime/doc/usr_02.txt @@ -372,6 +376,7 @@ share/nvim/runtime/ftplugin/flexwiki.vim share/nvim/runtime/ftplugin/fortran.vim share/nvim/runtime/ftplugin/framescript.vim share/nvim/runtime/ftplugin/fvwm.vim +share/nvim/runtime/ftplugin/gdb.vim share/nvim/runtime/ftplugin/git.vim share/nvim/runtime/ftplugin/gitcommit.vim share/nvim/runtime/ftplugin/gitconfig.vim @@ -435,6 +440,7 @@ share/nvim/runtime/ftplugin/mrxvtrc.vim share/nvim/runtime/ftplugin/msmessages.vim share/nvim/runtime/ftplugin/muttrc.vim share/nvim/runtime/ftplugin/nanorc.vim +share/nvim/runtime/ftplugin/neomuttrc.vim share/nvim/runtime/ftplugin/netrc.vim share/nvim/runtime/ftplugin/nsis.vim share/nvim/runtime/ftplugin/objc.vim @@ -470,7 +476,9 @@ share/nvim/runtime/ftplugin/rpl.vim share/nvim/runtime/ftplugin/rrst.vim share/nvim/runtime/ftplugin/rst.vim share/nvim/runtime/ftplugin/ruby.vim +share/nvim/runtime/ftplugin/rust.vim share/nvim/runtime/ftplugin/sass.vim +share/nvim/runtime/ftplugin/sbt.vim share/nvim/runtime/ftplugin/scala.vim share/nvim/runtime/ftplugin/scheme.vim share/nvim/runtime/ftplugin/screen.vim @@ -498,6 +506,7 @@ share/nvim/runtime/ftplugin/tcsh.vim share/nvim/runtime/ftplugin/terminfo.vim share/nvim/runtime/ftplugin/tex.vim share/nvim/runtime/ftplugin/text.vim +share/nvim/runtime/ftplugin/tmux.vim share/nvim/runtime/ftplugin/treetop.vim share/nvim/runtime/ftplugin/tt2html.vim share/nvim/runtime/ftplugin/tutor.vim @@ -611,6 +620,8 @@ share/nvim/runtime/indent/rpl.vim share/nvim/runtime/indent/rrst.vim share/nvim/runtime/indent/rst.vim share/nvim/runtime/indent/ruby.vim +share/nvim/runtime/indent/rust.vim +share/nvim/runtime/indent/sas.vim share/nvim/runtime/indent/sass.vim share/nvim/runtime/indent/scala.vim share/nvim/runtime/indent/scheme.vim @@ -743,6 +754,9 @@ share/nvim/runtime/pack/dist/opt/shellme share/nvim/runtime/pack/dist/opt/swapmouse/ share/nvim/runtime/pack/dist/opt/swapmouse/plugin/ share/nvim/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim +share/nvim/runtime/pack/dist/opt/termdebug/ +share/nvim/runtime/pack/dist/opt/termdebug/plugin/ +share/nvim/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim share/nvim/runtime/pack/dist/opt/vimball/ share/nvim/runtime/pack/dist/opt/vimball/autoload/ share/nvim/runtime/pack/dist/opt/vimball/autoload/vimball.vim @@ -799,6 +813,7 @@ share/nvim/runtime/print/ks_roman.ps share/nvim/runtime/print/latin1.ps share/nvim/runtime/print/mac-roman.ps share/nvim/runtime/print/prolog.ps +share/nvim/runtime/rgb.txt share/nvim/runtime/scripts.vim share/nvim/runtime/synmenu.vim share/nvim/runtime/syntax/ @@ -1123,15 +1138,18 @@ share/nvim/runtime/syntax/msidl.vim share/nvim/runtime/syntax/msmessages.vim share/nvim/runtime/syntax/msql.vim share/nvim/runtime/syntax/mupad.vim +share/nvim/runtime/syntax/murphi.vim share/nvim/runtime/syntax/mush.vim share/nvim/runtime/syntax/muttrc.vim share/nvim/runtime/syntax/mysql.vim +share/nvim/runtime/syntax/n1ql.vim share/nvim/runtime/syntax/named.vim share/nvim/runtime/syntax/nanorc.vim share/nvim/runtime/syntax/nasm.vim share/nvim/runtime/syntax/nastran.vim share/nvim/runtime/syntax/natural.vim share/nvim/runtime/syntax/ncf.vim +share/nvim/runtime/syntax/neomuttrc.vim share/nvim/runtime/syntax/netrc.vim share/nvim/runtime/syntax/netrw.vim share/nvim/runtime/syntax/ninja.vim @@ -1221,10 +1239,12 @@ share/nvim/runtime/syntax/rrst.vim share/nvim/runtime/syntax/rst.vim share/nvim/runtime/syntax/rtf.vim share/nvim/runtime/syntax/ruby.vim +share/nvim/runtime/syntax/rust.vim share/nvim/runtime/syntax/samba.vim share/nvim/runtime/syntax/sas.vim share/nvim/runtime/syntax/sass.vim share/nvim/runtime/syntax/sather.vim +share/nvim/runtime/syntax/sbt.vim share/nvim/runtime/syntax/scala.vim share/nvim/runtime/syntax/scheme.vim share/nvim/runtime/syntax/scilab.vim @@ -1305,6 +1325,7 @@ share/nvim/runtime/syntax/tags.vim share/nvim/runtime/syntax/tak.vim share/nvim/runtime/syntax/takcmp.vim share/nvim/runtime/syntax/takout.vim +share/nvim/runtime/syntax/tap.vim share/nvim/runtime/syntax/tar.vim share/nvim/runtime/syntax/taskdata.vim share/nvim/runtime/syntax/taskedit.vim @@ -1320,6 +1341,7 @@ share/nvim/runtime/syntax/tf.vim share/nvim/runtime/syntax/tidy.vim share/nvim/runtime/syntax/tilde.vim share/nvim/runtime/syntax/tli.vim +share/nvim/runtime/syntax/tmux.vim share/nvim/runtime/syntax/tpp.vim share/nvim/runtime/syntax/trasys.vim share/nvim/runtime/syntax/treetop.vim @@ -1398,4 +1420,7 @@ share/nvim/runtime/tutor/ share/nvim/runtime/tutor/en/ share/nvim/runtime/tutor/en/vim-01-beginner.tutor share/nvim/runtime/tutor/tutor.tutor -share/nvim/runtime/vimrc_example.vim +share/pixmaps/ +share/pixmaps/nvim.png +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
