Update lua-stdlib to 41.2.2.

Massive changes in the package, including proper packaging into the std
namespace.

4 files changed, 66 insertions, 77 deletions

diff --git a/devel/lua-stdlib/Makefile b/devel/lua-stdlib/Makefile
index af5d7bd3dd2..1ef6f50efb6 100644
--- a/devel/lua-stdlib/Makefile
+++ b/devel/lua-stdlib/Makefile
@@ -1,30 +1,40 @@
-# $NetBSD: Makefile,v 1.8 2020/07/02 10:26:18 nia Exp $
+# $NetBSD: Makefile,v 1.9 2020/08/06 23:45:07 joerg Exp $
 
-DISTNAME=		stdlib-28
+DISTNAME=		stdlib-41.2.2
 PKGNAME=		${DISTNAME:S/stdlib/${LUA_PKGPREFIX}-stdlib/}
-PKGREVISION=		3
 CATEGORIES=		devel lua
-MASTER_SITES=		https://cloud.github.com/downloads/rrthomas/lua-stdlib/
-EXTRACT_SUFX=		.zip
+MASTER_SITES=		${MASTER_SITE_GITHUB:=lua-stdlib/}
+GITHUB_PROJECT=		lua-stdlib
+GITHUB_TAG=		release-v${PKGVERSION_NOREV}
 
 MAINTAINER=		cheusov@NetBSD.org
-HOMEPAGE=		https://github.com/rrthomas/lua-stdlib
+HOMEPAGE=		https://github.com/lua-stdlib/lua-stdlib/tags
 COMMENT=		Standard library for Lua programming language
 LICENSE=		mit
 
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
 
-INSTALLATION_DIRS+=	${LUA_LDIR} ${LUA_DOCDIR}/modules
+WRKSRC=			${WRKDIR}/lua-stdlib-${GITHUB_TAG}
+
+INSTALLATION_DIRS+=	${LUA_LDIR}/std/debug_init \
+			${LUA_DOCDIR}/std/classes \
+			${LUA_DOCDIR}/std/modules
 
 .include "../../lang/lua/module.mk"
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/src/*.lua \
+	${INSTALL_DATA} ${WRKSRC}/lib/*.lua \
 	                ${DESTDIR}${PREFIX}/${LUA_LDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/*.html \
-	                ${DESTDIR}${PREFIX}/${LUA_DOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/src/modules/*.html \
-	                ${DESTDIR}${PREFIX}/${LUA_DOCDIR}/modules/
+	${INSTALL_DATA} ${WRKSRC}/lib/std/*.lua \
+	                ${DESTDIR}${PREFIX}/${LUA_LDIR}/std/
+	${INSTALL_DATA} ${WRKSRC}/lib/std/debug_init/*.lua \
+	                ${DESTDIR}${PREFIX}/${LUA_LDIR}/std/debug_init/
+	${INSTALL_DATA} ${WRKSRC}/doc/index.html ${WRKSRC}/doc/ldoc.css \
+			${DESTDIR}${PREFIX}/${LUA_DOCDIR}/std
+	${INSTALL_DATA} ${WRKSRC}/doc/classes/*.html \
+			${DESTDIR}${PREFIX}/${LUA_DOCDIR}/std/classes
+	${INSTALL_DATA} ${WRKSRC}/doc/modules/*.html \
+			${DESTDIR}${PREFIX}/${LUA_DOCDIR}/std/modules
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/lua-stdlib/Makefile.common b/devel/lua-stdlib/Makefile.common
deleted file mode 100644
index 3bd1b18e503..00000000000
--- a/devel/lua-stdlib/Makefile.common
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile.common,v 1.7 2015/09/12 20:03:00 tnn Exp $
-# used by devel/lua-stdlib-doc/Makefile
-# used by devel/lua-stdlib/Makefile
-
-DISTNAME=		stdlib-28
-PKGNAME=		lua-${DISTNAME}
-CATEGORIES=		devel
-MASTER_SITES=		https://cloud.github.com/downloads/rrthomas/lua-stdlib/
-EXTRACT_SUFX=		.zip
-
-HOMEPAGE=		https://github.com/rrthomas/lua-stdlib
-LICENSE=		mit
-
-DISTINFO_FILE=		${.CURDIR}/../../devel/lua-stdlib/distinfo
-
-NO_BUILD=		yes
-NO_CONFIGURE=		yes
diff --git a/devel/lua-stdlib/PLIST b/devel/lua-stdlib/PLIST
index da0c90d2cdb..4fc5e88c261 100644
--- a/devel/lua-stdlib/PLIST
+++ b/devel/lua-stdlib/PLIST
@@ -1,44 +1,40 @@
-@comment $NetBSD: PLIST,v 1.3 2014/05/03 13:01:24 alnsn Exp $
-${LUA_LDIR}/base.lua
-${LUA_LDIR}/bin.lua
-${LUA_LDIR}/debug_ext.lua
-${LUA_LDIR}/debug_init.lua
-${LUA_LDIR}/fstable.lua
-${LUA_LDIR}/getopt.lua
-${LUA_LDIR}/io_ext.lua
-${LUA_LDIR}/lcs.lua
-${LUA_LDIR}/list.lua
-${LUA_LDIR}/math_ext.lua
-${LUA_LDIR}/mbox.lua
-${LUA_LDIR}/modules.lua
-${LUA_LDIR}/object.lua
-${LUA_LDIR}/package_ext.lua
-${LUA_LDIR}/parser.lua
-${LUA_LDIR}/set.lua
+@comment $NetBSD: PLIST,v 1.4 2020/08/06 23:45:07 joerg Exp $
+${LUA_DOCDIR}/std/classes/std.container.html
+${LUA_DOCDIR}/std/classes/std.list.html
+${LUA_DOCDIR}/std/classes/std.object.html
+${LUA_DOCDIR}/std/classes/std.optparse.html
+${LUA_DOCDIR}/std/classes/std.set.html
+${LUA_DOCDIR}/std/classes/std.strbuf.html
+${LUA_DOCDIR}/std/classes/std.tree.html
+${LUA_DOCDIR}/std/index.html
+${LUA_DOCDIR}/std/ldoc.css
+${LUA_DOCDIR}/std/modules/std.debug.html
+${LUA_DOCDIR}/std/modules/std.functional.html
+${LUA_DOCDIR}/std/modules/std.html
+${LUA_DOCDIR}/std/modules/std.io.html
+${LUA_DOCDIR}/std/modules/std.math.html
+${LUA_DOCDIR}/std/modules/std.operator.html
+${LUA_DOCDIR}/std/modules/std.package.html
+${LUA_DOCDIR}/std/modules/std.strict.html
+${LUA_DOCDIR}/std/modules/std.string.html
+${LUA_DOCDIR}/std/modules/std.table.html
 ${LUA_LDIR}/std.lua
-${LUA_LDIR}/strbuf.lua
-${LUA_LDIR}/strict.lua
-${LUA_LDIR}/string_ext.lua
-${LUA_LDIR}/tree.lua
-${LUA_LDIR}/table_ext.lua
-${LUA_LDIR}/xml.lua
-${LUA_DOCDIR}/index.html
-${LUA_DOCDIR}/modules/base.html
-${LUA_DOCDIR}/modules/bin.html
-${LUA_DOCDIR}/modules/debug.html
-${LUA_DOCDIR}/modules/fstable.html
-${LUA_DOCDIR}/modules/getopt.html
-${LUA_DOCDIR}/modules/io.html
-${LUA_DOCDIR}/modules/lcs.html
-${LUA_DOCDIR}/modules/list.html
-${LUA_DOCDIR}/modules/math.html
-${LUA_DOCDIR}/modules/mbox.html
-${LUA_DOCDIR}/modules/object.html
-${LUA_DOCDIR}/modules/package.html
-${LUA_DOCDIR}/modules/parser.html
-${LUA_DOCDIR}/modules/set.html
-${LUA_DOCDIR}/modules/std.html
-${LUA_DOCDIR}/modules/strbuf.html
-${LUA_DOCDIR}/modules/string.html
-${LUA_DOCDIR}/modules/table.html
-${LUA_DOCDIR}/modules/tree.html
+${LUA_LDIR}/std/base.lua
+${LUA_LDIR}/std/container.lua
+${LUA_LDIR}/std/debug.lua
+${LUA_LDIR}/std/debug_init/init.lua
+${LUA_LDIR}/std/functional.lua
+${LUA_LDIR}/std/io.lua
+${LUA_LDIR}/std/list.lua
+${LUA_LDIR}/std/math.lua
+${LUA_LDIR}/std/object.lua
+${LUA_LDIR}/std/operator.lua
+${LUA_LDIR}/std/optparse.lua
+${LUA_LDIR}/std/package.lua
+${LUA_LDIR}/std/set.lua
+${LUA_LDIR}/std/strbuf.lua
+${LUA_LDIR}/std/strict.lua
+${LUA_LDIR}/std/string.lua
+${LUA_LDIR}/std/table.lua
+${LUA_LDIR}/std/tree.lua
+${LUA_LDIR}/std/version.lua
diff --git a/devel/lua-stdlib/distinfo b/devel/lua-stdlib/distinfo
index 783de0ef108..d1994a01a1f 100644
--- a/devel/lua-stdlib/distinfo
+++ b/devel/lua-stdlib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 03:27:48 agc Exp $
+$NetBSD: distinfo,v 1.5 2020/08/06 23:45:07 joerg Exp $
 
-SHA1 (stdlib-28.zip) = 4ad81a072912f436bba2bba531ab725fe60d1ee2
-RMD160 (stdlib-28.zip) = d6c638bd11cf8199191eaa1ca53e7c14c7b0b5fb
-SHA512 (stdlib-28.zip) = 413b853d09417a676650d9c12f1261b9d53fac011b0d64cb842a4720d97c4bcc30352861c8e21e414e5e51183bb9938ec91c033d02fe1c4c1e11e35ac2807221
-Size (stdlib-28.zip) = 214032 bytes
+SHA1 (stdlib-41.2.2.tar.gz) = 4c85bc8ce1b302696b61614bb4a4ca0d3b3219d8
+RMD160 (stdlib-41.2.2.tar.gz) = d08b092fd90dd3f66574d39c98a96f7dd81fea51
+SHA512 (stdlib-41.2.2.tar.gz) = b477ff90f2c3e49ad83194b1a67592d786c91dbc9dfe199a701fa68bc84b6ba8c820d37ac2fc74c2ebc3fb7a83aac8bcf0af58041ce14fc1dc6b297f3ae054aa
+Size (stdlib-41.2.2.tar.gz) = 398500 bytes