diff --git a/devel/lua-luarocks/Makefile b/devel/lua-luarocks/Makefile
index 467a4c8a6fc6..d8d7d1144693 100644
--- a/devel/lua-luarocks/Makefile
+++ b/devel/lua-luarocks/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	luarocks
 PORTVERSION=	3.12.2
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://luarocks.org/releases/
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Package manager for Lua modules
 WWW=		https://luarocks.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	curl:ftp/curl \
 		zip:archivers/zip
 
 USES=		gmake uniquefiles
 
 CONFIGURE_ARGS=	--lua-version=${LUA_VER} \
 		--prefix=${PREFIX} \
 		--with-lua-include=${LUA_INCDIR}
 HAS_CONFIGURE=	yes
 NO_ARCH=	yes
 UNIQUE_SUFFIX=	${LUA_VER_STR}
 UNIQUE_SUFFIX_FILES=	bin/luarocks bin/luarocks-admin
 
 OPTIONS_DEFINE=	LUAJIT
+OPTIONS_SUB=	yes
 LUAJIT_DESC=	Use LuaJIT instead of Lua
 
 LUAJIT_USES=		luajit
-LUAJIT_CONFIGURE_ON=	--lua-suffix=jit
 LUAJIT_PLIST_SUB=	LUA_VER=${LUA_VER} \
 			LUA_MODSHAREDIR=share/lua/${LUA_VER}
 LUAJIT_VARS=		LUA_INCDIR=${LUAJIT_INCDIR} \
 			LUA_PKGNAMEPREFIX=lua51- \
 			LUA_VER=5.1
 LUAJIT_USES_OFF=	lua:flavors
 
 post-patch:
 # /usr/local is a mix of site-local data and packages installs.
 # If PREFIX/LOCALBASE changes, look for dependencies there as well.
 .if defined(PREFIX) && ${PREFIX} != "/usr/local" && ${PREFIX} != "/usr"
 	@${REINPLACE_CMD} '/external_deps_dirs/ s|{ |&"${PREFIX}", |' ${WRKSRC}/src/luarocks/core/cfg.lua
 .endif
 
 post-install:
 # Let @sample manage default config
 	${MV} ${STAGEDIR}${ETCDIR}/config-${LUA_VER}.lua ${STAGEDIR}${ETCDIR}/config-${LUA_VER}.lua.sample
 
 .include <bsd.port.mk>
diff --git a/devel/lua-luarocks/pkg-plist b/devel/lua-luarocks/pkg-plist
index b650af539421..cd18972da5f0 100644
--- a/devel/lua-luarocks/pkg-plist
+++ b/devel/lua-luarocks/pkg-plist
@@ -1,104 +1,107 @@
 bin/luarocks
 bin/luarocks-admin
 @sample %%ETCDIR%%/config-%%LUA_VER%%.lua.sample
+%%LUAJIT%%%%LUA_MODSHAREDIR%%/compat53/file_mt.lua
+%%LUAJIT%%%%LUA_MODSHAREDIR%%/compat53/init.lua
+%%LUAJIT%%%%LUA_MODSHAREDIR%%/compat53/module.lua
 %%LUA_MODSHAREDIR%%/luarocks/admin/cache.lua
 %%LUA_MODSHAREDIR%%/luarocks/admin/cmd/add.lua
 %%LUA_MODSHAREDIR%%/luarocks/admin/cmd/make_manifest.lua
 %%LUA_MODSHAREDIR%%/luarocks/admin/cmd/refresh_cache.lua
 %%LUA_MODSHAREDIR%%/luarocks/admin/cmd/remove.lua
 %%LUA_MODSHAREDIR%%/luarocks/admin/index.lua
 %%LUA_MODSHAREDIR%%/luarocks/build.lua
 %%LUA_MODSHAREDIR%%/luarocks/build/builtin.lua
 %%LUA_MODSHAREDIR%%/luarocks/build/cmake.lua
 %%LUA_MODSHAREDIR%%/luarocks/build/command.lua
 %%LUA_MODSHAREDIR%%/luarocks/build/make.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/build.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/config.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/doc.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/download.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/init.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/install.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/lint.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/list.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/make.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/new_version.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/pack.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/path.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/purge.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/remove.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/search.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/show.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/test.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/unpack.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/upload.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/which.lua
 %%LUA_MODSHAREDIR%%/luarocks/cmd/write_rockspec.lua
 %%LUA_MODSHAREDIR%%/luarocks/config.lua
 %%LUA_MODSHAREDIR%%/luarocks/core/cfg.lua
 %%LUA_MODSHAREDIR%%/luarocks/core/dir.lua
 %%LUA_MODSHAREDIR%%/luarocks/core/manif.lua
 %%LUA_MODSHAREDIR%%/luarocks/core/path.lua
 %%LUA_MODSHAREDIR%%/luarocks/core/persist.lua
 %%LUA_MODSHAREDIR%%/luarocks/core/sysdetect.lua
 %%LUA_MODSHAREDIR%%/luarocks/core/types/query.lua
 %%LUA_MODSHAREDIR%%/luarocks/core/types/result.lua
 %%LUA_MODSHAREDIR%%/luarocks/core/types/rockspec.lua
 %%LUA_MODSHAREDIR%%/luarocks/core/util.lua
 %%LUA_MODSHAREDIR%%/luarocks/core/vers.lua
 %%LUA_MODSHAREDIR%%/luarocks/deplocks.lua
 %%LUA_MODSHAREDIR%%/luarocks/deps.lua
 %%LUA_MODSHAREDIR%%/luarocks/dir.lua
 %%LUA_MODSHAREDIR%%/luarocks/download.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/cvs.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/git.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/git_file.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/git_http.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/git_https.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/git_ssh.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/hg.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/hg_http.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/hg_https.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/hg_ssh.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/sscm.lua
 %%LUA_MODSHAREDIR%%/luarocks/fetch/svn.lua
 %%LUA_MODSHAREDIR%%/luarocks/fs.lua
 %%LUA_MODSHAREDIR%%/luarocks/fs/linux.lua
 %%LUA_MODSHAREDIR%%/luarocks/fs/lua.lua
 %%LUA_MODSHAREDIR%%/luarocks/fs/macosx.lua
 %%LUA_MODSHAREDIR%%/luarocks/fs/tools.lua
 %%LUA_MODSHAREDIR%%/luarocks/fs/unix.lua
 %%LUA_MODSHAREDIR%%/luarocks/fs/unix/tools.lua
 %%LUA_MODSHAREDIR%%/luarocks/fs/win32.lua
 %%LUA_MODSHAREDIR%%/luarocks/fs/win32/tools.lua
 %%LUA_MODSHAREDIR%%/luarocks/fun.lua
 %%LUA_MODSHAREDIR%%/luarocks/loader.lua
 %%LUA_MODSHAREDIR%%/luarocks/manif.lua
 %%LUA_MODSHAREDIR%%/luarocks/manif/writer.lua
 %%LUA_MODSHAREDIR%%/luarocks/pack.lua
 %%LUA_MODSHAREDIR%%/luarocks/path.lua
 %%LUA_MODSHAREDIR%%/luarocks/persist.lua
 %%LUA_MODSHAREDIR%%/luarocks/queries.lua
 %%LUA_MODSHAREDIR%%/luarocks/remove.lua
 %%LUA_MODSHAREDIR%%/luarocks/repo_writer.lua
 %%LUA_MODSHAREDIR%%/luarocks/repos.lua
 %%LUA_MODSHAREDIR%%/luarocks/require.lua
 %%LUA_MODSHAREDIR%%/luarocks/results.lua
 %%LUA_MODSHAREDIR%%/luarocks/rockspecs.lua
 %%LUA_MODSHAREDIR%%/luarocks/search.lua
 %%LUA_MODSHAREDIR%%/luarocks/signing.lua
 %%LUA_MODSHAREDIR%%/luarocks/test.lua
 %%LUA_MODSHAREDIR%%/luarocks/test/busted.lua
 %%LUA_MODSHAREDIR%%/luarocks/test/command.lua
 %%LUA_MODSHAREDIR%%/luarocks/tools/patch.lua
 %%LUA_MODSHAREDIR%%/luarocks/tools/tar.lua
 %%LUA_MODSHAREDIR%%/luarocks/tools/zip.lua
 %%LUA_MODSHAREDIR%%/luarocks/type/manifest.lua
 %%LUA_MODSHAREDIR%%/luarocks/type/rockspec.lua
 %%LUA_MODSHAREDIR%%/luarocks/type_check.lua
 %%LUA_MODSHAREDIR%%/luarocks/upload/api.lua
 %%LUA_MODSHAREDIR%%/luarocks/upload/multipart.lua
 %%LUA_MODSHAREDIR%%/luarocks/util.lua
 %%LUA_MODSHAREDIR%%/luarocks/vendor/argparse.lua
 %%LUA_MODSHAREDIR%%/luarocks/vendor/dkjson.lua