From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 20 13:40:03 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07E891065670 for ; Thu, 20 Jan 2011 13:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B9FD78FC1B for ; Thu, 20 Jan 2011 13:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p0KDe2A0046400 for ; Thu, 20 Jan 2011 13:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p0KDe2s4046399; Thu, 20 Jan 2011 13:40:02 GMT (envelope-from gnats) Resent-Date: Thu, 20 Jan 2011 13:40:02 GMT Resent-Message-Id: <201101201340.p0KDe2s4046399@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rusty Nejdl Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4317B106566B for ; Thu, 20 Jan 2011 13:34:52 +0000 (UTC) (envelope-from rnejdl@tethys.ringofsaturn.com) Received: from tethys.ringofsaturn.com (tethys.ringofsaturn.com [71.252.219.43]) by mx1.freebsd.org (Postfix) with ESMTP id F13328FC1F for ; Thu, 20 Jan 2011 13:34:51 +0000 (UTC) Received: from ASSP.nospam (localhost [127.0.0.1]) by tethys.ringofsaturn.com (8.14.4/8.14.4) with ESMTP id p0KDYohe010244 for ; Thu, 20 Jan 2011 07:34:51 -0600 (CST) (envelope-from rnejdl@tethys.ringofsaturn.com) Received: from tethys.ringofsaturn.com ([127.0.0.1] helo=tethys.ringofsaturn.com) with IPv4:25 by ASSP.nospam; 20 Jan 2011 07:34:49 -0600 Received: (from rnejdl@localhost) by tethys.ringofsaturn.com (8.14.4/8.14.4/Submit) id p0KDYn0L010243; Thu, 20 Jan 2011 07:34:49 -0600 (CST) (envelope-from rnejdl) Message-Id: <201101201334.p0KDYn0L010243@tethys.ringofsaturn.com> Date: Thu, 20 Jan 2011 07:34:49 -0600 (CST) From: Rusty Nejdl To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/154168: Update toula++ to 1.0.93 as needed by ogre3d update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Rusty Nejdl List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jan 2011 13:40:03 -0000 >Number: 154168 >Category: ports >Synopsis: Update toula++ to 1.0.93 as needed by ogre3d update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jan 20 13:40:02 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Rusty Nejdl >Release: FreeBSD 8.2-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD tethys.ringofsaturn.com 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #4: Fri Dec 24 11:10:16 CST 2010 root@tethys.ringofsaturn.com:/usr/obj/usr/src/sys/SATURN amd64 >Description: This udpates tolua++ to 1.0.93. >How-To-Repeat: >Fix: This udpates tolua++ to 1.0.93. Please note that libtolua++.so is not generated in this build and instead a static object is built. --- tolua++.diff begins here --- diff -ruN tolua++/Makefile tolua++.new/Makefile --- tolua++/Makefile 2009-07-28 11:34:35.000000000 -0500 +++ tolua++.new/Makefile 2011-01-20 07:31:22.000000000 -0600 @@ -6,8 +6,7 @@ # PORTNAME= tolua++ -PORTVERSION= 1.0.92 -PORTREVISION= 3 +PORTVERSION= 1.0.93 CATEGORIES= lang devel MASTER_SITES= http://www.codenix.com/~tolua/ \ http://mirror.amdmi3.ru/distfiles/ @@ -31,7 +30,6 @@ ${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_DATA} ${WRKSRC}/lib/libtolua++.so ${LUA_LIBDIR} - ${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.so ${PREFIX}/lib/libtolua++-${LUA_VER}.so + ${INSTALL_DATA} ${WRKSRC}/lib/libtolua++_static.a ${LUA_LIBDIR} .include diff -ruN tolua++/distinfo tolua++.new/distinfo --- tolua++/distinfo 2006-12-23 16:09:32.000000000 -0600 +++ tolua++.new/distinfo 2011-01-20 07:14:44.000000000 -0600 @@ -1,3 +1,2 @@ -MD5 (tolua++-1.0.92.tar.bz2) = f4682e065b7d6d4de5eec13e6b7d347c -SHA256 (tolua++-1.0.92.tar.bz2) = fd2199f669d7d7c11f5451001ee1601add263203b2522363b3632411437e4fac -SIZE (tolua++-1.0.92.tar.bz2) = 153961 +SHA256 (tolua++-1.0.93.tar.bz2) = 90df1eeb8354941ca65663dcf28658b67d3aa41daa71133bdd20c35abb1bcaba +SIZE (tolua++-1.0.93.tar.bz2) = 163956 diff -ruN tolua++/files/patch-SConstruct tolua++.new/files/patch-SConstruct --- tolua++/files/patch-SConstruct 2009-06-07 12:54:09.000000000 -0500 +++ tolua++.new/files/patch-SConstruct 2011-01-20 07:17:50.000000000 -0600 @@ -1,6 +1,6 @@ ---- SConstruct.orig 2006-04-10 13:45:44.000000000 +0400 -+++ SConstruct 2008-08-22 01:43:56.000000000 +0400 -@@ -17,6 +17,7 @@ +--- SConstruct.orig 2011-01-20 07:15:38.000000000 -0600 ++++ SConstruct 2011-01-20 07:16:53.000000000 -0600 +@@ -22,6 +22,7 @@ opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall']) opts.Add('LINK', 'The linker.') opts.Add('LINKFLAGS', 'Linker flags.', []) @@ -8,7 +8,7 @@ opts.Add('no_cygwin', 'Use -mno-cygwin to build using the mingw compiler on cygwin', 0) opts.Add('LIBS', 'libraries', []) opts.Add('LIBPATH', 'library path', []) -@@ -128,7 +129,9 @@ +@@ -145,7 +146,9 @@ ########### end of helper builders env['CPPPATH'] = '#/include' diff -ruN tolua++/files/patch-gcc43-fixes tolua++.new/files/patch-gcc43-fixes --- tolua++/files/patch-gcc43-fixes 2008-08-19 15:40:19.000000000 -0500 +++ tolua++.new/files/patch-gcc43-fixes 1969-12-31 18:00:00.000000000 -0600 @@ -1,130 +0,0 @@ ---- include/tolua++.h.orig 2006-04-27 05:33:40.000000000 +0200 -+++ include/tolua++.h 2008-03-13 23:20:12.000000000 +0100 -@@ -53,7 +53,7 @@ - #define TOLUA_NOPEER LUA_REGISTRYINDEX /* for lua 5.1 */ - - TOLUA_API const char* tolua_typename (lua_State* L, int lo); --TOLUA_API void tolua_error (lua_State* L, char* msg, tolua_Error* err); -+TOLUA_API void tolua_error (lua_State* L, const char* msg, tolua_Error* err); - TOLUA_API int tolua_isnoobj (lua_State* L, int lo, tolua_Error* err); - TOLUA_API int tolua_isvalue (lua_State* L, int lo, int def, tolua_Error* err); - TOLUA_API int tolua_isboolean (lua_State* L, int lo, int def, tolua_Error* err); -@@ -84,16 +84,15 @@ - TOLUA_API int tolua_register_gc (lua_State* L, int lo); - TOLUA_API int tolua_default_collect (lua_State* tolua_S); - --TOLUA_API void tolua_usertype (lua_State* L, char* type); --TOLUA_API void tolua_beginmodule (lua_State* L, char* name); -+TOLUA_API void tolua_usertype (lua_State* L, const char* type); -+TOLUA_API void tolua_beginmodule (lua_State* L, const char* name); - TOLUA_API void tolua_endmodule (lua_State* L); --TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar); --TOLUA_API void tolua_class (lua_State* L, char* name, char* base); --TOLUA_API void tolua_cclass (lua_State* L, char* lname, char* name, char* base, lua_CFunction col); --TOLUA_API void tolua_function (lua_State* L, char* name, lua_CFunction func); --TOLUA_API void tolua_constant (lua_State* L, char* name, double value); --TOLUA_API void tolua_variable (lua_State* L, char* name, lua_CFunction get, lua_CFunction set); --TOLUA_API void tolua_array (lua_State* L,char* name, lua_CFunction get, lua_CFunction set); -+TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar); -+TOLUA_API void tolua_cclass (lua_State* L, const char* lname, const char* name, const char* base, lua_CFunction col); -+TOLUA_API void tolua_function (lua_State* L, const char* name, lua_CFunction func); -+TOLUA_API void tolua_constant (lua_State* L, const char* name, double value); -+TOLUA_API void tolua_variable (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set); -+TOLUA_API void tolua_array (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set); - - /* TOLUA_API void tolua_set_call_event(lua_State* L, lua_CFunction func, char* type); */ - /* TOLUA_API void tolua_addbase(lua_State* L, char* name, char* base); */ ---- src/lib/tolua_is.c.orig 2005-12-19 02:13:05.000000000 +0100 -+++ src/lib/tolua_is.c 2008-03-13 23:11:27.000000000 +0100 -@@ -85,7 +85,7 @@ - return lua_tostring(L,-1); - } - --TOLUA_API void tolua_error (lua_State* L, char* msg, tolua_Error* err) -+TOLUA_API void tolua_error (lua_State* L, const char* msg, tolua_Error* err) - { - if (msg[0] == '#') - { ---- src/lib/tolua_map.c.orig 2006-03-13 23:37:49.000000000 +0100 -+++ src/lib/tolua_map.c 2008-03-13 23:21:58.000000000 +0100 -@@ -389,7 +389,7 @@ - * It creates the correspoding metatable in the registry, for both 'type' and 'const type'. - * It maps 'const type' as being also a 'type' - */ --TOLUA_API void tolua_usertype (lua_State* L, char* type) -+TOLUA_API void tolua_usertype (lua_State* L, const char* type) - { - char ctype[128] = "const "; - strncat(ctype,type,120); -@@ -403,7 +403,7 @@ - /* Begin module - * It pushes the module (or class) table on the stack - */ --TOLUA_API void tolua_beginmodule (lua_State* L, char* name) -+TOLUA_API void tolua_beginmodule (lua_State* L, const char* name) - { - if (name) - { -@@ -426,7 +426,7 @@ - * It creates a new module - */ - #if 1 --TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar) -+TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar) - { - if (name) - { -@@ -462,7 +462,7 @@ - lua_pop(L,1); /* pop module */ - } - #else --TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar) -+TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar) - { - if (name) - { -@@ -518,7 +518,7 @@ - /* Map C class - * It maps a C class, setting the appropriate inheritance and super classes. - */ --TOLUA_API void tolua_cclass (lua_State* L, char* lname, char* name, char* base, lua_CFunction col) -+TOLUA_API void tolua_cclass (lua_State* L, const char* lname, const char* name, const char* base, lua_CFunction col) - { - char cname[128] = "const "; - char cbase[128] = "const "; -@@ -577,7 +577,7 @@ - /* Map function - * It assigns a function into the current module (or class) - */ --TOLUA_API void tolua_function (lua_State* L, char* name, lua_CFunction func) -+TOLUA_API void tolua_function (lua_State* L, const char* name, lua_CFunction func) - { - lua_pushstring(L,name); - lua_pushcfunction(L,func); -@@ -600,7 +600,7 @@ - /* Map constant number - * It assigns a constant number into the current module (or class) - */ --TOLUA_API void tolua_constant (lua_State* L, char* name, double value) -+TOLUA_API void tolua_constant (lua_State* L, const char* name, double value) - { - lua_pushstring(L,name); - tolua_pushnumber(L,value); -@@ -611,7 +611,7 @@ - /* Map variable - * It assigns a variable into the current module (or class) - */ --TOLUA_API void tolua_variable (lua_State* L, char* name, lua_CFunction get, lua_CFunction set) -+TOLUA_API void tolua_variable (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set) - { - /* get func */ - lua_pushstring(L,".get"); -@@ -663,7 +663,7 @@ - /* Map an array - * It assigns an array into the current module (or class) - */ --TOLUA_API void tolua_array (lua_State* L, char* name, lua_CFunction get, lua_CFunction set) -+TOLUA_API void tolua_array (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set) - { - lua_pushstring(L,".get"); - lua_rawget(L,-2); diff -ruN tolua++/files/patch-src-lib-SCsub tolua++.new/files/patch-src-lib-SCsub --- tolua++/files/patch-src-lib-SCsub 2008-08-21 17:31:18.000000000 -0500 +++ tolua++.new/files/patch-src-lib-SCsub 1969-12-31 18:00:00.000000000 -0600 @@ -1,8 +0,0 @@ ---- src/lib/SCsub.orig 2005-11-28 16:51:15.000000000 +0300 -+++ src/lib/SCsub 2008-08-22 01:44:24.000000000 +0400 -@@ -10,4 +10,5 @@ - ] - - env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources) -+env.lib_target += env.SharedLibrary('#/lib/'+env['tolua_lib'], sources) - diff -ruN tolua++/pkg-plist tolua++.new/pkg-plist --- tolua++/pkg-plist 2008-08-21 17:31:18.000000000 -0500 +++ tolua++.new/pkg-plist 2011-01-20 07:32:01.000000000 -0600 @@ -1,6 +1,5 @@ %%LUA_BINDIR%%/tolua++ bin/tolua++-%%LUA_VER%% %%LUA_LIBDIR%%/libtolua++.a -%%LUA_LIBDIR%%/libtolua++.so -lib/libtolua++-%%LUA_VER%%.so +%%LUA_LIBDIR%%/libtolua++_static.a %%LUA_INCDIR%%/tolua++.h --- tolua++.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: