[pkgsrc/trunk]: pkgsrc/www www/nginx*: remove build and install of njs comman...

[osa <osa%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef22ee3ba144
branches:  trunk
changeset: 375412:ef22ee3ba144
user:      osa <osa%pkgsrc.org@localhost>
date:      Mon Mar 14 02:49:09 2022 +0000

description:
www/nginx*: remove build and install of njs command line utility

The new and shiny lang/njs package will be added shortly.

Bump PKGREVISIONs.

diffstat:

 www/nginx-devel/Makefile  |   4 ++--
 www/nginx-devel/PLIST     |   3 +--
 www/nginx/Makefile        |   4 ++--
 www/nginx/Makefile.common |  14 +-------------
 www/nginx/PLIST           |   3 +--
 5 files changed, 7 insertions(+), 21 deletions(-)

diffs (98 lines):

diff -r 66f9938b3972 -r ef22ee3ba144 www/nginx-devel/Makefile
--- a/www/nginx-devel/Makefile  Sun Mar 13 20:57:42 2022 +0000
+++ b/www/nginx-devel/Makefile  Mon Mar 14 02:49:09 2022 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.73 2022/03/10 18:40:44 osa Exp $
+# $NetBSD: Makefile,v 1.74 2022/03/14 02:49:09 osa Exp $
 
 DISTNAME=      nginx-1.21.6
 
 MAINTAINER=    osa%NetBSD.org@localhost
 
-PKGREVISION=   3 
+PKGREVISION=   4 
 .include "../../www/nginx/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 66f9938b3972 -r ef22ee3ba144 www/nginx-devel/PLIST
--- a/www/nginx-devel/PLIST     Sun Mar 13 20:57:42 2022 +0000
+++ b/www/nginx-devel/PLIST     Mon Mar 14 02:49:09 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2022/03/10 18:40:44 osa Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/03/14 02:49:09 osa Exp $
 ${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
@@ -22,7 +22,6 @@
 ${PLIST.dso}${PLIST.stream}libexec/nginx/ngx_stream_module.so
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT}
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm
-${PLIST.njs}bin/njs
 man/man8/nginx.8
 sbin/nginx
 share/examples/nginx/conf/fastcgi.conf
diff -r 66f9938b3972 -r ef22ee3ba144 www/nginx/Makefile
--- a/www/nginx/Makefile        Sun Mar 13 20:57:42 2022 +0000
+++ b/www/nginx/Makefile        Mon Mar 14 02:49:09 2022 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.108 2022/03/10 18:40:44 osa Exp $
+# $NetBSD: Makefile,v 1.109 2022/03/14 02:49:09 osa Exp $
 
 DISTNAME=      nginx-1.20.2
 
 MAINTAINER=    osa%NetBSD.org@localhost
 
-PKGREVISION=   4
+PKGREVISION=   5
 .include "../../www/nginx/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 66f9938b3972 -r ef22ee3ba144 www/nginx/Makefile.common
--- a/www/nginx/Makefile.common Sun Mar 13 20:57:42 2022 +0000
+++ b/www/nginx/Makefile.common Mon Mar 14 02:49:09 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2022/03/10 18:40:44 osa Exp $
+# $NetBSD: Makefile.common,v 1.23 2022/03/14 02:49:09 osa Exp $
 # used by www/nginx/Makefile
 # used by www/nginx-devel/Makefile
 
@@ -96,14 +96,6 @@
 .endif
 PLIST_SUBST+=  SOEXT=${SOEXT}
 
-post-configure:
-.if !empty(PKG_OPTIONS:Mnjs)
-       ${RUN} cd ${WRKDIR}/${NJS_DISTNAME} && ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV}        \
-               ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ${CONFIGURE_SCRIPT} ${NJS_CONFIGURE_ARGS} \
-               && ${PKGSRC_SETENV} ${MAKE_ENV} ${BUILD_MAKE_CMD} \
-               && ${MV} build/njs ${WRKDIR}/${NJS_DISTNAME}/njs
-.endif
-
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx
 .for file in ${EGFILES}
@@ -127,9 +119,5 @@
        (cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
                -exec ${INSTALL_PROGRAM} {} ${DESTDIR}${PREFIX}/libexec/nginx \;)
 .endif
-.if !empty(PKG_OPTIONS:Mnjs)
-       ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKDIR}/${NJS_DISTNAME}/njs ${DESTDIR}${PREFIX}/bin/njs
-.endif
 
 .include "../../devel/zlib/buildlink3.mk"
diff -r 66f9938b3972 -r ef22ee3ba144 www/nginx/PLIST
--- a/www/nginx/PLIST   Sun Mar 13 20:57:42 2022 +0000
+++ b/www/nginx/PLIST   Mon Mar 14 02:49:09 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2022/03/10 18:40:44 osa Exp $
+@comment $NetBSD: PLIST,v 1.14 2022/03/14 02:49:09 osa Exp $
 ${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
@@ -22,7 +22,6 @@
 ${PLIST.dso}${PLIST.stream}libexec/nginx/ngx_stream_module.so
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT}
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm
-${PLIST.njs}bin/njs
 man/man8/nginx.8
 sbin/nginx
 share/examples/nginx/conf/fastcgi.conf