diff --git a/www/angie-module-lua/Makefile b/www/angie-module-lua/Makefile index 9132aa5f986a..c8642014f7c6 100644 --- a/www/angie-module-lua/Makefile +++ b/www/angie-module-lua/Makefile @@ -1,48 +1,48 @@ PORTNAME= angie-module-lua MODULE_VERSION= 0.10.31 -MODULE_PORTREVISION= 0 +MODULE_PORTREVISION= 2 GH_TUPLE= openresty:lua-nginx-module:v${MODULE_VERSION}:lua GH_TUPLE+= openresty:stream-lua-nginx-module:v0.0.17R4:lua_stream GH_TUPLE+= vision5:ngx_devel_kit:v0.3.4:ndk COMMENT= Angie Lua dynamic module WWW= https://github.com/openresty/lua-nginx-module/ LICENSE_FILE= ${WRKSRC_lua}/README.markdown LIB_DEPENDS= libpcre.so:devel/pcre CONFIGURE_ADD= --add-dynamic-module=${WRKSRC_lua} \ --add-dynamic-module=${WRKSRC_lua_stream} \ --add-dynamic-module=${WRKSRC_ndk} CONFIGURE_ENV= LUAJIT_INC=${LUAJIT_INCDIR} \ LUAJIT_LIB=${LOCALBASE}/lib RUN_DEPENDS= angie-module-ndk>=0.3.4,1:www/angie-module-ndk \ lua-resty-core>=0.1.32:www/lua-resty-core -USES= luajit:luajit-openresty +USES= luajit:luajit-openresty MASTERDIR= ${.CURDIR}/../../www/angie do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} \ ${STAGEDIR}${MODDIR} ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_lua_module.so \ ${WRKSRC}/objs/ngx_stream_lua_module.so \ ${STAGEDIR}${MODDIR} ${INSTALL_DATA} ${WRKSRC_lua}/README.markdown \ ${STAGEDIR}${DOCSDIR}/README.lua-nginx-module.markdown ${INSTALL_DATA} ${WRKSRC_lua_stream}/README.md \ ${STAGEDIR}${DOCSDIR}/README.stream-lua-nginx-module.md do-install-DEBUG-on: .for i in ngx_http_lua_module ngx_stream_lua_module ${INSTALL} ${COPY} -m ${_SHAREMODE} ${WRKSRC_DEBUG}/objs/${i}.so \ ${STAGEDIR}${MODDIR}/${i}-debug.so .endfor .include "${MASTERDIR}/Makefile" diff --git a/www/angie-module-lua/files/patch-lua-config b/www/angie-module-lua/files/patch-lua-config index a56a797979bd..a271c7be5764 100644 --- a/www/angie-module-lua/files/patch-lua-config +++ b/www/angie-module-lua/files/patch-lua-config @@ -1,26 +1,26 @@ ---- ../lua-nginx-module-0.10.29R2/config.orig -+++ ../lua-nginx-module-0.10.29R2/config +--- ../lua-nginx-module-0.10.31/config.orig ++++ ../lua-nginx-module-0.10.31/config @@ -45,9 +45,9 @@ NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT" if [ $NGX_RPATH = YES ]; then - ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" + ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" else - ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" + ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" fi . auto/feature @@ -71,9 +71,9 @@ NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT" if [ $NGX_RPATH = YES ]; then - ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" + ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" else - ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" + ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" fi . auto/feature