Index: head/www/volta/Makefile =================================================================== --- head/www/volta/Makefile (revision 390179) +++ head/www/volta/Makefile (revision 390180) @@ -1,40 +1,37 @@ # Created by: mahlon # $FreeBSD$ PORTNAME= volta -PORTVERSION= 0.2.0 +PORTVERSION= 0.3.0 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://dl.dropbox.com/u/7234177/Releases/ \ http://projects.martini.nu/volta/chrome/site/ MAINTAINER= mahlon@martini.nu COMMENT= High performance, low resource URI rewriter for Squid LICENSE= BSD3CLAUSE LIB_DEPENDS= libcdb.so:${PORTSDIR}/databases/tinycdb USES= gmake pkgconfig lua tar:tgz ALL_TARGET= ${PORTNAME} NO_INSTALL= yes CFLAGS+= -I${PREFIX}/include LDFLAGS+= -L${PREFIX}/lib PLIST_FILES= bin/volta PORTDOCS= README INSTALL LICENSE ChangeLog SUB_FILES= pkg-message - -post-patch: - @${REINPLACE_CMD} -e "s/5.1/${LUA_VER}/g" ${WRKSRC}/Makefile post-install: ${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 Index: head/www/volta/distinfo =================================================================== --- head/www/volta/distinfo (revision 390179) +++ head/www/volta/distinfo (revision 390180) @@ -1,2 +1,2 @@ -SHA256 (volta-0.2.0.tgz) = 9857c08cddafd935238a756d13822a6240ac1f79ed3a33f84805b60532e523d6 -SIZE (volta-0.2.0.tgz) = 29357 +SHA256 (volta-0.3.0.tgz) = 499e2ba9167b2b1663790961f13d1289bfcb9339d2032b7e2076314bc96fba5c +SIZE (volta-0.3.0.tgz) = 29458 Index: head/www/volta/files/patch-lua.c =================================================================== --- head/www/volta/files/patch-lua.c (revision 390179) +++ head/www/volta/files/patch-lua.c (nonexistent) @@ -1,38 +0,0 @@ ---- ./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 ); Property changes on: head/www/volta/files/patch-lua.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/volta/files/pkg-message.in =================================================================== --- head/www/volta/files/pkg-message.in (revision 390179) +++ head/www/volta/files/pkg-message.in (revision 390180) @@ -1,10 +1,10 @@ To get volta up and running, you'll still need to do two things: - Enable url rewriting from within the squid configuration file. - url_rewrite_children 10 url_rewrite_program %%PREFIX%%/bin/volta -f %%PREFIX%%/etc/volta.db + url_rewrite_children 5 startup=1 idle=2 concurrency=50 - Create a volta rule database! For detailed instructions, please reference %%DOCSDIR%%/README, or volta's website at: http://projects.martini.nu/volta/