CVS commit: pkgsrc/www

["Sergey A. Osokin" <osa%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   osa
Date:           Mon Mar 14 02:49:09 UTC 2022

Modified Files:
        pkgsrc/www/nginx: Makefile Makefile.common PLIST
        pkgsrc/www/nginx-devel: Makefile PLIST

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

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

Bump PKGREVISIONs.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/nginx/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/nginx/PLIST
cvs rdiff -u -r1.73 -r1.74 pkgsrc/www/nginx-devel/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/nginx-devel/PLIST

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.108 pkgsrc/www/nginx/Makefile:1.109
--- pkgsrc/www/nginx/Makefile:1.108     Thu Mar 10 18:40:44 2022
+++ pkgsrc/www/nginx/Makefile   Mon Mar 14 02:49:09 2022
@@ -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"

Index: pkgsrc/www/nginx/Makefile.common
diff -u pkgsrc/www/nginx/Makefile.common:1.22 pkgsrc/www/nginx/Makefile.common:1.23
--- pkgsrc/www/nginx/Makefile.common:1.22       Thu Mar 10 18:40:44 2022
+++ pkgsrc/www/nginx/Makefile.common    Mon Mar 14 02:49:09 2022
@@ -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"

Index: pkgsrc/www/nginx/PLIST
diff -u pkgsrc/www/nginx/PLIST:1.13 pkgsrc/www/nginx/PLIST:1.14
--- pkgsrc/www/nginx/PLIST:1.13 Thu Mar 10 18:40:44 2022
+++ pkgsrc/www/nginx/PLIST      Mon Mar 14 02:49:09 2022
@@ -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/ngin
 ${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

Index: pkgsrc/www/nginx-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.73 pkgsrc/www/nginx-devel/Makefile:1.74
--- pkgsrc/www/nginx-devel/Makefile:1.73        Thu Mar 10 18:40:44 2022
+++ pkgsrc/www/nginx-devel/Makefile     Mon Mar 14 02:49:09 2022
@@ -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"

Index: pkgsrc/www/nginx-devel/PLIST
diff -u pkgsrc/www/nginx-devel/PLIST:1.7 pkgsrc/www/nginx-devel/PLIST:1.8
--- pkgsrc/www/nginx-devel/PLIST:1.7    Thu Mar 10 18:40:44 2022
+++ pkgsrc/www/nginx-devel/PLIST        Mon Mar 14 02:49:09 2022
@@ -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/ngin
 ${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