Hi,
On Tue, Jun 26, 2018 at 01:28:38PM -0400, Jon Bernard wrote:
> > c++abi is only on architectures with clang in base, so this will fail on
> > other
> > arches.
>
> Here's a new version that uses COMPILER_LIBCXX
I don't think that's right. port-lib-depends-check gives:
Extra: c++.1
Grepping the tree, I think we want:
---8<---
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mclang}
WANTLIB += c++abi
.endif
--->8---
Can you confirm that is right Stuart?
> and includes Edd's README suggestions.
I've made a small tweak. I don't think the rename needs it's own section
in the README.
New diff inline. However, I'm seeing some Python-related test failures:
---8<---
>From test_python2.vim:
Executing Test_pydo()
Executed 1 test
1 FAILED:
Found errors in Test_pydo():
function RunTheTest[35]..Test_pydo line 13: Expected 3 but got 5
>From test_python3.vim:
Executing Test_py3do()
Executed 1 test
1 FAILED:
Found errors in Test_py3do():
function RunTheTest[35]..Test_py3do line 13: Expected 3 but got 5
>From test_python2.vim:
Found errors in Test_pydo():
function RunTheTest[35]..Test_pydo line 13: Expected 3 but got 5
>From test_python3.vim:
Found errors in Test_py3do():
function RunTheTest[35]..Test_py3do line 13: Expected 3 but got 5
--->8---
I don't get these if I install the neovim python modules from pip.
Weird... Needs investigation I'm afraid.
Since the tests obviously check python stuff, I've added the python
modules as TEST_DEPENDS.
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/neovim/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 20 May 2018 08:30:56 -0000 1.7
+++ Makefile 26 Jun 2018 19:06:52 -0000
@@ -4,8 +4,7 @@ COMMENT = continuation and extension of
GH_ACCOUNT = neovim
GH_PROJECT = neovim
-GH_TAGNAME = v0.2.2
-REVISION = 0
+GH_TAGNAME = v0.3.0
CATEGORIES = editors devel
HOMEPAGE = http://neovim.org
@@ -17,6 +16,11 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c iconv intl ${MODLUA_WANTLIB} m msgpackc pthread termkey
WANTLIB += unibilium util uv vterm
+.include <bsd.port.arch.mk>
+.if ${PROPERTIES:Mclang}
+WANTLIB += c++abi
+.endif
+
MODULES = devel/cmake \
lang/lua \
textproc/intltool
@@ -46,7 +50,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 26 Jun 2018 18:25:09 -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_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
- #endif
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/neovim/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 20 May 2018 08:30:56 -0000 1.3
+++ pkg/PLIST 26 Jun 2018 18:25:09 -0000
@@ -56,6 +56,8 @@ share/nvim/runtime/autoload/context.vim
share/nvim/runtime/autoload/contextcomplete.vim
share/nvim/runtime/autoload/csscomplete.vim
share/nvim/runtime/autoload/decada.vim
+share/nvim/runtime/autoload/dist/
+share/nvim/runtime/autoload/dist/ft.vim
share/nvim/runtime/autoload/gnat.vim
share/nvim/runtime/autoload/gzip.vim
share/nvim/runtime/autoload/health/
@@ -204,6 +206,7 @@ share/nvim/runtime/doc/api.txt
share/nvim/runtime/doc/arabic.txt
share/nvim/runtime/doc/autocmd.txt
share/nvim/runtime/doc/change.txt
+share/nvim/runtime/doc/channel.txt
share/nvim/runtime/doc/cmdline.txt
share/nvim/runtime/doc/debug.txt
share/nvim/runtime/doc/deprecated.txt
@@ -728,6 +731,8 @@ share/nvim/runtime/keymap/ukrainian-jcuk
share/nvim/runtime/keymap/vietnamese-telex_utf-8.vim
share/nvim/runtime/keymap/vietnamese-viqr_utf-8.vim
share/nvim/runtime/keymap/vietnamese-vni_utf-8.vim
+share/nvim/runtime/lua/
+share/nvim/runtime/lua/man.lua
share/nvim/runtime/macmap.vim
share/nvim/runtime/macros/
share/nvim/runtime/macros/editexisting.vim
@@ -766,7 +771,6 @@ share/nvim/runtime/pack/dist/opt/vimball
share/nvim/runtime/pack/dist/opt/vimball/plugin/
share/nvim/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim
share/nvim/runtime/plugin/
-share/nvim/runtime/plugin/gui_shim.vim
share/nvim/runtime/plugin/gzip.vim
share/nvim/runtime/plugin/health.vim
share/nvim/runtime/plugin/man.vim
@@ -815,6 +819,8 @@ 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/spell/
+share/nvim/runtime/spell/en.utf-8.spl
share/nvim/runtime/synmenu.vim
share/nvim/runtime/syntax/
share/nvim/runtime/syntax/2html.vim
@@ -1419,7 +1425,9 @@ share/nvim/runtime/syntax/zsh.vim
share/nvim/runtime/tutor/
share/nvim/runtime/tutor/en/
share/nvim/runtime/tutor/en/vim-01-beginner.tutor
+share/nvim/runtime/tutor/en/vim-01-beginner.tutor.json
share/nvim/runtime/tutor/tutor.tutor
+share/nvim/runtime/tutor/tutor.tutor.json
share/pixmaps/
share/pixmaps/nvim.png
@exec %D/bin/update-desktop-database
Index: pkg/README
===================================================================
RCS file: /cvs/ports/editors/neovim/pkg/README,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 README
--- pkg/README 2 May 2017 20:58:42 -0000 1.1.1.1
+++ pkg/README 26 Jun 2018 18:26:41 -0000
@@ -18,5 +18,8 @@ dir is ~/.config/nvim, and the main conf
can symlink your existing traditional vim config and directory to the new
paths, and this will work.
-The first time you invoke nvim, run ':CheckHealth' to see what else you might
+The first time you invoke nvim, run ':checkhealth' to see what else you might
need to do to migrate.
+
+Please note that ':checkhealth' was called ':CheckHealth' (with different
+capitalisation) prior to neovim version 0.3.0.
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
