Bug 126440

Summary: [patch] bsd.lua.mk: add support for tolua++
Product: Ports & Packages Reporter: Dmitry Marakasov <amdmi3>
Component: Individual Port(s)Assignee: Alejandro Pulver <alepulver>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
bsd.lua.mk.patch none

Description Dmitry Marakasov freebsd_committer freebsd_triage 2008-08-11 03:20:01 UTC
Add support for lang/tolua++ (lang/tolua++50) in a way similar to lang/tolua (lang/tolua50).
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2008-08-11 03:20:12 UTC
Responsible Changed
From-To: freebsd-ports-bugs->alepulver

bsd.lua.mk is alepulver territory (via the GNATS Auto Assign Tool)
Comment 2 Dmitry Marakasov 2008-08-21 23:31:36 UTC
* FreeBSD-gnats-submit@FreeBSD.org (FreeBSD-gnats-submit@FreeBSD.org) wrote:

> http://www.freebsd.org/cgi/query-pr.cgi?pr=126440

Here's the updated patch. It changes the dependency style to lib,
as shared library support was just added to tolua++ ports.

--- bsd.lua.mk.patch begins here ---
Index: bsd.lua.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.lua.mk,v
retrieving revision 1.18
diff -u -r1.18 bsd.lua.mk
--- bsd.lua.mk	10 Aug 2008 19:29:42 -0000	1.18
+++ bsd.lua.mk	21 Aug 2008 21:54:57 -0000
@@ -33,7 +33,8 @@
 #				  type.
 #				  The available components are:
 #				  lua			- The Lua library.
-#				  tolua			- The tolua library (for 4.0-5.0).
+#				  tolua			- The tolua library (for 4.0-5.1).
+#				  toluaxx		- The tolua++ library (for 5.0-5.1).
 #				  ruby			- The Ruby bindings for Lua (for 4.0-5.0).
 #				  Other components (modules):
 #				  5.0			- app, compat51, dfui, filename, gettext,
@@ -77,8 +78,10 @@
 #				  NOTE: please see comments below about its double function.
 # LUA_SUBDIR	- The directory under bin/share/lib where Lua is installed.
 #				  Also used by Lua ports (lang/lua*) to set LATEST_LINK.
-# LUA_INCDIR	- The directory where Lua and tolua header files are installed.
-# LUA_LIBDIR	- The directory where Lua and tolua libraries are installed.
+# LUA_INCDIR	- The directory where Lua, tolua and tolua++ header files are
+#				  installed.
+# LUA_LIBDIR	- The directory where Lua, tolua and tolua++ libraries are
+#				  installed.
 # LUA_MODLIBDIR	- The directory where Lua module libraries (.so) are installed.
 # LUA_MODSHAREDIR
 #				- The directory where Lua modules (.lua) are installed.
@@ -87,6 +90,7 @@
 # LUA_CMD		- The path to the Lua interpreter.
 # LUAC_CMD		- The path to the Lua compiler.
 # TOLUA_CMD		- The path to the tolua program.
+# TOLUAXX_CMD	- The path to the tolua++ program.
 #
 # Examples:
 # - A port that needs Lua 4.0 and tolua (also 4.0) libraries (lua for building
@@ -145,7 +149,7 @@
 #						  to be added to PLIST_SUB.
 #
 
-_LUA_COMPS_ALL=			lua tolua ruby \
+_LUA_COMPS_ALL=			lua tolua toluaxx ruby \
 						app compat51 dfui filename gettext posix pty socket
 _LUA_DEP_TYPES_ALL=		build lib run
 _LUA_VERS_ALL=			4.0 5.0 5.1
@@ -171,6 +175,7 @@
 _LUA_PORT_lua_5.0=		lang/lua50
 _LUA_DEPTYPE_lua_5.0=	lib
 _LUA_PORT_tolua_5.0=	lang/tolua50
+_LUA_PORT_toluaxx_5.0=	lang/tolua++50
 _LUA_PORT_ruby_5.0=		lang/ruby-lua
 
 _LUA_PORT_app_5.0=		devel/lua50-app
@@ -192,6 +197,7 @@
 _LUA_PORT_pty_5.1=		devel/lua-pty
 _LUA_PORT_socket_5.1=	net/luasocket
 _LUA_PORT_tolua_5.1=	lang/tolua
+_LUA_PORT_toluaxx_5.1=	lang/tolua++
 
 .	for comp in ${_LUA_COMPS_ALL}
 _LUA_COMP=				${comp}
@@ -205,6 +211,9 @@
 .			elif ${_LUA_COMP} == "tolua"
 _LUA_FILE_${comp}_${ver}=	${LOCALBASE}/lib/lua${ver:S/.//g}/libtolua.a
 _LUA_DEPTYPE_${comp}_${ver}=build
+.			elif ${_LUA_COMP} == "toluaxx"
+_LUA_FILE_${comp}_${ver}=	${LOCALBASE}/lib/lua${ver:S/.//g}/libtolua++.so
+_LUA_DEPTYPE_${comp}_${ver}=lib
 .			elif ${_LUA_COMP} == "ruby"
 _LUA_FILE_${comp}_${ver}=	${RUBY_SITEARCHLIBDIR}/lua-${ver}.so
 _LUA_DEPTYPE_${comp}_${ver}=lib
@@ -470,6 +479,7 @@
 LUA_CMD?=				${LUA_PREFIX}/bin/lua-${LUA_VER}
 LUAC_CMD?=				${LUA_PREFIX}/bin/luac-${LUA_VER}
 TOLUA_CMD?=				${LUA_PREFIX}/bin/tolua-${LUA_VER}
+TOLUAXX_CMD?=			${LUA_PREFIX}/bin/tolua++-${LUA_VER}
 
 .endif		# _LUA_Need_Version
 
--- bsd.lua.mk.patch ends here ---

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
Comment 3 dfilter service freebsd_committer freebsd_triage 2008-08-25 21:21:04 UTC
alepulver    2008-08-25 20:20:50 UTC

  FreeBSD ports repository

  Modified files:
    Mk                   bsd.lua.mk 
  Log:
  - Add support for lang/tolua++ (lang/tolua++50) in a way similar to
    lang/tolua (lang/tolua50).
  
  PR:             ports/126440
  Submitted by:   amdmi3
  
  Revision  Changes    Path
  1.19      +15 -5     ports/Mk/bsd.lua.mk
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 4 Alejandro Pulver freebsd_committer freebsd_triage 2008-08-25 21:21:16 UTC
State Changed
From-To: open->closed

Committed. Thanks!