Attached is a diff that updates Lua to 5.2. I've been sitting on it since 5.2 was released a little over a month ago. You will want to apply with -E.
I attempted to split Lua into 2 separate packages much like Python, Ruby and PHP but gave up. A number of other ports rely on Lua 5.1 so I'm not asking to have this committed. I just wanted to put it out there for those who may not rely on other libraries and just want to see whats new in 5.2 -- James Turner ja...@calminferno.net
Index: Makefile =================================================================== RCS file: /cvs/ports/lang/lua/Makefile,v retrieving revision 1.43 diff -u -p -r1.43 Makefile --- Makefile 4 Dec 2011 21:12:19 -0000 1.43 +++ Makefile 17 Dec 2011 18:03:29 -0000 @@ -2,18 +2,13 @@ COMMENT= powerful, light-weight programming language -DISTNAME= lua-5.1.4 -REVISION= 3 +DISTNAME= lua-5.2.0 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ \ http://www.tecgraf.puc-rio.br/lua/ftp/ \ http://ftp.gwdg.de/pub/languages/lua/ \ - http://ftp.ntua.gr/pub/lang/lua/ \ - http://ftp.chg.ru/pub/lang/lua/ - -PATCHFILES= patch-${DISTNAME}-4 -PATCH_DIST_ARGS=-z .bak.orig -d ${WRKSRC}/src + http://ftp.ntua.gr/pub/lang/lua/ HOMEPAGE= http://www.lua.org/ @@ -24,17 +19,10 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes SHARED_ONLY= Yes -SHARED_LIBS= lua 5.1 +SHARED_LIBS= lua 5.2 MAKE_FLAGS+= LIBlua_VERSION="${LIBlua_VERSION}" CC="${CC}" WANTLIB= c m edit curses USE_GROFF = Yes NO_REGRESS= Yes - -pre-configure: - ${SUBST_CMD} ${WRKSRC}/etc/lua.pc - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${PREFIX}/lib/pkgconfig .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/lang/lua/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 4 Dec 2011 14:16:44 -0000 1.14 +++ distinfo 17 Dec 2011 18:03:29 -0000 @@ -1,10 +1,5 @@ -MD5 (lua-5.1.4.tar.gz) = 0IcPLeVdWcHIQZ826PrBUA== -MD5 (patch-lua-5.1.4-4) = Mp2GlePm8SZxkOIgVZ97bA== -RMD160 (lua-5.1.4.tar.gz) = yGfINkKV0+T7Tk2Ouyf6KyMSze8= -RMD160 (patch-lua-5.1.4-4) = zOmtB+jhmrnjppyV1p/fnARhR6Y= -SHA1 (lua-5.1.4.tar.gz) = KxHI5gMG77fwc0t0dYj1eZVJPbc= -SHA1 (patch-lua-5.1.4-4) = 3bIUJe4KfYiC78P7axBRMryfYiQ= -SHA256 (lua-5.1.4.tar.gz) = sDjiJerypbV8m8w1zROqjGyCiO9JPVKXDJVFB0CYrzo= -SHA256 (patch-lua-5.1.4-4) = FLVDZt0evTaqBq5+y07yNlYYVvjOf1dEA6Qh+Fl42GM= -SIZE (lua-5.1.4.tar.gz) = 216679 -SIZE (patch-lua-5.1.4-4) = 6314 +MD5 (lua-5.2.0.tar.gz) = 8eqDHzlyFLroomWZWrGpPg== +RMD160 (lua-5.2.0.tar.gz) = YVO93VdJNJC3LnAMyZE1Qyv2U/A= +SHA1 (lua-5.2.0.tar.gz) = CPhMNVzdZG9hfwnOvqSL2DJBWCk= +SHA256 (lua-5.2.0.tar.gz) = yr43lGWqjjiJiAc9WbaedroAJUKdLB2oCCGiUs32vg0= +SIZE (lua-5.2.0.tar.gz) = 246377 Index: lua.port.mk =================================================================== RCS file: /cvs/ports/lang/lua/lua.port.mk,v retrieving revision 1.7 diff -u -p -r1.7 lua.port.mk --- lua.port.mk 17 Nov 2011 23:48:13 -0000 1.7 +++ lua.port.mk 17 Dec 2011 18:03:29 -0000 @@ -3,7 +3,7 @@ CATEGORIES+= lang/lua # Major.Minor of current lua version provided by lang/lua -MODLUA_VERSION= 5.1 +MODLUA_VERSION= 5.2 # Where the lua libraries will be installed to MODLUA_LIBDIR= ${PREFIX}/lib/lua/${MODLUA_VERSION}/ Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/lang/lua/patches/patch-Makefile,v retrieving revision 1.7 diff -u -p -r1.7 patch-Makefile --- patches/patch-Makefile 7 Nov 2008 12:23:12 -0000 1.7 +++ patches/patch-Makefile 17 Dec 2011 18:03:29 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile,v 1.7 2008/11/07 12:23:12 jsg Exp $ ---- Makefile.orig Thu Nov 6 21:44:23 2008 -+++ Makefile Thu Nov 6 21:46:04 2008 -@@ -5,11 +5,11 @@ +$OpenBSD$ +--- Makefile.orig Fri Dec 16 22:00:10 2011 ++++ Makefile Fri Dec 16 22:04:06 2011 +@@ -4,13 +4,13 @@ # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= # Your platform. See PLATS for possible values. @@ -9,16 +9,18 @@ $OpenBSD: patch-Makefile,v 1.7 2008/11/0 +PLAT= bsd # Where to install. The installation starts in the src and doc directories, - # so take care if INSTALL_TOP is not an absolute path. + # so take care if INSTALL_TOP is not an absolute path. See the local target. + # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with + # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. -INSTALL_TOP= /usr/local -+INSTALL_TOP= $(PREFIX) ++INSTALL_TOP= ${PREFIX} INSTALL_BIN= $(INSTALL_TOP)/bin INSTALL_INC= $(INSTALL_TOP)/include INSTALL_LIB= $(INSTALL_TOP)/lib -@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw +@@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw # What to install. TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp -TO_LIB= liblua.a +TO_LIB= liblua.a liblua.so.${LIBlua_VERSION} TO_MAN= lua.1 luac.1 Index: patches/patch-etc_lua_pc =================================================================== RCS file: patches/patch-etc_lua_pc diff -N patches/patch-etc_lua_pc --- patches/patch-etc_lua_pc 17 May 2010 08:18:59 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-etc_lua_pc,v 1.6 2010/05/17 08:18:59 dcoppa Exp $ ---- etc/lua.pc.orig Fri Aug 8 14:46:11 2008 -+++ etc/lua.pc Mon May 17 09:43:31 2010 -@@ -8,7 +8,7 @@ V= 5.1 - R= 5.1.4 - - # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' --prefix= /usr/local -+prefix= ${PREFIX} - INSTALL_BIN= ${prefix}/bin - INSTALL_INC= ${prefix}/include - INSTALL_LIB= ${prefix}/lib Index: patches/patch-src_Makefile =================================================================== RCS file: /cvs/ports/lang/lua/patches/patch-src_Makefile,v retrieving revision 1.5 diff -u -p -r1.5 patch-src_Makefile --- patches/patch-src_Makefile 19 Apr 2008 17:59:32 -0000 1.5 +++ patches/patch-src_Makefile 17 Dec 2011 18:03:29 -0000 @@ -1,44 +1,47 @@ -$OpenBSD: patch-src_Makefile,v 1.5 2008/04/19 17:59:32 okan Exp $ ---- src/Makefile.orig Sat Jan 19 20:37:58 2008 -+++ src/Makefile Mon Mar 24 14:17:33 2008 -@@ -7,8 +7,7 @@ +$OpenBSD$ +--- src/Makefile.orig Mon Sep 19 08:45:14 2011 ++++ src/Makefile Sat Dec 17 10:43:54 2011 +@@ -6,8 +6,7 @@ # Your platform. See PLATS for possible values. PLAT= none -CC= gcc --CFLAGS= -O2 -Wall $(MYCFLAGS) -+CFLAGS+= $(MYCFLAGS) -fPIC - AR= ar rcu - RANLIB= ranlib - RM= rm -f -@@ -34,9 +33,10 @@ LUA_O= lua.o +-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) ++CFLAGS+= -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) -fPIC + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS= -lm $(SYSLIBS) $(MYLIBS) + +@@ -38,12 +37,13 @@ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) + + LUA_T= lua + LUA_O= lua.o ++LUA_SO= liblua.so.${LIBlua_VERSION} LUAC_T= luac - LUAC_O= luac.o print.o -+LUA_SO= liblua.so.${LIBlua_VERSION} + LUAC_O= luac.o - ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) ++ALL_T= $(LUA_A) $(LUA_T) $(LUA_SO) $(LUAC_T) ALL_A= $(LUA_A) - default: $(PLAT) -@@ -57,6 +57,9 @@ $(LUA_T): $(LUA_O) $(LUA_A) - $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + # Targets start here. +@@ -62,6 +62,9 @@ $(LUA_A): $(BASE_O) + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) +$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -o $@ -shared -fPIC $(MYLDFLAGS) $(CORE_O) $(LIB_O) ++ $(CC) -o $@ -shared -fPIC $(LDFLAGS) $(CORE_O) $(LIB_O) + - clean: - $(RM) $(ALL_T) $(ALL_O) + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) -@@ -87,7 +90,7 @@ ansi: - $(MAKE) all MYCFLAGS=-DLUA_ANSI +@@ -95,7 +98,7 @@ ansi: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_ANSI" bsd: -- $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E" -+ $(MAKE) all MYCFLAGS=-DLUA_USE_BSD MYLIBS="-Wl,-E -ledit -lcurses" +- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-Wl,-E" ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_BSD" SYSLIBS="-Wl,-E -ledit -lcurses" freebsd: - $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline" + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -lreadline" Index: patches/patch-src_lobject_c =================================================================== RCS file: /cvs/ports/lang/lua/patches/patch-src_lobject_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-src_lobject_c --- patches/patch-src_lobject_c 29 Oct 2007 20:30:32 -0000 1.3 +++ patches/patch-src_lobject_c 17 Dec 2011 18:03:29 -0000 @@ -1,65 +1,12 @@ -$OpenBSD: patch-src_lobject_c,v 1.3 2007/10/29 20:30:32 espie Exp $ ---- src/lobject.c.orig Fri Feb 10 18:43:52 2006 -+++ src/lobject.c Mon Oct 29 21:26:20 2007 -@@ -142,7 +142,7 @@ const char *luaO_pushvfstring (lua_State *L, const cha +$OpenBSD$ +--- src/lobject.c.orig Fri Dec 16 22:08:28 2011 ++++ src/lobject.c Fri Dec 16 22:09:21 2011 +@@ -209,7 +209,7 @@ const char *luaO_pushvfstring (lua_State *L, const cha } case 'p': { char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */ -- sprintf(buff, "%p", va_arg(argp, void *)); -+ snprintf(buff, sizeof(buff), "%p", va_arg(argp, void *)); - pushstr(L, buff); +- int l = sprintf(buff, "%p", va_arg(argp, void *)); ++ int l = snprintf(buff, sizeof(buff), "%p", va_arg(argp, void *)); + pushstr(L, buff, l); break; } -@@ -180,35 +180,33 @@ const char *luaO_pushfstring (lua_State *L, const char - - - void luaO_chunkid (char *out, const char *source, size_t bufflen) { -- if (*source == '=') { -- strncpy(out, source+1, bufflen); /* remove first char */ -- out[bufflen-1] = '\0'; /* ensures null termination */ -- } -+ if (*source == '=') -+ strlcpy(out, source+1, bufflen); /* remove first char */ - else { /* out = "source", or "...source" */ - if (*source == '@') { -- size_t l; -+ size_t l, m; - source++; /* skip the `@' */ -- bufflen -= sizeof(" '...' "); - l = strlen(source); -- strcpy(out, ""); -- if (l > bufflen) { -- source += (l-bufflen); /* get last part of file name */ -- strcat(out, "..."); -+ m = bufflen - sizeof(" '...' "); -+ strlcpy(out, "", bufflen); -+ if (l > m) { -+ source += (l-m); /* get last part of file name */ -+ strlcat(out, "...", bufflen); - } -- strcat(out, source); -+ strlcat(out, source, bufflen); - } - else { /* out = [string "string"] */ -- size_t len = strcspn(source, "\n\r"); /* stop at first newline */ -- bufflen -= sizeof(" [string \"...\"] "); -- if (len > bufflen) len = bufflen; -- strcpy(out, "[string \""); -+ size_t pos = strcspn(source, "\n\r"); /* stop at first newline */ -+ size_t len = bufflen - sizeof(" [string \"...\"] "); -+ if (pos > len) pos = len; -+ strlcpy(out, "[string \"", bufflen); - if (source[len] != '\0') { /* must truncate? */ -- strncat(out, source, len); -- strcat(out, "..."); -+ strlcat(out, source, len); -+ strlcat(out, "...", bufflen); - } - else -- strcat(out, source); -- strcat(out, "\"]"); -+ strlcat(out, source, bufflen); -+ strlcat(out, "\"]", bufflen); - } - } - } Index: patches/patch-src_loslib_c =================================================================== RCS file: patches/patch-src_loslib_c diff -N patches/patch-src_loslib_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_loslib_c 17 Dec 2011 18:03:29 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/loslib.c.orig Fri Dec 16 22:07:34 2011 ++++ src/loslib.c Fri Dec 16 22:08:17 2011 +@@ -45,7 +45,7 @@ + #include <unistd.h> + #define LUA_TMPNAMBUFSIZE 32 + #define lua_tmpnam(b,e) { \ +- strcpy(b, "/tmp/lua_XXXXXX"); \ ++ strlcpy(b, "/tmp/lua_XXXXXX", sizeof(b)); \ + e = mkstemp(b); \ + if (e != -1) close(e); \ + e = (e == -1); } Index: patches/patch-src_lstrlib_c =================================================================== RCS file: /cvs/ports/lang/lua/patches/patch-src_lstrlib_c,v retrieving revision 1.4 diff -u -p -r1.4 patch-src_lstrlib_c --- patches/patch-src_lstrlib_c 25 Aug 2011 07:02:42 -0000 1.4 +++ patches/patch-src_lstrlib_c 17 Dec 2011 18:03:29 -0000 @@ -1,55 +1,69 @@ -$OpenBSD: patch-src_lstrlib_c,v 1.4 2011/08/25 07:02:42 jasper Exp $ ---- src/lstrlib.c.orig Wed Aug 24 22:24:32 2011 -+++ src/lstrlib.c Wed Aug 24 22:24:32 2011 -@@ -746,10 +746,9 @@ static const char *scanformat (lua_State *L, const cha - - static void addintlen (char *form) { +$OpenBSD$ +--- src/lstrlib.c.orig Wed Nov 30 13:24:56 2011 ++++ src/lstrlib.c Sat Dec 17 11:38:32 2011 +@@ -796,9 +796,9 @@ static void addquoted (lua_State *L, luaL_Buffer *b, i + else if (*s == '\0' || iscntrl(uchar(*s))) { + char buff[10]; + if (!isdigit(uchar(*(s+1)))) +- sprintf(buff, "\\%d", (int)uchar(*s)); ++ snprintf(buff, sizeof(buff), "\\%d", (int)uchar(*s)); + else +- sprintf(buff, "\\%03d", (int)uchar(*s)); ++ snprintf(buff, sizeof(buff), "\\%03d", (int)uchar(*s)); + luaL_addstring(b, buff); + } + else +@@ -837,7 +837,7 @@ static void addlenmod (char *form, const char *lenmod) size_t l = strlen(form); -- char spec = form[l - 1]; -- strcpy(form + l - 1, LUA_INTFRMLEN); -- form[l + sizeof(LUA_INTFRMLEN) - 2] = spec; -- form[l + sizeof(LUA_INTFRMLEN) - 1] = '\0'; -+ char spec[3] = { 'l', form[l - 1], '\0' }; -+ form[l - 1] = '\0'; -+ strlcat(form, spec, MAX_FORMAT); + size_t lm = strlen(lenmod); + char spec = form[l - 1]; +- strcpy(form + l - 1, lenmod); ++ strlcpy(form + l - 1, lenmod, sizeof(form + l - 1)); + form[l + lm - 1] = spec; + form[l + lm] = '\0'; } - - -@@ -774,22 +773,24 @@ static int str_format (lua_State *L) { +@@ -865,7 +865,7 @@ static int str_format (lua_State *L) { strfrmt = scanformat(L, strfrmt, form); switch (*strfrmt++) { case 'c': { -- sprintf(buff, form, (int)luaL_checknumber(L, arg)); -+ snprintf(buff, sizeof(buff), form, (int)luaL_checknumber(L, arg)); +- nb = sprintf(buff, form, luaL_checkint(L, arg)); ++ nb = snprintf(buff, MAX_ITEM, form, luaL_checkint(L, arg)); break; } case 'd': case 'i': { - addintlen(form); -- sprintf(buff, form, (LUA_INTFRM_T)luaL_checknumber(L, arg)); -+ snprintf(buff, sizeof(buff), form, -+ (LUA_INTFRM_T)luaL_checknumber(L, arg)); +@@ -873,7 +873,7 @@ static int str_format (lua_State *L) { + luaL_argcheck(L, (MIN_INTFRM - 1) < n && n < (MAX_INTFRM + 1), arg, + "not a number in proper range"); + addlenmod(form, LUA_INTFRMLEN); +- nb = sprintf(buff, form, (LUA_INTFRM_T)n); ++ nb = snprintf(buff, MAX_ITEM, form, (LUA_INTFRM_T)n); break; } case 'o': case 'u': case 'x': case 'X': { - addintlen(form); -- sprintf(buff, form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg)); -+ snprintf(buff, sizeof(buff), form, -+ (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg)); +@@ -881,7 +881,7 @@ static int str_format (lua_State *L) { + luaL_argcheck(L, 0 <= n && n < (MAX_UINTFRM + 1), arg, + "not a non-negative number in proper range"); + addlenmod(form, LUA_INTFRMLEN); +- nb = sprintf(buff, form, (unsigned LUA_INTFRM_T)n); ++ nb = snprintf(buff, MAX_ITEM, form, (unsigned LUA_INTFRM_T)n); break; } case 'e': case 'E': case 'f': +@@ -890,7 +890,7 @@ static int str_format (lua_State *L) { + #endif case 'g': case 'G': { -- sprintf(buff, form, (double)luaL_checknumber(L, arg)); -+ snprintf(buff, sizeof(buff), form, (double)luaL_checknumber(L, arg)); + addlenmod(form, LUA_FLTFRMLEN); +- nb = sprintf(buff, form, (LUA_FLTFRM_T)luaL_checknumber(L, arg)); ++ nb = snprintf(buff, MAX_ITEM, form, (LUA_FLTFRM_T)luaL_checknumber(L, arg)); break; } case 'q': { -@@ -807,7 +808,7 @@ static int str_format (lua_State *L) { - continue; /* skip the `addsize' at the end */ +@@ -907,7 +907,7 @@ static int str_format (lua_State *L) { + break; } else { -- sprintf(buff, form, s); -+ snprintf(buff, sizeof(buff), form, s); +- nb = sprintf(buff, form, s); ++ nb = snprintf(buff, MAX_ITEM, form, s); + lua_pop(L, 1); /* remove result from 'luaL_tolstring' */ break; } - } Index: patches/patch-src_luaconf_h =================================================================== RCS file: /cvs/ports/lang/lua/patches/patch-src_luaconf_h,v retrieving revision 1.4 diff -u -p -r1.4 patch-src_luaconf_h --- patches/patch-src_luaconf_h 19 Apr 2008 17:59:32 -0000 1.4 +++ patches/patch-src_luaconf_h 17 Dec 2011 18:03:29 -0000 @@ -1,30 +1,21 @@ -$OpenBSD: patch-src_luaconf_h,v 1.4 2008/04/19 17:59:32 okan Exp $ ---- src/luaconf.h.orig Fri Jan 18 18:07:48 2008 -+++ src/luaconf.h Mon Mar 24 13:53:08 2008 -@@ -33,7 +33,7 @@ - #define LUA_WIN - #endif +$OpenBSD$ +--- src/luaconf.h.orig Tue Dec 6 11:58:36 2011 ++++ src/luaconf.h Sat Dec 17 10:46:04 2011 +@@ -40,7 +40,7 @@ + + -#if defined(LUA_USE_LINUX) +#if defined(LUA_USE_BSD) || defined(LUA_USE_LINUX) #define LUA_USE_POSIX #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ #define LUA_USE_READLINE /* needs some extra libraries */ -@@ -520,7 +520,7 @@ +@@ -394,7 +394,7 @@ */ #define LUA_NUMBER_SCAN "%lf" #define LUA_NUMBER_FMT "%.14g" -#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n)) +#define lua_number2str(s,n) snprintf((s), sizeof((s)), LUA_NUMBER_FMT, (n)) #define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */ - #define lua_str2number(s,p) strtod((s), (p)) -@@ -647,7 +647,7 @@ union luai_Cast { double l_d; long l_l; }; - #include <unistd.h> - #define LUA_TMPNAMBUFSIZE 32 - #define lua_tmpnam(b,e) { \ -- strcpy(b, "/tmp/lua_XXXXXX"); \ -+ strlcpy(b, "/tmp/lua_XXXXXX", sizeof(b)); \ - e = mkstemp(b); \ - if (e != -1) close(e); \ - e = (e == -1); } + Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/lua/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- pkg/PLIST 7 Nov 2008 12:23:12 -0000 1.13 +++ pkg/PLIST 17 Dec 2011 18:03:29 -0000 @@ -9,10 +9,8 @@ include/lualib.h lib/liblua.a @lib lib/liblua.so.${LIBlua_VERSION} lib/lua/ -lib/lua/5.1/ -lib/pkgconfig/ -lib/pkgconfig/lua.pc +lib/lua/5.2/ @man man/man1/lua.1 @man man/man1/luac.1 share/lua/ -share/lua/5.1/ +share/lua/5.2/