4 files changed, 40 insertions, 7 deletions

diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index 23608d3ce4dc..2afbd6f319b5 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	neovim
-PORTVERSION=	0.1.3
+PORTVERSION=	0.1.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
@@ -11,8 +11,7 @@ COMMENT=	Next generation Vim
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LUA_MODSHAREDIR}/MessagePack.lua:devel/lua-MessagePack \
-		${LUA_MODLIBDIR}/bit.so:devel/lua-bitop \
+BUILD_DEPENDS=	${LUA_MODLIBDIR}/bit.so:devel/lua-bitop \
 		${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg
 LIB_DEPENDS=	libunibilium.so:devel/unibilium \
 		libvterm.so:devel/libvterm \
@@ -21,11 +20,26 @@ LIB_DEPENDS=	libunibilium.so:devel/unibilium \
 		libuv.so:devel/libuv \
 		libmsgpack.so:devel/msgpack
 
-USES=		cmake:outsource compiler gettext iconv lua pathfix pkgconfig
+USES=		cmake:outsource gettext iconv ninja lua:build pathfix pkgconfig
 USE_GITHUB=	yes
+GH_TUPLE=	tarruda:libmpack:1.0.2:libmpack
 
 CMAKE_ARGS=	-DLUA_PRG:FILEPATH="${LUA_CMD}" \
 		-DCMAKE_INSTALL_MANDIR:PATH="${MANPREFIX}/man" \
 		-DDEPS_PREFIX:PATH="${LOCALBASE}"
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'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
+
+pre-build:
+	@${MKDIR} ${BUILD_WRKSRC}/src/nvim
+	@(cd ${WRKSRC_libmpack}/binding/lua && ${CC} ${CFLAGS} -fPIC \
+		-I${LUA_INCDIR} -shared lmpack.c -o \
+		${BUILD_WRKSRC}/src/nvim/mpack.so \
+		${LUA_LIBDIR}/liblua-${LUA_VER}.so)
+
 .include <bsd.port.mk>
diff --git a/editors/neovim/distinfo b/editors/neovim/distinfo
index 726186b6d9ed..6e401f015bd8 100644
--- a/editors/neovim/distinfo
+++ b/editors/neovim/distinfo
@@ -1,2 +1,4 @@
-SHA256 (neovim-neovim-v0.1.3_GH0.tar.gz) = 7a86892d941b8829537ad46864b9a363d009ba56aeefdef2ee15ffa3eee5f92b
-SIZE (neovim-neovim-v0.1.3_GH0.tar.gz) = 7636777
+SHA256 (neovim-neovim-v0.1.4_GH0.tar.gz) = bb7e359eb83db20c5ec5984b470b249372b6dcd813ae2ccf72c01cce560f93e9
+SIZE (neovim-neovim-v0.1.4_GH0.tar.gz) = 7678847
+SHA256 (tarruda-libmpack-1.0.2_GH0.tar.gz) = 9c570b2aab81b0c56d97cbd8fc483dc431b69510fd9becb4a1845291563e8bc9
+SIZE (tarruda-libmpack-1.0.2_GH0.tar.gz) = 44671
diff --git a/editors/neovim/files/patch-CMakeLists.txt b/editors/neovim/files/patch-CMakeLists.txt
index e010c7090899..1856019417f2 100644
--- a/editors/neovim/files/patch-CMakeLists.txt
+++ b/editors/neovim/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2016-04-08 02:04:21 UTC
+--- CMakeLists.txt.orig	2016-05-09 13:04:04 UTC
 +++ CMakeLists.txt
 @@ -213,7 +213,7 @@ else()
  
@@ -9,3 +9,12 @@
      add_definitions(-Wno-c11-extensions)
    endif()
  endif()
+@@ -367,7 +367,7 @@ endforeach()
+ 
+ # Find Lua interpreter
+ include(LuaHelpers)
+-set(LUA_DEPENDENCIES lpeg mpack bit)
++set(LUA_DEPENDENCIES lpeg bit)
+ if(NOT LUA_PRG)
+   foreach(CURRENT_LUA_PRG luajit lua)
+     # If LUA_PRG is set find_program() will not search
diff --git a/editors/neovim/pkg-plist b/editors/neovim/pkg-plist
index ba8dfacad5cf..bdd4d424b504 100644
--- a/editors/neovim/pkg-plist
+++ b/editors/neovim/pkg-plist
@@ -300,6 +300,7 @@ share/nvim/runtime/ftplugin/automake.vim
 share/nvim/runtime/ftplugin/bdf.vim
 share/nvim/runtime/ftplugin/bst.vim
 share/nvim/runtime/ftplugin/btm.vim
+share/nvim/runtime/ftplugin/bzl.vim
 share/nvim/runtime/ftplugin/c.vim
 share/nvim/runtime/ftplugin/calendar.vim
 share/nvim/runtime/ftplugin/cdrdaoconf.vim
@@ -456,6 +457,7 @@ share/nvim/runtime/ftplugin/sshconfig.vim
 share/nvim/runtime/ftplugin/sudoers.vim
 share/nvim/runtime/ftplugin/svg.vim
 share/nvim/runtime/ftplugin/sysctl.vim
+share/nvim/runtime/ftplugin/systemd.vim
 share/nvim/runtime/ftplugin/systemverilog.vim
 share/nvim/runtime/ftplugin/tcl.vim
 share/nvim/runtime/ftplugin/tcsh.vim
@@ -495,6 +497,7 @@ share/nvim/runtime/indent/automake.vim
 share/nvim/runtime/indent/awk.vim
 share/nvim/runtime/indent/bib.vim
 share/nvim/runtime/indent/bst.vim
+share/nvim/runtime/indent/bzl.vim
 share/nvim/runtime/indent/c.vim
 share/nvim/runtime/indent/cdl.vim
 share/nvim/runtime/indent/ch.vim
@@ -578,9 +581,11 @@ share/nvim/runtime/indent/sh.vim
 share/nvim/runtime/indent/sml.vim
 share/nvim/runtime/indent/sql.vim
 share/nvim/runtime/indent/sqlanywhere.vim
+share/nvim/runtime/indent/systemd.vim
 share/nvim/runtime/indent/systemverilog.vim
 share/nvim/runtime/indent/tcl.vim
 share/nvim/runtime/indent/tcsh.vim
+share/nvim/runtime/indent/teraterm.vim
 share/nvim/runtime/indent/tex.vim
 share/nvim/runtime/indent/tf.vim
 share/nvim/runtime/indent/tilde.vim
@@ -776,6 +781,7 @@ share/nvim/runtime/syntax/bindzone.vim
 share/nvim/runtime/syntax/blank.vim
 share/nvim/runtime/syntax/bst.vim
 share/nvim/runtime/syntax/btm.vim
+share/nvim/runtime/syntax/bzl.vim
 share/nvim/runtime/syntax/bzr.vim
 share/nvim/runtime/syntax/c.vim
 share/nvim/runtime/syntax/cabal.vim
@@ -1219,6 +1225,7 @@ share/nvim/runtime/syntax/syncolor.vim
 share/nvim/runtime/syntax/synload.vim
 share/nvim/runtime/syntax/syntax.vim
 share/nvim/runtime/syntax/sysctl.vim
+share/nvim/runtime/syntax/systemd.vim
 share/nvim/runtime/syntax/systemverilog.vim
 share/nvim/runtime/syntax/tads.vim
 share/nvim/runtime/syntax/tags.vim
@@ -1231,6 +1238,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/teraterm.vim
 share/nvim/runtime/syntax/terminfo.vim
 share/nvim/runtime/syntax/tex.vim
 share/nvim/runtime/syntax/texinfo.vim