diff options
| author | obache <obache@pkgsrc.org> | 2007-06-15 17:45:37 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2007-06-15 17:45:37 +0000 |
| commit | e1dcce3d8365e54ea4ab816280cd6fc5b0d9d7c1 (patch) | |
| tree | 5cde919a1193534f57ab2b4176397697c69e6f60 /lang/lua/patches | |
| parent | 8c3c80bc8c9a6bfa8c0a3063fb380a904f10b006 (diff) | |
| download | pkgsrc-e1dcce3d8365e54ea4ab816280cd6fc5b0d9d7c1.tar.gz | |
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.
Diffstat (limited to 'lang/lua/patches')
| -rw-r--r-- | lang/lua/patches/patch-aa | 14 | ||||
| -rw-r--r-- | lang/lua/patches/patch-ab | 17 |
2 files changed, 15 insertions, 16 deletions
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= @@ -11,10 +11,9 @@ $NetBSD: patch-ab,v 1.8 2006/09/06 14:58:00 abs Exp $ + $(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" |