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

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

Bump PKGREVISIONs.

5 files changed, 7 insertions, 21 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 3bc8d11a043..427bc25f772 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -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
 
-PKGREVISION=	3 
+PKGREVISION=	4 
 .include "../../www/nginx/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/nginx-devel/PLIST b/www/nginx-devel/PLIST
index 02f2eb8dec5..7c7f6a0dc6c 100644
--- a/www/nginx-devel/PLIST
+++ b/www/nginx-devel/PLIST
@@ -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.setmisc}libexec/nginx/ngx_http_set_misc_module.so
 ${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 --git a/www/nginx/Makefile b/www/nginx/Makefile
index b7615285792..0fe0191b669 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -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
 
-PKGREVISION=	4
+PKGREVISION=	5
 .include "../../www/nginx/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/nginx/Makefile.common b/www/nginx/Makefile.common
index 890504a1ad5..2465f092287 100644
--- a/www/nginx/Makefile.common
+++ b/www/nginx/Makefile.common
@@ -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 @@ SOEXT=		so
 .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 @@ do-install:
 	(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 --git a/www/nginx/PLIST b/www/nginx/PLIST
index 7d4b3b3a2d6..c909a20369f 100644
--- a/www/nginx/PLIST
+++ b/www/nginx/PLIST
@@ -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.setmisc}libexec/nginx/ngx_http_set_misc_module.so
 ${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