mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-02 11:09:29 +00:00
Code Issues Releases Activity

Port to lua 5.2

Browse Source 
Support stage
This commit is contained in:
Baptiste Daroussin 2014-01-10 08:27:29 +00:00
parent 021c0cfdde
commit ba2d30cb2d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=339324
2 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
www/volta/Makefile
View File

@ -10,16 +10,13 @@ MASTER_SITES= http://dl.dropbox.com/u/7234177/Releases/ \
EXTRACT_SUFX= .tgz
MAINTAINER= mahlon@martini.nu
COMMENT= A high performance, low resource URI rewriter for Squid
COMMENT= High performance, low resource URI rewriter for Squid
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE= BSD3CLAUSE
LIB_DEPENDS= libcdb.so:${PORTSDIR}/databases/tinycdb
USES= pkgconfig
USE_GMAKE= yes
USE_LUA= 5.1
USES= gmake pkgconfig lua
ALL_TARGET= ${PORTNAME}
NO_INSTALL= yes
@ -30,18 +27,15 @@ PLIST_FILES= bin/volta
PORTDOCS= README INSTALL LICENSE ChangeLog
SUB_FILES= pkg-message
NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e "s/5.1/${LUA_VER}/g" ${WRKSRC}/Makefile
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
.endif
${INSTALL_PROGRAM} ${WRKSRC}/volta ${PREFIX}/bin
@${ECHO_CMD} ""
@${CAT} ${PKGMESSAGE}
@${ECHO_CMD} ""
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
${INSTALL_PROGRAM} ${WRKSRC}/volta ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>

38
www/volta/files/patch-lua.c Normal file
View File

@ -0,0 +1,38 @@
--- ./lua.c.orig 2012-05-04 06:21:02.000000000 +0200
+++ ./lua.c 2014-01-10 09:17:46.000000000 +0100
@@ -79,14 +79,12 @@
luaL_openlibs( lua ); /* include lua standard libraries */
/* Predeclare the request table. */
- lua_pushstring( lua, "request" );
lua_createtable( lua, 0, 7 );
- lua_settable( lua, LUA_GLOBALSINDEX );
+ lua_setglobal(lua, "request");
/* Predeclare a table for shared data */
- lua_pushstring( lua, "shared" );
lua_newtable( lua );
- lua_settable( lua, LUA_GLOBALSINDEX );
+ lua_setglobal(lua, "shared");
/* replace the lua print() function with one that calls debug() instead */
lua_register( lua, "print", luaV_print );
@@ -97,7 +95,8 @@
lua_setfield( lua, -2, "__newindex");
lua_pushboolean( lua, 0 );
lua_setfield( lua, -2, "__metatable");
- lua_setmetatable( lua, LUA_GLOBALSINDEX );
+ lua_setmetatable(lua, -2);
+
lua_settop( lua, 0 ); /* wipe the stack */
return( lua );
@@ -111,7 +110,7 @@
void
luaV_setup_request( parsed *request )
{
- lua_getfield( v.lua, LUA_GLOBALSINDEX, "request" );
+ lua_getglobal(v.lua, "request");
lua_pushstring( v.lua, request->scheme );
lua_setfield( v.lua, 1, "scheme" );
lua_pushstring( v.lua, request->host );