Update to 5.1.1. Almost all dependencies need adaptation -> bump API.

Changes:

* Changes from version 5.0 to 5.1
  -------------------------------
  Language:
  + new module system.
  + new semantics for control variables of fors.
  + new semantics for setn/getn.
  + new syntax/semantics for varargs.
  + new long strings and comments.
  + new `mod' operator (`%')
  + new length operator #t
  + metatables for all types
  API:
  + new functions: lua_createtable, lua_get(set)field, lua_push(to)integer.
  + user supplies memory allocator (lua_open becomes lua_newstate).
  + luaopen_* functionst must be called through Lua.
  Implementation:
  + new configuration scheme via luaconf.h.
  + incremental garbage collection.
  + better handling of end-of-line in the lexer.
  + fully reentrant parser (new Lua function `load')
  + better support for 64-bit machines.
  + native loadlib support for Mac OS X.
  + standard distribution in only one library (lualib.a merged into lua.a)

6 files changed, 104 insertions, 193 deletions

diff --git a/lang/lua/patches/patch-aa b/lang/lua/patches/patch-aa
index 9c17a5b6aec..e6f23b804d0 100644
--- a/lang/lua/patches/patch-aa
+++ b/lang/lua/patches/patch-aa
@@ -1,85 +1,37 @@
-$NetBSD: patch-aa,v 1.11 2006/06/01 06:52:28 rillig Exp $
+$NetBSD: patch-aa,v 1.12 2006/08/14 22:31:39 wiz Exp $
 
---- config.orig	2003-04-11 15:00:41.000000000 +0100
-+++ config	2006-06-01 07:40:42.963818821 +0100
-@@ -4,7 +4,7 @@
- # These are default values. Skip this section and see the explanations below.
- 
- LOADLIB=
--DLLIB=
-+#DLLIB=
- NUMBER=
- POPEN=
- TMPNAM=
-@@ -25,7 +25,7 @@ USERCONF=
- # interface (e.g., Linux, Solaris, IRIX, BSD, AIX, HPUX, and probably others),
- # uncomment the next two lines.
- #
--#LOADLIB= -DUSE_DLOPEN=1
-+LOADLIB= -DUSE_DLOPEN=1
- #DLLIB= -ldl
- #
- # In Linux with gcc, you should also uncomment the next definition for
-@@ -45,7 +45,7 @@ USERCONF=
- # If your system is not POSIX but has popen and pclose, define USE_POPEN=1.
- # If you don't want to support pipes, define USE_POPEN=0.
- #
--#POPEN= -DUSE_POPEN=1
-+POPEN= -DUSE_POPEN=1
- #POPEN= -DUSE_POPEN=0
- #
- # The form below will probably work in (some) Windows systems.
-@@ -108,8 +108,8 @@ EXTRA_LIBS= -lm
- # You need an ANSI C compiler. gcc is a popular one. We do not use -ansi in
- # WARN because it disables POSIX features used in the libraries.
- #
--CC= gcc
--WARN= -Wall
-+#CC= gcc
-+#WARN= -Wall
- 
- # ------------------------------------------------------------------ C options
- 
-@@ -119,7 +119,7 @@ WARN= -Wall
- # debug information. If you only want the shared libraries, you may want to
- # add -fPIC to MYCFLAGS.
+--- Makefile.orig	2006-06-02 10:53:38.000000000 +0000
++++ Makefile
+@@ -11,7 +11,7 @@ PLAT= none
+ # if INSTALL_TOP is not an absolute path. (Man pages are installed from the
+ # doc directory.)
  #
--MYCFLAGS= -O2
-+#MYCFLAGS= -O2
- #MYCFLAGS= -O3 -fomit-frame-pointer # -fPIC
- 
- # Write here any options you may need for your C linker.
-@@ -148,11 +148,11 @@ STRIP= strip
- 
- # 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
-+INSTALL_MAN= $(INSTALL_ROOT)/$(PKGMANDIR)/man1
- 
- # You may prefer to use "install" instead of "cp" if you have it.
- # If you use "install", you may also want to change the permissions after -m.
-@@ -165,6 +165,7 @@ INSTALL_DATA= cp
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
- 
- V=5.0
-+LV=5:0
- 
- BIN= $(LUA)/bin
- INC= $(LUA)/include
-@@ -173,6 +174,11 @@ LIB= $(LUA)/lib
- INCS= -I$(INC) $(EXTRA_INCS)
- DEFS= $(NUMBER) $(EXTRA_DEFS)
- 
-+CCLD= $(LIBTOOL) --mode=link $(CC)
- CFLAGS= $(MYCFLAGS) $(WARN) $(INCS) $(DEFS)
- 
-+.SUFFIXES:	.lo
-+.c.lo:
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
-+
- # (end of config)
+-INSTALL_TOP= /usr/local
++INSTALL_TOP= ${PREFIX}
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+ INSTALL_INC= $(INSTALL_TOP)/include
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+@@ -42,7 +42,7 @@ PLATS= aix ansi bsd generic linux macosx
+ # What to install.
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
+-TO_LIB= liblua.a
++TO_LIB= liblua.la
+ TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+@@ -59,10 +59,10 @@ test:	dummy
+ 
+ install: dummy
+ 	cd src && $(MKDIR) -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+-	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
+-	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+-	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
+-	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
++	cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) $(INSTALL_BIN)
++	cd src && $(BSD_INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
++	cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(INSTALL_LIB)
++	cd doc && $(BSD_INSTALL_MAN) $(TO_MAN) $(INSTALL_MAN)
+ #	$(RANLIB) $(INSTALL_LIB)/$(TO_LIB)
+ 
+ local:
diff --git a/lang/lua/patches/patch-ab b/lang/lua/patches/patch-ab
index 653beb55dd4..fa25897f151 100644
--- a/lang/lua/patches/patch-ab
+++ b/lang/lua/patches/patch-ab
@@ -1,22 +1,70 @@
-$NetBSD: patch-ab,v 1.6 2005/09/04 04:59:36 jlam Exp $
+$NetBSD: patch-ab,v 1.7 2006/08/14 22:31:39 wiz Exp $
 
---- Makefile.orig	Fri Mar 12 01:50:55 2004
-+++ Makefile
-@@ -29,12 +29,12 @@ strip:
- 	$(STRIP) bin/*
- 
- # 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)
--	$(INSTALL_DATA) lib/*.a $(INSTALL_LIB)
--	$(INSTALL_DATA) doc/*.1 $(INSTALL_MAN)
-+	cd bin; for f in *; do $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$f $(INSTALL_BIN); done
-+	cd include; for f in *.h; do $(BSD_INSTALL_DATA) $$f $(INSTALL_INC); done
-+	cd lib; for f in *.la; do $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $$f $(INSTALL_LIB); done
-+	cd doc; for f in *.1; do $(BSD_INSTALL_MAN) $$f $(INSTALL_MAN); done
- 
- # shared libraries (for Linux)
- so:
+--- src/Makefile.orig	2006-03-22 00:41:49.000000000 +0000
++++ src/Makefile
+@@ -18,22 +18,33 @@ MYCFLAGS=
+ MYLDFLAGS=
+ MYLIBS=
+ 
++.SUFFIXES:	.lo
++.c.lo:
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
++LV=	5:1
++
++
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+ PLATS= aix ansi bsd generic linux macosx mingw posix solaris
+ 
+-LUA_A=	liblua.a
+-CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
++LUA_XA=	liblua.a
++LUA_A=	liblua.la
++XCORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+ 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+ 	lundump.o lvm.o lzio.o
+-LIB_O=	lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
++XLIB_O=	lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
+ 	lstrlib.o loadlib.o linit.o
++CORE_O=	$(XCORE_O:.o=.lo)
++LIB_O=	$(XLIB_O:.o=.lo)
+ 
+ LUA_T=	lua
+-LUA_O=	lua.o
++LUA_XO=	lua.o
++LUA_O=	$(LUA_XO:.o=.lo)
+ 
+ LUAC_T=	luac
+-LUAC_O=	luac.o print.o
++LUAC_XO=	luac.o print.o
++LUAC_O=	$(LUAC_XO:.o=.lo)
+ 
+ ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+ ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+@@ -48,14 +59,13 @@ o:	$(ALL_O)
+ a:	$(ALL_A)
+ 
+ $(LUA_A): $(CORE_O) $(LIB_O)
+-	$(AR) $@ $?
+-	$(RANLIB) $@
++	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${CORE_O} ${LIB_O} -rpath ${PREFIX}/lib -version-info ${LV} ${LIBS}
+ 
+ $(LUA_T): $(LUA_O) $(LUA_A)
+-	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++	${LIBTOOL} --mode=link $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
+ $(LUAC_T): $(LUAC_O) $(LUA_A)
+-	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
++	${LIBTOOL} --mode=link $(CC) -static -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+ 
+ clean:
+ 	$(RM) $(ALL_T) $(ALL_O)
+@@ -92,7 +102,7 @@ generic:
+ 	$(MAKE) all MYCFLAGS=
+ 
+ linux:
+-	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
++	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -lreadline -lhistory -lncurses"
+ 
+ macosx:
+ 	$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
diff --git a/lang/lua/patches/patch-ac b/lang/lua/patches/patch-ac
deleted file mode 100644
index 128429c7857..00000000000
--- a/lang/lua/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2006/06/01 06:52:28 rillig Exp $
-
---- src/Makefile.orig	2002-12-13 12:12:11.000000000 +0000
-+++ src/Makefile	2006-06-01 07:25:02.604386400 +0100
-@@ -26,6 +26,8 @@ OBJS=	\
- 	lvm.o \
- 	lzio.o
- 
-+LOBJS=	$(OBJS:.o=.lo)
-+
- SRCS=	\
- 	lapi.c \
- 	lcode.c \
-@@ -68,13 +70,17 @@ SRCS=	\
- 	lzio.h
- 
- T= $(LIB)/liblua.a
-+LT= $(T:.a=.la)
- 
--all:	$T
-+all:	$(LT)
- 
- $T:	$(OBJS)
- 	$(AR) $@ $(OBJS)
- 	$(RANLIB) $@
- 
-+$(LT):	$(LOBJS)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV) $(DLLIB)
-+
- clean:
- 	rm -f $(OBJS) $T
- 
diff --git a/lang/lua/patches/patch-ad b/lang/lua/patches/patch-ad
deleted file mode 100644
index b6104def4f2..00000000000
--- a/lang/lua/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2006/06/01 06:52:28 rillig Exp $
-
---- src/lib/Makefile.orig	2003-03-28 12:49:56.000000000 +0000
-+++ src/lib/Makefile	2006-06-01 07:25:02.631381504 +0100
-@@ -7,16 +7,21 @@ include $(LUA)/config
- EXTRA_DEFS= $(POPEN) $(TMPNAM) $(DEGREES) $(LOADLIB)
- 
- OBJS= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o ltablib.o lstrlib.o loadlib.o
-+LOBJS= $(OBJS:.o=.lo)
- SRCS= lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c ltablib.c lstrlib.c loadlib.c
- 
- T= $(LIB)/liblualib.a
-+LT= $(T:.a=.la)
- 
--all:	$T
-+all:	$(LT)
- 
- $T:	$(OBJS)
- 	$(AR) $@ $(OBJS)
- 	$(RANLIB) $@
- 
-+$(LT):	$(LOBJS)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV) $(DLLIB)
-+
- clean:
- 	rm -f $(OBJS) $T
- 
diff --git a/lang/lua/patches/patch-ae b/lang/lua/patches/patch-ae
deleted file mode 100644
index 8d36dd5d9a3..00000000000
--- a/lang/lua/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2005/09/04 04:59:36 jlam Exp $
-
---- src/lua/Makefile.orig	Wed Apr  9 02:07:23 2003
-+++ src/lua/Makefile
-@@ -12,8 +12,8 @@ T= $(BIN)/lua
- 
- all:	$T
- 
--$T:	$(OBJS) $(LIB)/liblua.a $(LIB)/liblualib.a
--	$(CC) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
-+$T:	$(OBJS)
-+	$(CCLD) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
- 
- $(LIB)/liblua.a:
- 	cd ..; $(MAKE)
diff --git a/lang/lua/patches/patch-af b/lang/lua/patches/patch-af
deleted file mode 100644
index c14a24b235a..00000000000
--- a/lang/lua/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.3 2005/09/04 04:59:36 jlam Exp $
-
---- src/luac/Makefile.orig	Tue Oct 21 11:54:08 2003
-+++ src/luac/Makefile
-@@ -12,8 +12,8 @@ T= $(BIN)/luac
- 
- all:	$T
- 
--$T:	$(OBJS) $(LIB)/liblua.a $(LIB)/liblualib.a
--	$(CC) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
-+$T:	$(OBJS)
-+	$(CCLD) -o $@ $(MYLDFLAGS) $(OBJS) -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
- 
- # print.c needs opcode names from lopcodes.c
- lopcodes.o:	../lopcodes.c ../lopcodes.h