pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/lua Update to 5.1.1. Almost all dependencies need...
details: https://anonhg.NetBSD.org/pkgsrc/rev/3c7a06e4aaaf
branches: trunk
changeset: 517552:3c7a06e4aaaf
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Aug 14 22:31:39 2006 +0000
description:
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)
diffstat:
lang/lua/Makefile | 24 ++++++---
lang/lua/PLIST | 20 ++-----
lang/lua/buildlink3.mk | 5 +-
lang/lua/distinfo | 16 ++----
lang/lua/patches/patch-aa | 112 +++++++++++++--------------------------------
lang/lua/patches/patch-ab | 86 +++++++++++++++++++++++++++-------
lang/lua/patches/patch-ac | 32 -------------
lang/lua/patches/patch-ad | 27 -----------
lang/lua/patches/patch-ae | 15 ------
lang/lua/patches/patch-af | 15 ------
10 files changed, 130 insertions(+), 222 deletions(-)
diffs (truncated from 463 to 300 lines):
diff -r c4514fb8c193 -r 3c7a06e4aaaf lang/lua/Makefile
--- a/lang/lua/Makefile Mon Aug 14 15:58:47 2006 +0000
+++ b/lang/lua/Makefile Mon Aug 14 22:31:39 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2006/06/01 06:52:27 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2006/08/14 22:31:39 wiz Exp $
-DISTNAME= lua-5.0.2
-PKGREVISION= 5
+DISTNAME= lua-5.1.1
CATEGORIES= lang
MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
ftp://ftp.ntua.gr/pub/lang/lua/ \
@@ -23,6 +22,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= yes
+USE_TOOLS+= gmake
MAKE_ENV+= MYCFLAGS=${CFLAGS:M*:Q}
MAKE_ENV+= MYLDFLAGS=${LDFLAGS:M*:Q}\ ${LIBS:M*:Q}
MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q}
@@ -30,10 +30,14 @@
DOCDIR= ${PREFIX}/share/doc/lua
EGDIR= ${PREFIX}/share/examples/lua
-.include "../../mk/dlopen.buildlink3.mk"
+BUILD_TARGET= linux
+
+PKGCONFIG_OVERRIDE= ${WRKSRC}/etc/lua.pc
-post-build:
- cd ${WRKSRC}/etc && ${SETENV} ${MAKE_ENV} ${MAKE} bin2c
+SUBST_CLASSES+= pc-prefix
+SUBST_FILES.pc-prefix+= ${WRKSRC}/etc/lua.pc
+SUBST_SED.pc-prefix+= -e "s,/usr/local,${PREFIX},"
+SUBST_STAGE.pc-prefix+= post-build
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
@@ -52,9 +56,13 @@
done
${INSTALL_DATA_DIR} ${EGDIR}/etc
set -e; \
- cd ${WRKSRC}/etc; for f in README *.c *.h *.lua lua.magic lua.xpm; do \
+ cd ${WRKSRC}/etc; for f in README *.c *.ico *.lua; do \
${INSTALL_DATA} "$$f" ${EGDIR}/etc; \
done
- ${INSTALL_PROGRAM} ${WRKSRC}/etc/bin2c ${PREFIX}/bin
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${PREFIX}/lib/pkgconfig
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r c4514fb8c193 -r 3c7a06e4aaaf lang/lua/PLIST
--- a/lang/lua/PLIST Mon Aug 14 15:58:47 2006 +0000
+++ b/lang/lua/PLIST Mon Aug 14 22:31:39 2006 +0000
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 2005/09/04 04:59:36 jlam Exp $
-bin/bin2c
+@comment $NetBSD: PLIST,v 1.8 2006/08/14 22:31:39 wiz Exp $
bin/lua
bin/luac
include/lauxlib.h
include/lua.h
+include/lua.hpp
+include/luaconf.h
include/lualib.h
lib/liblua.la
-lib/liblualib.la
+lib/pkgconfig/lua.pc
man/man1/lua.1
man/man1/luac.1
share/doc/lua/COPYRIGHT
@@ -24,17 +25,11 @@
share/examples/lua/echo.lua
share/examples/lua/env.lua
share/examples/lua/etc/README
-share/examples/lua/etc/bin2c.c
-share/examples/lua/etc/compat.lua
-share/examples/lua/etc/doall.lua
-share/examples/lua/etc/lua.magic
-share/examples/lua/etc/lua.xpm
-share/examples/lua/etc/luser_number.h
-share/examples/lua/etc/luser_tests.h
+share/examples/lua/etc/all.c
+share/examples/lua/etc/lua.ico
share/examples/lua/etc/min.c
share/examples/lua/etc/noparser.c
-share/examples/lua/etc/saconfig.c
-share/examples/lua/etc/trace.c
+share/examples/lua/etc/strict.lua
share/examples/lua/factorial.lua
share/examples/lua/fib.lua
share/examples/lua/fibfor.lua
@@ -49,7 +44,6 @@
share/examples/lua/table.lua
share/examples/lua/trace-calls.lua
share/examples/lua/trace-globals.lua
-share/examples/lua/undefined.lua
share/examples/lua/xd.lua
@dirrm share/examples/lua/etc
@dirrm share/examples/lua
diff -r c4514fb8c193 -r 3c7a06e4aaaf lang/lua/buildlink3.mk
--- a/lang/lua/buildlink3.mk Mon Aug 14 15:58:47 2006 +0000
+++ b/lang/lua/buildlink3.mk Mon Aug 14 22:31:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/08/14 22:31:39 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LUA_BUILDLINK3_MK:= ${LUA_BUILDLINK3_MK}+
@@ -12,8 +12,7 @@
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lua
.if !empty(LUA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.lua+= lua>=5.0.2
-BUILDLINK_ABI_DEPENDS.lua+= lua>=5.0.2nb5
+BUILDLINK_API_DEPENDS.lua+= lua>=5.1.1
BUILDLINK_PKGSRCDIR.lua?= ../../lang/lua
.endif # LUA_BUILDLINK3_MK
diff -r c4514fb8c193 -r 3c7a06e4aaaf lang/lua/distinfo
--- a/lang/lua/distinfo Mon Aug 14 15:58:47 2006 +0000
+++ b/lang/lua/distinfo Mon Aug 14 22:31:39 2006 +0000
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.14 2006/06/01 06:52:27 rillig Exp $
+$NetBSD: distinfo,v 1.15 2006/08/14 22:31:39 wiz Exp $
-SHA1 (lua-5.0.2.tar.gz) = a200cfd20a9a4c7da1206ae45dddf26186a9e0e7
-RMD160 (lua-5.0.2.tar.gz) = 5f1a1cf5802e38b3c4dcfc9f3cd0dc33bfdc0a30
-Size (lua-5.0.2.tar.gz) = 190442 bytes
-SHA1 (patch-aa) = b521ce5dfed8c57a2e7ac4d1b1a263a7c011b666
-SHA1 (patch-ab) = 983d0ea51adf08188830b163075e13f331bb4c8a
-SHA1 (patch-ac) = 10ab28dc4b389b8b2d9b41eb6694ccfbd2320c1e
-SHA1 (patch-ad) = 8c4907c47dae10c70bc7d6365c5980765e0db31a
-SHA1 (patch-ae) = 178d4ea2cb59a9548aad73ce3be67d6920d19be9
-SHA1 (patch-af) = e15b5a75a162fdce6d0b6898ae5db048c6d62e75
+SHA1 (lua-5.1.1.tar.gz) = be13878ceef8e1ee7a4201261f0adf09f89f1005
+RMD160 (lua-5.1.1.tar.gz) = 0b9cc31cca1a0f4c2ebb62f177dc157677953a4c
+Size (lua-5.1.1.tar.gz) = 207810 bytes
+SHA1 (patch-aa) = 34380612e3f032881b47510c114da2b875084b0f
+SHA1 (patch-ab) = 6aaf6f383b10ba4096498a2d8b8f41d4ba9233fd
diff -r c4514fb8c193 -r 3c7a06e4aaaf lang/lua/patches/patch-aa
--- a/lang/lua/patches/patch-aa Mon Aug 14 15:58:47 2006 +0000
+++ b/lang/lua/patches/patch-aa Mon Aug 14 22:31:39 2006 +0000
@@ -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
+--- 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.)
#
- # 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
+-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
-@@ -119,7 +119,7 @@ WARN= -Wall
- # debug information. If you only want the shared libraries, you may want to
- # add -fPIC to MYCFLAGS.
- #
--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
+ # Lua version and release.
+@@ -59,10 +59,10 @@ test: dummy
- # 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
+ 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)
- 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)
+ local:
diff -r c4514fb8c193 -r 3c7a06e4aaaf lang/lua/patches/patch-ab
--- a/lang/lua/patches/patch-ab Mon Aug 14 15:58:47 2006 +0000
+++ b/lang/lua/patches/patch-ab Mon Aug 14 22:31:39 2006 +0000
@@ -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/*
+--- 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 \
Home |
Main Index |
Thread Index |
Old Index