summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-04-05 02:31:06 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-04-05 02:31:06 +0000
commit6982011999eb6a95c112358991c99cdb8e67a3f4 (patch)
tree810d73183f91354cbb4628a29b7c48a3963d930e /lang
parentafcb1149e896cd035473877f686095e476d058a3 (diff)
downloadpkgsrc-6982011999eb6a95c112358991c99cdb8e67a3f4.tar.gz
Update lua to 5.0.2, from Bruce J.A. Nourish via tech-pkg@.
Lua 5.0.2 is a bugfix release, which contains the following fixes: src/ldo.c Attempt to resume running coroutine crashed Lua src/lgc.c C functions also may have stacks larger than current top Userdata to be collected still counted into new GC threshold src/lgc.h Userdata to be collected still counted into new GC threshold src/lparser.c Syntax `local function' did not increment stack size src/lvm.c `pc' address was invalidated when a coroutine was suspended Count hook might be called without being set src/lib/lbaselib.c Buffer overflow for unusual %p representation Wrong number of returns from chunks loaded from stdin src/lib/liolib.c `file.close()' could not be called without arguments Buffer overflow for unusual %p representation src/luac/luac.c Missing lock/unlock
Diffstat (limited to 'lang')
-rw-r--r--lang/lua/Makefile25
-rw-r--r--lang/lua/PLIST17
-rw-r--r--lang/lua/distinfo14
-rw-r--r--lang/lua/patches/patch-aa62
-rw-r--r--lang/lua/patches/patch-ab46
-rw-r--r--lang/lua/patches/patch-ac32
-rw-r--r--lang/lua/patches/patch-ad21
-rw-r--r--lang/lua/patches/patch-ae21
-rw-r--r--lang/lua/patches/patch-af15
9 files changed, 86 insertions, 167 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index 281d14fa2fe..d648da6449e 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2004/02/24 00:05:26 cube Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/05 02:31:06 xtraeme Exp $
-DISTNAME= lua-5.0.1
-PKGREVISION= 1
+DISTNAME= lua-5.0.2
CATEGORIES= lang
MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
ftp://ftp.ntua.gr/pub/lang/lua/ \
@@ -16,28 +15,20 @@ MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
http://mirrors.sunsite.dk/lua/ \
http://ftp.chg.ru/pub/lang/lua/
-MAINTAINER= tech-pkg@NetBSD.org
+MAINTAINER= pkgsrc@bjan.freeshell.org
HOMEPAGE= http://www.lua.org/
COMMENT= Powerful light-weight language for extending applications
-USE_BUILDLINK3= yes
-MAKE_ENV+= NOGCCERROR=yes
-
-BUILD_DIRS= ${WRKSRC}/objdir
-
-post-extract:
- ${MKDIR} ${BUILD_DIRS}
-
-post-patch:
- ${CP} ${WRKSRC}/doc/lua.1 ${BUILD_DIRS}/lua
- ${CP} ${WRKSRC}/doc/luac.1 ${BUILD_DIRS}/luac
+USE_BUILDLINK3= yes
+ALL_TARGET= all so
+INSTALL_TARGET= install soinstall
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lua
- cd ${WRKSRC}; ${INSTALL_DATA} README COPYRIGHT \
+ cd ${WRKSRC}; ${INSTALL_DATA} README COPYRIGHT \
HISTORY ${PREFIX}/share/doc/lua
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/lua
- cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.gif \
+ cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.gif \
${PREFIX}/share/doc/html/lua
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lua
cd ${WRKSRC}/test && ${INSTALL_DATA} README *.lua \
diff --git a/lang/lua/PLIST b/lang/lua/PLIST
index 6512a7925c2..227c2ee8a47 100644
--- a/lang/lua/PLIST
+++ b/lang/lua/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/01/25 10:48:21 cube Exp $
-bin/bin2c
+@comment $NetBSD: PLIST,v 1.5 2004/04/05 02:31:06 xtraeme Exp $
bin/lua
bin/luac
include/lauxlib.h
@@ -7,20 +6,13 @@ include/lua.h
include/lualib.h
lib/liblua.a
lib/liblua.so
-lib/liblua.so.1
-lib/liblua.so.1.0
-lib/liblua_p.a
-lib/liblua_pic.a
+lib/liblua.so.5.0
lib/liblualib.a
lib/liblualib.so
-lib/liblualib.so.1
-lib/liblualib.so.1.0
-lib/liblualib_p.a
-lib/liblualib_pic.a
-man/cat1/lua.0
-man/cat1/luac.0
+lib/liblualib.so.5.0
man/man1/lua.1
man/man1/luac.1
+share/doc/html/lua/contents.html
share/doc/html/lua/logo.gif
share/doc/html/lua/lua.html
share/doc/html/lua/luac.html
@@ -32,7 +24,6 @@ share/doc/lua/README
share/examples/lua/README
share/examples/lua/bisect.lua
share/examples/lua/cf.lua
-share/examples/lua/compat.lua
share/examples/lua/echo.lua
share/examples/lua/env.lua
share/examples/lua/etc/README
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index 3a3cec09e04..20b48a0e1cd 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.5 2004/01/25 10:48:21 cube Exp $
+$NetBSD: distinfo,v 1.6 2004/04/05 02:31:06 xtraeme Exp $
-SHA1 (lua-5.0.1.tar.gz) = 03b47b4785178aca583333f01d8726a8ab9f7ae7
-Size (lua-5.0.1.tar.gz) = 193978 bytes
-SHA1 (patch-aa) = c69676ed0fe3fdb657fce1e5e6b5271461dd4f38
-SHA1 (patch-ab) = 8579e7d691cb9811af599390b657300a644cad51
-SHA1 (patch-ac) = d84dc51de00f31fc0741d3b275cdea5aad20f697
-SHA1 (patch-ad) = c7a1ea9d1e5276a904e44fa407f9bda9badf590d
-SHA1 (patch-ae) = 54987ad95ef87b46a9c8a427022eceb2762606bb
-SHA1 (patch-af) = f09313f59a4ea226cfbe168f2e47e5c32d47ddc9
+SHA1 (lua-5.0.2.tar.gz) = a200cfd20a9a4c7da1206ae45dddf26186a9e0e7
+Size (lua-5.0.2.tar.gz) = 190442 bytes
+SHA1 (patch-aa) = c00182becd052a33c8697b13ef818b456d470859
+SHA1 (patch-ab) = 788834909e1b1ef990805c334071d9ad8761c36f
diff --git a/lang/lua/patches/patch-aa b/lang/lua/patches/patch-aa
index c117b520827..a2808f2e39b 100644
--- a/lang/lua/patches/patch-aa
+++ b/lang/lua/patches/patch-aa
@@ -1,8 +1,56 @@
-$NetBSD: patch-aa,v 1.4 2004/01/25 10:48:21 cube Exp $
+$NetBSD: patch-aa,v 1.5 2004/04/05 02:31:06 xtraeme Exp $
---- objdir/Makefile.orig 2004-01-25 11:30:50.000000000 +0100
-+++ objdir/Makefile
-@@ -0,0 +1,3 @@
-+SUBDIR+= liblua liblualib lua luac bin2c
-+
-+.include <bsd.subdir.mk>
+--- config.orig Fri Apr 11 14:00:41 2003
++++ config
+@@ -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
+@@ -83,7 +83,7 @@ USERCONF=
+ # For partial compatibility with old upvalue behavior in C functions, define
+ # LUA_COMPATUPVALUES. Add these definitions to MYCFLAGS.
+ #
+-# -DLUA_COMPATUPSYNTAX -DLUA_COMPATUPVALUES
++EXTRA_DEFS=-DLUA_COMPATUPSYNTAX -DLUA_COMPATUPVALUES
+
+ # ------------------------------------------------------------- Lua interpreter
+
+@@ -119,11 +119,11 @@ WARN= -Wall
+ # debug information. If you only want the shared libraries, you may want to
+ # add -fPIC to MYCFLAGS.
+ #
+-MYCFLAGS= -O2
++MYCFLAGS:= $(CFLAGS)
+ #MYCFLAGS= -O3 -fomit-frame-pointer # -fPIC
+
+ # Write here any options you may need for your C linker.
+-#MYLDFLAGS=
++MYLDFLAGS= $(LDFLAGS) -Wl,-E
+
+ # ------------------------------------------------------------------ librarian
+
+@@ -148,7 +148,7 @@ 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
+@@ -157,8 +157,8 @@ INSTALL_MAN= $(INSTALL_ROOT)/man/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.
+ #
+-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
+
diff --git a/lang/lua/patches/patch-ab b/lang/lua/patches/patch-ab
index 00e87a1ce2a..c170a64ec0d 100644
--- a/lang/lua/patches/patch-ab
+++ b/lang/lua/patches/patch-ab
@@ -1,33 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2003/04/29 23:33:57 jtb Exp $
+$NetBSD: patch-ab,v 1.4 2004/04/05 02:31:06 xtraeme Exp $
---- /dev/null
-+++ objdir/liblua/Makefile
-@@ -0,0 +1,28 @@
-+LIB= lua
-+
-+SHLIB_MAJOR= 1
-+SHLIB_MINOR= 0
-+
-+LIBDIR= ${PREFIX}/lib
-+INCDIR= ${PREFIX}/include
-+
-+CPPFLAGS+= -I${.CURDIR}/../../include
-+
-+LDADD+= -lm
-+
-+NOLINT= 1
-+
-+.PATH: ${.CURDIR}/../../src
-+
-+INCLUDES= lua.h lauxlib.h
-+
-+SRCS= lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c \
-+ lobject.c lopcodes.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>
+--- Makefile.orig Fri Apr 11 00:34:38 2003
++++ Makefile
+@@ -38,8 +38,8 @@ install: all strip
+
+ # shared libraries (for Linux)
+ so:
+- ld -o lib/liblua.so.$V -shared src/*.o
+- ld -o lib/liblualib.so.$V -shared src/lib/*.o
++ ${CC} ${LDFLAGS} -o lib/liblua.so.$V -shared src/*.o
++ ${CC} ${LDFLAGS} -o lib/liblualib.so.$V -shared src/lib/*.o
+ cd lib; ln -fs liblua.so.$V liblua.so; ln -fs liblualib.so.$V liblualib.so
+
+ # binaries using shared libraries
diff --git a/lang/lua/patches/patch-ac b/lang/lua/patches/patch-ac
deleted file mode 100644
index 2e60417301f..00000000000
--- a/lang/lua/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/04/29 23:33:57 jtb Exp $
-
---- /dev/null
-+++ objdir/liblualib/Makefile
-@@ -0,0 +1,27 @@
-+LIB= lualib
-+
-+SHLIB_MAJOR= 1
-+SHLIB_MINOR= 0
-+
-+LIBDIR= ${PREFIX}/lib
-+INCDIR= ${PREFIX}/include
-+
-+CPPFLAGS+= -I${.CURDIR}/../../include
-+CPPFLAGS+= -DUSE_DLOPEN=1
-+
-+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 ltablib.c lstrlib.c loadlib.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
deleted file mode 100644
index 18d9632aa2f..00000000000
--- a/lang/lua/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/04/29 23:33:57 jtb Exp $
-
---- /dev/null
-+++ objdir/lua/Makefile
-@@ -0,0 +1,16 @@
-+PROG= lua
-+
-+SRCS= lua.c
-+
-+BINDIR= ${PREFIX}/bin
-+MANDIR= ${PREFIX}/man
-+
-+CPPFLAGS+= -I${.CURDIR}/../../include
-+
-+LDFLAGS+= -Wl,--export-dynamic -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
deleted file mode 100644
index 5feea4287ca..00000000000
--- a/lang/lua/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/04/29 23:33:57 jtb Exp $
-
---- /dev/null
-+++ objdir/luac/Makefile
-@@ -0,0 +1,16 @@
-+PROG= luac
-+
-+SRCS= luac.c print.c lopcodes.c
-+
-+BINDIR= ${PREFIX}/bin
-+MANDIR= ${PREFIX}/man
-+
-+CPPFLAGS+= -DLUA_OPNAMES -I${.CURDIR}/../../include -I${.CURDIR}/../../src
-+
-+LDFLAGS+= -Wl,--export-dynamic -R${PREFIX}/lib -L${.CURDIR}/../liblualib -L${.CURDIR}/../liblua
-+
-+LDADD+= -llualib -llua
-+
-+.PATH: ${.CURDIR}/../../src/luac ${.CURDIR}/../../src
-+
-+.include <bsd.prog.mk>
diff --git a/lang/lua/patches/patch-af b/lang/lua/patches/patch-af
deleted file mode 100644
index 651d8b74435..00000000000
--- a/lang/lua/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/01/25 10:48:21 cube Exp $
-
---- objdir/bin2c/Makefile.orig 2004-01-25 11:34:55.000000000 +0100
-+++ objdir/bin2c/Makefile
-@@ -0,0 +1,10 @@
-+PROG= bin2c
-+
-+SRCS= bin2c
-+MAN= # empty
-+
-+BINDIR= ${PREFIX}/bin
-+
-+.PATH: ${.CURDIR}/../../etc
-+
-+.include <bsd.prog.mk>