Updated to 1.0.92

PR:		100042
Submitted by:	Alexander Botero-Lowry <alex@foxybanana.com>

4 files changed, 20 insertions, 39 deletions

diff --git a/lang/tolua++/Makefile b/lang/tolua++/Makefile
index 3ae4076bebee..f6e9ab8773ac 100644
--- a/lang/tolua++/Makefile
+++ b/lang/tolua++/Makefile
@@ -6,31 +6,21 @@
 #
 
 PORTNAME=	tolua++
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.92
 CATEGORIES=	lang devel
 MASTER_SITES=	http://www.codenix.com/~tolua/
-DISTFILES=	tolua++-current${EXTRACT_SUFX}
 
 MAINTAINER=	aaron@FreeBSD.org
 COMMENT=	An extended version of tolua, a tool to integrate C/C++ code with Lua
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/scons:${PORTSDIR}/devel/scons
+LIB_DEPENDS=	lua:${PORTSDIR}/lang/lua50
 
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_LUA=	5.0
-NO_BUILD=	yes
+USE_SCONS=	yes
+SCONS_ARGS=	prefix=${PREFIX}
 
-post-patch:
-.for f in LOCALBASE LUA_VER LUA_INCDIR LUA_LIBDIR
-	@${REINPLACE_CMD} -i "" -e 's|%%${f}%%|${${f}}|g' \
-		${WRKSRC}/config_posix.py
-.endfor
-
-do-build:
-	@cd ${WRKSRC} && scons
-
-do-install:
-	@cd ${WRKSRC} && scons prefix=${PREFIX} install
+CFLAGS+=	-I/usr/local/include/lua50
+LDFLAGS+=	-L/usr/local/lib/lua50
 
 .include <bsd.port.mk>
diff --git a/lang/tolua++/distinfo b/lang/tolua++/distinfo
index 828bfccb1542..edc78f47bdf9 100644
--- a/lang/tolua++/distinfo
+++ b/lang/tolua++/distinfo
@@ -1,3 +1,3 @@
-MD5 (tolua++-current.tar.bz2) = 8785100f7c9d9253cb47b530d97a32f6
-SHA256 (tolua++-current.tar.bz2) = 557d8efd248ca3a9bdb3ed221abd4be2b71010d9463983ec804e20b4b888638c
-SIZE (tolua++-current.tar.bz2) = 171870
+MD5 (tolua++-1.0.92.tar.bz2) = f4682e065b7d6d4de5eec13e6b7d347c
+SHA256 (tolua++-1.0.92.tar.bz2) = fd2199f669d7d7c11f5451001ee1601add263203b2522363b3632411437e4fac
+SIZE (tolua++-1.0.92.tar.bz2) = 153961
diff --git a/lang/tolua++/files/patch-SConstruct b/lang/tolua++/files/patch-SConstruct
new file mode 100644
index 000000000000..fc35d15f2166
--- /dev/null
+++ b/lang/tolua++/files/patch-SConstruct
@@ -0,0 +1,11 @@
+--- SConstruct.orig	Sat Dec 23 14:21:33 2006
++++ SConstruct	Sat Dec 23 14:21:46 2006
+@@ -128,7 +128,7 @@
+ ########### end of helper builders
+ 
+ env['CPPPATH'] = '#/include'
+-env['LIBPATH'] =  ['#/lib'] + env['LIBPATH']
++env['LIBPATH'] =  ['#/lib'] + env['LIBPATH'].split(" ")
+ 
+ if env['no_cygwin']:
+ 
diff --git a/lang/tolua++/files/patch-config_posix.py b/lang/tolua++/files/patch-config_posix.py
deleted file mode 100644
index 3d001f49dd63..000000000000
--- a/lang/tolua++/files/patch-config_posix.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./config_posix.py.orig	Fri Jan 21 00:01:08 2005
-+++ ./config_posix.py	Sun Aug 27 14:25:40 2006
-@@ -5,7 +5,7 @@
- 
- # flags for the compiler
- #CCFLAGS = []
--CCFLAGS = ['-O2', '-ansi', '-Wall']
-+CCFLAGS = ['-O2', '-ansi', '-Wall', '-I%%LOCALBASE%%/include', '-I%%LUA_INCDIR%%']
- 
- # this is the default directory for installation. Files will be installed on
- # <prefix>/bin, <prefix>/lib and <prefix>/include when you run 'scons install'
-@@ -16,6 +16,6 @@
- prefix = '/usr/local'
- 
- # libraries
--LIBS = ['lua', 'lualib', 'm']
--
-+LIBS = ['lua-%%LUA_VER%%', 'lualib-%%LUA_VER%%', 'm']
-+LINKFLAGS = ['-L%%LOCALBASE%%/lib', '-L%%LUA_LIBDIR%%']
-