aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorlinimon <linimon@FreeBSD.org>2006-09-15 18:58:52 +0800
committerlinimon <linimon@FreeBSD.org>2006-09-15 18:58:52 +0800
commite51cee47df4e4fbded499c79e117217c07415cb8 (patch)
treeb7b1387cd23e16f5d630e23cec5f08849f70c14d /lang
parent7a27784394368a6b530ffc9f3cacd6bcfe88acf1 (diff)
downloadfreebsd-ports-gnome-e51cee47df4e4fbded499c79e117217c07415cb8.tar.gz
freebsd-ports-gnome-e51cee47df4e4fbded499c79e117217c07415cb8.tar.zst
freebsd-ports-gnome-e51cee47df4e4fbded499c79e117217c07415cb8.zip
Catch up with the last few files tested on pointyhat as part of later
revisions to ports/101612 that were not in the PR. Hat: portmgr
Diffstat (limited to 'lang')
-rw-r--r--lang/ruby-lua/Makefile13
-rw-r--r--lang/ruby-lua/pkg-plist2
-rw-r--r--lang/tolua++/Makefile5
-rw-r--r--lang/tolua++50/Makefile5
4 files changed, 12 insertions, 13 deletions
diff --git a/lang/ruby-lua/Makefile b/lang/ruby-lua/Makefile
index 9fbf12f09c4a..652df5a8958c 100644
--- a/lang/ruby-lua/Makefile
+++ b/lang/ruby-lua/Makefile
@@ -17,19 +17,20 @@ DIST_SUBDIR= ruby
MAINTAINER= ports@FreeBSD.org
COMMENT= A Ruby extension to make Lua script language as a class
-LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua50
-
-CONFLICTS= ${RUBY_PKGNAMEPREFIX}lua4-[0-9]*
-
+USE_LUA= 5.0
USE_RUBY= yes
USE_RUBY_SETUP= yes
RUBY_SETUP= install.rb
-CONFIGURE_ARGS= -- --with-lua-dir=${LOCALBASE}
+CONFIGURE_ARGS= -- --with-lua-include=${LUA_INCDIR} --with-lua-lib=${LUA_LIBDIR}
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|\(create_makefile("lua\)")|\1-${LUA_VER}")|' \
+ ${WRKSRC}/ext/lua/extconf.rb
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${RUBY_MODDOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}
.endif
.include <bsd.port.mk>
diff --git a/lang/ruby-lua/pkg-plist b/lang/ruby-lua/pkg-plist
index 0acec37b549b..2cc3aa971126 100644
--- a/lang/ruby-lua/pkg-plist
+++ b/lang/ruby-lua/pkg-plist
@@ -1,3 +1,3 @@
-%%RUBY_SITEARCHLIBDIR%%/lua.so
+%%RUBY_SITEARCHLIBDIR%%/lua-%%LUA_VER%%.so
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/lang/tolua++/Makefile b/lang/tolua++/Makefile
index 5df222084a30..3ae4076bebee 100644
--- a/lang/tolua++/Makefile
+++ b/lang/tolua++/Makefile
@@ -15,11 +15,10 @@ 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
-WRKSRC= ${WRKDIR}/tolua++-${PORTVERSION}
USE_BZIP2= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
+USE_LUA= 5.0
NO_BUILD= yes
post-patch:
diff --git a/lang/tolua++50/Makefile b/lang/tolua++50/Makefile
index 5df222084a30..3ae4076bebee 100644
--- a/lang/tolua++50/Makefile
+++ b/lang/tolua++50/Makefile
@@ -15,11 +15,10 @@ 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
-WRKSRC= ${WRKDIR}/tolua++-${PORTVERSION}
USE_BZIP2= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
+USE_LUA= 5.0
NO_BUILD= yes
post-patch: