Hi Travis, On Fri, Nov 15, 2019 at 09:04:13PM -0800, Travis Cole wrote: > Are you sure you sent the right diff? It looks like one of the ones > I'd sent previously, but I don't notice any changes. > > If you could resend, or point out what I missed, I can merge it with > my latest diff.
My apologies. That was indeed the wrong diff! Here it is. Please merge your changes in, and we can ask Stuart what he thinks. Index: Makefile =================================================================== RCS file: /cvs/ports/editors/neovim/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile 9 Jul 2019 09:46:16 -0000 1.18 +++ Makefile 15 Nov 2019 11:17:57 -0000 @@ -4,15 +4,24 @@ COMMENT = continuation and extension of GH_ACCOUNT = neovim GH_PROJECT = neovim -GH_TAGNAME = v0.3.8 +GH_TAGNAME = v0.4.3 CATEGORIES = editors devel HOMEPAGE = https://neovim.io MAINTAINER = Edd Barrett <e...@openbsd.org> +# Neovim must be statically linked with libluv, which isn't yet ported. +LUV_VER = 1.30.1-1 +LUV = luv-${LUV_VER} +MASTER_SITES0 = https://github.com/luvit/luv/releases/download/${LUV_VER}/ +DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \ + ${LUV}${EXTRACT_SUFX}:0 + # Apache 2.0 + Vim License PERMIT_PACKAGE = Yes +DEBUG_PACKAGES = ${BUILD_PACKAGES} + WANTLIB += c iconv intl ${MODLUA_WANTLIB} m msgpackc pthread termkey WANTLIB += unibilium util uv vterm @@ -30,18 +39,20 @@ BUILD_DEPENDS = ${RUN_DEPENDS} \ LIB_DEPENDS = devel/gettext,-runtime \ devel/libtermkey \ devel/libuv \ - devel/libvterm \ + devel/libvterm>=1.0 \ devel/msgpack \ - devel/unibilium + devel/unibilium>=1.0 RUN_DEPENDS += devel/libmpack/lua \ devel/libmpack/main \ devel/desktop-file-utils -MAKE_FLAGS += USE_BUNDLED_DEPS=OFF +MAKE_FLAGS += USE_BUNDLED=OFF CONFIGURE_ARGS += -DLUA_PRG=${MODLUA_BIN} \ -DLUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \ -DLUA_LIBRARIES=${MODLUA_LIB} \ + -DLIBLUV_INCLUDE_DIR=${WRKBUILD}/deps/include \ + -DLIBLUV_LIBRARY=${WRKBUILD}/deps/lib/libluv.a \ -DPREFER_LUA=ON # disables LuaJIT # Tests need gmake @@ -50,6 +61,27 @@ USE_GMAKE = Yes TEST_DEPENDS = shells/bash \ editors/py-neovim \ editors/py-neovim,python3 + +# Build libluv first as a static library. We opted not to create a libluv +# port because it must be built for a specific Lua version and we don't know +# what version future ports might need. Currently no other port requires +# libluv, so it's simpler to build a static library here. +# +# Most of this target is lifted from ${MODCMAKE_configure} in cmake.port.mk. +# Unfortunately we can't use it directly, as some of the arguments make +# assumptions that can't work for us here. +pre-configure: + mkdir -p ${WRKBUILD}/build + cd ${WRKBUILD}/build && \ + ${SETENV} CC="${CC}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + ${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake \ + -DWITH_LUA_ENGINE=Lua \ + -DLUA_LIBRARIES=${MODLUA_LIB} \ + -DLUA_INCLUDE_DIR=${MODLUA_INCL_DIR} -DBUILD_MODULE=OFF \ + -DLUA_BUILD_TYPE=System -DCMAKE_COLOR_MAKEFILE=OFF \ + -DCMAKE_INSTALL_PREFIX=${WRKBUILD}/deps ${WRKDIR}/${LUV} && \ + env VERBOSE=1 ${MAKE_PROGRAM} install # 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. Index: distinfo =================================================================== RCS file: /cvs/ports/editors/neovim/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 9 Jul 2019 09:46:16 -0000 1.6 +++ distinfo 15 Nov 2019 10:10:08 -0000 @@ -1,2 +1,4 @@ -SHA256 (neovim-0.3.8.tar.gz) = lT4TRWjYJNrXy/Mu4xFJUXMvmnUMRi5DDmtZP0GK92w= -SIZE (neovim-0.3.8.tar.gz) = 9233661 +SHA256 (luv-1.30.1-1.tar.gz) = Tih77W9R/VDOA7p/qMwz2E4bnLhpEcSBK7H0eh4+0So= +SHA256 (neovim-0.4.3.tar.gz) = kaC10yIEqCG/QUaQ5rSM9pIk0ZYdNxWMKzg/amz4VNI= +SIZE (luv-1.30.1-1.tar.gz) = 1354232 +SIZE (neovim-0.4.3.tar.gz) = 9556199 Index: patches/patch-src_nvim_os_process_c =================================================================== RCS file: patches/patch-src_nvim_os_process_c diff -N patches/patch-src_nvim_os_process_c --- patches/patch-src_nvim_os_process_c 17 Mar 2019 13:13:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,40 +0,0 @@ -$OpenBSD: patch-src_nvim_os_process_c,v 1.1 2019/03/17 13:13:40 edd Exp $ - -Port job stopping bug fix to neovim: - -Original vim fix: -https://github.com/vim/vim/commit/76ab4fd61901090e6af3451ca6c5ca0fc370571f#diff-b68adb4fa34020d8d7f0ab40a2704335 - -Index: src/nvim/os/process.c ---- src/nvim/os/process.c.orig -+++ src/nvim/os/process.c -@@ -89,21 +89,16 @@ bool os_proc_tree_kill(int pid, int sig) - bool os_proc_tree_kill(int pid, int sig) - { - assert(sig == SIGTERM || sig == SIGKILL); -- int pgid = getpgid(pid); -- if (pgid > 0) { // Ignore error. Never kill self (pid=0). -- if (pgid == pid) { -- ILOG("sending %s to process group: -%d", -- sig == SIGTERM ? "SIGTERM" : "SIGKILL", pgid); -- int rv = uv_kill(-pgid, sig); -- return rv == 0; -- } else { -- // Should never happen, because process_spawn() did setsid() in the child. -- ELOG("pgid %d != pid %d", pgid, pid); -- } -+ if (pid != 0) { // Never kill self (pid=0). -+ ILOG("sending %s to PIDs %d and %d", -+ sig == SIGTERM ? "SIGTERM" : "SIGKILL", -pid, pid); -+ -+ int rv1 = uv_kill(-pid, sig); -+ int rv2 = uv_kill(pid, sig); -+ return (rv1 == 0) && (rv2 == 0); - } else { -- ELOG("getpgid(%d) returned %d", pid, pgid); -+ return false; - } -- return false; - } - #endif - Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/editors/neovim/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 17 Mar 2019 13:13:40 -0000 1.7 +++ pkg/PLIST 15 Nov 2019 10:10:08 -0000 @@ -220,7 +220,6 @@ share/nvim/runtime/doc/diff.txt share/nvim/runtime/doc/digraph.txt share/nvim/runtime/doc/editing.txt share/nvim/runtime/doc/eval.txt -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 @@ -253,7 +252,6 @@ share/nvim/runtime/doc/options.txt share/nvim/runtime/doc/pattern.txt share/nvim/runtime/doc/pi_gzip.txt share/nvim/runtime/doc/pi_health.txt -share/nvim/runtime/doc/pi_matchit.txt share/nvim/runtime/doc/pi_msgpack.txt share/nvim/runtime/doc/pi_netrw.txt share/nvim/runtime/doc/pi_paren.txt @@ -325,6 +323,7 @@ share/nvim/runtime/filetype.vim share/nvim/runtime/ftoff.vim share/nvim/runtime/ftplugin/ share/nvim/runtime/ftplugin.vim +share/nvim/runtime/ftplugin/8th.vim share/nvim/runtime/ftplugin/a2ps.vim share/nvim/runtime/ftplugin/aap.vim share/nvim/runtime/ftplugin/abap.vim @@ -337,6 +336,7 @@ share/nvim/runtime/ftplugin/art.vim share/nvim/runtime/ftplugin/aspvbs.vim share/nvim/runtime/ftplugin/automake.vim share/nvim/runtime/ftplugin/awk.vim +share/nvim/runtime/ftplugin/bash.vim share/nvim/runtime/ftplugin/bdf.vim share/nvim/runtime/ftplugin/bst.vim share/nvim/runtime/ftplugin/btm.vim @@ -344,6 +344,7 @@ share/nvim/runtime/ftplugin/bzl.vim share/nvim/runtime/ftplugin/c.vim share/nvim/runtime/ftplugin/calendar.vim share/nvim/runtime/ftplugin/cdrdaoconf.vim +share/nvim/runtime/ftplugin/cfg.vim share/nvim/runtime/ftplugin/ch.vim share/nvim/runtime/ftplugin/changelog.vim share/nvim/runtime/ftplugin/chicken.vim @@ -374,6 +375,7 @@ share/nvim/runtime/ftplugin/dosbatch.vim share/nvim/runtime/ftplugin/dosini.vim share/nvim/runtime/ftplugin/dtd.vim share/nvim/runtime/ftplugin/dtrace.vim +share/nvim/runtime/ftplugin/dune.vim share/nvim/runtime/ftplugin/eiffel.vim share/nvim/runtime/ftplugin/elinks.vim share/nvim/runtime/ftplugin/erlang.vim @@ -413,6 +415,7 @@ share/nvim/runtime/ftplugin/ishd.vim share/nvim/runtime/ftplugin/j.vim share/nvim/runtime/ftplugin/java.vim share/nvim/runtime/ftplugin/javascript.vim +share/nvim/runtime/ftplugin/javascriptreact.vim share/nvim/runtime/ftplugin/jproperties.vim share/nvim/runtime/ftplugin/json.vim share/nvim/runtime/ftplugin/jsp.vim @@ -442,6 +445,7 @@ share/nvim/runtime/ftplugin/manconf.vim share/nvim/runtime/ftplugin/markdown.vim share/nvim/runtime/ftplugin/matlab.vim share/nvim/runtime/ftplugin/mf.vim +share/nvim/runtime/ftplugin/mma.vim share/nvim/runtime/ftplugin/modconf.vim share/nvim/runtime/ftplugin/mp.vim share/nvim/runtime/ftplugin/mplayerconf.vim @@ -451,6 +455,7 @@ 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/nroff.vim share/nvim/runtime/ftplugin/nsis.vim share/nvim/runtime/ftplugin/objc.vim share/nvim/runtime/ftplugin/ocaml.vim @@ -595,6 +600,7 @@ share/nvim/runtime/indent/ishd.vim share/nvim/runtime/indent/j.vim share/nvim/runtime/indent/java.vim share/nvim/runtime/indent/javascript.vim +share/nvim/runtime/indent/javascriptreact.vim share/nvim/runtime/indent/json.vim share/nvim/runtime/indent/jsp.vim share/nvim/runtime/indent/ld.vim @@ -624,6 +630,7 @@ share/nvim/runtime/indent/prolog.vim share/nvim/runtime/indent/pyrex.vim share/nvim/runtime/indent/python.vim share/nvim/runtime/indent/r.vim +share/nvim/runtime/indent/raml.vim share/nvim/runtime/indent/readline.vim share/nvim/runtime/indent/rhelp.vim share/nvim/runtime/indent/rmd.vim @@ -652,6 +659,7 @@ share/nvim/runtime/indent/tex.vim share/nvim/runtime/indent/tf.vim share/nvim/runtime/indent/tilde.vim share/nvim/runtime/indent/treetop.vim +share/nvim/runtime/indent/typescript.vim share/nvim/runtime/indent/vb.vim share/nvim/runtime/indent/verilog.vim share/nvim/runtime/indent/vhdl.vim @@ -747,6 +755,8 @@ share/nvim/runtime/lua/ share/nvim/runtime/lua/man.lua share/nvim/runtime/lua/vim/ share/nvim/runtime/lua/vim/compat.lua +share/nvim/runtime/lua/vim/inspect.lua +share/nvim/runtime/lua/vim/shared.lua share/nvim/runtime/macmap.vim share/nvim/runtime/macros/ share/nvim/runtime/macros/editexisting.vim @@ -770,6 +780,14 @@ share/nvim/runtime/pack/dist/opt/cfilter share/nvim/runtime/pack/dist/opt/justify/ share/nvim/runtime/pack/dist/opt/justify/plugin/ share/nvim/runtime/pack/dist/opt/justify/plugin/justify.vim +share/nvim/runtime/pack/dist/opt/matchit/ +share/nvim/runtime/pack/dist/opt/matchit/autoload/ +share/nvim/runtime/pack/dist/opt/matchit/autoload/matchit.vim +share/nvim/runtime/pack/dist/opt/matchit/doc/ +share/nvim/runtime/pack/dist/opt/matchit/doc/matchit.txt +share/nvim/runtime/pack/dist/opt/matchit/doc/tags +share/nvim/runtime/pack/dist/opt/matchit/plugin/ +share/nvim/runtime/pack/dist/opt/matchit/plugin/matchit.vim share/nvim/runtime/pack/dist/opt/shellmenu/ share/nvim/runtime/pack/dist/opt/shellmenu/plugin/ share/nvim/runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim @@ -840,6 +858,7 @@ share/nvim/runtime/spell/en.utf-8.spl share/nvim/runtime/synmenu.vim share/nvim/runtime/syntax/ share/nvim/runtime/syntax/2html.vim +share/nvim/runtime/syntax/8th.vim share/nvim/runtime/syntax/a2ps.vim share/nvim/runtime/syntax/a65.vim share/nvim/runtime/syntax/aap.vim @@ -980,6 +999,7 @@ share/nvim/runtime/syntax/dtd.vim share/nvim/runtime/syntax/dtml.vim share/nvim/runtime/syntax/dtrace.vim share/nvim/runtime/syntax/dts.vim +share/nvim/runtime/syntax/dune.vim share/nvim/runtime/syntax/dylan.vim share/nvim/runtime/syntax/dylanintr.vim share/nvim/runtime/syntax/dylanlid.vim @@ -1055,6 +1075,7 @@ share/nvim/runtime/syntax/hex.vim share/nvim/runtime/syntax/hgcommit.vim share/nvim/runtime/syntax/hitest.vim share/nvim/runtime/syntax/hog.vim +share/nvim/runtime/syntax/hollywood.vim share/nvim/runtime/syntax/hostconf.vim share/nvim/runtime/syntax/hostsaccess.vim share/nvim/runtime/syntax/html.vim @@ -1084,6 +1105,7 @@ share/nvim/runtime/syntax/jargon.vim share/nvim/runtime/syntax/java.vim share/nvim/runtime/syntax/javacc.vim share/nvim/runtime/syntax/javascript.vim +share/nvim/runtime/syntax/javascriptreact.vim share/nvim/runtime/syntax/jess.vim share/nvim/runtime/syntax/jgraph.vim share/nvim/runtime/syntax/jovial.vim @@ -1240,6 +1262,7 @@ share/nvim/runtime/syntax/quake.vim share/nvim/runtime/syntax/r.vim share/nvim/runtime/syntax/racc.vim share/nvim/runtime/syntax/radiance.vim +share/nvim/runtime/syntax/raml.vim share/nvim/runtime/syntax/ratpoison.vim share/nvim/runtime/syntax/rc.vim share/nvim/runtime/syntax/rcs.vim @@ -1358,6 +1381,7 @@ share/nvim/runtime/syntax/taskedit.vim share/nvim/runtime/syntax/tasm.vim share/nvim/runtime/syntax/tcl.vim share/nvim/runtime/syntax/tcsh.vim +share/nvim/runtime/syntax/template.vim share/nvim/runtime/syntax/teraterm.vim share/nvim/runtime/syntax/terminfo.vim share/nvim/runtime/syntax/tex.vim @@ -1380,6 +1404,7 @@ share/nvim/runtime/syntax/tt2.vim share/nvim/runtime/syntax/tt2html.vim share/nvim/runtime/syntax/tt2js.vim share/nvim/runtime/syntax/tutor.vim +share/nvim/runtime/syntax/typescript.vim share/nvim/runtime/syntax/uc.vim share/nvim/runtime/syntax/udevconf.vim share/nvim/runtime/syntax/udevperm.vim @@ -1411,6 +1436,7 @@ share/nvim/runtime/syntax/voscm.vim share/nvim/runtime/syntax/vrml.vim share/nvim/runtime/syntax/vroom.vim share/nvim/runtime/syntax/vsejcl.vim +share/nvim/runtime/syntax/vue.vim share/nvim/runtime/syntax/wast.vim share/nvim/runtime/syntax/wdiff.vim share/nvim/runtime/syntax/web.vim -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
