Here's the updated version of the patch with pkg/PLIST-njs and pkg/DESCR-njs files.
On Sat, Oct 23, 2021 at 02:52:35AM +0000, Sergey A. Osokin wrote:
> Hi,
>
> here the patch to add NGINX Javascript (njs) module to www/nginx port.
> Please let me know if you have any questions.
>
> Thank you.
>
> --
> Sergey Osokin
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/nginx/Makefile,v
> retrieving revision 1.156
> diff -u -p -r1.156 Makefile
> --- Makefile 10 Sep 2021 15:19:00 -0000 1.156
> +++ Makefile 23 Oct 2021 02:48:39 -0000
> @@ -13,6 +13,7 @@ COMMENT-ldap_auth= nginx LDAP authentica
> COMMENT-lua= nginx lua scripting module
> COMMENT-headers_more= nginx module for setting/adding/clearing headers
> COMMENT-perl= nginx perl scripting module
> +COMMENT-njs= nginx javascript scripting module
> COMMENT-passenger= nginx passenger (ruby/python/nodejs) integration module
> COMMENT-rtmp= nginx module for RTMP streaming
> COMMENT-securelink= nginx HMAC secure link module
> @@ -24,6 +25,7 @@ CATEGORIES= www
> REVISION-lua= 0
> REVISION-passenger= 0
>
> +VERSION-njs= 0.7.0
> VERSION-rtmp= 1.2.1
>
> PKGNAME-main= ${DISTNAME}
> @@ -37,6 +39,7 @@ PKGNAME-ldap_auth= nginx-ldap_auth-${VER
> PKGNAME-lua= nginx-lua-${VERSION}
> PKGNAME-headers_more= nginx-headers-more-${VERSION}
> PKGNAME-perl= nginx-perl-${VERSION}
> +PKGNAME-njs= nginx-njs-${VERSION}
> PKGNAME-passenger= nginx-passenger-${VERSION}
> PKGNAME-rtmp= nginx-rtmp-${VERSION}
> PKGNAME-securelink= nginx-securelink-${VERSION}
> @@ -58,6 +61,7 @@ _GH_MODS= \
> nbs-system naxsi 1.3 \
> kvspb nginx-auth-ldap
> 83c059b73566c2ee9cbda920d91b66657cf120b7 \
> arut nginx-rtmp-module v${VERSION-rtmp} \
> + nginx njs ${VERSION-njs} \
> simpl ngx_devel_kit v0.3.0 \
> leev ngx_http_geoip2_module 3.3 \
> nginx-modules ngx_http_hmac_secure_link_module
> 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
> @@ -76,8 +80,8 @@ PERMIT_PACKAGE= Yes
> MULTI_PACKAGES = -main -naxsi -perl ${MODULE_PACKAGES}
>
> MODULE_PACKAGES = -image_filter -geoip2 -xslt -mailproxy -stream \
> - -passenger -headers_more -ldap_auth -lua -rtmp \
> - -securelink
> + -passenger -headers_more -ldap_auth -lua -njs \
> + -rtmp -securelink
>
> FLAVOR ?=
> PSEUDO_FLAVORS = no_lua no_passenger
> @@ -92,6 +96,7 @@ WANTLIB-stream=
> WANTLIB-image_filter= gd
> WANTLIB-geoip2= maxminddb
> WANTLIB-rtmp=
> +WANTLIB-njs=
> WANTLIB-xslt= exslt xml2 xslt
> WANTLIB-naxsi=
> WANTLIB-ldap_auth= ldap
> @@ -109,6 +114,7 @@ LIB_DEPENDS-geoip2= net/libmaxminddb
> LIB_DEPENDS-ldap_auth= databases/openldap
> LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
> LIB_DEPENDS-rtmp=
> +LIB_DEPENDS-njs=
> LIB_DEPENDS-securelink=
>
> MODLUA_RUNDEP= No
> @@ -158,6 +164,10 @@ CONFIGURE_ARGS+= --add-dynamic-module=${
>
> .if ${BUILD_PACKAGES:M-rtmp}
> CONFIGURE_ARGS+=
> --add-dynamic-module=${WRKDIR}/nginx-rtmp-module-${VERSION-rtmp}/
> +.endif
> +
> +.if ${BUILD_PACKAGES:M-njs}
> +CONFIGURE_ARGS+= --add-dynamic-module=${WRKDIR}/njs-${VERSION-njs}/nginx
> .endif
>
> CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/nginx/distinfo,v
> retrieving revision 1.77
> diff -u -p -r1.77 distinfo
> --- distinfo 25 May 2021 19:43:55 -0000 1.77
> +++ distinfo 23 Oct 2021 02:48:39 -0000
> @@ -8,6 +8,7 @@ SHA256 (nginx-rtmp-module-v1.2.1.tar.gz)
> SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
> iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
> SHA256 (ngx_http_geoip2_module-3.3.tar.gz) =
> QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
> SHA256
> (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
> = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
> +SHA256 (njs-0.7.0.tar.gz) = Pw/n13YAqcVAAM4QHdUfRIEZZFAmQa5QXjjBu/WV5vE=
> SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
> SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> SIZE (naxsi-1.3.tar.gz) = 235626
> @@ -18,3 +19,4 @@ SIZE (nginx-rtmp-module-v1.2.1.tar.gz) =
> SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
> SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
> SIZE
> (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
> = 6159
> +SIZE (njs-0.7.0.tar.gz) = 575477
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile 10 Sep 2021 15:19:00 -0000 1.156
+++ Makefile 23 Oct 2021 02:48:39 -0000
@@ -13,6 +13,7 @@ COMMENT-ldap_auth= nginx LDAP authentica
COMMENT-lua= nginx lua scripting module
COMMENT-headers_more= nginx module for setting/adding/clearing headers
COMMENT-perl= nginx perl scripting module
+COMMENT-njs= nginx javascript scripting module
COMMENT-passenger= nginx passenger (ruby/python/nodejs) integration module
COMMENT-rtmp= nginx module for RTMP streaming
COMMENT-securelink= nginx HMAC secure link module
@@ -24,6 +25,7 @@ CATEGORIES= www
REVISION-lua= 0
REVISION-passenger= 0
+VERSION-njs= 0.7.0
VERSION-rtmp= 1.2.1
PKGNAME-main= ${DISTNAME}
@@ -37,6 +39,7 @@ PKGNAME-ldap_auth= nginx-ldap_auth-${VER
PKGNAME-lua= nginx-lua-${VERSION}
PKGNAME-headers_more= nginx-headers-more-${VERSION}
PKGNAME-perl= nginx-perl-${VERSION}
+PKGNAME-njs= nginx-njs-${VERSION}
PKGNAME-passenger= nginx-passenger-${VERSION}
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink= nginx-securelink-${VERSION}
@@ -58,6 +61,7 @@ _GH_MODS= \
nbs-system naxsi 1.3 \
kvspb nginx-auth-ldap
83c059b73566c2ee9cbda920d91b66657cf120b7 \
arut nginx-rtmp-module v${VERSION-rtmp} \
+ nginx njs ${VERSION-njs} \
simpl ngx_devel_kit v0.3.0 \
leev ngx_http_geoip2_module 3.3 \
nginx-modules ngx_http_hmac_secure_link_module
48c4625fbbf51ed5a95bfec23fa444f6c3702e50
@@ -76,8 +80,8 @@ PERMIT_PACKAGE= Yes
MULTI_PACKAGES = -main -naxsi -perl ${MODULE_PACKAGES}
MODULE_PACKAGES = -image_filter -geoip2 -xslt -mailproxy -stream \
- -passenger -headers_more -ldap_auth -lua -rtmp \
- -securelink
+ -passenger -headers_more -ldap_auth -lua -njs \
+ -rtmp -securelink
FLAVOR ?=
PSEUDO_FLAVORS = no_lua no_passenger
@@ -92,6 +96,7 @@ WANTLIB-stream=
WANTLIB-image_filter= gd
WANTLIB-geoip2= maxminddb
WANTLIB-rtmp=
+WANTLIB-njs=
WANTLIB-xslt= exslt xml2 xslt
WANTLIB-naxsi=
WANTLIB-ldap_auth= ldap
@@ -109,6 +114,7 @@ LIB_DEPENDS-geoip2= net/libmaxminddb
LIB_DEPENDS-ldap_auth= databases/openldap
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
LIB_DEPENDS-rtmp=
+LIB_DEPENDS-njs=
LIB_DEPENDS-securelink=
MODLUA_RUNDEP= No
@@ -158,6 +164,10 @@ CONFIGURE_ARGS+= --add-dynamic-module=${
.if ${BUILD_PACKAGES:M-rtmp}
CONFIGURE_ARGS+=
--add-dynamic-module=${WRKDIR}/nginx-rtmp-module-${VERSION-rtmp}/
+.endif
+
+.if ${BUILD_PACKAGES:M-njs}
+CONFIGURE_ARGS+= --add-dynamic-module=${WRKDIR}/njs-${VERSION-njs}/nginx
.endif
CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.77
diff -u -p -r1.77 distinfo
--- distinfo 25 May 2021 19:43:55 -0000 1.77
+++ distinfo 23 Oct 2021 02:48:39 -0000
@@ -8,6 +8,7 @@ SHA256 (nginx-rtmp-module-v1.2.1.tar.gz)
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
SHA256 (ngx_http_geoip2_module-3.3.tar.gz) =
QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
SHA256
(ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
= ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
+SHA256 (njs-0.7.0.tar.gz) = Pw/n13YAqcVAAM4QHdUfRIEZZFAmQa5QXjjBu/WV5vE=
SIZE (headers-more-nginx-module-v0.33.tar.gz) = 28130
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-1.3.tar.gz) = 235626
@@ -18,3 +19,4 @@ SIZE (nginx-rtmp-module-v1.2.1.tar.gz) =
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
SIZE
(ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
= 6159
+SIZE (njs-0.7.0.tar.gz) = 575477
--- /dev/null Fri Oct 22 22:29:42 2021
+++ pkg/PLIST-njs Fri Oct 22 22:25:50 2021
@@ -0,0 +1,3 @@
+@comment $OpenBSD$
+@so ngx_http_js_module.so
+@so ngx_stream_js_module.so
--- /dev/null Fri Oct 22 22:29:50 2021
+++ pkg/DESCR-njs Fri Oct 22 22:18:34 2021
@@ -0,0 +1,2 @@
+The NGINX Javascript is a subset of the JavaScript language that
+allows extending nginx functionality.
signature.asc
Description: PGP signature
