Update lua-stdlib to 0.28

6 files changed, 51 insertions, 38 deletions

diff --git a/devel/lua-stdlib-doc/Makefile b/devel/lua-stdlib-doc/Makefile
index 5c8091c407a..583063ccc29 100644
--- a/devel/lua-stdlib-doc/Makefile
+++ b/devel/lua-stdlib-doc/Makefile
@@ -1,17 +1,21 @@
-# $NetBSD: Makefile,v 1.2 2009/08/12 17:17:42 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2012/12/02 09:26:08 cheusov Exp $
 
 .include "../../devel/lua-stdlib/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/stdlib/lua-stdlib-doc/}
+MAINTAINER=		cheusov@NetBSD.org
 
 COMMENT=		Documentation for modules from lua-stdlib
 
 DOCDIR=			share/doc/lua-stdlib
 
-INSTALLATION_DIRS+=	${DOCDIR}
+DEPENDS+=		lua-${DISTNAME}{,nb*}:../../devel/lua-stdlib
+INSTALLATION_DIRS+=	${DOCDIR}/modules
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/modules/*.html \
-	                ${DESTDIR}${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/*.html \
+	                ${DESTDIR}${PREFIX}/${DOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/src/modules/*.html \
+	                ${DESTDIR}${PREFIX}/${DOCDIR}/modules/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/lua-stdlib-doc/PLIST b/devel/lua-stdlib-doc/PLIST
index 8c9a316a9bb..7e30430483c 100644
--- a/devel/lua-stdlib-doc/PLIST
+++ b/devel/lua-stdlib-doc/PLIST
@@ -1,17 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/02/12 01:47:49 minskim Exp $
-share/doc/lua-stdlib/base.html
-share/doc/lua-stdlib/debug_ext.html
-share/doc/lua-stdlib/getopt.html
-share/doc/lua-stdlib/io_ext.html
-share/doc/lua-stdlib/lcs.html
-share/doc/lua-stdlib/list.html
-share/doc/lua-stdlib/math_ext.html
-share/doc/lua-stdlib/mbox.html
-share/doc/lua-stdlib/object.html
-share/doc/lua-stdlib/parser.html
-share/doc/lua-stdlib/rex.html
-share/doc/lua-stdlib/set.html
-share/doc/lua-stdlib/std.html
-share/doc/lua-stdlib/string_ext.html
-share/doc/lua-stdlib/table_ext.html
-share/doc/lua-stdlib/xml.html
+@comment $NetBSD: PLIST,v 1.2 2012/12/02 09:26:08 cheusov Exp $
+share/doc/lua-stdlib/index.html
+share/doc/lua-stdlib/modules/base.html
+share/doc/lua-stdlib/modules/bin.html
+share/doc/lua-stdlib/modules/debug.html
+share/doc/lua-stdlib/modules/fstable.html
+share/doc/lua-stdlib/modules/getopt.html
+share/doc/lua-stdlib/modules/io.html
+share/doc/lua-stdlib/modules/lcs.html
+share/doc/lua-stdlib/modules/list.html
+share/doc/lua-stdlib/modules/math.html
+share/doc/lua-stdlib/modules/mbox.html
+share/doc/lua-stdlib/modules/object.html
+share/doc/lua-stdlib/modules/package.html
+share/doc/lua-stdlib/modules/parser.html
+share/doc/lua-stdlib/modules/set.html
+share/doc/lua-stdlib/modules/std.html
+share/doc/lua-stdlib/modules/strbuf.html
+share/doc/lua-stdlib/modules/string.html
+share/doc/lua-stdlib/modules/table.html
+share/doc/lua-stdlib/modules/tree.html
diff --git a/devel/lua-stdlib/Makefile b/devel/lua-stdlib/Makefile
index d189ee8e6e0..56fe29ba5ff 100644
--- a/devel/lua-stdlib/Makefile
+++ b/devel/lua-stdlib/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2011/07/25 20:10:50 cheusov Exp $
+# $NetBSD: Makefile,v 1.3 2012/12/02 09:26:08 cheusov Exp $
 
 .include "../../devel/lua-stdlib/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/stdlib/${LUA_PKGPREFIX}-stdlib/}
-PKGREVISION=		1
 COMMENT=		Standard library for Lua programming language
+MAINTAINER=		cheusov@NetBSD.org
 
-DEPENDS+=		lua-lrexlib-pcre-[0-9]*:../../devel/lua-lrexlib-pcre
 INSTALLATION_DIRS+=	${LUA_LDIR}
 
 .include "../../lang/lua/module.mk"
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/modules/*.lua \
+	${INSTALL_DATA} ${WRKSRC}/src/*.lua \
 	                ${DESTDIR}${PREFIX}/${LUA_LDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/lua-stdlib/Makefile.common b/devel/lua-stdlib/Makefile.common
index 11fd493abea..0dc222cdd69 100644
--- a/devel/lua-stdlib/Makefile.common
+++ b/devel/lua-stdlib/Makefile.common
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile.common,v 1.5 2012/10/31 11:17:26 asau Exp $
+# $NetBSD: Makefile.common,v 1.6 2012/12/02 09:26:08 cheusov Exp $
 # used by devel/lua-stdlib-doc/Makefile
 # used by devel/lua-stdlib/Makefile
 
-DISTNAME=		stdlib-11
+DISTNAME=		stdlib-28
+PKGNAME=		lua-${DISTNAME}
 CATEGORIES=		devel
-MASTER_SITES=		http://luaforge.net/frs/download.php/3987/
+MASTER_SITES=		http://cloud.github.com/downloads/rrthomas/lua-stdlib/
+EXTRACT_SUFX=		.zip
 
-MAINTAINER=		cheusov@NetBSD.org
-HOMEPAGE=		http://luaforge.net/projects/stdlib/
+HOMEPAGE=		https://github.com/rrthomas/lua-stdlib
 LICENSE=		mit
 
 DISTINFO_FILE=		${.CURDIR}/../../devel/lua-stdlib/distinfo
 
-WRKSRC=			${WRKDIR}/stdlib
-
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
diff --git a/devel/lua-stdlib/PLIST b/devel/lua-stdlib/PLIST
index ef67d891bb1..d782603f4f9 100644
--- a/devel/lua-stdlib/PLIST
+++ b/devel/lua-stdlib/PLIST
@@ -1,17 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/02/12 01:45:01 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/12/02 09:26:08 cheusov 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}/rex.lua
 ${LUA_LDIR}/set.lua
 ${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
diff --git a/devel/lua-stdlib/distinfo b/devel/lua-stdlib/distinfo
index 0c89f624638..5ac3ffa28d4 100644
--- a/devel/lua-stdlib/distinfo
+++ b/devel/lua-stdlib/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/08/12 17:17:42 minskim Exp $
+$NetBSD: distinfo,v 1.3 2012/12/02 09:26:08 cheusov Exp $
 
-SHA1 (stdlib-11.tar.gz) = 3588c2c7fa35972079e16ac169208c3802a09973
-RMD160 (stdlib-11.tar.gz) = fac54e53dc3f31d5e1cd4372ad8a6ec15122e1db
-Size (stdlib-11.tar.gz) = 31052 bytes
+SHA1 (stdlib-28.zip) = 4ad81a072912f436bba2bba531ab725fe60d1ee2
+RMD160 (stdlib-28.zip) = d6c638bd11cf8199191eaa1ca53e7c14c7b0b5fb
+Size (stdlib-28.zip) = 214032 bytes