- Update to 0.2.0

Changelog: https://github.com/neovim/neovim/releases/tag/v0.2.0

PR:		219141
Submitted by:	maintainer

5 files changed, 37 insertions, 14 deletions

diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index 9507add04026..65cf89152725 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	neovim
-PORTVERSION=	0.1.7
+PORTVERSION=	0.2.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
@@ -23,7 +23,8 @@ LIB_DEPENDS=	libunibilium.so:devel/unibilium \
 
 USES=		cmake:outsource gettext iconv ninja lua:build pathfix pkgconfig
 USE_GITHUB=	yes
-GH_TUPLE=	tarruda:libmpack:1.0.3:libmpack
+GH_TUPLE=	libmpack:libmpack:1.0.5:libmpack \
+		libmpack:libmpack-lua:1.0.6:libmpack_lua
 
 CMAKE_ARGS=	-DLUA_PRG:FILEPATH="${LUA_CMD}" \
 		-DCMAKE_INSTALL_MANDIR:PATH="${MANPREFIX}/man" \
@@ -34,11 +35,12 @@ post-patch:
 		's|lua_objlen|lua_rawlen| ; \
 		 s|luaL_reg |luaL_Reg | ; \
 		 s|luaL_register(L, NULL, \(.*\));|luaL_setfuncs(L, \1, 0);|' \
-		${WRKSRC_libmpack}/binding/lua/lmpack.c
+		${WRKSRC_libmpack_lua}/lmpack.c
 
 pre-build:
+	@${LN} -s ${WRKSRC_libmpack} ${WRKSRC_libmpack_lua}/mpack-src
 	@${MKDIR} ${BUILD_WRKSRC}/src/nvim
-	@(cd ${WRKSRC_libmpack}/binding/lua && ${CC} ${CFLAGS} -fPIC \
+	@(cd ${WRKSRC_libmpack_lua} && ${CC} ${CFLAGS} -fPIC \
 		-I${LUA_INCDIR} -shared lmpack.c -o \
 		${BUILD_WRKSRC}/src/nvim/mpack.so \
 		${LUA_LIBDIR}/liblua-${LUA_VER}.so)
diff --git a/editors/neovim/distinfo b/editors/neovim/distinfo
index 2b5575aa5e0c..1f18198c4796 100644
--- a/editors/neovim/distinfo
+++ b/editors/neovim/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1480313427
-SHA256 (neovim-neovim-v0.1.7_GH0.tar.gz) = d8f885d019b1ad608f36ae23b8f1b15b7e33585e16f7514666ab6c9809bb4b7e
-SIZE (neovim-neovim-v0.1.7_GH0.tar.gz) = 7601279
-SHA256 (tarruda-libmpack-1.0.3_GH0.tar.gz) = 65eb21cfa9313204ac5296e3b305d752b8422c724b6375caecc6385f0a6d6e22
-SIZE (tarruda-libmpack-1.0.3_GH0.tar.gz) = 45720
+TIMESTAMP = 1494237437
+SHA256 (neovim-neovim-v0.2.0_GH0.tar.gz) = 72e263f9d23fe60403d53a52d4c95026b0be428c1b9c02b80ab55166ea3f62b5
+SIZE (neovim-neovim-v0.2.0_GH0.tar.gz) = 7846467
+SHA256 (libmpack-libmpack-1.0.5_GH0.tar.gz) = 4ce91395d81ccea97d3ad4cb962f8540d166e59d3e2ddce8a22979b49f108956
+SIZE (libmpack-libmpack-1.0.5_GH0.tar.gz) = 32966
+SHA256 (libmpack-libmpack-lua-1.0.6_GH0.tar.gz) = 66811e30b316b53d1e3c4225248d4813b8b852c3e19121ba5ad47a9d4537d1ae
+SIZE (libmpack-libmpack-lua-1.0.6_GH0.tar.gz) = 14557
diff --git a/editors/neovim/files/patch-CMakeLists.txt b/editors/neovim/files/patch-CMakeLists.txt
index 1335b47b7586..46a244f67af0 100644
--- a/editors/neovim/files/patch-CMakeLists.txt
+++ b/editors/neovim/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2016-11-08 05:44:53 UTC
+--- CMakeLists.txt.orig	2017-05-04 05:07:26 UTC
 +++ CMakeLists.txt
-@@ -221,7 +221,7 @@ else()
+@@ -223,7 +223,7 @@ else()
  
    # On FreeBSD 64 math.h uses unguarded C11 extension, which taints clang
    # 3.4.1 used there.
@@ -9,7 +9,7 @@
      add_definitions(-Wno-c11-extensions)
    endif()
  endif()
-@@ -386,9 +386,9 @@ endforeach()
+@@ -401,9 +401,9 @@ endforeach()
  
  # Find Lua interpreter
  include(LuaHelpers)
diff --git a/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c b/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c
index 993dc4fc0a31..fee4466ad2dc 100644
--- a/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c
+++ b/editors/neovim/files/patch-src_nvim_os_pty__process__unix.c
@@ -1,6 +1,6 @@
---- src/nvim/os/pty_process_unix.c.orig	2016-11-08 05:50:09 UTC
+--- src/nvim/os/pty_process_unix.c.orig	2017-05-04 05:10:42 UTC
 +++ src/nvim/os/pty_process_unix.c
-@@ -9,7 +9,7 @@
+@@ -12,7 +12,7 @@
  #include <sys/ioctl.h>
  
  // forkpty is not in POSIX, so headers are platform-specific
diff --git a/editors/neovim/pkg-plist b/editors/neovim/pkg-plist
index 6ba38d1e689d..dd93e114db8c 100644
--- a/editors/neovim/pkg-plist
+++ b/editors/neovim/pkg-plist
@@ -32,6 +32,8 @@ share/nvim/runtime/autoload/ada.vim
 share/nvim/runtime/autoload/adacomplete.vim
 share/nvim/runtime/autoload/ccomplete.vim
 share/nvim/runtime/autoload/clojurecomplete.vim
+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/gnat.vim
@@ -106,7 +108,9 @@ share/nvim/runtime/compiler/ant.vim
 share/nvim/runtime/compiler/bcc.vim
 share/nvim/runtime/compiler/bdf.vim
 share/nvim/runtime/compiler/checkstyle.vim
+share/nvim/runtime/compiler/context.vim
 share/nvim/runtime/compiler/cs.vim
+share/nvim/runtime/compiler/csslint.vim
 share/nvim/runtime/compiler/cucumber.vim
 share/nvim/runtime/compiler/decada.vim
 share/nvim/runtime/compiler/dot.vim
@@ -121,6 +125,7 @@ share/nvim/runtime/compiler/fpc.vim
 share/nvim/runtime/compiler/g95.vim
 share/nvim/runtime/compiler/gcc.vim
 share/nvim/runtime/compiler/gfortran.vim
+share/nvim/runtime/compiler/ghc.vim
 share/nvim/runtime/compiler/gnat.vim
 share/nvim/runtime/compiler/go.vim
 share/nvim/runtime/compiler/haml.vim
@@ -145,6 +150,7 @@ share/nvim/runtime/compiler/onsgmls.vim
 share/nvim/runtime/compiler/pbx.vim
 share/nvim/runtime/compiler/perl.vim
 share/nvim/runtime/compiler/php.vim
+share/nvim/runtime/compiler/pylint.vim
 share/nvim/runtime/compiler/pyunit.vim
 share/nvim/runtime/compiler/rake.vim
 share/nvim/runtime/compiler/rspec.vim
@@ -288,6 +294,7 @@ share/nvim/runtime/ftplugin/arch.vim
 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/bdf.vim
 share/nvim/runtime/ftplugin/bst.vim
 share/nvim/runtime/ftplugin/btm.vim
@@ -433,6 +440,7 @@ share/nvim/runtime/ftplugin/rrst.vim
 share/nvim/runtime/ftplugin/rst.vim
 share/nvim/runtime/ftplugin/ruby.vim
 share/nvim/runtime/ftplugin/sass.vim
+share/nvim/runtime/ftplugin/scala.vim
 share/nvim/runtime/ftplugin/scheme.vim
 share/nvim/runtime/ftplugin/screen.vim
 share/nvim/runtime/ftplugin/scss.vim
@@ -502,6 +510,7 @@ share/nvim/runtime/indent/clojure.vim
 share/nvim/runtime/indent/cmake.vim
 share/nvim/runtime/indent/cobol.vim
 share/nvim/runtime/indent/config.vim
+share/nvim/runtime/indent/context.vim
 share/nvim/runtime/indent/cpp.vim
 share/nvim/runtime/indent/cs.vim
 share/nvim/runtime/indent/css.vim
@@ -546,6 +555,7 @@ share/nvim/runtime/indent/lua.vim
 share/nvim/runtime/indent/mail.vim
 share/nvim/runtime/indent/make.vim
 share/nvim/runtime/indent/matlab.vim
+share/nvim/runtime/indent/mf.vim
 share/nvim/runtime/indent/mma.vim
 share/nvim/runtime/indent/mp.vim
 share/nvim/runtime/indent/objc.vim
@@ -570,6 +580,7 @@ share/nvim/runtime/indent/rrst.vim
 share/nvim/runtime/indent/rst.vim
 share/nvim/runtime/indent/ruby.vim
 share/nvim/runtime/indent/sass.vim
+share/nvim/runtime/indent/scala.vim
 share/nvim/runtime/indent/scheme.vim
 share/nvim/runtime/indent/scss.vim
 share/nvim/runtime/indent/sdl.vim
@@ -605,6 +616,8 @@ share/nvim/runtime/indoff.vim
 share/nvim/runtime/keymap/accents.vim
 share/nvim/runtime/keymap/arabic.vim
 share/nvim/runtime/keymap/arabic_utf-8.vim
+share/nvim/runtime/keymap/armenian-eastern_utf-8.vim
+share/nvim/runtime/keymap/armenian-western_utf-8.vim
 share/nvim/runtime/keymap/belarusian-jcuken.vim
 share/nvim/runtime/keymap/bulgarian-bds.vim
 share/nvim/runtime/keymap/bulgarian-phonetic.vim
@@ -632,6 +645,7 @@ share/nvim/runtime/keymap/hebrewp_cp1255.vim
 share/nvim/runtime/keymap/hebrewp_iso-8859-8.vim
 share/nvim/runtime/keymap/hebrewp_utf-8.vim
 share/nvim/runtime/keymap/kana.vim
+share/nvim/runtime/keymap/kazakh-jcuken.vim
 share/nvim/runtime/keymap/lithuanian-baltic.vim
 share/nvim/runtime/keymap/magyar_utf-8.vim
 share/nvim/runtime/keymap/mongolian_utf-8.vim
@@ -645,6 +659,7 @@ share/nvim/runtime/keymap/polish-slash_iso-8859-2.vim
 share/nvim/runtime/keymap/polish-slash_utf-8.vim
 share/nvim/runtime/keymap/russian-dvorak.vim
 share/nvim/runtime/keymap/russian-jcuken.vim
+share/nvim/runtime/keymap/russian-jcukenmac.vim
 share/nvim/runtime/keymap/russian-jcukenwin.vim
 share/nvim/runtime/keymap/russian-yawerty.vim
 share/nvim/runtime/keymap/serbian-latin.vim
@@ -666,7 +681,9 @@ share/nvim/runtime/keymap/thaana-phonetic_utf-8.vim
 share/nvim/runtime/keymap/thaana.vim
 share/nvim/runtime/keymap/ukrainian-dvorak.vim
 share/nvim/runtime/keymap/ukrainian-jcuken.vim
+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/macmap.vim
 share/nvim/runtime/macros/editexisting.vim
 share/nvim/runtime/macros/justify.vim
@@ -687,6 +704,7 @@ share/nvim/runtime/pack/dist/opt/vimball/autoload/vimball.vim
 share/nvim/runtime/pack/dist/opt/vimball/doc/tags
 share/nvim/runtime/pack/dist/opt/vimball/doc/vimball.txt
 share/nvim/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim
+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
@@ -1157,6 +1175,7 @@ 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/scala.vim
 share/nvim/runtime/syntax/scheme.vim
 share/nvim/runtime/syntax/scilab.vim
 share/nvim/runtime/syntax/screen.vim