View | Details | Raw Unified | Return to bug 154168
Collapse All | Expand All

(-)tolua++.new/Makefile (-4 / +2 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	tolua++
8
PORTNAME=	tolua++
9
PORTVERSION=	1.0.92
9
PORTVERSION=	1.0.93
10
PORTREVISION=	3
11
CATEGORIES=	lang devel
10
CATEGORIES=	lang devel
12
MASTER_SITES=	http://www.codenix.com/~tolua/ \
11
MASTER_SITES=	http://www.codenix.com/~tolua/ \
13
		http://mirror.amdmi3.ru/distfiles/
12
		http://mirror.amdmi3.ru/distfiles/
Lines 31-37 Link Here
31
	${LN} -sf ${LUA_SUBDIR}/tolua++ ${PREFIX}/bin/tolua++-${LUA_VER}
30
	${LN} -sf ${LUA_SUBDIR}/tolua++ ${PREFIX}/bin/tolua++-${LUA_VER}
32
	${INSTALL_DATA} ${WRKSRC}/include/tolua++.h ${LUA_INCDIR}
31
	${INSTALL_DATA} ${WRKSRC}/include/tolua++.h ${LUA_INCDIR}
33
	${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.a ${LUA_LIBDIR}
32
	${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.a ${LUA_LIBDIR}
34
	${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.so ${LUA_LIBDIR}
33
	${INSTALL_DATA} ${WRKSRC}/lib/libtolua++_static.a ${LUA_LIBDIR}
35
	${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.so ${PREFIX}/lib/libtolua++-${LUA_VER}.so
36
34
37
.include <bsd.port.mk>
35
.include <bsd.port.mk>
(-)tolua++.new/distinfo (-3 / +2 lines)
Lines 1-3 Link Here
1
MD5 (tolua++-1.0.92.tar.bz2) = f4682e065b7d6d4de5eec13e6b7d347c
1
SHA256 (tolua++-1.0.93.tar.bz2) = 90df1eeb8354941ca65663dcf28658b67d3aa41daa71133bdd20c35abb1bcaba
2
SHA256 (tolua++-1.0.92.tar.bz2) = fd2199f669d7d7c11f5451001ee1601add263203b2522363b3632411437e4fac
2
SIZE (tolua++-1.0.93.tar.bz2) = 163956
3
SIZE (tolua++-1.0.92.tar.bz2) = 153961
(-)tolua++.new/files/patch-SConstruct (-4 / +4 lines)
Lines 1-6 Link Here
1
--- SConstruct.orig	2006-04-10 13:45:44.000000000 +0400
1
--- SConstruct.orig	2011-01-20 07:15:38.000000000 -0600
2
+++ SConstruct	2008-08-22 01:43:56.000000000 +0400
2
+++ SConstruct	2011-01-20 07:16:53.000000000 -0600
3
@@ -17,6 +17,7 @@
3
@@ -22,6 +22,7 @@
4
 opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall'])
4
 opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall'])
5
 opts.Add('LINK', 'The linker.')
5
 opts.Add('LINK', 'The linker.')
6
 opts.Add('LINKFLAGS', 'Linker flags.', [])
6
 opts.Add('LINKFLAGS', 'Linker flags.', [])
Lines 8-14 Link Here
8
 opts.Add('no_cygwin', 'Use -mno-cygwin to build using the mingw compiler on cygwin', 0)
8
 opts.Add('no_cygwin', 'Use -mno-cygwin to build using the mingw compiler on cygwin', 0)
9
 opts.Add('LIBS', 'libraries', [])
9
 opts.Add('LIBS', 'libraries', [])
10
 opts.Add('LIBPATH', 'library path', [])
10
 opts.Add('LIBPATH', 'library path', [])
11
@@ -128,7 +129,9 @@
11
@@ -145,7 +146,9 @@
12
 ########### end of helper builders
12
 ########### end of helper builders
13
 
13
 
14
 env['CPPPATH'] = '#/include'
14
 env['CPPPATH'] = '#/include'
(-)tolua++.new/files/patch-gcc43-fixes (-130 lines)
Lines 1-130 Link Here
1
--- include/tolua++.h.orig	2006-04-27 05:33:40.000000000 +0200
2
+++ include/tolua++.h	2008-03-13 23:20:12.000000000 +0100
3
@@ -53,7 +53,7 @@
4
 #define TOLUA_NOPEER	LUA_REGISTRYINDEX /* for lua 5.1 */
5
 
6
 TOLUA_API const char* tolua_typename (lua_State* L, int lo);
7
-TOLUA_API void tolua_error (lua_State* L, char* msg, tolua_Error* err);
8
+TOLUA_API void tolua_error (lua_State* L, const char* msg, tolua_Error* err);
9
 TOLUA_API int tolua_isnoobj (lua_State* L, int lo, tolua_Error* err);
10
 TOLUA_API int tolua_isvalue (lua_State* L, int lo, int def, tolua_Error* err);
11
 TOLUA_API int tolua_isboolean (lua_State* L, int lo, int def, tolua_Error* err);
12
@@ -84,16 +84,15 @@
13
 TOLUA_API int tolua_register_gc (lua_State* L, int lo);
14
 TOLUA_API int tolua_default_collect (lua_State* tolua_S);
15
 
16
-TOLUA_API void tolua_usertype (lua_State* L, char* type);
17
-TOLUA_API void tolua_beginmodule (lua_State* L, char* name);
18
+TOLUA_API void tolua_usertype (lua_State* L, const char* type);
19
+TOLUA_API void tolua_beginmodule (lua_State* L, const char* name);
20
 TOLUA_API void tolua_endmodule (lua_State* L);
21
-TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar);
22
-TOLUA_API void tolua_class (lua_State* L, char* name, char* base);
23
-TOLUA_API void tolua_cclass (lua_State* L, char* lname, char* name, char* base, lua_CFunction col);
24
-TOLUA_API void tolua_function (lua_State* L, char* name, lua_CFunction func);
25
-TOLUA_API void tolua_constant (lua_State* L, char* name, double value);
26
-TOLUA_API void tolua_variable (lua_State* L, char* name, lua_CFunction get, lua_CFunction set);
27
-TOLUA_API void tolua_array (lua_State* L,char* name, lua_CFunction get, lua_CFunction set);
28
+TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar);
29
+TOLUA_API void tolua_cclass (lua_State* L, const char* lname, const char* name, const char* base, lua_CFunction col);
30
+TOLUA_API void tolua_function (lua_State* L, const char* name, lua_CFunction func);
31
+TOLUA_API void tolua_constant (lua_State* L, const char* name, double value);
32
+TOLUA_API void tolua_variable (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set);
33
+TOLUA_API void tolua_array (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set);
34
 
35
 /* TOLUA_API void tolua_set_call_event(lua_State* L, lua_CFunction func, char* type); */
36
 /* TOLUA_API void tolua_addbase(lua_State* L, char* name, char* base); */
37
--- src/lib/tolua_is.c.orig	2005-12-19 02:13:05.000000000 +0100
38
+++ src/lib/tolua_is.c	2008-03-13 23:11:27.000000000 +0100
39
@@ -85,7 +85,7 @@
40
 	return lua_tostring(L,-1);
41
 }
42
 
43
-TOLUA_API void tolua_error (lua_State* L, char* msg, tolua_Error* err)
44
+TOLUA_API void tolua_error (lua_State* L, const char* msg, tolua_Error* err)
45
 {
46
 	if (msg[0] == '#')
47
 	{
48
--- src/lib/tolua_map.c.orig	2006-03-13 23:37:49.000000000 +0100
49
+++ src/lib/tolua_map.c	2008-03-13 23:21:58.000000000 +0100
50
@@ -389,7 +389,7 @@
51
 	* It creates the correspoding metatable in the registry, for both 'type' and 'const type'.
52
 	* It maps 'const type' as being also a 'type'
53
 */
54
-TOLUA_API void tolua_usertype (lua_State* L, char* type)
55
+TOLUA_API void tolua_usertype (lua_State* L, const char* type)
56
 {
57
  char ctype[128] = "const ";
58
  strncat(ctype,type,120);
59
@@ -403,7 +403,7 @@
60
 /* Begin module
61
 	* It pushes the module (or class) table on the stack
62
 */
63
-TOLUA_API void tolua_beginmodule (lua_State* L, char* name)
64
+TOLUA_API void tolua_beginmodule (lua_State* L, const char* name)
65
 {
66
 	if (name)
67
 	{
68
@@ -426,7 +426,7 @@
69
 	* It creates a new module
70
 */
71
 #if 1
72
-TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar)
73
+TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar)
74
 {
75
 	if (name)
76
 	{
77
@@ -462,7 +462,7 @@
78
 	lua_pop(L,1);               /* pop module */
79
 }
80
 #else
81
-TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar)
82
+TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar)
83
 {
84
 	if (name)
85
 	{
86
@@ -518,7 +518,7 @@
87
 /* Map C class
88
 	* It maps a C class, setting the appropriate inheritance and super classes.
89
 */
90
-TOLUA_API void tolua_cclass (lua_State* L, char* lname, char* name, char* base, lua_CFunction col)
91
+TOLUA_API void tolua_cclass (lua_State* L, const char* lname, const char* name, const char* base, lua_CFunction col)
92
 {
93
 	char cname[128] = "const ";
94
 	char cbase[128] = "const ";
95
@@ -577,7 +577,7 @@
96
 /* Map function
97
 	* It assigns a function into the current module (or class)
98
 */
99
-TOLUA_API void tolua_function (lua_State* L, char* name, lua_CFunction func)
100
+TOLUA_API void tolua_function (lua_State* L, const char* name, lua_CFunction func)
101
 {
102
  lua_pushstring(L,name);
103
  lua_pushcfunction(L,func);
104
@@ -600,7 +600,7 @@
105
 /* Map constant number
106
 	* It assigns a constant number into the current module (or class)
107
 */
108
-TOLUA_API void tolua_constant (lua_State* L, char* name, double value)
109
+TOLUA_API void tolua_constant (lua_State* L, const char* name, double value)
110
 {
111
 	lua_pushstring(L,name);
112
 	tolua_pushnumber(L,value);
113
@@ -611,7 +611,7 @@
114
 /* Map variable
115
 	* It assigns a variable into the current module (or class)
116
 */
117
-TOLUA_API void tolua_variable (lua_State* L, char* name, lua_CFunction get, lua_CFunction set)
118
+TOLUA_API void tolua_variable (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set)
119
 {
120
 	/* get func */
121
 	lua_pushstring(L,".get");
122
@@ -663,7 +663,7 @@
123
 /* Map an array
124
 	* It assigns an array into the current module (or class)
125
 */
126
-TOLUA_API void tolua_array (lua_State* L, char* name, lua_CFunction get, lua_CFunction set)
127
+TOLUA_API void tolua_array (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set)
128
 {
129
 	lua_pushstring(L,".get");
130
 	lua_rawget(L,-2);
(-)tolua++.new/files/patch-src-lib-SCsub (-8 lines)
Lines 1-8 Link Here
1
--- src/lib/SCsub.orig	2005-11-28 16:51:15.000000000 +0300
2
+++ src/lib/SCsub	2008-08-22 01:44:24.000000000 +0400
3
@@ -10,4 +10,5 @@
4
 	]
5
 
6
 env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
7
+env.lib_target += env.SharedLibrary('#/lib/'+env['tolua_lib'], sources)
8
 
(-)tolua++.new/pkg-plist (-2 / +1 lines)
Lines 1-6 Link Here
1
%%LUA_BINDIR%%/tolua++
1
%%LUA_BINDIR%%/tolua++
2
bin/tolua++-%%LUA_VER%%
2
bin/tolua++-%%LUA_VER%%
3
%%LUA_LIBDIR%%/libtolua++.a
3
%%LUA_LIBDIR%%/libtolua++.a
4
%%LUA_LIBDIR%%/libtolua++.so
4
%%LUA_LIBDIR%%/libtolua++_static.a
5
lib/libtolua++-%%LUA_VER%%.so
6
%%LUA_INCDIR%%/tolua++.h
5
%%LUA_INCDIR%%/tolua++.h

Return to bug 154168