Re: [update] editors/neovim 0.3.0

On Wed, Jun 27, 2018 at 01:01:42AM +0100, Stuart Henderson wrote:
> Personally I'd just go for the simpler COMPER_LIBCXX, the "Extra" isn't a
> real problem, but either way is ok with me.

Alright, so here's an updated diff which syncs us with the work on tags,
uses COMPILER_LIBCXX, and fixes some formatting.

If I can get an OK on this an py-neovim, I will commit them at the same
time.

Thanks


Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/neovim/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 27 Jun 2018 21:03:41 -0000 1.8
+++ Makefile 29 Jun 2018 10:39:51 -0000
@@ -4,8 +4,7 @@ COMMENT = continuation and extension of

GH_ACCOUNT = neovim
GH_PROJECT = neovim
-GH_TAGNAME = v0.2.2
-REVISION = 1
+GH_TAGNAME = v0.3.0

CATEGORIES = editors devel
HOMEPAGE = http://neovim.org
@@ -15,7 +14,7 @@ MAINTAINER = Edd Barrett <edd@openbsd.or
PERMIT_PACKAGE_CDROM = Yes

WANTLIB += c iconv intl ${MODLUA_WANTLIB} m msgpackc pthread termkey
-WANTLIB += unibilium util uv vterm
+WANTLIB += unibilium util uv vterm ${COMPILER_LIBCXX}

MODULES = devel/cmake \
lang/lua \
@@ -46,7 +45,9 @@ CONFIGURE_ARGS += -DLUA_PRG=${MODLUA_BIN
# Tests need gmake
USE_GMAKE = Yes
# `test_startup_utf8.vim' requires either bash or zsh
-TEST_DEPENDS = shells/bash
+TEST_DEPENDS = shells/bash \
+ editors/py-neovim \
+ editors/py-neovim,python3

# 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.2
diff -u -p -r1.2 distinfo
--- distinfo 2 Dec 2017 12:28:05 -0000 1.2
+++ distinfo 29 Jun 2018 10:07:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (neovim-0.2.2.tar.gz) = qDjuB8yaLvit4bMaKk8tXpM54kSt5o5kVWwfS0DMxe0=
-SIZE (neovim-0.2.2.tar.gz) = 8325879
+SHA256 (neovim-0.3.0.tar.gz) = 96y2GxbT9SGQfZnEhrep8eUF6LKhjJ72mm1/GPKfdLg=
+SIZE (neovim-0.3.0.tar.gz) = 8903630
Index: patches/patch-src_nvim_testdir_test_python2_vim
===================================================================
RCS file: patches/patch-src_nvim_testdir_test_python2_vim
diff -N patches/patch-src_nvim_testdir_test_python2_vim
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_nvim_testdir_test_python2_vim 29 Jun 2018 10:07:37 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Skip a known failing test until fixed upstream:
+https://github.com/neovim/neovim/issues/8554
+
+Index: src/nvim/testdir/test_python2.vim
+--- src/nvim/testdir/test_python2.vim.orig
++++ src/nvim/testdir/test_python2.vim
+@@ -1,6 +1,8 @@
+ " Test for python 2 commands.
+ " TODO: move tests from test87.in here.
+
++finish
++
+ if !has('python')
+ finish
+ endif
Index: patches/patch-src_nvim_testdir_test_python3_vim
===================================================================
RCS file: patches/patch-src_nvim_testdir_test_python3_vim
diff -N patches/patch-src_nvim_testdir_test_python3_vim
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_nvim_testdir_test_python3_vim 29 Jun 2018 10:07:37 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Skip a known failing test until fixed upstream:
+https://github.com/neovim/neovim/issues/8554
+
+Index: src/nvim/testdir/test_python3.vim
+--- src/nvim/testdir/test_python3.vim.orig
++++ src/nvim/testdir/test_python3.vim
+@@ -1,6 +1,8 @@
+ " Test for python 2 commands.
+ " TODO: move tests from test88.in here.
+
++finish
++
+ if !has('python3')
+ finish
+ endif
Index: patches/patch-src_nvim_vim_h
===================================================================
RCS file: patches/patch-src_nvim_vim_h
diff -N patches/patch-src_nvim_vim_h
--- patches/patch-src_nvim_vim_h 2 Dec 2017 12:28:05 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_nvim_vim_h,v 1.1 2017/12/02 12:28:05 edd Exp $
-
-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
-