5 files changed, 25 insertions, 49 deletions

diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index ca222ac39f8d..c450519a98dc 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lua
-PORTVERSION=	5.0.2
-PORTREVISION=	1
+PORTVERSION=	5.1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.lua.org/ftp/ \
 		ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
@@ -19,30 +18,14 @@ MASTER_SITES=	http://www.lua.org/ftp/ \
 MAINTAINER=	him@richardkiss.com
 COMMENT=	Small, compilable scripting language providing easy access to C code
 
-USE_REINPLACE=	yes
 MAN1=		lua.1 luac.1
-ALL_TARGET=	all so
-INSTALL_TARGET=	install soinstall
-INSTALLS_SHLIB=	YES
 
-do-configure:
-	${REINPLACE_CMD} \
-		-e 's|^\(MYCFLAGS=\).*$$|\1 ${CFLAGS}|' \
-		-e 's|^\(LOADLIB=\).*$$|\1 -DUSE_DLOPEN=1|' \
-		-e 's|^\(CC=\).*$$|\1 ${CC}|' \
-		-e 's|^\(STRIP=\).*$$|\1 ${STRIP_CMD}|' \
-		-e 's|^\(INSTALL_ROOT=\).*$$|\1 ${PREFIX}|' \
-		-e 's|^\(INSTALL_EXEC=\).*$$|\1 ${INSTALL_PROGRAM}|' \
-		-e 's|^\(INSTALL_DATA=\).*$$|\1 ${INSTALL_DATA}|' \
-		-e 's|^#\(USERCONF.*READLINE.*\)$$|\1|' \
-		-e 's|^\(EXTRA_LIBS=\).*$$|\1 -lm -lreadline -lhistory -lncurses|' \
-		-e 's|V=5.0|V=5|' \
-		${WRKSRC}/config
+MAKE_ARGS=	bsd
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.gif ${DOCSDIR}
+	@cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.css *.gif ${DOCSDIR}
 .endif
 
 .if ${MACHINE_ARCH:L} == "amd64"
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index e1defc555b33..736a2e0aba08 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -1,3 +1,3 @@
-MD5 (lua-5.0.2.tar.gz) = dea74646b7e5c621fef7174df83c34b1
-SHA256 (lua-5.0.2.tar.gz) = a6c85d85f912e1c321723084389d63dee7660b81b8292452b190ea7190dd73bc
-SIZE (lua-5.0.2.tar.gz) = 190442
+MD5 (lua-5.1.tar.gz) = 3e8dfe8be00a744cec2f9e766b2f2aee
+SHA256 (lua-5.1.tar.gz) = 7f5bb9061eb3b9ba1e406a5aa68001a66cb82bac95748839dc02dd10048472c1
+SIZE (lua-5.1.tar.gz) = 206877
diff --git a/lang/lua/files/patch-ab b/lang/lua/files/patch-ab
index 5a24cd697f27..f6db9372a79d 100644
--- a/lang/lua/files/patch-ab
+++ b/lang/lua/files/patch-ab
@@ -1,6 +1,6 @@
---- src/lib/lmathlib.c.orig	Tue Mar 11 21:30:37 2003
-+++ src/lib/lmathlib.c	Fri May  9 02:32:59 2003
-@@ -170,7 +170,7 @@
+--- 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 */
@@ -9,7 +9,7 @@
    switch (lua_gettop(L)) {  /* check number of arguments */
      case 0: {  /* no arguments */
        lua_pushnumber(L, r);  /* Number between 0 and 1 */
-@@ -196,7 +196,7 @@
+@@ -207,7 +207,7 @@
  
  
  static int math_randomseed (lua_State *L) {
diff --git a/lang/lua/files/patch-config b/lang/lua/files/patch-config
deleted file mode 100644
index af26d8b26550..000000000000
--- a/lang/lua/files/patch-config
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.orig	Fri Apr 11 16:00:41 2003
-+++ config	Wed Jul  6 00:09:46 2005
-@@ -6,7 +6,7 @@
- LOADLIB=
- DLLIB=
- NUMBER=
--POPEN=
-+POPEN= -DUSE_POPEN=1
- TMPNAM=
- DEGREES=
- USERCONF=
diff --git a/lang/lua/pkg-plist b/lang/lua/pkg-plist
index ce4ed92536d9..0e1c8d85a72b 100644
--- a/lang/lua/pkg-plist
+++ b/lang/lua/pkg-plist
@@ -1,18 +1,22 @@
-bin/lua
-bin/luac
-include/lauxlib.h
-include/lua.h
-include/lualib.h
-lib/liblua.a
-lib/liblua.so
-lib/liblua.so.5
-lib/liblualib.a
-lib/liblualib.so
-lib/liblualib.so.5
+@exec mkdir -p %D/lib/lua/5.1
+@exec mkdir -p %D/share/lua/5.1
 %%DOCSDIR%%/contents.html
 %%DOCSDIR%%/logo.gif
+%%DOCSDIR%%/lua.css
 %%DOCSDIR%%/lua.html
 %%DOCSDIR%%/luac.html
 %%DOCSDIR%%/manual.html
 %%DOCSDIR%%/readme.html
+bin/lua
+bin/luac
+include/lauxlib.h
+include/lua.h
+include/lua.hpp
+include/luaconf.h
+include/lualib.h
+lib/liblua.a
 @dirrm %%DOCSDIR%%
+@dirrm share/lua/5.1
+@dirrm share/lua
+@dirrm lib/lua/5.1
+@dirrm lib/lua