[pkgsrc/trunk]: pkgsrc/devel/lua-rocks lua-rocks: Update to 3.3.1

To: source-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/lua-rocks lua-rocks: Update to 3.3.1
From: nia <nia%pkgsrc.org@localhost>
Date: Wed, 01 Jul 2020 12:24:01 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/9c73ac1258cd
branches:  trunk
changeset: 435150:9c73ac1258cd
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Jul 01 11:06:40 2020 +0000

description:
lua-rocks: Update to 3.3.1

This adds Lua 5.4 support, among many other features.

diffstat:

 devel/lua-rocks/Makefile                           |  21 ++---
 devel/lua-rocks/PLIST                              |  79 ++++++++++++++-------
 devel/lua-rocks/distinfo                           |  13 +-
 devel/lua-rocks/patches/patch-GNUmakefile          |  43 +++++++++++
 devel/lua-rocks/patches/patch-Makefile             |  15 ----
 devel/lua-rocks/patches/patch-Makefile.install.inc |  14 ---
 6 files changed, 111 insertions(+), 74 deletions(-)

diffs (275 lines):

diff -r c1959b32d800 -r 9c73ac1258cd devel/lua-rocks/Makefile
--- a/devel/lua-rocks/Makefile  Wed Jul 01 10:32:42 2020 +0000
+++ b/devel/lua-rocks/Makefile  Wed Jul 01 11:06:40 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/07/01 10:32:42 nia Exp $
+# $NetBSD: Makefile,v 1.10 2020/07/01 11:06:40 nia Exp $
 
-DISTNAME=      luarocks-2.4.4
+DISTNAME=      luarocks-3.3.1
 PKGNAME=       ${DISTNAME:S/luarocks/${LUA_PKGPREFIX}-rocks/}
 CATEGORIES=    devel
 MASTER_SITES=  https://luarocks.org/releases/
@@ -10,9 +10,12 @@
 COMMENT=       Deployment and management system for Lua modules
 LICENSE=       mit
 
-USE_TOOLS+=    curl:run    # downloader (curl or wget)
-USE_TOOLS+=    openssl:run # md5-checker (openssl or md5sum)
-USE_TOOLS+=    unzip
+USE_TOOLS+=    gmake
+USE_TOOLS+=    curl:run        # downloader (curl or wget)
+USE_TOOLS+=    openssl:run     # md5-checker (openssl or md5sum)
+USE_TOOLS+=    unzip:run       # extraction
+
+MAKE_FILE=     GNUmakefile
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -22,12 +25,8 @@
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --rocks-tree=${PREFIX}/luarocks
 CONFIGURE_ARGS+=       --with-lua=${PREFIX}
-CONFIGURE_ARGS+=       --lua-suffix=${_LUA_DOT_VERSION}
+CONFIGURE_ARGS+=       --with-lua-include=${PREFIX}/${LUA_INCDIR}
 CONFIGURE_ARGS+=       --lua-version=${_LUA_DOT_VERSION}
-CONFIGURE_ARGS+=       --with-lua-include=${PREFIX}/${LUA_INCDIR}
-CONFIGURE_ARGS+=       --versioned-rocks-dir
-CONFIGURE_ARGS+=       --with-downloader=curl
-CONFIGURE_ARGS+=       --with-md5-checker=openssl
 
 BUILD_TARGET=          build
 MAKE_ENV+=             LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR}
@@ -41,8 +40,6 @@
 PLIST_SUBST+=          LUADOTVER=${_LUA_DOT_VERSION}
 FILES_SUBST+=          LUADOTVER=${_LUA_DOT_VERSION}
 
-LUA_VERSIONS_ACCEPTED= 53 52 51
-
 .include "../../lang/lua/application.mk"
 .include "../../lang/lua/module.mk"
 .include "../../mk/alternatives.mk"
diff -r c1959b32d800 -r 9c73ac1258cd devel/lua-rocks/PLIST
--- a/devel/lua-rocks/PLIST     Wed Jul 01 10:32:42 2020 +0000
+++ b/devel/lua-rocks/PLIST     Wed Jul 01 11:06:40 2020 +0000
@@ -1,21 +1,52 @@
-@comment $NetBSD: PLIST,v 1.2 2016/10/06 20:28:54 alnsn Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/07/01 11:06:40 nia Exp $
 bin/luarocks-${LUADOTVER}
 bin/luarocks-admin-${LUADOTVER}
 ${LUA_EXAMPLESDIR}/config-${LUADOTVER}.lua
-${LUA_LDIR}/luarocks/add.lua
-${LUA_LDIR}/luarocks/admin_remove.lua
+${LUA_LDIR}/luarocks/admin/cache.lua
+${LUA_LDIR}/luarocks/admin/cmd/add.lua
+${LUA_LDIR}/luarocks/admin/cmd/make_manifest.lua
+${LUA_LDIR}/luarocks/admin/cmd/refresh_cache.lua
+${LUA_LDIR}/luarocks/admin/cmd/remove.lua
+${LUA_LDIR}/luarocks/admin/index.lua
+${LUA_LDIR}/luarocks/argparse.lua
 ${LUA_LDIR}/luarocks/build.lua
 ${LUA_LDIR}/luarocks/build/builtin.lua
 ${LUA_LDIR}/luarocks/build/cmake.lua
 ${LUA_LDIR}/luarocks/build/command.lua
 ${LUA_LDIR}/luarocks/build/make.lua
-${LUA_LDIR}/luarocks/cache.lua
-${LUA_LDIR}/luarocks/cfg.lua
-${LUA_LDIR}/luarocks/command_line.lua
-${LUA_LDIR}/luarocks/config_cmd.lua
+${LUA_LDIR}/luarocks/cmd.lua
+${LUA_LDIR}/luarocks/cmd/build.lua
+${LUA_LDIR}/luarocks/cmd/config.lua
+${LUA_LDIR}/luarocks/cmd/doc.lua
+${LUA_LDIR}/luarocks/cmd/download.lua
+${LUA_LDIR}/luarocks/cmd/init.lua
+${LUA_LDIR}/luarocks/cmd/install.lua
+${LUA_LDIR}/luarocks/cmd/lint.lua
+${LUA_LDIR}/luarocks/cmd/list.lua
+${LUA_LDIR}/luarocks/cmd/make.lua
+${LUA_LDIR}/luarocks/cmd/new_version.lua
+${LUA_LDIR}/luarocks/cmd/pack.lua
+${LUA_LDIR}/luarocks/cmd/path.lua
+${LUA_LDIR}/luarocks/cmd/purge.lua
+${LUA_LDIR}/luarocks/cmd/remove.lua
+${LUA_LDIR}/luarocks/cmd/search.lua
+${LUA_LDIR}/luarocks/cmd/show.lua
+${LUA_LDIR}/luarocks/cmd/test.lua
+${LUA_LDIR}/luarocks/cmd/unpack.lua
+${LUA_LDIR}/luarocks/cmd/upload.lua
+${LUA_LDIR}/luarocks/cmd/which.lua
+${LUA_LDIR}/luarocks/cmd/write_rockspec.lua
+${LUA_LDIR}/luarocks/core/cfg.lua
+${LUA_LDIR}/luarocks/core/dir.lua
+${LUA_LDIR}/luarocks/core/manif.lua
+${LUA_LDIR}/luarocks/core/path.lua
+${LUA_LDIR}/luarocks/core/persist.lua
+${LUA_LDIR}/luarocks/core/sysdetect.lua
+${LUA_LDIR}/luarocks/core/util.lua
+${LUA_LDIR}/luarocks/core/vers.lua
+${LUA_LDIR}/luarocks/deplocks.lua
 ${LUA_LDIR}/luarocks/deps.lua
 ${LUA_LDIR}/luarocks/dir.lua
-${LUA_LDIR}/luarocks/doc.lua
 ${LUA_LDIR}/luarocks/download.lua
 ${LUA_LDIR}/luarocks/fetch.lua
 ${LUA_LDIR}/luarocks/fetch/cvs.lua
@@ -31,43 +62,39 @@
 ${LUA_LDIR}/luarocks/fetch/sscm.lua
 ${LUA_LDIR}/luarocks/fetch/svn.lua
 ${LUA_LDIR}/luarocks/fs.lua
+${LUA_LDIR}/luarocks/fs/freebsd.lua
+${LUA_LDIR}/luarocks/fs/linux.lua
 ${LUA_LDIR}/luarocks/fs/lua.lua
+${LUA_LDIR}/luarocks/fs/macosx.lua
 ${LUA_LDIR}/luarocks/fs/tools.lua
 ${LUA_LDIR}/luarocks/fs/unix.lua
 ${LUA_LDIR}/luarocks/fs/unix/tools.lua
 ${LUA_LDIR}/luarocks/fs/win32.lua
 ${LUA_LDIR}/luarocks/fs/win32/tools.lua
-${LUA_LDIR}/luarocks/help.lua
-${LUA_LDIR}/luarocks/index.lua
-${LUA_LDIR}/luarocks/install.lua
-${LUA_LDIR}/luarocks/lint.lua
-${LUA_LDIR}/luarocks/list.lua
+${LUA_LDIR}/luarocks/fun.lua
 ${LUA_LDIR}/luarocks/loader.lua
-${LUA_LDIR}/luarocks/make.lua
-${LUA_LDIR}/luarocks/make_manifest.lua
 ${LUA_LDIR}/luarocks/manif.lua
-${LUA_LDIR}/luarocks/manif_core.lua
-${LUA_LDIR}/luarocks/new_version.lua
+${LUA_LDIR}/luarocks/manif/writer.lua
 ${LUA_LDIR}/luarocks/pack.lua
 ${LUA_LDIR}/luarocks/path.lua
-${LUA_LDIR}/luarocks/path_cmd.lua
 ${LUA_LDIR}/luarocks/persist.lua
-${LUA_LDIR}/luarocks/purge.lua
-${LUA_LDIR}/luarocks/refresh_cache.lua
+${LUA_LDIR}/luarocks/queries.lua
 ${LUA_LDIR}/luarocks/remove.lua
 ${LUA_LDIR}/luarocks/repos.lua
 ${LUA_LDIR}/luarocks/require.lua
+${LUA_LDIR}/luarocks/results.lua
+${LUA_LDIR}/luarocks/rockspecs.lua
 ${LUA_LDIR}/luarocks/search.lua
-${LUA_LDIR}/luarocks/show.lua
-${LUA_LDIR}/luarocks/site_config.lua
+${LUA_LDIR}/luarocks/signing.lua
+${LUA_LDIR}/luarocks/test.lua
+${LUA_LDIR}/luarocks/test/busted.lua
+${LUA_LDIR}/luarocks/test/command.lua
 ${LUA_LDIR}/luarocks/tools/patch.lua
 ${LUA_LDIR}/luarocks/tools/tar.lua
 ${LUA_LDIR}/luarocks/tools/zip.lua
+${LUA_LDIR}/luarocks/type/manifest.lua
+${LUA_LDIR}/luarocks/type/rockspec.lua
 ${LUA_LDIR}/luarocks/type_check.lua
-${LUA_LDIR}/luarocks/unpack.lua
-${LUA_LDIR}/luarocks/upload.lua
 ${LUA_LDIR}/luarocks/upload/api.lua
 ${LUA_LDIR}/luarocks/upload/multipart.lua
 ${LUA_LDIR}/luarocks/util.lua
-${LUA_LDIR}/luarocks/validate.lua
-${LUA_LDIR}/luarocks/write_rockspec.lua
diff -r c1959b32d800 -r 9c73ac1258cd devel/lua-rocks/distinfo
--- a/devel/lua-rocks/distinfo  Wed Jul 01 10:32:42 2020 +0000
+++ b/devel/lua-rocks/distinfo  Wed Jul 01 11:06:40 2020 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2018/07/17 22:18:06 alnsn Exp $
+$NetBSD: distinfo,v 1.6 2020/07/01 11:06:40 nia Exp $
 
-SHA1 (luarocks-2.4.4.tar.gz) = cb7f93e80d704b5f7ed93406ec6c950a2c969600
-RMD160 (luarocks-2.4.4.tar.gz) = d4355758e2742b153feb9dc6d7d71d87d33a094b
-SHA512 (luarocks-2.4.4.tar.gz) = cbc6a54aa5077e656dcb4fed915fe8b66cad4ad04f28700e2f67805232a6dc366d4ac03e3a85e27a45b178c362ae8aa905ceab5553252735e049730a28450e19
-Size (luarocks-2.4.4.tar.gz) = 140452 bytes
-SHA1 (patch-Makefile) = c94a4daf6670a0a96f3d5ce7898d8e06aa422e0e
-SHA1 (patch-Makefile.install.inc) = f12fd0b89c32c9741a2af2b0b4a0e34d8fdfa6f0
+SHA1 (luarocks-3.3.1.tar.gz) = b85a4afd890d172994f4ebc95fe647f71de7eeb4
+RMD160 (luarocks-3.3.1.tar.gz) = 937a2d6d62474e3245927dc77fbe982b8ca4f2bb
+SHA512 (luarocks-3.3.1.tar.gz) = 0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a
+Size (luarocks-3.3.1.tar.gz) = 241636 bytes
+SHA1 (patch-GNUmakefile) = 1f84ae6e926a57b07abcc65789d784c8e6a0fa75
diff -r c1959b32d800 -r 9c73ac1258cd devel/lua-rocks/patches/patch-GNUmakefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/lua-rocks/patches/patch-GNUmakefile Wed Jul 01 11:06:40 2020 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-GNUmakefile,v 1.1 2020/07/01 11:06:40 nia Exp $
+
+- Install suffixed binaries so multiple Lua versions can coexist.
+- Install config file to LUA_EXAMPLESDIR.
+
+--- GNUmakefile.orig   2020-02-07 10:24:14.000000000 +0000
++++ GNUmakefile
+@@ -103,20 +103,20 @@ $(buildbinarydir)/luarocks-admin.exe: sr
+ # Regular install
+ # ----------------------------------------
+ 
+-INSTALL_FILES = $(DESTDIR)$(bindir)/luarocks \
+-      $(DESTDIR)$(bindir)/luarocks-admin \
+-      $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua \
++INSTALL_FILES = $(DESTDIR)$(bindir)/luarocks-$(LUA_VERSION) \
++      $(DESTDIR)$(bindir)/luarocks-admin-$(LUA_VERSION) \
++      $(DESTDIR)$(PREFIX)/$(LUA_EXAMPLESDIR)/config-$(LUA_VERSION).lua \
+       $(patsubst src/%, $(DESTDIR)$(luadir)/%, $(LUAROCKS_FILES))
+ 
+ install: $(INSTALL_FILES)
+ 
+-install-config: $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
++install-config: $(DESTDIR)$(PREFIX)/$(LUA_EXAMPLESDIR)/config-$(LUA_VERSION).lua
+ 
+-$(DESTDIR)$(bindir)/luarocks: $(builddir)/luarocks
++$(DESTDIR)$(bindir)/luarocks-$(LUA_VERSION): $(builddir)/luarocks
+       mkdir -p "$(@D)"
+       $(INSTALL) "$<" "$@"
+ 
+-$(DESTDIR)$(bindir)/luarocks-admin: $(builddir)/luarocks-admin
++$(DESTDIR)$(bindir)/luarocks-admin-$(LUA_VERSION): $(builddir)/luarocks-admin
+       mkdir -p "$(@D)"
+       $(INSTALL) "$<" "$@"
+ 
+@@ -124,7 +124,7 @@ $(DESTDIR)$(luadir)/luarocks/%.lua: src/
+       mkdir -p "$(@D)"
+       $(INSTALL_DATA) "$<" "$@"
+ 
+-$(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua: $(builddir)/config-$(LUA_VERSION).lua
++$(DESTDIR)$(PREFIX)/$(LUA_EXAMPLESDIR)/config-$(LUA_VERSION).lua: $(builddir)/config-$(LUA_VERSION).lua
+       mkdir -p "$(@D)"
+       $(INSTALL_DATA) "$<" "$@"
+ 
diff -r c1959b32d800 -r 9c73ac1258cd devel/lua-rocks/patches/patch-Makefile
--- a/devel/lua-rocks/patches/patch-Makefile    Wed Jul 01 10:32:42 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile,v 1.2 2016/10/06 20:28:54 alnsn Exp $
-
-Install config-5.x.lua to LUA_EXAMPLESDIR.
-
---- Makefile.orig      2016-10-06 19:01:55.000000000 +0000
-+++ Makefile
-@@ -10,7 +10,7 @@ SYSCONFDIR ?= $(PREFIX)/etc/luarocks
- LUA_DIR ?= /usr/local
- LUA_BINDIR ?= $(LUA_DIR)/bin
- 
--CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua
-+CONFIG_FILE = $(PREFIX)/$(LUA_EXAMPLESDIR)/config-$(LUA_VERSION).lua
- 
- SAFEPWD=`echo "$$PWD" | sed -e 's/\([][]\)\1/]]..'\''\1\1'\''..[[/g'`
- 
diff -r c1959b32d800 -r 9c73ac1258cd devel/lua-rocks/patches/patch-Makefile.install.inc
--- a/devel/lua-rocks/patches/patch-Makefile.install.inc        Wed Jul 01 10:32:42 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-Makefile.install.inc,v 1.2 2016/10/06 20:28:54 alnsn Exp $
-
-Be pkg_alternatives(8) friendly.
-
---- Makefile.install.inc.orig  2016-10-06 19:01:55.000000000 +0000
-+++ Makefile.install.inc
-@@ -9,7 +9,6 @@ install_bins:
-       do \
-          cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
-          chmod +rx "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
--         ln -nfs "$$f-$$luaver" "$(DESTDIR)$(BINDIR)/$$f"; \
-       done
- 
- install_luas:
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/lua-rocks to 3.3.1
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/lua-lustache lua-lustache: Take maintainership
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/lua-rocks to 3.3.1
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/lua-lustache lua-lustache: Take maintainership
Indexes:
Home | Main Index | Thread Index | Old Index