Re: Bugfix update to lua-5.1.5

2012-03-28 Thread David Coppa
On Tue, 27 Mar 2012, David Coppa wrote:
 
 Hi, 
 
 This should go in, since the patchfile is currently giving 404...
 
 Nothing has changed, it's just 5.1.4 plus the patch.
 
 ok?

Does silence mean consent?

Just pinging...
David

 Index: Makefile
 ===
 RCS file: /cvs/ports/lang/lua/Makefile,v
 retrieving revision 1.44
 diff -u -p -r1.44 Makefile
 --- Makefile  7 Mar 2012 13:14:26 -   1.44
 +++ Makefile  27 Mar 2012 10:53:46 -
 @@ -2,8 +2,7 @@
  
  COMMENT= powerful, light-weight programming language
  
 -DISTNAME=lua-5.1.4
 -REVISION=4
 +DISTNAME=lua-5.1.5
  CATEGORIES=  lang
  
  MASTER_SITES=http://www.lua.org/ftp/ \
 @@ -11,9 +10,6 @@ MASTER_SITES=   http://www.lua.org/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
  
  HOMEPAGE=http://www.lua.org/
  
 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 -   1.14
 +++ distinfo  27 Mar 2012 10:53:46 -
 @@ -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.1.5.tar.gz) = LhFf4m5DXjOw1cAi5EkFZw==
 +RMD160 (lua-5.1.5.tar.gz) = sMIjRnUzWovxWKEltneM+ADHVKA=
 +SHA1 (lua-5.1.5.tar.gz) = s4ghEa0C7Ma5cvjBJBZHkFyy4/w=
 +SHA256 (lua-5.1.5.tar.gz) = JkD8VqeV8p0o7xXhPDSkfiI5YLAkDoywqC2bBzhpUzM=
 +SIZE (lua-5.1.5.tar.gz) = 221213
 Index: patches/patch-etc_lua_pc
 ===
 RCS file: /cvs/ports/lang/lua/patches/patch-etc_lua_pc,v
 retrieving revision 1.6
 diff -u -p -r1.6 patch-etc_lua_pc
 --- patches/patch-etc_lua_pc  17 May 2010 08:18:59 -  1.6
 +++ patches/patch-etc_lua_pc  27 Mar 2012 10:53:46 -
 @@ -1,8 +1,8 @@
  $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
 +--- etc/lua.pc.orig  Fri Feb 10 10:50:30 2012
  etc/lua.pc   Tue Mar 27 12:49:48 2012
  @@ -8,7 +8,7 @@ V= 5.1
 - R= 5.1.4
 + R= 5.1.5
   
   # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
  -prefix= /usr/local
 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_Makefile19 Apr 2008 17:59:32 -  1.5
 +++ patches/patch-src_Makefile27 Mar 2012 10:53:46 -
 @@ -1,6 +1,6 @@
  $OpenBSD: patch-src_Makefile,v 1.5 2008/04/19 17:59:32 okan Exp $
  src/Makefile.origSat Jan 19 20:37:58 2008
 -+++ src/Makefile Mon Mar 24 14:17:33 2008
 +--- src/Makefile.origMon Feb 13 21:41:22 2012
  src/Makefile Tue Mar 27 12:50:12 2012
  @@ -7,8 +7,7 @@
   # Your platform. See PLATS for possible values.
   PLAT= none
 @@ -23,6 +23,15 @@ $OpenBSD: patch-src_Makefile,v 1.5 2008/
   ALL_A= $(LUA_A)
   
   default: $(PLAT)
 +@@ -48,7 +48,7 @@ o: $(ALL_O)
 + a:  $(ALL_A)
 + 
 + $(LUA_A): $(CORE_O) $(LIB_O)
 +-$(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
 ++$(AR) $@ $(CORE_O) $(LIB_O)
 + $(RANLIB) $@
 + 
 + $(LUA_T): $(LUA_O) $(LUA_A)
  @@ -57,6 +57,9 @@ $(LUA_T): $(LUA_O) $(LUA_A)
   $(LUAC_T): $(LUAC_O) $(LUA_A)
   $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
 



Bugfix update to lua-5.1.5

2012-03-27 Thread David Coppa

Hi, 

This should go in, since the patchfile is currently giving 404...

Nothing has changed, it's just 5.1.4 plus the patch.

ok?

Index: Makefile
===
RCS file: /cvs/ports/lang/lua/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile7 Mar 2012 13:14:26 -   1.44
+++ Makefile27 Mar 2012 10:53:46 -
@@ -2,8 +2,7 @@
 
 COMMENT=   powerful, light-weight programming language
 
-DISTNAME=  lua-5.1.4
-REVISION=  4
+DISTNAME=  lua-5.1.5
 CATEGORIES=lang
 
 MASTER_SITES=  http://www.lua.org/ftp/ \
@@ -11,9 +10,6 @@ MASTER_SITES= http://www.lua.org/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
 
 HOMEPAGE=  http://www.lua.org/
 
Index: distinfo
===
RCS file: /cvs/ports/lang/lua/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo4 Dec 2011 14:16:44 -   1.14
+++ distinfo27 Mar 2012 10:53:46 -
@@ -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.1.5.tar.gz) = LhFf4m5DXjOw1cAi5EkFZw==
+RMD160 (lua-5.1.5.tar.gz) = sMIjRnUzWovxWKEltneM+ADHVKA=
+SHA1 (lua-5.1.5.tar.gz) = s4ghEa0C7Ma5cvjBJBZHkFyy4/w=
+SHA256 (lua-5.1.5.tar.gz) = JkD8VqeV8p0o7xXhPDSkfiI5YLAkDoywqC2bBzhpUzM=
+SIZE (lua-5.1.5.tar.gz) = 221213
Index: patches/patch-etc_lua_pc
===
RCS file: /cvs/ports/lang/lua/patches/patch-etc_lua_pc,v
retrieving revision 1.6
diff -u -p -r1.6 patch-etc_lua_pc
--- patches/patch-etc_lua_pc17 May 2010 08:18:59 -  1.6
+++ patches/patch-etc_lua_pc27 Mar 2012 10:53:46 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-etc_lua_pc,v 1.6 2010/05/17 08:18:59 dcoppa Exp $
 etc/lua.pc.origFri Aug  8 14:46:11 2008
-+++ etc/lua.pc Mon May 17 09:43:31 2010
+--- etc/lua.pc.origFri Feb 10 10:50:30 2012
 etc/lua.pc Tue Mar 27 12:49:48 2012
 @@ -8,7 +8,7 @@ V= 5.1
- R= 5.1.4
+ R= 5.1.5
  
  # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
 -prefix= /usr/local
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 -  1.5
+++ patches/patch-src_Makefile  27 Mar 2012 10:53:46 -
@@ -1,6 +1,6 @@
 $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
+--- src/Makefile.orig  Mon Feb 13 21:41:22 2012
 src/Makefile   Tue Mar 27 12:50:12 2012
 @@ -7,8 +7,7 @@
  # Your platform. See PLATS for possible values.
  PLAT= none
@@ -23,6 +23,15 @@ $OpenBSD: patch-src_Makefile,v 1.5 2008/
  ALL_A= $(LUA_A)
  
  default: $(PLAT)
+@@ -48,7 +48,7 @@ o:   $(ALL_O)
+ a:$(ALL_A)
+ 
+ $(LUA_A): $(CORE_O) $(LIB_O)
+-  $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
++  $(AR) $@ $(CORE_O) $(LIB_O)
+   $(RANLIB) $@
+ 
+ $(LUA_T): $(LUA_O) $(LUA_A)
 @@ -57,6 +57,9 @@ $(LUA_T): $(LUA_O) $(LUA_A)
  $(LUAC_T): $(LUAC_O) $(LUA_A)
$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)