ports/166540: [patch] port lang/lua update to 5.1.5

[Olli Hauer]

>Number:         166540
>Category:       ports
>Synopsis:       [patch] port lang/lua update to 5.1.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 31 20:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Olli Hauer
>Release:        
>Organization:
>Environment:


>Description:
Update lang/lua to 5.1.5

Question to the lua team:
The following expression in archivers/rpm5/Makefile doesn't look valid

archivers/rpm5/Makefile line 54: USE_LUA= 5.1-

shouldn't this be 5.1+ ??

>How-To-Repeat:
>Fix:


--- patch_lua.txt begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/lua/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- Makefile	16 Mar 2012 18:18:01 -0000	1.48
+++ Makefile	31 Mar 2012 19:04:19 -0000
@@ -6,16 +6,12 @@
 #
 
 PORTNAME=	lua
-PORTVERSION=	5.1.4
-PORTREVISION=	6
+PORTVERSION=	5.1.5
 CATEGORIES=	lang
 MASTER_SITES=	http://www.lua.org/ftp/ \
 		ftp://ftp.ntua.gr/pub/lang/lua/ \
 		ftp://ftp.gwdg.de/pub/languages/lua/
 
-PATCH_SITES=	http://www.lua.org/ftp/
-PATCHFILES=	patch-lua-5.1.4-3
-
 MAINTAINER=	lua at FreeBSD.org
 COMMENT=	Small, compilable scripting language providing easy access to C code
 
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/lang/lua/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo	6 Jul 2011 00:13:41 -0000	1.16
+++ distinfo	31 Mar 2012 19:04:19 -0000
@@ -1,4 +1,2 @@
-SHA256 (lua-5.1.4.tar.gz) = b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
-SIZE (lua-5.1.4.tar.gz) = 216679
-SHA256 (patch-lua-5.1.4-3) = 260fcbdb558001f0a8a8e49bdcb83bf9bdcf9065bb82b661f458ee061f5ff44c
-SIZE (patch-lua-5.1.4-3) = 5004
+SHA256 (lua-5.1.5.tar.gz) = 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
+SIZE (lua-5.1.5.tar.gz) = 221213
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/lang/lua/pkg-plist,v
retrieving revision 1.12
diff -u -r1.12 pkg-plist
--- pkg-plist	5 Feb 2009 18:14:06 -0000	1.12
+++ pkg-plist	31 Mar 2012 19:04:19 -0000
@@ -1,5 +1,3 @@
- at exec mkdir -p %D/share/lua/%%LUA_VER%%
- at exec mkdir -p %D/lib/lua/%%LUA_VER%%
 bin/lua-%%LUA_VER%%
 %%LUA_BINDIR%%/lua
 %%LUA_BINDIR%%/luac
@@ -11,14 +9,16 @@
 %%LUA_INCDIR%%/lualib.h
 lib/liblua-%%LUA_VER%%.so
 lib/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%%
+%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%%
 %%LUA_LIBDIR%%/liblua.a
 %%LUA_LIBDIR%%/liblua.so
-%%LUA_LIBDIR%%/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%%
 libdata/pkgconfig/lua-%%LUA_VER%%.pc
- at dirrm share/lua/%%LUA_VER%%
- at dirrmtry share/lua
+ at dirrm %%DATADIR%%/%%LUA_VER%%
+ at dirrmtry %%DATADIR%%
 @dirrm %%LUA_LIBDIR%%
 @dirrm lib/lua/%%LUA_VER%%
 @dirrmtry lib/lua
 @dirrm %%LUA_INCDIR%%
 @dirrm %%LUA_BINDIR%%
+ at exec mkdir -p %D/%%DATADIR%%/%%LUA_VER%%
+ at exec mkdir -p %D/lib/lua/%%LUA_VER%%
Index: files/patch-src-Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/lua/files/patch-src-Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-src-Makefile
--- files/patch-src-Makefile	16 Sep 2010 13:54:16 -0000	1.3
+++ files/patch-src-Makefile	31 Mar 2012 19:04:19 -0000
@@ -33,7 +33,7 @@
 +	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $?
 +
  $(LUA_A): $(CORE_O) $(LIB_O)
--	$(AR) $@ $?
+-	$(AR) $@ $(CORE_O) $(LIB_O)	# DLL needs all object files
 +	$(AR) $(ARFLAGS) $@ $?
  	$(RANLIB) $@
  
--- patch_lua.txt ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: