diff --git a/devel/luv/Makefile b/devel/luv/Makefile
index a6dff13c0873..84d16184a62d 100644
--- a/devel/luv/Makefile
+++ b/devel/luv/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	luv
 DISTVERSION=	1.41.0-0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	checo1705@secmail.pro
@@ -24,10 +25,7 @@ OPTIONS_DEFAULT_i386=	LUAJIT
 OPTIONS_DEFAULT_powerpc64=	LUAJIT
 
 LUAJIT_DESC=		Use LuaJIT (instead of just Lua)
-LUAJIT_LIB_DEPENDS=	${LUAJIT_LIB_DEPENDS_${ARCH}}
-LUAJIT_LIB_DEPENDS_amd64=	libluajit-5.1.so:lang/luajit
-LUAJIT_LIB_DEPENDS_i386=	libluajit-5.1.so:lang/luajit
-LUAJIT_LIB_DEPENDS_powerpc64=	libluajit-5.1.so:lang/luajit-openresty
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 LUAJIT_CMAKE_ON=	-DWITH_LUA_ENGINE=LuaJIT
 LUAJIT_USES_OFF=	lua
 LUAJIT_CMAKE_OFF=	-DWITH_LUA_ENGINE=Lua
diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index 3f2e000c6e33..918cad3c0574 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	neovim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	adamw@FreeBSD.org
@@ -13,7 +14,8 @@ LICENSE=	APACHE20
 BUILD_DEPENDS=	gperf:devel/gperf \
 		${LUA_MODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \
 		${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}
-LIB_DEPENDS=	libluv.so:devel/luv \
+LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty \
+		libluv.so:devel/luv \
 		libmsgpackc.so:devel/msgpack \
 		libtermkey.so:devel/libtermkey \
 		libtree-sitter.so:devel/tree-sitter \
@@ -25,7 +27,7 @@ TEST_DEPENDS=	autoconf>=0:devel/autoconf \
 		gmake:devel/gmake \
 		libtool:devel/libtool
 
-USES=		cmake iconv pathfix pkgconfig
+USES=		cmake iconv lua:build pathfix pkgconfig
 USE_GITHUB=	yes
 GH_TUPLE=	libmpack:libmpack:1.0.5:libmpack \
 		libmpack:libmpack-lua:1.0.7:libmpack_lua
@@ -38,23 +40,11 @@ CMAKE_ARGS=	-DLUA_PRG:FILEPATH="${LUA_CMD}" \
 DATADIR=	${PREFIX}/share/nvim
 PORTDATA=	runtime
 
-OPTIONS_DEFINE=	LUAJIT NLS PYNVIM
-OPTIONS_DEFAULT=LUAJIT
-OPTIONS_EXCLUDE_aarch64=LUAJIT
-OPTIONS_EXCLUDE_mips64=	LUAJIT
-OPTIONS_EXCLUDE_powerpc=LUAJIT
-OPTIONS_EXCLUDE_riscv=	LUAJIT
-OPTIONS_EXCLUDE_riscv64=LUAJIT
-OPTIONS_EXCLUDE_sparc64=LUAJIT
+OPTIONS_DEFINE=	NLS PYNVIM
 OPTIONS_SUB=	yes
 
-LUAJIT_DESC=	Use LuaJIT for faster Lua code
 PYNVIM_DESC=	Enable support for plugins written in python
 
-LUAJIT_CMAKE_OFF=	-DPREFER_LUA:BOOL="ON"
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
-LUAJIT_USES=		lua:build
-LUAJIT_USES_OFF=	lua:52
 NLS_CMAKE_BOOL=		ENABLE_LIBINTL
 NLS_USES=		gettext
 PYNVIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR}
@@ -63,7 +53,6 @@ PYNVIM_USES=		python:run
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc64*}
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 USES+=		compiler:gcc-c++11-lib
 .endif