Index: head/devel/lua-luacheck/Makefile
===================================================================
--- head/devel/lua-luacheck/Makefile	(revision 552363)
+++ head/devel/lua-luacheck/Makefile	(revision 552364)
@@ -1,33 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	luacheck
-PORTVERSION=	0.21.2
+PORTVERSION=	0.25.g20200825
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	Linter and static analyzer for lua files
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR}
+RUN_DEPENDS=	${LUA_MODSHAREDIR}/argparse.lua:devel/lua-argparse \
+		${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR}
 
-USES=	lua
+USES=		lua
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	mpeterv
+GH_ACCOUNT=	luarocks
+GH_TAGNAME=	4e5774169fa
 
 INSTALL_DIR=	${LUA_MODSHAREDIR}/luacheck
 
 do-install:
+	${MKDIR} ${STAGEDIR}${INSTALL_DIR}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/luacheck.lua ${STAGEDIR}${INSTALL_DIR}/bin
 	(cd ${WRKSRC} && \
-	    ${LUA_CMD} install.lua ${STAGEDIR}${INSTALL_DIR})
-	@${RLN} ${STAGEDIR}${INSTALL_DIR}/bin/luacheck \
+	    ${COPYTREE_SHARE} src ${STAGEDIR}${INSTALL_DIR}/)
+	${INSTALL_SCRIPT} ${FILESDIR}/luacheck.in \
 	    ${STAGEDIR}${PREFIX}/bin/luacheck
-	@${RLN} ${STAGEDIR}${INSTALL_DIR}/bin/luacheck.lua \
-	    ${STAGEDIR}${PREFIX}/bin/luacheck.lua
+	${REINPLACE_CMD} -e "s,%%LUA_CMD%%,${LUA_CMD},g" \
+	    -e "s,%%INSTALL_DIR%%,${INSTALL_DIR},g" \
+		${STAGEDIR}${PREFIX}/bin/luacheck
 
 .include <bsd.port.mk>
Index: head/devel/lua-luacheck/distinfo
===================================================================
--- head/devel/lua-luacheck/distinfo	(revision 552363)
+++ head/devel/lua-luacheck/distinfo	(revision 552364)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519274161
-SHA256 (mpeterv-luacheck-0.21.2_GH0.tar.gz) = b1528bd73dc0da2c36dc3f93110a83362553546c2f5a354be0c0162149eb1abc
-SIZE (mpeterv-luacheck-0.21.2_GH0.tar.gz) = 137086
+TIMESTAMP = 1602514106
+SHA256 (luarocks-luacheck-0.25.g20200825-4e5774169fa_GH0.tar.gz) = 1b9b487f18e00e5329536dc04d91e3fac785ea0217a9fa0f866e6822d5a8ef82
+SIZE (luarocks-luacheck-0.25.g20200825-4e5774169fa_GH0.tar.gz) = 162593
Index: head/devel/lua-luacheck/files/patch-install.lua
===================================================================
--- head/devel/lua-luacheck/files/patch-install.lua	(revision 552363)
+++ head/devel/lua-luacheck/files/patch-install.lua	(nonexistent)
@@ -1,11 +0,0 @@
---- install.lua.orig	2018-02-22 04:51:23 UTC
-+++ install.lua
-@@ -76,7 +76,7 @@ else
-    fh:write(([=[
- #!/bin/sh
- exec "%s" -e "package.path=[[%s/../src/?.lua;%s/../src/?/init.lua;]]..package.path" "%s/luacheck.lua" "$@"
--]=]):format(args.lua, '$(dirname "$0")', '$(dirname "$0")', '$(dirname "$0")'))
-+]=]):format(args.lua, '$(dirname $(realpath "$0"))', '$(dirname $(realpath "$0"))', '$(dirname $(realpath "$0"))'))
- end
- 
- fh:close()

Property changes on: head/devel/lua-luacheck/files/patch-install.lua
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/lua-luacheck/files/luacheck.in
===================================================================
--- head/devel/lua-luacheck/files/luacheck.in	(nonexistent)
+++ head/devel/lua-luacheck/files/luacheck.in	(revision 552364)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec "%%LUA_CMD%%" -e "package.path=[[%%INSTALL_DIR%%/src/?.lua;%%INSTALL_DIR%%/src/?/init.lua;]]..package.path" "%%INSTALL_DIR%%/bin/luacheck.lua" "$@"

Property changes on: head/devel/lua-luacheck/files/luacheck.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+on
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/lua-luacheck/pkg-descr
===================================================================
--- head/devel/lua-luacheck/pkg-descr	(revision 552363)
+++ head/devel/lua-luacheck/pkg-descr	(revision 552364)
@@ -1,8 +1,8 @@
 Luacheck is a static analyzer and a linter for Lua. Luacheck detects various
 issues such as usage of undefined global variables, unused variables and values,
 accessing uninitialized variables, unreachable code and more.
 
 Luacheck supports checking Lua files using syntax of Lua 5.1, Lua 5.2, Lua 5.3
 and LuaJIT.
 
-WWW: https://github.com/mpeterv/luacheck
+WWW: https://github.com/luarocks/luacheck
Index: head/devel/lua-luacheck/pkg-plist
===================================================================
--- head/devel/lua-luacheck/pkg-plist	(revision 552363)
+++ head/devel/lua-luacheck/pkg-plist	(revision 552364)
@@ -1,36 +1,55 @@
 bin/luacheck
-bin/luacheck.lua
-%%LUA_MODSHAREDIR%%/luacheck/bin/luacheck
 %%LUA_MODSHAREDIR%%/luacheck/bin/luacheck.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/analyze.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/argparse.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/builtin_standards.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/builtin_standards/init.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/builtin_standards/love.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/builtin_standards/ngx.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/cache.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/check.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/check_state.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/config.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/core_utils.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/detect_globals.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/detect_uninit_access.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/detect_unreachable_code.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/detect_unused_rec_funcs.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/decoder.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/expand_rockspec.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/filter.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/format.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/fs.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/globbing.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/init.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/inline_options.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/lexer.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/lfs_fs.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/linearize.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/love_standard.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/lua_fs.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/main.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/multithreading.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/ngx_standard.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/options.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/parser.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/profiler.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/runner.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/serializer.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/detect_bad_whitespace.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/detect_cyclomatic_complexity.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/detect_empty_blocks.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/detect_empty_statements.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/detect_globals.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/detect_reversed_fornum_loops.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/detect_unbalanced_assignments.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/detect_uninit_accesses.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/detect_unreachable_code.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/detect_unused_fields.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/detect_unused_locals.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/init.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/linearize.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/name_functions.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/parse.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/parse_inline_options.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/resolve_locals.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/stages/unwrap_parens.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/standards.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/unicode.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/unicode_printability_boundaries.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/utils.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/vendor/sha1/LICENSE
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/vendor/sha1/bit32_ops.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/vendor/sha1/bit_ops.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/vendor/sha1/common.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/vendor/sha1/init.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/vendor/sha1/lua53_ops.lua
+%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/vendor/sha1/pure_lua_ops.lua
 %%LUA_MODSHAREDIR%%/luacheck/src/luacheck/version.lua
-%%LUA_MODSHAREDIR%%/luacheck/src/luacheck/whitespace.lua