Wed Jul 1 11:06:40 2020 UTC ()
lua-rocks: Update to 3.3.1

This adds Lua 5.4 support, among many other features.


(nia)
diff -r1.9 -r1.10 pkgsrc/devel/lua-rocks/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/lua-rocks/PLIST
diff -r1.5 -r1.6 pkgsrc/devel/lua-rocks/distinfo
diff -r0 -r1.1 pkgsrc/devel/lua-rocks/patches/patch-GNUmakefile
diff -r1.2 -r0 pkgsrc/devel/lua-rocks/patches/patch-Makefile
diff -r1.2 -r0 pkgsrc/devel/lua-rocks/patches/patch-Makefile.install.inc
cvs diff -r1.9 -r1.10 pkgsrc/devel/lua-rocks/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/lua-rocks/Makefile 2020/07/01 10:32:42 1.9
+++ pkgsrc/devel/lua-rocks/Makefile 2020/07/01 11:06:40 1.10
@@ -1,49 +1,46 @@ @@ -1,49 +1,46 @@
1# $NetBSD: Makefile,v 1.9 2020/07/01 10:32:42 nia Exp $ 1# $NetBSD: Makefile,v 1.10 2020/07/01 11:06:40 nia Exp $
2 2
3DISTNAME= luarocks-2.4.4 3DISTNAME= luarocks-3.3.1
4PKGNAME= ${DISTNAME:S/luarocks/${LUA_PKGPREFIX}-rocks/} 4PKGNAME= ${DISTNAME:S/luarocks/${LUA_PKGPREFIX}-rocks/}
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= https://luarocks.org/releases/ 6MASTER_SITES= https://luarocks.org/releases/
7 7
8MAINTAINER= alnsn@NetBSD.org 8MAINTAINER= alnsn@NetBSD.org
9HOMEPAGE= https://luarocks.org/ 9HOMEPAGE= https://luarocks.org/
10COMMENT= Deployment and management system for Lua modules 10COMMENT= Deployment and management system for Lua modules
11LICENSE= mit 11LICENSE= mit
12 12
13USE_TOOLS+= curl:run # downloader (curl or wget) 13USE_TOOLS+= gmake
14USE_TOOLS+= openssl:run # md5-checker (openssl or md5sum) 14USE_TOOLS+= curl:run # downloader (curl or wget)
15USE_TOOLS+= unzip 15USE_TOOLS+= openssl:run # md5-checker (openssl or md5sum)
 16USE_TOOLS+= unzip:run # extraction
 17
 18MAKE_FILE= GNUmakefile
16 19
17.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
18 21
19HAS_CONFIGURE= yes 22HAS_CONFIGURE= yes
20USE_LANGUAGES= # none 23USE_LANGUAGES= # none
21 24
22CONFIGURE_ARGS+= --prefix=${PREFIX} 25CONFIGURE_ARGS+= --prefix=${PREFIX}
23CONFIGURE_ARGS+= --rocks-tree=${PREFIX}/luarocks 26CONFIGURE_ARGS+= --rocks-tree=${PREFIX}/luarocks
24CONFIGURE_ARGS+= --with-lua=${PREFIX} 27CONFIGURE_ARGS+= --with-lua=${PREFIX}
25CONFIGURE_ARGS+= --lua-suffix=${_LUA_DOT_VERSION} 
26CONFIGURE_ARGS+= --lua-version=${_LUA_DOT_VERSION} 
27CONFIGURE_ARGS+= --with-lua-include=${PREFIX}/${LUA_INCDIR} 28CONFIGURE_ARGS+= --with-lua-include=${PREFIX}/${LUA_INCDIR}
28CONFIGURE_ARGS+= --versioned-rocks-dir 29CONFIGURE_ARGS+= --lua-version=${_LUA_DOT_VERSION}
29CONFIGURE_ARGS+= --with-downloader=curl 
30CONFIGURE_ARGS+= --with-md5-checker=openssl 
31 30
32BUILD_TARGET= build 31BUILD_TARGET= build
33MAKE_ENV+= LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR} 32MAKE_ENV+= LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR}
34 33
35PKG_SYSCONFSUBDIR= luarocks 34PKG_SYSCONFSUBDIR= luarocks
36LUAROCKS_CONF= config-${_LUA_DOT_VERSION}.lua 35LUAROCKS_CONF= config-${_LUA_DOT_VERSION}.lua
37CONF_FILES= ${LUA_EXAMPLESDIR}/${LUAROCKS_CONF} \ 36CONF_FILES= ${LUA_EXAMPLESDIR}/${LUAROCKS_CONF} \
38 ${PKG_SYSCONFDIR}/${LUAROCKS_CONF} 37 ${PKG_SYSCONFDIR}/${LUAROCKS_CONF}
39 38
40# XXX Add subst rules to ../../lang/lua/xxx.mk 39# XXX Add subst rules to ../../lang/lua/xxx.mk
41PLIST_SUBST+= LUADOTVER=${_LUA_DOT_VERSION} 40PLIST_SUBST+= LUADOTVER=${_LUA_DOT_VERSION}
42FILES_SUBST+= LUADOTVER=${_LUA_DOT_VERSION} 41FILES_SUBST+= LUADOTVER=${_LUA_DOT_VERSION}
43 42
44LUA_VERSIONS_ACCEPTED= 53 52 51 
45 
46.include "../../lang/lua/application.mk" 43.include "../../lang/lua/application.mk"
47.include "../../lang/lua/module.mk" 44.include "../../lang/lua/module.mk"
48.include "../../mk/alternatives.mk" 45.include "../../mk/alternatives.mk"
49.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/lua-rocks/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/lua-rocks/PLIST 2016/10/06 20:28:54 1.2
+++ pkgsrc/devel/lua-rocks/PLIST 2020/07/01 11:06:40 1.3
@@ -1,73 +1,100 @@ @@ -1,73 +1,100 @@
1@comment $NetBSD: PLIST,v 1.2 2016/10/06 20:28:54 alnsn Exp $ 1@comment $NetBSD: PLIST,v 1.3 2020/07/01 11:06:40 nia Exp $
2bin/luarocks-${LUADOTVER} 2bin/luarocks-${LUADOTVER}
3bin/luarocks-admin-${LUADOTVER} 3bin/luarocks-admin-${LUADOTVER}
4${LUA_EXAMPLESDIR}/config-${LUADOTVER}.lua 4${LUA_EXAMPLESDIR}/config-${LUADOTVER}.lua
5${LUA_LDIR}/luarocks/add.lua 5${LUA_LDIR}/luarocks/admin/cache.lua
6${LUA_LDIR}/luarocks/admin_remove.lua 6${LUA_LDIR}/luarocks/admin/cmd/add.lua
 7${LUA_LDIR}/luarocks/admin/cmd/make_manifest.lua
 8${LUA_LDIR}/luarocks/admin/cmd/refresh_cache.lua
 9${LUA_LDIR}/luarocks/admin/cmd/remove.lua
 10${LUA_LDIR}/luarocks/admin/index.lua
 11${LUA_LDIR}/luarocks/argparse.lua
7${LUA_LDIR}/luarocks/build.lua 12${LUA_LDIR}/luarocks/build.lua
8${LUA_LDIR}/luarocks/build/builtin.lua 13${LUA_LDIR}/luarocks/build/builtin.lua
9${LUA_LDIR}/luarocks/build/cmake.lua 14${LUA_LDIR}/luarocks/build/cmake.lua
10${LUA_LDIR}/luarocks/build/command.lua 15${LUA_LDIR}/luarocks/build/command.lua
11${LUA_LDIR}/luarocks/build/make.lua 16${LUA_LDIR}/luarocks/build/make.lua
12${LUA_LDIR}/luarocks/cache.lua 17${LUA_LDIR}/luarocks/cmd.lua
13${LUA_LDIR}/luarocks/cfg.lua 18${LUA_LDIR}/luarocks/cmd/build.lua
14${LUA_LDIR}/luarocks/command_line.lua 19${LUA_LDIR}/luarocks/cmd/config.lua
15${LUA_LDIR}/luarocks/config_cmd.lua 20${LUA_LDIR}/luarocks/cmd/doc.lua
 21${LUA_LDIR}/luarocks/cmd/download.lua
 22${LUA_LDIR}/luarocks/cmd/init.lua
 23${LUA_LDIR}/luarocks/cmd/install.lua
 24${LUA_LDIR}/luarocks/cmd/lint.lua
 25${LUA_LDIR}/luarocks/cmd/list.lua
 26${LUA_LDIR}/luarocks/cmd/make.lua
 27${LUA_LDIR}/luarocks/cmd/new_version.lua
 28${LUA_LDIR}/luarocks/cmd/pack.lua
 29${LUA_LDIR}/luarocks/cmd/path.lua
 30${LUA_LDIR}/luarocks/cmd/purge.lua
 31${LUA_LDIR}/luarocks/cmd/remove.lua
 32${LUA_LDIR}/luarocks/cmd/search.lua
 33${LUA_LDIR}/luarocks/cmd/show.lua
 34${LUA_LDIR}/luarocks/cmd/test.lua
 35${LUA_LDIR}/luarocks/cmd/unpack.lua
 36${LUA_LDIR}/luarocks/cmd/upload.lua
 37${LUA_LDIR}/luarocks/cmd/which.lua
 38${LUA_LDIR}/luarocks/cmd/write_rockspec.lua
 39${LUA_LDIR}/luarocks/core/cfg.lua
 40${LUA_LDIR}/luarocks/core/dir.lua
 41${LUA_LDIR}/luarocks/core/manif.lua
 42${LUA_LDIR}/luarocks/core/path.lua
 43${LUA_LDIR}/luarocks/core/persist.lua
 44${LUA_LDIR}/luarocks/core/sysdetect.lua
 45${LUA_LDIR}/luarocks/core/util.lua
 46${LUA_LDIR}/luarocks/core/vers.lua
 47${LUA_LDIR}/luarocks/deplocks.lua
16${LUA_LDIR}/luarocks/deps.lua 48${LUA_LDIR}/luarocks/deps.lua
17${LUA_LDIR}/luarocks/dir.lua 49${LUA_LDIR}/luarocks/dir.lua
18${LUA_LDIR}/luarocks/doc.lua 
19${LUA_LDIR}/luarocks/download.lua 50${LUA_LDIR}/luarocks/download.lua
20${LUA_LDIR}/luarocks/fetch.lua 51${LUA_LDIR}/luarocks/fetch.lua
21${LUA_LDIR}/luarocks/fetch/cvs.lua 52${LUA_LDIR}/luarocks/fetch/cvs.lua
22${LUA_LDIR}/luarocks/fetch/git.lua 53${LUA_LDIR}/luarocks/fetch/git.lua
23${LUA_LDIR}/luarocks/fetch/git_file.lua 54${LUA_LDIR}/luarocks/fetch/git_file.lua
24${LUA_LDIR}/luarocks/fetch/git_http.lua 55${LUA_LDIR}/luarocks/fetch/git_http.lua
25${LUA_LDIR}/luarocks/fetch/git_https.lua 56${LUA_LDIR}/luarocks/fetch/git_https.lua
26${LUA_LDIR}/luarocks/fetch/git_ssh.lua 57${LUA_LDIR}/luarocks/fetch/git_ssh.lua
27${LUA_LDIR}/luarocks/fetch/hg.lua 58${LUA_LDIR}/luarocks/fetch/hg.lua
28${LUA_LDIR}/luarocks/fetch/hg_http.lua 59${LUA_LDIR}/luarocks/fetch/hg_http.lua
29${LUA_LDIR}/luarocks/fetch/hg_https.lua 60${LUA_LDIR}/luarocks/fetch/hg_https.lua
30${LUA_LDIR}/luarocks/fetch/hg_ssh.lua 61${LUA_LDIR}/luarocks/fetch/hg_ssh.lua
31${LUA_LDIR}/luarocks/fetch/sscm.lua 62${LUA_LDIR}/luarocks/fetch/sscm.lua
32${LUA_LDIR}/luarocks/fetch/svn.lua 63${LUA_LDIR}/luarocks/fetch/svn.lua
33${LUA_LDIR}/luarocks/fs.lua 64${LUA_LDIR}/luarocks/fs.lua
 65${LUA_LDIR}/luarocks/fs/freebsd.lua
 66${LUA_LDIR}/luarocks/fs/linux.lua
34${LUA_LDIR}/luarocks/fs/lua.lua 67${LUA_LDIR}/luarocks/fs/lua.lua
 68${LUA_LDIR}/luarocks/fs/macosx.lua
35${LUA_LDIR}/luarocks/fs/tools.lua 69${LUA_LDIR}/luarocks/fs/tools.lua
36${LUA_LDIR}/luarocks/fs/unix.lua 70${LUA_LDIR}/luarocks/fs/unix.lua
37${LUA_LDIR}/luarocks/fs/unix/tools.lua 71${LUA_LDIR}/luarocks/fs/unix/tools.lua
38${LUA_LDIR}/luarocks/fs/win32.lua 72${LUA_LDIR}/luarocks/fs/win32.lua
39${LUA_LDIR}/luarocks/fs/win32/tools.lua 73${LUA_LDIR}/luarocks/fs/win32/tools.lua
40${LUA_LDIR}/luarocks/help.lua 74${LUA_LDIR}/luarocks/fun.lua
41${LUA_LDIR}/luarocks/index.lua 
42${LUA_LDIR}/luarocks/install.lua 
43${LUA_LDIR}/luarocks/lint.lua 
44${LUA_LDIR}/luarocks/list.lua 
45${LUA_LDIR}/luarocks/loader.lua 75${LUA_LDIR}/luarocks/loader.lua
46${LUA_LDIR}/luarocks/make.lua 
47${LUA_LDIR}/luarocks/make_manifest.lua 
48${LUA_LDIR}/luarocks/manif.lua 76${LUA_LDIR}/luarocks/manif.lua
49${LUA_LDIR}/luarocks/manif_core.lua 77${LUA_LDIR}/luarocks/manif/writer.lua
50${LUA_LDIR}/luarocks/new_version.lua 
51${LUA_LDIR}/luarocks/pack.lua 78${LUA_LDIR}/luarocks/pack.lua
52${LUA_LDIR}/luarocks/path.lua 79${LUA_LDIR}/luarocks/path.lua
53${LUA_LDIR}/luarocks/path_cmd.lua 
54${LUA_LDIR}/luarocks/persist.lua 80${LUA_LDIR}/luarocks/persist.lua
55${LUA_LDIR}/luarocks/purge.lua 81${LUA_LDIR}/luarocks/queries.lua
56${LUA_LDIR}/luarocks/refresh_cache.lua 
57${LUA_LDIR}/luarocks/remove.lua 82${LUA_LDIR}/luarocks/remove.lua
58${LUA_LDIR}/luarocks/repos.lua 83${LUA_LDIR}/luarocks/repos.lua
59${LUA_LDIR}/luarocks/require.lua 84${LUA_LDIR}/luarocks/require.lua
 85${LUA_LDIR}/luarocks/results.lua
 86${LUA_LDIR}/luarocks/rockspecs.lua
60${LUA_LDIR}/luarocks/search.lua 87${LUA_LDIR}/luarocks/search.lua
61${LUA_LDIR}/luarocks/show.lua 88${LUA_LDIR}/luarocks/signing.lua
62${LUA_LDIR}/luarocks/site_config.lua 89${LUA_LDIR}/luarocks/test.lua
 90${LUA_LDIR}/luarocks/test/busted.lua
 91${LUA_LDIR}/luarocks/test/command.lua
63${LUA_LDIR}/luarocks/tools/patch.lua 92${LUA_LDIR}/luarocks/tools/patch.lua
64${LUA_LDIR}/luarocks/tools/tar.lua 93${LUA_LDIR}/luarocks/tools/tar.lua
65${LUA_LDIR}/luarocks/tools/zip.lua 94${LUA_LDIR}/luarocks/tools/zip.lua
 95${LUA_LDIR}/luarocks/type/manifest.lua
 96${LUA_LDIR}/luarocks/type/rockspec.lua
66${LUA_LDIR}/luarocks/type_check.lua 97${LUA_LDIR}/luarocks/type_check.lua
67${LUA_LDIR}/luarocks/unpack.lua 
68${LUA_LDIR}/luarocks/upload.lua 
69${LUA_LDIR}/luarocks/upload/api.lua 98${LUA_LDIR}/luarocks/upload/api.lua
70${LUA_LDIR}/luarocks/upload/multipart.lua 99${LUA_LDIR}/luarocks/upload/multipart.lua
71${LUA_LDIR}/luarocks/util.lua 100${LUA_LDIR}/luarocks/util.lua
72${LUA_LDIR}/luarocks/validate.lua 
73${LUA_LDIR}/luarocks/write_rockspec.lua 
cvs diff -r1.5 -r1.6 pkgsrc/devel/lua-rocks/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/lua-rocks/distinfo 2018/07/17 22:18:06 1.5
+++ pkgsrc/devel/lua-rocks/distinfo 2020/07/01 11:06:40 1.6
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.5 2018/07/17 22:18:06 alnsn Exp $ 1$NetBSD: distinfo,v 1.6 2020/07/01 11:06:40 nia Exp $
2 2
3SHA1 (luarocks-2.4.4.tar.gz) = cb7f93e80d704b5f7ed93406ec6c950a2c969600 3SHA1 (luarocks-3.3.1.tar.gz) = b85a4afd890d172994f4ebc95fe647f71de7eeb4
4RMD160 (luarocks-2.4.4.tar.gz) = d4355758e2742b153feb9dc6d7d71d87d33a094b 4RMD160 (luarocks-3.3.1.tar.gz) = 937a2d6d62474e3245927dc77fbe982b8ca4f2bb
5SHA512 (luarocks-2.4.4.tar.gz) = cbc6a54aa5077e656dcb4fed915fe8b66cad4ad04f28700e2f67805232a6dc366d4ac03e3a85e27a45b178c362ae8aa905ceab5553252735e049730a28450e19 5SHA512 (luarocks-3.3.1.tar.gz) = 0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a
6Size (luarocks-2.4.4.tar.gz) = 140452 bytes 6Size (luarocks-3.3.1.tar.gz) = 241636 bytes
7SHA1 (patch-Makefile) = c94a4daf6670a0a96f3d5ce7898d8e06aa422e0e 7SHA1 (patch-GNUmakefile) = 1f84ae6e926a57b07abcc65789d784c8e6a0fa75
8SHA1 (patch-Makefile.install.inc) = f12fd0b89c32c9741a2af2b0b4a0e34d8fdfa6f0 
File Added: pkgsrc/devel/lua-rocks/patches/patch-GNUmakefile
$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) "$<" "$@"
File Deleted: pkgsrc/devel/lua-rocks/patches/Attic/patch-Makefile
File Deleted: pkgsrc/devel/lua-rocks/patches/Attic/patch-Makefile.install.inc