diff --git a/lang/lua/Makefile b/lang/lua/Makefile index d645bb32dc3..0dab1f91768 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.40 2010/10/24 21:06:28 sthen Exp $ +# $OpenBSD: Makefile,v 1.41 2011/08/25 07:02:42 jasper Exp $ COMMENT= powerful, light-weight programming language DISTNAME= lua-5.1.4 -REVISION= 1 +REVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ \ @@ -12,7 +12,7 @@ MASTER_SITES= http://www.lua.org/ftp/ \ http://ftp.ntua.gr/pub/lang/lua/ \ http://ftp.chg.ru/pub/lang/lua/ -PATCHFILES= patch-${DISTNAME}-2 +PATCHFILES= patch-${DISTNAME}-3 PATCH_DIST_ARGS=-z .bak.orig -d ${WRKSRC}/src HOMEPAGE= http://www.lua.org/ diff --git a/lang/lua/distinfo b/lang/lua/distinfo index f1c0e702796..b7b7d121bea 100644 --- a/lang/lua/distinfo +++ b/lang/lua/distinfo @@ -1,10 +1,10 @@ MD5 (lua-5.1.4.tar.gz) = 0IcPLeVdWcHIQZ826PrBUA== -MD5 (patch-lua-5.1.4-2) = EjkxDgxKWBx4MeWW+VzGzQ== +MD5 (patch-lua-5.1.4-3) = mY73iGGD9h06XKiRqc5qeQ== RMD160 (lua-5.1.4.tar.gz) = yGfINkKV0+T7Tk2Ouyf6KyMSze8= -RMD160 (patch-lua-5.1.4-2) = cELl3q83OIZ6ldbrhKW1WwLZ0qo= +RMD160 (patch-lua-5.1.4-3) = g2HXTSttH3pT6qmUPdXE8vO4krk= SHA1 (lua-5.1.4.tar.gz) = KxHI5gMG77fwc0t0dYj1eZVJPbc= -SHA1 (patch-lua-5.1.4-2) = /bHgEjERLgphkFfkXEBNR/0JLFk= +SHA1 (patch-lua-5.1.4-3) = MS1br0gKpMYc3CEty9EDIvAgwZg= SHA256 (lua-5.1.4.tar.gz) = sDjiJerypbV8m8w1zROqjGyCiO9JPVKXDJVFB0CYrzo= -SHA256 (patch-lua-5.1.4-2) = p/jKmjvlLa7LPTyZiNCMzCv594WwdaC8ZGMDg1ap7Ew= +SHA256 (patch-lua-5.1.4-3) = Jg/L21WAAfCoqOSb3Lg7+b3PkGW7grZh9FjuBh9f9Ew= SIZE (lua-5.1.4.tar.gz) = 216679 -SIZE (patch-lua-5.1.4-2) = 5473 +SIZE (patch-lua-5.1.4-3) = 5004 diff --git a/lang/lua/patches/patch-src_lstrlib_c b/lang/lua/patches/patch-src_lstrlib_c index b0cfc8eb802..a2281bf33c9 100644 --- a/lang/lua/patches/patch-src_lstrlib_c +++ b/lang/lua/patches/patch-src_lstrlib_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_lstrlib_c,v 1.3 2008/11/07 12:23:12 jsg Exp $ ---- src/lstrlib.c.orig Sat Jul 12 03:27:21 2008 -+++ src/lstrlib.c Thu Nov 6 21:43:39 2008 +$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) { @@ -15,7 +15,7 @@ $OpenBSD: patch-src_lstrlib_c,v 1.3 2008/11/07 12:23:12 jsg Exp $ } -@@ -772,22 +771,24 @@ static int str_format (lua_State *L) { +@@ -774,22 +773,24 @@ static int str_format (lua_State *L) { strfrmt = scanformat(L, strfrmt, form); switch (*strfrmt++) { case 'c': { @@ -44,7 +44,7 @@ $OpenBSD: patch-src_lstrlib_c,v 1.3 2008/11/07 12:23:12 jsg Exp $ break; } case 'q': { -@@ -805,7 +806,7 @@ static int str_format (lua_State *L) { +@@ -807,7 +808,7 @@ static int str_format (lua_State *L) { continue; /* skip the `addsize' at the end */ } else {