From 5d183607b43dc8e6e243969ff77f3425e78e8fe9 Mon Sep 17 00:00:00 2001
From: dcoppa <dcoppa@openbsd.org>
Date: Thu, 29 Mar 2012 08:51:26 +0000
Subject: [PATCH] Bugfix update to lua-5.1.5 (it's just lua-5.1.4 plus the
 distribution patch)

---
 lang/lua/Makefile                   |  8 ++------
 lang/lua/distinfo                   | 15 +++++----------
 lang/lua/patches/patch-etc_lua_pc   |  8 ++++----
 lang/lua/patches/patch-src_Makefile | 15 ++++++++++++---
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index 8bbd7d0a4f6..6d6bfbe8308 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.44 2012/03/07 13:14:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.45 2012/03/29 08:51:26 dcoppa Exp $
 
 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/ \
@@ -12,9 +11,6 @@ MASTER_SITES=	http://www.lua.org/ftp/ \
 		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/
 
 # MIT
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index eadbdbeddb9..63106fac89d 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -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
diff --git a/lang/lua/patches/patch-etc_lua_pc b/lang/lua/patches/patch-etc_lua_pc
index 2e96942a5e5..a7d3a5aefc9 100644
--- a/lang/lua/patches/patch-etc_lua_pc
+++ b/lang/lua/patches/patch-etc_lua_pc
@@ -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
+$OpenBSD: patch-etc_lua_pc,v 1.7 2012/03/29 08:51:26 dcoppa Exp $
+--- 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
diff --git a/lang/lua/patches/patch-src_Makefile b/lang/lua/patches/patch-src_Makefile
index 79fe42e983a..f38e73a46f1 100644
--- a/lang/lua/patches/patch-src_Makefile
+++ b/lang/lua/patches/patch-src_Makefile
@@ -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
+$OpenBSD: patch-src_Makefile,v 1.6 2012/03/29 08:51:26 dcoppa Exp $
+--- 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/04/19 17:59:32 okan Exp $
  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)