Replace lang/lua with the new lang/lua51

lang/lua51 is working the same way lang/lua52, chase ports using lua 5.1
Make the default lua lua52
Make all lua ports using USES=lua

Approved by:	portmgr (implicit)

13 files changed, 20 insertions, 37 deletions

diff --git a/devel/geany-plugin-lua/Makefile b/devel/geany-plugin-lua/Makefile
index 43ab4ed0a852..e0293407a7b3 100644
--- a/devel/geany-plugin-lua/Makefile
+++ b/devel/geany-plugin-lua/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-USE_LUA=	5.1
+USES=		lua:51
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/love/Makefile b/devel/love/Makefile
index 0481be61f1c8..102992ba58d8 100644
--- a/devel/love/Makefile
+++ b/devel/love/Makefile
@@ -20,10 +20,9 @@ LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 
-USES=		gmake openal dos2unix
+USES=		gmake openal dos2unix lua:51
 USE_SDL=	sdl mixer
 USE_GL=		gl glu
-USE_LUA=	5.1+
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
 		-I${LUA_INCDIR} `${SDL_CONFIG} --cflags`
diff --git a/devel/love07/Makefile b/devel/love07/Makefile
index 634ffd234d45..5c15043fead5 100644
--- a/devel/love07/Makefile
+++ b/devel/love07/Makefile
@@ -23,10 +23,9 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
 
 PORTSCOUT=	limit:^0\.7\.
 
-USES=		gmake openal dos2unix
+USES=		gmake openal dos2unix lua:41
 USE_SDL=	sdl mixer
 USE_GL=		gl glu
-USE_LUA=	5.1+
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
 		-I${LUA_INCDIR} `${SDL_CONFIG} --cflags`
diff --git a/devel/love5/Makefile b/devel/love5/Makefile
index bcd3ca7c2621..89a5e18c4425 100644
--- a/devel/love5/Makefile
+++ b/devel/love5/Makefile
@@ -16,10 +16,9 @@ LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 
-USES=		tar:bzip2 gmake dos2unix
+USES=		tar:bzip2 gmake dos2unix lua:51
 USE_SDL=	sdl mixer
 USE_GL=		gl glu
-USE_LUA=	5.1+
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
 		-I${LUA_INCDIR} `${SDL_CONFIG} --cflags`
diff --git a/devel/lua-cjson/Makefile b/devel/lua-cjson/Makefile
index ab318ff3b6ba..ba01b0b9aa6d 100644
--- a/devel/lua-cjson/Makefile
+++ b/devel/lua-cjson/Makefile
@@ -11,17 +11,15 @@ DISTNAME=	lua-cjson-${PORTVERSION}
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Fast JSON parsing and encoding support for Lua
 
-USE_LUA?=	5.1
+USES=		lua:51
+
+MAKE_ARGS=	LUA_VERSION=${LUA_VER}
 
 PLIST_FILES=	%%LUA_MODLIBDIR%%/cjson.so
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} '16,18d; \
-		21s|^\(LUA_INCLUDE.*\)\(PREFIX\)\(.*\)|\1LOCALBASE\3/lua51|' \
+		21s|^\(LUA_INCLUDE.*\)\(PREFIX\)\(.*\)|\1LOCALBASE\3/lua${LUA_VER_STR}|' \
 		${WRKSRC}/Makefile
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cjson.so ${LUA_MODLIBDIR}
-
 .include <bsd.port.mk>
diff --git a/devel/lua-gettext/Makefile b/devel/lua-gettext/Makefile
index 6a7d98eb8634..103f87ba9179 100644
--- a/devel/lua-gettext/Makefile
+++ b/devel/lua-gettext/Makefile
@@ -13,8 +13,7 @@ DISTFILES=	lua_gettext.c?rev=${CVER} gettext.lua?rev=${LVER}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gettext binding for Lua 5
 
-USE_LUA?=	5.1
-USES=		gettext
+USES=		gettext lua:51
 
 CVER=		1.15
 LVER=		${PORTVERSION}
diff --git a/devel/lua-pty/Makefile b/devel/lua-pty/Makefile
index 9d1d56292c57..b3e0ec8411bb 100644
--- a/devel/lua-pty/Makefile
+++ b/devel/lua-pty/Makefile
@@ -13,7 +13,7 @@ DISTFILES=	pty.lua?rev=1.2 pty.c?rev=1.25
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pty (pseudo-terminal) bindings for Lua 5
 
-USE_LUA=	5.1
+USES=		lua:51
 
 PLIST_FILES=	%%LUA_MODSHAREDIR%%/pty.lua \
 		%%LUA_MODLIBDIR%%/lpty.so
diff --git a/devel/luabind/Makefile b/devel/luabind/Makefile
index ab1825210939..ae6b07377e67 100644
--- a/devel/luabind/Makefile
+++ b/devel/luabind/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library that helps you create bindings between C++ and Lua
 
 LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
 
-USE_LUA=	5.1+
+USES=		lua
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I.. -I${LUA_INCDIR} -I${LOCALBASE}/include
diff --git a/devel/luafilesystem/Makefile b/devel/luafilesystem/Makefile
index 1fa12567e853..8a943489d615 100644
--- a/devel/luafilesystem/Makefile
+++ b/devel/luafilesystem/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library to access directory structure and file attributes
 
 LICENSE=	MIT
 
-USE_LUA=	5.1
+USES=		lua:51
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	keplerproject
diff --git a/devel/luajava/Makefile b/devel/luajava/Makefile
index f1b631e52eee..a9f57b5a8c3c 100644
--- a/devel/luajava/Makefile
+++ b/devel/luajava/Makefile
@@ -10,12 +10,8 @@ MASTER_SITES=	http://luaforge.net/frs/download.php/2105/
 MAINTAINER=	sunghyuk@gmail.com
 COMMENT=	Lua scripting tool for Java
 
-USES=		gmake dos2unix
-USE_LUA=	5.1
+USES=		gmake dos2unix lua:51
 LUA_COMPS=	lua
-.if ${USE_LUA} == 5.0
-LUA_COMPS+=	compat51
-.endif
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index afa6dfebf9ed..3f5674610fe2 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -19,10 +19,8 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libbotan-1.10.so:${PORTSDIR}/security/botan110
 
 SUB_FILES=	pkg-message
-USE_BZIP2=	yes
-USES=		iconv pkgconfig gmake perl5
+USES=		iconv pkgconfig gmake perl5 lua:51 tar:bzip2
 USE_PERL5=	build
-USE_LUA=	5.1+
 MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 318e856f51be..bed0fba1cbaf 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -36,8 +36,7 @@ LUA_DESC=	Enable Lua support
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MLUA}
-USE_LUA=	5.0+
-LUA_COMPS=	lua:build
+USES+=		lua:51
 CONFIGURE_ARGS+=--with-lua=${LUA_BINDIR}/lua \
 		--with-luaincl=${LUA_INCDIR} \
 		--with-lualib=${LUA_LIBDIR}
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 8432f54f0d53..7dffe897e02c 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -14,32 +14,28 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-USES=		gmake
-USE_AUTOTOOLS=	autoconf:env libtool
+USES=		gmake libtool lua:51
+USE_AUTOTOOLS=	autoconf:env
 
 VER=		${PORTVERSION:R}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} VER="${VER}"
 
+GNU_CONFIGURE=	yes
 CFLAGS+=	-fPIC -DPIC
 ALL_TARGET=	# none
 
-WANT_LUA=	yes
-WANT_LUA_VER=	5.0+
-
 CONFIGURE_ARGS+=--program-suffix=${VER}
 
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_LUA:Mlua-5.*} != ""
 USE_LUA=	yes
 LUA_COMPS=	lua:build
 CONFIGURE_ARGS+=--with-lua=${LUA_BINDIR}/lua \
 		--with-luaincl=${LUA_INCDIR} \
 		--with-lualib=${LUA_LIBDIR}
-.endif
 
 OCTAVE_VER_CMD=	${LOCALBASE}/bin/octave-config -v 2>/dev/null || ${TRUE}
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	${SETENV} OCTAVE_VER=$$(${OCTAVE_VER_CMD}) \
 	${REINPLACE_CMD} -e 's|$$RUBY |${RUBY} |; \