From 860620e08bc1e77c09753e4e10029a87daaa71f9 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 25 Jan 2014 23:07:49 +0000
Subject: [PATCH] Update to 5.2.0 Bring under lua@ maintainership [1] Support
 stage Use MAKE_ARGS instead of patching config Convert to USES=lua

Approved by:	edwin@ [1]
---
 lang/tolua/Makefile                         | 48 +++++++--------------
 lang/tolua/distinfo                         |  4 +-
 lang/tolua/files/patch-src::tests::Makefile | 18 --------
 lang/tolua/pkg-descr                        |  1 -
 lang/tolua/pkg-plist                        |  7 ++-
 5 files changed, 21 insertions(+), 57 deletions(-)
 delete mode 100644 lang/tolua/files/patch-src::tests::Makefile

diff --git a/lang/tolua/Makefile b/lang/tolua/Makefile
index 78bc38e77c69..da348548bd7e 100644
--- a/lang/tolua/Makefile
+++ b/lang/tolua/Makefile
@@ -2,46 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	tolua
-PORTVERSION=	5.1.3
+PORTVERSION=	5.2.0
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/users/celes/tolua/ \
-		http://www.tecgraf.puc-rio.br/~celes/tolua/
+MASTER_SITES=	http://www.tecgraf.puc-rio.br/~celes/tolua/ \
+		ftp://ftp.tecgraf.puc-rio.br/pub/users/celes/tolua/
 
-MAINTAINER=	edwin@mavetju.org
+MAINTAINER=	lua@FreeBSD.org
 COMMENT=	toLua: accessing C/C++ code from Lua
 
-USE_GMAKE=	yes
-USE_LUA=	5.1
-WRKSRC=		${WRKDIR}/${PORTNAME}-5.1.3
+USES=		gmake lua
 
-NO_STAGE=	yes
-post-extract:
-	${RM} ${WRKSRC}/src/bin/tolua_lua.o
+MAKE_ARGS=	CC="${CC}" CCPP="${CXX}" \
+		LUAINC="${LUA_INCDIR}" \
+		LUALIB="${LUA_LIBDIR}" \
+		WARN="${CFLAGS}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|make|$${MAKE}|' ${WRKSRC}/${MAKEFILE}
-	@${REINPLACE_CMD} -Ee \
-		's|^(CC=).*|\1 ${CC}|; \
-		 s|^(CCPP =).*|\1 ${CXX}|; \
-		 s|^(LUA=).*|\1 ${LOCALBASE}|; \
-		 s|^(LUA(INC\|LIB)=).*|\1 $${LUA_\2DIR}|; \
-		 s|^(CPPFLAGS)(=.*)|\1+\2 -lstdc++|; \
-		 s|^(CFLAGS)(=.*)|\1+\2|;' \
-		${WRKSRC}/config
+	@${REINPLACE_CMD} -e 's|llua|llua-${LUA_VER}|' \
+		${WRKSRC}/src/bin/${MAKEFILE} \
+		${WRKSRC}/src/tests/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/tolua ${LUA_BINDIR}
-	${LN} -sf ${LUA_SUBDIR}/tolua ${PREFIX}/bin/tolua-${LUA_VER}
-	${INSTALL_DATA} ${WRKSRC}/include/tolua.h ${LUA_INCDIR}
-	${INSTALL_DATA} ${WRKSRC}/lib/libtolua.a ${LUA_LIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/tolua ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/include/tolua.h ${STAGEDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/lib/libtolua.a ${STAGEDIR}${PREFIX}/lib
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc
-.endif
-.if ${ARCH} == "sparc64" && ${OSVERSION} > 900000
-BROKEN=		Does not install on sparc64-9
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/tolua/distinfo b/lang/tolua/distinfo
index 12bc63609fc0..918e9fb7742a 100644
--- a/lang/tolua/distinfo
+++ b/lang/tolua/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tolua-5.1.3.tar.gz) = 916fd03732a677d75b515c6b804b736b9b529b5e6ab4e954e281b553a61f9596
-SIZE (tolua-5.1.3.tar.gz) = 271064
+SHA256 (tolua-5.2.0.tar.gz) = f3d3836e9d2f11177fb3230ebb4c1ad8be74eb87fa95ce03a79d10df45ef89c3
+SIZE (tolua-5.2.0.tar.gz) = 79025
diff --git a/lang/tolua/files/patch-src::tests::Makefile b/lang/tolua/files/patch-src::tests::Makefile
deleted file mode 100644
index fa65a402933a..000000000000
--- a/lang/tolua/files/patch-src::tests::Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/tests/Makefile.orig	2008-02-21 15:06:21.000000000 +0000
-+++ src/tests/Makefile	2008-05-05 06:56:29.000000000 +0000
-@@ -4,7 +4,7 @@
- 
- include $(TOLUA)/config
- 
--LIBS = -ltolua -llua
-+LIBS = -ltolua -llua -lm
- 
- all: tmodule tnamespace tclass tinheritance tconstant tvariable tfunction tarray tdirective tenum
- 	./tmodule; ./tnamespace; ./tclass; ./tinheritance; ./tconstant; ./tvariable; ./tfunction; ./tarray; ./tdirective; ./tfunction; ./tenum
-@@ -71,6 +71,3 @@
- 
- klean:
- 	rm -f tmodule tnamespace tclass tinheritance tconstant tvariable tfunction tarray tdirective
--
--
--
diff --git a/lang/tolua/pkg-descr b/lang/tolua/pkg-descr
index 83b1a11b46fe..dc34a1bf67b1 100644
--- a/lang/tolua/pkg-descr
+++ b/lang/tolua/pkg-descr
@@ -6,5 +6,4 @@ maps C/C++ constants, external variables, functions, namespace,
 classes, and methods to Lua. It also provides facilities to create
 Lua modules.
 
-Author: Waldemar Celes <celes@tecgraf.puc-rio.br>
 WWW: http://www.tecgraf.puc-rio.br/~celes/tolua/
diff --git a/lang/tolua/pkg-plist b/lang/tolua/pkg-plist
index ef0070c93b27..488452014d8f 100644
--- a/lang/tolua/pkg-plist
+++ b/lang/tolua/pkg-plist
@@ -1,4 +1,3 @@
-%%LUA_BINDIR%%/tolua
-bin/tolua-%%LUA_VER%%
-%%LUA_LIBDIR%%/libtolua.a
-%%LUA_INCDIR%%/tolua.h
+bin/tolua
+lib/libtolua.a
+include/tolua.h