Update to version 4.0.1.

Added my own makefiles to create shared versions of the libraries
using bsd.lib.mk.

Changes in Lua itself:

lua/src/lapi.c
lua/src/lstring.c
	Fixed a bug in lua_pushuserdata(L, NULL)
lua/src/ldo.c
lua/src/lgc.c
lua/src/lgc.h
	Give a good chance for GC before parsing
lua/src/lparser.c
	Fixed a bug (did not accept `;' after a `return')
lua/src/lvm.c
	Fixed a bug (linehook off by 1)
lua/src/lib/lbaselib.c
	Fixed a bug in rawget and rawset (seg. fault if given extra arguments)
	Fixed a bug in dostring (identification of precompiled chunks)

9 files changed, 166 insertions, 85 deletions

diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index 9d15b194a67..43854085bea 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -1,23 +1,32 @@
-# $NetBSD: Makefile,v 1.2 2001/11/14 14:47:55 agc Exp $
+# $NetBSD: Makefile,v 1.3 2003/02/22 00:51:58 jtb Exp $
 
-DISTNAME=	lua-4.0
+DISTNAME=	lua-4.0.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
-		ftp://csg.uwaterloo.ca/pub/lhf/lua/ \
-		ftp://ftp.freesoftware.com/pub/languages/lua/ \
-		ftp://ftp.gwdg.de/pub/languages/lua/ \
 		ftp://ftp.ntua.gr/pub/lang/lua/ \
+		ftp://ftp.gwdg.de/pub/languages/lua/ \
 		ftp://ftp.u-aizu.ac.jp/pub/lang/lua/ \
-		ftp://ftp.ucore.com/lua/dist/
+		ftp://ftp.ucore.com/lua/dist/ \
+		ftp://sunsite.dk/pub/languages/lua/ \
+		ftp://ftp.chg.ru/pub/lang/lua/ \
+		http://www.lua.org/ftp/ \
+		http://www.tecgraf.puc-rio.br/lua/ftp/ \
+		http://ftp.gwdg.de/pub/languages/lua/ \
+		http://mirrors.sunsite.dk/lua/ \
+		http://ftp.chg.ru/pub/lang/lua/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.lua.org
 COMMENT=	Powerful, light-weight programming language for extending applications
 
-WRKSRC=		${WRKDIR}/lua
+BUILD_DIRS=	${WRKSRC}/build
 
 post-extract:
-	@cd ${WRKSRC}/test; ${RM} -f lua luac
+	${MKDIR} ${BUILD_DIRS}
+
+post-patch:
+	${CP} ${WRKSRC}/doc/lua.1 ${BUILD_DIRS}/lua
+	${CP} ${WRKSRC}/doc/luac.1 ${BUILD_DIRS}/luac
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lua
@@ -27,6 +36,11 @@ post-install:
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.gif  \
 		${PREFIX}/share/doc/html/lua
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lua
+	${RM} -f ${WRKSRC}/test/lua*
 	cd ${WRKSRC}/test && ${PAX} -rw . ${PREFIX}/share/examples/lua
+	${RM} -f ${WRKSRC}/etc/Makefile
+	${RM} -f ${WRKSRC}/etc/lua.ico
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lua/etc
+	cd ${WRKSRC}/etc && ${PAX} -rw . ${PREFIX}/share/examples/lua/etc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/lua/PLIST b/lang/lua/PLIST
index 7b3dace5df7..ef89c24cc48 100644
--- a/lang/lua/PLIST
+++ b/lang/lua/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:24:03 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/22 00:51:58 jtb Exp $
 bin/lua
 bin/luac
 include/lauxlib.h
@@ -6,7 +6,17 @@ include/lua.h
 include/luadebug.h
 include/lualib.h
 lib/liblua.a
+lib/liblua.so
+lib/liblua.so.0
+lib/liblua.so.0.0
+lib/liblua_p.a
+lib/liblua_pic.a
 lib/liblualib.a
+lib/liblualib.so
+lib/liblualib.so.0
+lib/liblualib.so.0.0
+lib/liblualib_p.a
+lib/liblualib_pic.a
 man/man1/lua.1
 man/man1/luac.1
 share/doc/html/lua/idx.html
@@ -19,6 +29,15 @@ share/doc/html/lua/readme.html
 share/doc/lua/COPYRIGHT
 share/doc/lua/HISTORY
 share/doc/lua/README
+share/examples/lua/etc/README
+share/examples/lua/etc/bin2c.c
+share/examples/lua/etc/def.lua
+share/examples/lua/etc/lua.magic
+share/examples/lua/etc/lua.xpm
+share/examples/lua/etc/min.c
+share/examples/lua/etc/setfallback.lua
+share/examples/lua/etc/stdcall.lua
+share/examples/lua/etc/trace.c
 share/examples/lua/examples/ps/ps.lua
 share/examples/lua/examples/ps/hilbert.lua
 share/examples/lua/examples/www/db.lua
@@ -47,6 +66,7 @@ share/examples/lua/table.lua
 @dirrm share/examples/lua/examples/www
 @dirrm share/examples/lua/examples/ps
 @dirrm share/examples/lua/examples
+@dirrm share/examples/lua/etc
 @dirrm share/examples/lua
 @dirrm share/doc/lua
 @dirrm share/doc/html/lua
diff --git a/lang/lua/buildlink2.mk b/lang/lua/buildlink2.mk
index 81f561ac322..5e5ff4e48f0 100644
--- a/lang/lua/buildlink2.mk
+++ b/lang/lua/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/26 21:38:23 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/02/22 00:51:58 jtb Exp $
 #
 # This Makefile fragment is included by packages that use lua.
 #
@@ -7,7 +7,7 @@
 LUA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		lua
-BUILDLINK_DEPENDS.lua?=		lua>=4.0
+BUILDLINK_DEPENDS.lua?=		lua>=4.0.1
 BUILDLINK_PKGSRCDIR.lua?=	../../lang/lua
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.lua=lua
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index f1800503003..b7a7418f995 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/19 14:47:22 jtb Exp $
+$NetBSD: distinfo,v 1.2 2003/02/22 00:51:58 jtb Exp $
 
-SHA1 (lua-4.0.tar.gz) = 8d432c73ef6e98b81d252114be1a83182cc9607a
-Size (lua-4.0.tar.gz) = 157102 bytes
-SHA1 (patch-aa) = d925fcf677c2fed99ebf56805f1fa121ad9133e4
-SHA1 (patch-ab) = 89c41b48f075254b27d68f3a25fdc64719d5f8b9
+SHA1 (lua-4.0.1.tar.gz) = 12f1864a7ecd4b8011862a07fa3f177b2e80e7d3
+Size (lua-4.0.1.tar.gz) = 158426 bytes
+SHA1 (patch-aa) = 144eedfb2105724b7d5f67bb1ac5d2e467b51107
+SHA1 (patch-ab) = 37ac2623dcc1bcd1a8e3e80b94e153106e876dcf
+SHA1 (patch-ac) = ee37ba37bcc408700fac203dcaef44fe044d6675
+SHA1 (patch-ad) = 0f3fbb185cc64a976e90fdd5385ce24ef956d5fd
+SHA1 (patch-ae) = d6d1f9133a35bf505da1fdd790545139d858f9fe
diff --git a/lang/lua/patches/patch-aa b/lang/lua/patches/patch-aa
index 45f04662110..c006693252b 100644
--- a/lang/lua/patches/patch-aa
+++ b/lang/lua/patches/patch-aa
@@ -1,58 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/06/19 14:47:23 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2003/02/22 00:51:58 jtb Exp $
 
---- config.orig	Tue Jun 19 14:57:50 2001
-+++ config
-@@ -14,7 +14,7 @@
- 
- # If you want support for pipes, uncomment the following line.
- # You need popen in your C library.
--#POPEN= -DPOPEN
-+POPEN= -DPOPEN
- 
- # If you need compatibility with previous versions, edit and uncomment the
- # definition of COMPAT below.
-@@ -28,7 +28,7 @@
- # ------------------------------------------------------------------ C compiler
- 
- # You need an ANSI C compiler. gcc is a popular one.
--CC= gcc
-+#CC= gcc
- WARN= -ansi -pedantic -Wall
- 
- # On IRIX, cc is a good ANSI compiler.
-@@ -65,22 +65,22 @@
- 
- # If your system doesn't have (or need) ranlib, use RANLIB=true.
- # On some systems, "ar s" does what ranlib would do.
--RANLIB= ranlib
-+#RANLIB= ranlib
- #RANLIB= ar s
- #RANLIB= true
- 
- # ------------------------------------------------------------------ install
- 
- # Locations for "make install". You may need to be root do "make install".
--INSTALL_ROOT= /usr/local
-+INSTALL_ROOT= ${PREFIX}
- INSTALL_BIN= $(INSTALL_ROOT)/bin
- INSTALL_INC= $(INSTALL_ROOT)/include
- INSTALL_LIB= $(INSTALL_ROOT)/lib
- INSTALL_MAN= $(INSTALL_ROOT)/man/man1
- 
- # You might prefer to use "install" if you have it.
--INSTALL_EXEC= cp
--INSTALL_DATA= cp
-+INSTALL_EXEC= ${BSD_INSTALL_PROGRAM}
-+INSTALL_DATA= ${BSD_INSTALL_DATA}
- #INSTALL_EXEC= install -m 0755
- #INSTALL_DATA= install -m 0644
- 
-@@ -93,7 +93,7 @@
- INCS= -I$(INC) $(EXTRA_INCS)
- DEFS= $(COMPAT) $(NUMBER) $(OLD_ANSI) $(EXTRA_DEFS)
- 
--CFLAGS= -O2 $(WARN) $(INCS) $(DEFS)
-+CFLAGS+= $(WARN) $(INCS) $(DEFS)
- 
- V=4.0
- 
+--- /dev/null	Fri Feb 21 23:40:02 2003
++++ build/Makefile
+@@ -0,0 +1,3 @@
++SUBDIR+= liblua liblualib lua luac
++
++.include <bsd.subdir.mk>
diff --git a/lang/lua/patches/patch-ab b/lang/lua/patches/patch-ab
index c96f7ce86ed..df039e8728a 100644
--- a/lang/lua/patches/patch-ab
+++ b/lang/lua/patches/patch-ab
@@ -1,13 +1,33 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/06/19 14:47:23 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2003/02/22 00:51:59 jtb Exp $
 
---- Makefile.orig	Tue Jun 19 15:18:13 2001
-+++ Makefile
-@@ -19,7 +19,7 @@
- 	strip bin/lua bin/luac
- 
- # official installation
--install: all strip
-+install: all
- 	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN)
- 	$(INSTALL_EXEC) bin/* $(INSTALL_BIN)
- 	$(INSTALL_DATA) include/*.h $(INSTALL_INC)
+--- /dev/null	Fri Feb 21 23:53:36 2003
++++ build/liblua/Makefile
+@@ -0,0 +1,28 @@
++LIB= lua
++
++SHLIB_MAJOR= 0
++SHLIB_MINOR= 0
++
++LIBDIR= ${PREFIX}/lib
++INCDIR= ${PREFIX}/include
++
++CPPFLAGS+= -I${.CURDIR}/../../include
++
++LDADD+= -lm
++
++NOLINT= 1
++
++.PATH:	${.CURDIR}/../../src
++
++INCLUDES= lua.h luadebug.h lauxlib.h
++
++SRCS= lapi.c lcode.c ldebug.c ldo.c lfunc.c lgc.c llex.c lmem.c	\
++      lobject.c lparser.c lstate.c lstring.c ltable.c ltests.c	\
++      ltm.c lundump.c lvm.c lzio.c
++
++afterinstall:
++	for i in ${INCLUDES}; do					\
++	${BSD_INSTALL_DATA} ${.CURDIR}/../../include/$$i ${INCDIR};	\
++	done
++
++.include <bsd.lib.mk>
diff --git a/lang/lua/patches/patch-ac b/lang/lua/patches/patch-ac
new file mode 100644
index 00000000000..cbf24064f9f
--- /dev/null
+++ b/lang/lua/patches/patch-ac
@@ -0,0 +1,32 @@
+$NetBSD: patch-ac,v 1.1 2003/02/22 00:51:59 jtb Exp $
+
+--- /dev/null	Fri Feb 21 23:53:43 2003
++++ build/liblualib/Makefile
+@@ -0,0 +1,27 @@
++LIB= lualib
++
++SHLIB_MAJOR= 0
++SHLIB_MINOR= 0
++
++LIBDIR= ${PREFIX}/lib
++INCDIR= ${PREFIX}/include
++
++CPPFLAGS+= -I${.CURDIR}/../../include
++CPPFLAGS+= -DPOPEN
++
++LDADD+= -R${LIBDIR} -L${.CURDIR}/../liblua -llua -lm
++
++NOLINT= 1
++
++.PATH:	${.CURDIR}/../../src/lib
++
++INCLUDES= lualib.h
++
++SRCS= lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c lstrlib.c
++
++afterinstall:
++	for i in ${INCLUDES}; do					\
++	${BSD_INSTALL_DATA} ${.CURDIR}/../../include/$$i ${INCDIR};	\
++	done
++
++.include <bsd.lib.mk>
diff --git a/lang/lua/patches/patch-ad b/lang/lua/patches/patch-ad
new file mode 100644
index 00000000000..77262644e3d
--- /dev/null
+++ b/lang/lua/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.1 2003/02/22 00:51:59 jtb Exp $
+
+--- /dev/null	Sat Feb 22 00:18:00 2003
++++ build/lua/Makefile
+@@ -0,0 +1,16 @@
++PROG= lua
++
++SRCS= lua.c
++
++BINDIR= ${PREFIX}/bin
++MANDIR= ${PREFIX}/man
++
++CPPFLAGS+= -D_POSIX_SOURCE -I${.CURDIR}/../../include
++
++LDFLAGS+= -R${PREFIX}/lib -L${.CURDIR}/../liblua -L${.CURDIR}/../liblualib
++
++LDADD+= -llua -llualib -lm
++
++.PATH:	${.CURDIR}/../../src/lua
++
++.include <bsd.prog.mk>
diff --git a/lang/lua/patches/patch-ae b/lang/lua/patches/patch-ae
new file mode 100644
index 00000000000..bc6d6319051
--- /dev/null
+++ b/lang/lua/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1 2003/02/22 00:51:59 jtb Exp $
+
+--- /dev/null	Sat Feb 22 00:18:04 2003
++++ build/luac/Makefile
+@@ -0,0 +1,16 @@
++PROG= luac
++
++SRCS= dump.c luac.c opt.c print.c stubs.c
++
++BINDIR= ${PREFIX}/bin
++MANDIR= ${PREFIX}/man
++
++CPPFLAGS+= -D_POSIX_SOURCE -I${.CURDIR}/../../include -I${.CURDIR}/../../src
++
++LDFLAGS+= -R${PREFIX}/lib -L${.CURDIR}/../liblua
++
++LDADD+= -llua
++
++.PATH:	${.CURDIR}/../../src/luac
++
++.include <bsd.prog.mk>