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

(-)bsd.lua.mk (-4 / +14 lines)
Lines 33-39 Link Here
33
#				  type.
33
#				  type.
34
#				  The available components are:
34
#				  The available components are:
35
#				  lua			- The Lua library.
35
#				  lua			- The Lua library.
36
#				  tolua			- The tolua library (for 4.0-5.0).
36
#				  tolua			- The tolua library (for 4.0-5.1).
37
#				  toluaxx		- The tolua++ library (for 5.0-5.1).
37
#				  ruby			- The Ruby bindings for Lua (for 4.0-5.0).
38
#				  ruby			- The Ruby bindings for Lua (for 4.0-5.0).
38
#				  Other components (modules):
39
#				  Other components (modules):
39
#				  5.0			- app, compat51, dfui, filename, gettext,
40
#				  5.0			- app, compat51, dfui, filename, gettext,
Lines 77-84 Link Here
77
#				  NOTE: please see comments below about its double function.
78
#				  NOTE: please see comments below about its double function.
78
# LUA_SUBDIR	- The directory under bin/share/lib where Lua is installed.
79
# LUA_SUBDIR	- The directory under bin/share/lib where Lua is installed.
79
#				  Also used by Lua ports (lang/lua*) to set LATEST_LINK.
80
#				  Also used by Lua ports (lang/lua*) to set LATEST_LINK.
80
# LUA_INCDIR	- The directory where Lua and tolua header files are installed.
81
# LUA_INCDIR	- The directory where Lua, tolua and tolua++ header files are
81
# LUA_LIBDIR	- The directory where Lua and tolua libraries are installed.
82
#				  installed.
83
# LUA_LIBDIR	- The directory where Lua, tolua and tolua++ libraries are
84
#				  installed.
82
# LUA_MODLIBDIR	- The directory where Lua module libraries (.so) are installed.
85
# LUA_MODLIBDIR	- The directory where Lua module libraries (.so) are installed.
83
# LUA_MODSHAREDIR
86
# LUA_MODSHAREDIR
84
#				- The directory where Lua modules (.lua) are installed.
87
#				- The directory where Lua modules (.lua) are installed.
Lines 87-92 Link Here
87
# LUA_CMD		- The path to the Lua interpreter.
90
# LUA_CMD		- The path to the Lua interpreter.
88
# LUAC_CMD		- The path to the Lua compiler.
91
# LUAC_CMD		- The path to the Lua compiler.
89
# TOLUA_CMD		- The path to the tolua program.
92
# TOLUA_CMD		- The path to the tolua program.
93
# TOLUAXX_CMD	- The path to the tolua++ program.
90
#
94
#
91
# Examples:
95
# Examples:
92
# - A port that needs Lua 4.0 and tolua (also 4.0) libraries (lua for building
96
# - A port that needs Lua 4.0 and tolua (also 4.0) libraries (lua for building
Lines 145-151 Link Here
145
#						  to be added to PLIST_SUB.
149
#						  to be added to PLIST_SUB.
146
#
150
#
147
151
148
_LUA_COMPS_ALL=			lua tolua ruby \
152
_LUA_COMPS_ALL=			lua tolua toluaxx ruby \
149
						app compat51 dfui filename gettext posix pty socket
153
						app compat51 dfui filename gettext posix pty socket
150
_LUA_DEP_TYPES_ALL=		build lib run
154
_LUA_DEP_TYPES_ALL=		build lib run
151
_LUA_VERS_ALL=			4.0 5.0 5.1
155
_LUA_VERS_ALL=			4.0 5.0 5.1
Lines 171-176 Link Here
171
_LUA_PORT_lua_5.0=		lang/lua50
175
_LUA_PORT_lua_5.0=		lang/lua50
172
_LUA_DEPTYPE_lua_5.0=	lib
176
_LUA_DEPTYPE_lua_5.0=	lib
173
_LUA_PORT_tolua_5.0=	lang/tolua50
177
_LUA_PORT_tolua_5.0=	lang/tolua50
178
_LUA_PORT_toluaxx_5.0=	lang/tolua++50
174
_LUA_PORT_ruby_5.0=		lang/ruby-lua
179
_LUA_PORT_ruby_5.0=		lang/ruby-lua
175
180
176
_LUA_PORT_app_5.0=		devel/lua50-app
181
_LUA_PORT_app_5.0=		devel/lua50-app
Lines 192-197 Link Here
192
_LUA_PORT_pty_5.1=		devel/lua-pty
197
_LUA_PORT_pty_5.1=		devel/lua-pty
193
_LUA_PORT_socket_5.1=	net/luasocket
198
_LUA_PORT_socket_5.1=	net/luasocket
194
_LUA_PORT_tolua_5.1=	lang/tolua
199
_LUA_PORT_tolua_5.1=	lang/tolua
200
_LUA_PORT_toluaxx_5.1=	lang/tolua++
195
201
196
.	for comp in ${_LUA_COMPS_ALL}
202
.	for comp in ${_LUA_COMPS_ALL}
197
_LUA_COMP=				${comp}
203
_LUA_COMP=				${comp}
Lines 205-210 Link Here
205
.			elif ${_LUA_COMP} == "tolua"
211
.			elif ${_LUA_COMP} == "tolua"
206
_LUA_FILE_${comp}_${ver}=	${LOCALBASE}/lib/lua${ver:S/.//g}/libtolua.a
212
_LUA_FILE_${comp}_${ver}=	${LOCALBASE}/lib/lua${ver:S/.//g}/libtolua.a
207
_LUA_DEPTYPE_${comp}_${ver}=build
213
_LUA_DEPTYPE_${comp}_${ver}=build
214
.			elif ${_LUA_COMP} == "toluaxx"
215
_LUA_FILE_${comp}_${ver}=	${LOCALBASE}/lib/lua${ver:S/.//g}/libtolua++.a
216
_LUA_DEPTYPE_${comp}_${ver}=build
208
.			elif ${_LUA_COMP} == "ruby"
217
.			elif ${_LUA_COMP} == "ruby"
209
_LUA_FILE_${comp}_${ver}=	${RUBY_SITEARCHLIBDIR}/lua-${ver}.so
218
_LUA_FILE_${comp}_${ver}=	${RUBY_SITEARCHLIBDIR}/lua-${ver}.so
210
_LUA_DEPTYPE_${comp}_${ver}=lib
219
_LUA_DEPTYPE_${comp}_${ver}=lib
Lines 470-475 Link Here
470
LUA_CMD?=				${LUA_PREFIX}/bin/lua-${LUA_VER}
479
LUA_CMD?=				${LUA_PREFIX}/bin/lua-${LUA_VER}
471
LUAC_CMD?=				${LUA_PREFIX}/bin/luac-${LUA_VER}
480
LUAC_CMD?=				${LUA_PREFIX}/bin/luac-${LUA_VER}
472
TOLUA_CMD?=				${LUA_PREFIX}/bin/tolua-${LUA_VER}
481
TOLUA_CMD?=				${LUA_PREFIX}/bin/tolua-${LUA_VER}
482
TOLUAXX_CMD?=			${LUA_PREFIX}/bin/tolua++-${LUA_VER}
473
483
474
.endif		# _LUA_Need_Version
484
.endif		# _LUA_Need_Version

Return to bug 126440