From 7dbacd93fb288f59820e94c1b8a277c7a49b6835 Mon Sep 17 00:00:00 2001 From: obache Date: Fri, 15 Jun 2007 17:45:37 +0000 Subject: Update lua to 5.1.2. Patch provided by Holger Weiss in PR 36333. And specify more platform target. This release fixes all known bugs in 5.1.1. --- lang/lua/Makefile | 15 +++++++++++---- lang/lua/PLIST | 3 ++- lang/lua/distinfo | 12 ++++++------ lang/lua/patches/patch-aa | 14 +++++++------- lang/lua/patches/patch-ab | 17 ++++++++--------- 5 files changed, 34 insertions(+), 27 deletions(-) (limited to 'lang') diff --git a/lang/lua/Makefile b/lang/lua/Makefile index d5ea0737ed3..b39b74f1265 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.32 2006/11/03 06:46:21 joerg Exp $ +# $NetBSD: Makefile,v 1.33 2007/06/15 17:45:37 obache Exp $ -DISTNAME= lua-5.1.1 -PKGREVISION= 1 +DISTNAME= lua-5.1.2 CATEGORIES= lang MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \ ftp://ftp.ntua.gr/pub/lang/lua/ \ @@ -34,10 +33,18 @@ EGDIR= ${PREFIX}/share/examples/lua .include "../../mk/bsd.prefs.mk" -.if !empty(OPSYS:M*BSD*) +.if ${OPSYS} == "FreeBSD" +BUILD_TARGET= freebsd +.elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly" BUILD_TARGET= bsd .elif ${OPSYS} == "Linux" BUILD_TARGET= linux +.elif ${OPSYS} == "Darwin" +BUILD_TARGET= macosx +.elif ${OPSYS} == "SunOS" +BUILD_TARGET= solaris +.elif ${OPSYS} == "AIX" +BUILD_TARGET= aix .else BUILD_TARGET= generic .endif diff --git a/lang/lua/PLIST b/lang/lua/PLIST index 842af2c49f7..0681ab5e2b9 100644 --- a/lang/lua/PLIST +++ b/lang/lua/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2006/08/14 22:31:39 wiz Exp $ +@comment $NetBSD: PLIST,v 1.9 2007/06/15 17:45:37 obache Exp $ bin/lua bin/luac include/lauxlib.h @@ -13,6 +13,7 @@ man/man1/luac.1 share/doc/lua/COPYRIGHT share/doc/lua/HISTORY share/doc/lua/README +share/doc/lua/amazon.gif share/doc/lua/contents.html share/doc/lua/logo.gif share/doc/lua/lua.html diff --git a/lang/lua/distinfo b/lang/lua/distinfo index bbc7f422af9..e4e73401fb1 100644 --- a/lang/lua/distinfo +++ b/lang/lua/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.18 2006/11/03 06:46:21 joerg Exp $ +$NetBSD: distinfo,v 1.19 2007/06/15 17:45:37 obache Exp $ -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) = 9440cceaf69d0db3883b08c857879631a915e93e -SHA1 (patch-ab) = 2ea6ab36420c886b73ce3ad7494b34a2100eee4d +SHA1 (lua-5.1.2.tar.gz) = 8a460d2d7e70e93cb72bf3d584405464763cb5f0 +RMD160 (lua-5.1.2.tar.gz) = 01350549b3a05838925dae1a666700bb9f1bc01a +Size (lua-5.1.2.tar.gz) = 214134 bytes +SHA1 (patch-aa) = f7be08d025d9ce68d568a922d778e5aca8eb35d5 +SHA1 (patch-ab) = c2439a9bce4e4d7a5be20906d218586160cc943d diff --git a/lang/lua/patches/patch-aa b/lang/lua/patches/patch-aa index fcfa9a3fa7b..f50412156d0 100644 --- a/lang/lua/patches/patch-aa +++ b/lang/lua/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.14 2006/11/03 06:46:21 joerg Exp $ +$NetBSD: patch-aa,v 1.15 2007/06/15 17:45:37 obache Exp $ ---- Makefile.orig 2006-06-02 10:53:38.000000000 +0000 +--- Makefile.orig 2007-03-25 14:44:39.000000000 +0000 +++ Makefile -@@ -11,11 +11,11 @@ PLAT= none - # if INSTALL_TOP is not an absolute path. (Man pages are installed from the - # doc directory.) +@@ -12,11 +12,11 @@ PLAT= none + # doc directory.) You may want to make these paths consistent with LUA_ROOT, + # LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc). # -INSTALL_TOP= /usr/local +INSTALL_TOP= ${PREFIX} @@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.14 2006/11/03 06:46:21 joerg Exp $ INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V -@@ -42,7 +42,7 @@ PLATS= aix ansi bsd generic linux macosx +@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linu # What to install. TO_BIN= lua luac TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp @@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.14 2006/11/03 06:46:21 joerg Exp $ TO_MAN= lua.1 luac.1 # Lua version and release. -@@ -58,11 +58,11 @@ test: dummy +@@ -59,11 +59,11 @@ test: dummy src/lua test/hello.lua install: dummy diff --git a/lang/lua/patches/patch-ab b/lang/lua/patches/patch-ab index d4577572440..8dcc4651a62 100644 --- a/lang/lua/patches/patch-ab +++ b/lang/lua/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.8 2006/09/06 14:58:00 abs Exp $ +$NetBSD: patch-ab,v 1.9 2007/06/15 17:45:37 obache Exp $ ---- src/Makefile.orig 2006-03-22 00:41:49.000000000 +0000 +--- src/Makefile.orig 2007-03-25 14:49:23.000000000 +0000 +++ src/Makefile -@@ -18,22 +18,33 @@ MYCFLAGS= +@@ -18,22 +18,32 @@ MYCFLAGS= MYLDFLAGS= MYLIBS= @@ -10,11 +10,10 @@ $NetBSD: patch-ab,v 1.8 2006/09/06 14:58:00 abs Exp $ +.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 + PLATS= aix ansi bsd freebsd 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 \ @@ -41,7 +40,7 @@ $NetBSD: patch-ab,v 1.8 2006/09/06 14:58:00 abs Exp $ 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) +@@ -48,14 +58,13 @@ o: $(ALL_O) a: $(ALL_A) $(LUA_A): $(CORE_O) $(LIB_O) @@ -59,12 +58,12 @@ $NetBSD: patch-ab,v 1.8 2006/09/06 14:58:00 abs Exp $ clean: $(RM) $(ALL_T) $(ALL_O) -@@ -86,7 +96,7 @@ ansi: +@@ -87,7 +96,7 @@ ansi: $(MAKE) all MYCFLAGS=-DLUA_ANSI bsd: - $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E" + $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_READLINE" MYLIBS="-Wl,-E -lreadline -lhistory" - generic: - $(MAKE) all MYCFLAGS= + freebsd: + $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline" -- cgit v1.2.3