svn commit: r552364 - in head/devel/lua-luacheck: . files

Kyle Evans kevans at FreeBSD.org
Thu Oct 15 00:22:37 UTC 2020 

Author: kevans
Date: Thu Oct 15 00:22:35 2020
New Revision: 552364
URL: https://svnweb.freebsd.org/changeset/ports/552364

Log:
  devel/lua-luacheck: update to just before the unreleased 0.25.0
  
  The intervening changes are many, with new checks and a switch to luarocks
  as upstream. This intermediate version also contains some Lua 5.4 support.
  Note that Lua 5.4 attributes are currently parsed, but ignored.
  
  argparse is no longer bundled with luacheck, so we'll grab argparse from
  devel/lua-argparse.
  
  The build system in luacheck got removed in favor of just using luarocks.
  This is currently incompatible with how ports wants to work, so I've changed
  it to the simpler approach that was previously advised to just copy the src/
  files over and now installing a script from FILESDIR that matches roughly
  what we were ending up with before to get the correct package.path.
  
  Miscellaneous indentation fixes included.

Added:
  head/devel/lua-luacheck/files/luacheck.in   (contents, props changed)
Deleted:
  head/devel/lua-luacheck/files/patch-install.lua
Modified:
  head/devel/lua-luacheck/Makefile
  head/devel/lua-luacheck/distinfo
  head/devel/lua-luacheck/pkg-descr
  head/devel/lua-luacheck/pkg-plist

Modified: head/devel/lua-luacheck/Makefile
==============================================================================
--- head/devel/lua-luacheck/Makefile	Wed Oct 14 23:59:40 2020	(r552363)
+++ head/devel/lua-luacheck/Makefile	Thu Oct 15 00:22:35 2020	(r552364)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	luacheck
-PORTVERSION=	0.21.2
+PORTVERSION=	0.25.g20200825
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
@@ -11,23 +11,28 @@ 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>

Modified: head/devel/lua-luacheck/distinfo
==============================================================================
--- head/devel/lua-luacheck/distinfo	Wed Oct 14 23:59:40 2020	(r552363)
+++ head/devel/lua-luacheck/distinfo	Thu Oct 15 00:22:35 2020	(r552364)
@@ -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

Added: head/devel/lua-luacheck/files/luacheck.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/lua-luacheck/files/luacheck.in	Thu Oct 15 00:22:35 2020	(r552364)
@@ -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" "$@"

Modified: head/devel/lua-luacheck/pkg-descr
==============================================================================
--- head/devel/lua-luacheck/pkg-descr	Wed Oct 14 23:59:40 2020	(r552363)
+++ head/devel/lua-luacheck/pkg-descr	Thu Oct 15 00:22:35 2020	(r552364)
@@ -5,4 +5,4 @@ accessing uninitialized variables, unreachable code an
 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

Modified: head/devel/lua-luacheck/pkg-plist
==============================================================================
--- head/devel/lua-luacheck/pkg-plist	Wed Oct 14 23:59:40 2020	(r552363)
+++ head/devel/lua-luacheck/pkg-plist	Thu Oct 15 00:22:35 2020	(r552364)
@@ -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

More information about the svn-ports-all mailing list