Attachment 67961 Details for Bug 100042 – diff.txt

diff.txt

diff.txt (text/plain), 3.47 KB, created by Aaron Dalton on 2006-12-23 22:09:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aaron Dalton

Created: 2006-12-23 22:09:30 UTC

Size: 3.47 KB

patch

obsolete

>===> Updating from CVS
>M Makefile
>M distinfo
>A files/patch-SConstruct
>R files/patch-config_posix.py
>===> Generating patch
>===> Viewing diff with more
>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/lang/tolua++/Makefile,v
>retrieving revision 1.4
>diff -u -u -r1.4 Makefile
>--- Makefile	15 Sep 2006 10:58:52 -0000	1.4
>+++ Makefile	23 Dec 2006 21:54:40 -0000
>@@ -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>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/lang/tolua++/distinfo,v
>retrieving revision 1.1
>diff -u -u -r1.1 distinfo
>--- distinfo	22 Jan 2006 23:42:31 -0000	1.1
>+++ distinfo	23 Dec 2006 21:54:40 -0000
>@@ -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
>Index: files/patch-SConstruct
>===================================================================
>RCS file: files/patch-SConstruct
>diff -N files/patch-SConstruct
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-SConstruct	23 Dec 2006 21:54:40 -0000
>@@ -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']:
>+ 
>Index: files/patch-config_posix.py
>===================================================================
>RCS file: files/patch-config_posix.py
>diff -N files/patch-config_posix.py
>--- files/patch-config_posix.py	15 Sep 2006 08:17:09 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -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%%']
>- 
>===> Done

Actions: View

Attachments on bug 100042: 67960 | 67961