CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Sergey A. Osokin" <osa%netbsd.org@localhost>
Date: Thu, 10 Mar 2022 18:40:44 +0000

Module Name:    pkgsrc
Committed By:   osa
Date:           Thu Mar 10 18:40:44 UTC 2022

Modified Files:
        pkgsrc/doc: CHANGES-2022
        pkgsrc/www/nginx: Makefile Makefile.common PLIST options.mk
        pkgsrc/www/nginx-devel: Makefile PLIST

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

Also, move NGINX JavaScript (njs) configure phase out of the NGINX build
phase.
Bump PKGREVISIONs.


To generate a diff of this commit:
cvs rdiff -u -r1.1375 -r1.1376 pkgsrc/doc/CHANGES-2022
cvs rdiff -u -r1.107 -r1.108 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/nginx/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/nginx/PLIST
cvs rdiff -u -r1.73 -r1.74 pkgsrc/www/nginx/options.mk
cvs rdiff -u -r1.72 -r1.73 pkgsrc/www/nginx-devel/Makefile
cvs rdiff -u -r1.6 -r1.7 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/doc/CHANGES-2022
diff -u pkgsrc/doc/CHANGES-2022:1.1375 pkgsrc/doc/CHANGES-2022:1.1376
--- pkgsrc/doc/CHANGES-2022:1.1375      Thu Mar 10 16:29:46 2022
+++ pkgsrc/doc/CHANGES-2022     Thu Mar 10 18:40:44 2022
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2022,v 1.1375 2022/03/10 16:29:46 nia Exp $
+$NetBSD: CHANGES-2022,v 1.1376 2022/03/10 18:40:44 osa Exp $
 
 Changes to the packages collection and infrastructure in 2022:
 
@@ -1738,3 +1738,5 @@ Changes to the packages collection and i
        Updated multimedia/mediainfo to 21.09 [ryoon 2022-03-10]
        Updated www/firefox91 to 91.7.0 [nia 2022-03-10]
        Updated www/firefox91-l10n to 91.7.0 [nia 2022-03-10]
+       Updated www/nginx to 1.20.2nb4 [osa 2022-03-10]
+       Updated www/nginx-devel to 1.21.6nb3 [osa 2022-03-10]

Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.107 pkgsrc/www/nginx/Makefile:1.108
--- pkgsrc/www/nginx/Makefile:1.107     Thu Mar 10 03:40:30 2022
+++ pkgsrc/www/nginx/Makefile   Thu Mar 10 18:40:44 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.107 2022/03/10 03:40:30 osa Exp $
+# $NetBSD: Makefile,v 1.108 2022/03/10 18:40:44 osa Exp $
 
 DISTNAME=      nginx-1.20.2
 
 MAINTAINER=    osa%NetBSD.org@localhost
 
-PKGREVISION=   3
+PKGREVISION=   4
 .include "../../www/nginx/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/nginx/Makefile.common
diff -u pkgsrc/www/nginx/Makefile.common:1.21 pkgsrc/www/nginx/Makefile.common:1.22
--- pkgsrc/www/nginx/Makefile.common:1.21       Thu Mar 10 03:40:30 2022
+++ pkgsrc/www/nginx/Makefile.common    Thu Mar 10 18:40:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2022/03/10 03:40:30 osa Exp $
+# $NetBSD: Makefile.common,v 1.22 2022/03/10 18:40:44 osa Exp $
 # used by www/nginx/Makefile
 # used by www/nginx-devel/Makefile
 
@@ -96,6 +96,14 @@ 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}
@@ -119,5 +127,9 @@ 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.12 pkgsrc/www/nginx/PLIST:1.13
--- pkgsrc/www/nginx/PLIST:1.12 Thu Mar 10 03:40:30 2022
+++ pkgsrc/www/nginx/PLIST      Thu Mar 10 18:40:44 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2022/03/10 03:40:30 osa Exp $
+@comment $NetBSD: PLIST,v 1.13 2022/03/10 18:40:44 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,6 +22,7 @@ ${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/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.73 pkgsrc/www/nginx/options.mk:1.74
--- pkgsrc/www/nginx/options.mk:1.73    Thu Mar 10 03:40:30 2022
+++ pkgsrc/www/nginx/options.mk Thu Mar 10 18:40:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.73 2022/03/10 03:40:30 osa Exp $
+# $NetBSD: options.mk,v 1.74 2022/03/10 18:40:44 osa Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug
@@ -313,6 +313,7 @@ PLIST.rtmp=         yes
 NJS_VERSION=           0.7.2
 NJS_DISTNAME=          njs-${NJS_VERSION}
 NJS_DISTFILE=          ${NJS_DISTNAME}.tar.gz
+NJS_CONFIGURE_ARGS=    --no-pcre2
 SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
 DISTFILES+=            ${NJS_DISTFILE}
 DSO_EXTMODS+=          njs

Index: pkgsrc/www/nginx-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.72 pkgsrc/www/nginx-devel/Makefile:1.73
--- pkgsrc/www/nginx-devel/Makefile:1.72        Thu Mar 10 03:40:30 2022
+++ pkgsrc/www/nginx-devel/Makefile     Thu Mar 10 18:40:44 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.72 2022/03/10 03:40:30 osa Exp $
+# $NetBSD: Makefile,v 1.73 2022/03/10 18:40:44 osa Exp $
 
 DISTNAME=      nginx-1.21.6
 
 MAINTAINER=    osa%NetBSD.org@localhost
 
-PKGREVISION=   2 
+PKGREVISION=   3 
 .include "../../www/nginx/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/nginx-devel/PLIST
diff -u pkgsrc/www/nginx-devel/PLIST:1.6 pkgsrc/www/nginx-devel/PLIST:1.7
--- pkgsrc/www/nginx-devel/PLIST:1.6    Thu Mar 10 03:40:30 2022
+++ pkgsrc/www/nginx-devel/PLIST        Thu Mar 10 18:40:44 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2022/03/10 03:40:30 osa Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/03/10 18:40:44 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,6 +22,7 @@ ${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

Prev by Date: CVS commit: pkgsrc/editors/gedit/patches
Next by Date: CVS commit: pkgsrc/lang/gjs
Previous by Thread: CVS commit: pkgsrc/editors/gedit/patches
Next by Thread: CVS commit: pkgsrc/lang/gjs
Indexes:

Home | Main Index | Thread Index | Old Index