CVS commit: pkgsrc/www/nginx

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Mar 29 08:35:10 UTC 2023

Modified Files:
        pkgsrc/www/nginx: Makefile PLIST options.mk

Log Message:
nginx: lua module needs lua-resty-core and lua-resty-lrucache; sort PLIST; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/nginx/PLIST
cvs rdiff -u -r1.88 -r1.89 pkgsrc/www/nginx/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.130 pkgsrc/www/nginx/Makefile:1.131
--- pkgsrc/www/nginx/Makefile:1.130     Sun Jan 29 21:18:05 2023
+++ pkgsrc/www/nginx/Makefile   Wed Mar 29 08:35:10 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.130 2023/01/29 21:18:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.131 2023/03/29 08:35:10 adam Exp $
 
 DISTNAME=      nginx-1.22.1
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    www
 MASTER_SITES=  http://nginx.org/download/
 DISTFILES=     ${DEFAULT_DISTFILES}

Index: pkgsrc/www/nginx/PLIST
diff -u pkgsrc/www/nginx/PLIST:1.15 pkgsrc/www/nginx/PLIST:1.16
--- pkgsrc/www/nginx/PLIST:1.15 Thu Jul 14 10:39:24 2022
+++ pkgsrc/www/nginx/PLIST      Wed Mar 29 08:35:10 2023
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.15 2022/07/14 10:39:24 osa Exp $
+@comment $NetBSD: PLIST,v 1.16 2023/03/29 08:35:10 adam Exp $
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT}
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm
+${PLIST.dso}${PLIST.ndk}libexec/nginx/ndk_http_module.so
 ${PLIST.dso}${PLIST.arrayvar}libexec/nginx/ngx_http_array_var_module.so
 ${PLIST.dso}${PLIST.cprg}libexec/nginx/ngx_http_cache_purge_module.so
 ${PLIST.dso}${PLIST.dav}libexec/nginx/ngx_http_dav_ext_module.so
@@ -6,23 +9,20 @@ ${PLIST.dso}${PLIST.echo}libexec/nginx/n
 ${PLIST.dso}${PLIST.encses}libexec/nginx/ngx_http_encrypted_session_module.so
 ${PLIST.dso}${PLIST.forminput}libexec/nginx/ngx_http_form_input_module.so
 ${PLIST.dso}${PLIST.geoip2}libexec/nginx/ngx_http_geoip2_module.so
-${PLIST.dso}${PLIST.geoip2}libexec/nginx/ngx_stream_geoip2_module.so
 ${PLIST.dso}${PLIST.headmore}libexec/nginx/ngx_http_headers_more_filter_module.so
 ${PLIST.dso}${PLIST.imagefilter}libexec/nginx/ngx_http_image_filter_module.so
+${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_http_js_module.so
 ${PLIST.dso}${PLIST.lua}libexec/nginx/ngx_http_lua_module.so
-${PLIST.dso}${PLIST.mail}libexec/nginx/ngx_mail_module.so
 ${PLIST.dso}${PLIST.naxsi}libexec/nginx/ngx_http_naxsi_module.so
-${PLIST.dso}${PLIST.nchan}libexec/nginx/ngx_nchan_module.so
-${PLIST.dso}${PLIST.ndk}libexec/nginx/ndk_http_module.so
-${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_http_js_module.so
-${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_stream_js_module.so
 ${PLIST.dso}${PLIST.perl}libexec/nginx/ngx_http_perl_module.so
-${PLIST.dso}${PLIST.rtmp}libexec/nginx/ngx_rtmp_module.so
 ${PLIST.dso}${PLIST.setmisc}libexec/nginx/ngx_http_set_misc_module.so
-${PLIST.dso}${PLIST.stream}libexec/nginx/ngx_stream_module.so
 ${PLIST.dso}${PLIST.upload}libexec/nginx/ngx_http_upload_module.so
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT}
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm
+${PLIST.dso}${PLIST.mail}libexec/nginx/ngx_mail_module.so
+${PLIST.dso}${PLIST.nchan}libexec/nginx/ngx_nchan_module.so
+${PLIST.dso}${PLIST.rtmp}libexec/nginx/ngx_rtmp_module.so
+${PLIST.dso}${PLIST.geoip2}libexec/nginx/ngx_stream_geoip2_module.so
+${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_stream_js_module.so
+${PLIST.dso}${PLIST.stream}libexec/nginx/ngx_stream_module.so
 man/man8/nginx.8
 sbin/nginx
 share/examples/nginx/conf/fastcgi.conf

Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.88 pkgsrc/www/nginx/options.mk:1.89
--- pkgsrc/www/nginx/options.mk:1.88    Thu Nov 17 16:04:27 2022
+++ pkgsrc/www/nginx/options.mk Wed Mar 29 08:35:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.88 2022/11/17 16:04:27 osa Exp $
+# $NetBSD: options.mk,v 1.89 2023/03/29 08:35:10 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug
@@ -166,6 +166,8 @@ LUA_DISTFILE=               ${LUA_DISTNAME}.tar.gz
 SITES.${LUA_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/lua-nginx-module/archive/}v${LUA_VERSION}.tar.gz
 DISTFILES+=            ${LUA_DISTFILE}
 .include "../../lang/LuaJIT2/buildlink3.mk"
+DEPENDS+=              lua-resty-core>=0.1.26:../../www/lua-resty-core
+DEPENDS+=              lua-resty-lrucache>=0.13:../../www/lua-resty-lrucache
 CONFIGURE_ENV+=                LUAJIT_LIB=${PREFIX}/lib
 CONFIGURE_ENV+=                LUAJIT_INC=${PREFIX}/include/luajit-2.0
 DSO_EXTMODS+=          lua