Index: branches/2019Q2/editors/neovim/Makefile
===================================================================
--- branches/2019Q2/editors/neovim/Makefile	(revision 502896)
+++ branches/2019Q2/editors/neovim/Makefile	(revision 502897)
@@ -1,65 +1,76 @@
 # Created by: Anton Tornqvist <antont@inbox.lv>
 # $FreeBSD$
 
 PORTNAME=	neovim
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.4
+DISTVERSION=	0.3.5
 PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Next-generation Vim
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	gperf:devel/gperf \
 		${LUA_MODLIBDIR}/bit.so:devel/lua-bitop \
 		${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg
-LIB_DEPENDS=	libluajit-5.1.so:lang/luajit \
-		libmsgpackc.so:devel/msgpack \
+LIB_DEPENDS=	libmsgpackc.so:devel/msgpack \
 		libtermkey.so:devel/libtermkey \
 		libunibilium.so:devel/unibilium \
 		libuv.so:devel/libuv \
 		libvterm.so:devel/libvterm
 TEST_DEPENDS=	autoconf>=0:devel/autoconf \
 		aclocal:devel/automake \
 		gmake:devel/gmake \
 		libtool:devel/libtool
 
-USES=		cmake iconv lua:build pathfix pkgconfig
+USES=		cmake iconv pathfix pkgconfig
 USE_GITHUB=	yes
 GH_TUPLE=	libmpack:libmpack:1.0.5:libmpack \
 		libmpack:libmpack-lua:1.0.7:libmpack_lua
 
 CMAKE_ARGS=	-DLUA_PRG:FILEPATH="${LUA_CMD}" \
 		-DCMAKE_INSTALL_MANDIR:PATH="${MANPREFIX}/man" \
 		-DDEPS_PREFIX:PATH="${LOCALBASE}"
 
-OPTIONS_DEFINE=	NLS PYNVIM
+OPTIONS_DEFINE=	LUAJIT NLS PYNVIM
+OPTIONS_DEFAULT=LUAJIT
+OPTIONS_EXCLUDE_aarch64=LUAJIT
+OPTIONS_EXCLUDE_mips64=	LUAJIT
+OPTIONS_EXCLUDE_powerpc64=	LUAJIT
+OPTIONS_EXCLUDE_riscv=	LUAJIT
+OPTIONS_EXCLUDE_sparc64=LUAJIT
 OPTIONS_SUB=	yes
+
+LUAJIT_DESC=	Use LuaJIT for faster Lua code
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
+LUAJIT_USES=		lua:build
+LUAJIT_CMAKE_OFF=	-DPREFER_LUA:BOOL="ON"
+LUAJIT_USES_OFF=	lua:52
 NLS_CMAKE_BOOL=	ENABLE_LIBINTL
 NLS_USES=	gettext
 PYNVIM_DESC=	Enable support for plugins written in python
 PYNVIM_USES=	python:run
 PYNVIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR}
 
 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_lua}/lmpack.c
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/add_subdirectory(po)/d' ${WRKSRC}/src/nvim/CMakeLists.txt
 
 pre-build:
 	${LN} -s ${WRKSRC_libmpack} ${WRKSRC_libmpack_lua}/mpack-src
 	@${MKDIR} ${BUILD_WRKSRC}/src/nvim
 	(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)
 	${LN} -s ${BUILD_WRKSRC}/src/nvim/mpack.so ${BUILD_WRKSRC}/runtime/mpack.so
 
 .include <bsd.port.mk>
Index: branches/2019Q2/editors/neovim/distinfo
===================================================================
--- branches/2019Q2/editors/neovim/distinfo	(revision 502896)
+++ branches/2019Q2/editors/neovim/distinfo	(revision 502897)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1547390550
-SHA256 (neovim-neovim-v0.3.4_GH0.tar.gz) = a641108bdebfaf319844ed46b1bf35d6f7c30ef5aeadeb29ba06e19c3274bc0e
-SIZE (neovim-neovim-v0.3.4_GH0.tar.gz) = 9231575
+TIMESTAMP = 1556484851
+SHA256 (neovim-neovim-v0.3.5_GH0.tar.gz) = b8b30043963133214f78901cb6361189c8f94e9f5f1b2493a7cedb4c323236d6
+SIZE (neovim-neovim-v0.3.5_GH0.tar.gz) = 9232168
 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.7_GH0.tar.gz) = 2ebe9c8972c378040c9b8505f5fb40a0c64d990cd68be6a62989362b18294d0a
 SIZE (libmpack-libmpack-lua-1.0.7_GH0.tar.gz) = 15606
Index: branches/2019Q2
===================================================================
--- branches/2019Q2	(revision 502896)
+++ branches/2019Q2	(revision 502897)

Property changes on: branches/2019Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r500370,502895