4 files changed, 8 insertions, 65 deletions

diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index 3545907d874b..e41c387d1ee7 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lua
-PORTVERSION=	5.1.3
-PORTREVISION=	3
+PORTVERSION=	5.1.4
 CATEGORIES=	lang
 MASTER_SITES=	http://www.lua.org/ftp/ \
 		ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
@@ -16,7 +15,7 @@ MASTER_SITES=	http://www.lua.org/ftp/ \
 		ftp://ftp.uni-trier.de/pub/languages/lua/ \
 		ftp://ftp.gwdg.de/pub/languages/lua/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Small, compilable scripting language providing easy access to C code
 
 USE_LUA=	5.1
@@ -28,6 +27,7 @@ MAKE_ENV=	LUA_SONAME="liblua-${LUA_VER}.so.${LUA_VER_SH}"
 
 MAN1=		lua-${LUA_VER}.1 luac-${LUA_VER}.1
 DOCSDIR=	${PREFIX}/share/doc/${LUA_SUBDIR}
+PORTDOCS=	*
 LATEST_LINK=	${LUA_SUBDIR}
 
 LUA_BIN=	lua luac
@@ -57,6 +57,8 @@ post-patch:
 		s|^(INSTALL_CMOD=).*|\1 ${LUA_MODLIBDIR}| ; \
 		s|^(INSTALL_LMOD=).*|\1 ${LUA_MODSHAREDIR}|' \
 		${WRKSRC}/etc/lua.pc
+	@${REINPLACE_CMD} -e 's,rand *(,random(,g' \
+		${WRKSRC}/src/lmathlib.c
 
 post-build:
 	@${RM} -f ${WRKSRC}/test/lua ${WRKSRC}/test/luac
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index 8347ba2d8285..79df026e224a 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -1,3 +1,3 @@
-MD5 (lua-5.1.3.tar.gz) = a70a8dfaa150e047866dc01a46272599
-SHA256 (lua-5.1.3.tar.gz) = 6b5df2edaa5e02bf1a2d85e1442b2e329493b30b0c0780f77199d24f087d296d
-SIZE (lua-5.1.3.tar.gz) = 215817
+MD5 (lua-5.1.4.tar.gz) = d0870f2de55d59c1c8419f36e8fac150
+SHA256 (lua-5.1.4.tar.gz) = b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
+SIZE (lua-5.1.4.tar.gz) = 216679
diff --git a/lang/lua/files/patch-ab b/lang/lua/files/patch-ab
deleted file mode 100644
index f6db9372a79d..000000000000
--- a/lang/lua/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/lmathlib.c.orig	Thu Apr 27 23:42:51 2006
-+++ src/lmathlib.c	Thu Apr 27 23:43:27 2006
-@@ -181,7 +181,7 @@
- static int math_random (lua_State *L) {
-   /* the `%' avoids the (rare) case of r==1, and is needed also because on
-      some systems (SunOS!) `rand()' may return a value larger than RAND_MAX */
--  lua_Number r = (lua_Number)(rand()%RAND_MAX) / (lua_Number)RAND_MAX;
-+  lua_Number r = (lua_Number)(random()%RAND_MAX) / (lua_Number)RAND_MAX;
-   switch (lua_gettop(L)) {  /* check number of arguments */
-     case 0: {  /* no arguments */
-       lua_pushnumber(L, r);  /* Number between 0 and 1 */
-@@ -207,7 +207,7 @@
- 
- 
- static int math_randomseed (lua_State *L) {
--  srand(luaL_checkint(L, 1));
-+  srandom(luaL_checkint(L, 1));
-   return 0;
- }
- 
diff --git a/lang/lua/pkg-plist b/lang/lua/pkg-plist
index 5cb722376d49..0559b965a70f 100644
--- a/lang/lua/pkg-plist
+++ b/lang/lua/pkg-plist
@@ -15,47 +15,8 @@ lib/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%%
 %%LUA_LIBDIR%%/liblua.so
 %%LUA_LIBDIR%%/liblua-%%LUA_VER%%.so.%%LUA_VER_SH%%
 libdata/pkgconfig/lua-%%LUA_VER%%.pc
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/amazon.gif
-%%PORTDOCS%%%%DOCSDIR%%/contents.html
-%%PORTDOCS%%%%DOCSDIR%%/etc/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/etc/README
-%%PORTDOCS%%%%DOCSDIR%%/etc/all.c
-%%PORTDOCS%%%%DOCSDIR%%/etc/lua.ico
-%%PORTDOCS%%%%DOCSDIR%%/etc/luavs.bat
-%%PORTDOCS%%%%DOCSDIR%%/etc/min.c
-%%PORTDOCS%%%%DOCSDIR%%/etc/noparser.c
-%%PORTDOCS%%%%DOCSDIR%%/etc/strict.lua
-%%PORTDOCS%%%%DOCSDIR%%/logo.gif
-%%PORTDOCS%%%%DOCSDIR%%/lua.html
-%%PORTDOCS%%%%DOCSDIR%%/luac.html
-%%PORTDOCS%%%%DOCSDIR%%/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/readme.html
-%%PORTDOCS%%%%DOCSDIR%%/test/README
-%%PORTDOCS%%%%DOCSDIR%%/test/bisect.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/cf.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/echo.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/env.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/factorial.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/fib.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/fibfor.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/globals.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/hello.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/life.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/luac.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/printf.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/readonly.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/sieve.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/sort.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/table.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/trace-calls.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/trace-globals.lua
-%%PORTDOCS%%%%DOCSDIR%%/test/xd.lua
 @dirrm share/lua/%%LUA_VER%%
 @dirrmtry share/lua
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/test
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/etc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%LUA_LIBDIR%%
 @dirrm lib/lua/%%LUA_VER%%
 @dirrmtry lib/lua