From d3219d894c6ff359d83ed25f000ca8a76bab7e99 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Thu, 16 Sep 2010 13:54:16 +0000
Subject: [PATCH] - Add upstream patches for version 1.5.4 - Bump PORTREVISION

---
 lang/lua/Makefile                 | 6 +++++-
 lang/lua/distinfo                 | 3 +++
 lang/lua/files/patch-src-Makefile | 6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index d932d1d76a40..ba7d995c20bd 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lua
 PORTVERSION=	5.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.lua.org/ftp/ \
 		ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
@@ -16,9 +16,13 @@ MASTER_SITES=	http://www.lua.org/ftp/ \
 		ftp://ftp.uni-trier.de/pub/languages/lua/ \
 		ftp://ftp.gwdg.de/pub/languages/lua/
 
+PATCH_SITES=	http://www.lua.org/ftp/
+PATCHFILES=	patch-lua-5.1.4-2
+
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Small, compilable scripting language providing easy access to C code
 
+PATCH_WRKSRC=	${WRKSRC}/src
 USE_LUA=	5.1
 LUA_COMPS=	# only define variables
 ALL_TARGET=	freebsd
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index 79df026e224a..bbcbc598586c 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -1,3 +1,6 @@
 MD5 (lua-5.1.4.tar.gz) = d0870f2de55d59c1c8419f36e8fac150
 SHA256 (lua-5.1.4.tar.gz) = b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
 SIZE (lua-5.1.4.tar.gz) = 216679
+MD5 (patch-lua-5.1.4-2) = 1239310e0c4a581c7831e596f95cc6cd
+SHA256 (patch-lua-5.1.4-2) = a7f8ca9a3be52daecb3d3c9988d08ccc2bf9f785b075a0bc6463038356a9ec4c
+SIZE (patch-lua-5.1.4-2) = 5473
diff --git a/lang/lua/files/patch-src-Makefile b/lang/lua/files/patch-src-Makefile
index c0c41025e95f..83de3a7ac42c 100644
--- a/lang/lua/files/patch-src-Makefile
+++ b/lang/lua/files/patch-src-Makefile
@@ -1,5 +1,5 @@
---- ./src/Makefile.orig	2008-01-19 17:37:58.000000000 -0200
-+++ ./src/Makefile	2008-08-10 16:00:41.000000000 -0300
+--- Makefile.orig	2008-01-19 17:37:58.000000000 -0200
++++ Makefile	2008-08-10 16:00:41.000000000 -0300
 @@ -9,7 +9,8 @@
  
  CC= gcc
@@ -30,7 +30,7 @@
  a:	$(ALL_A)
  
 +$(LUA_SO):	$(CORE_O) $(LIB_O)
-+	$(CC) -o $@ $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $?
++	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $?
 +
  $(LUA_A): $(CORE_O) $(LIB_O)
 -	$(AR) $@ $?