kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Also, move NGINX JavaScript (njs) configure phase out of the NGINX build
phase.
Bump PKGREVISIONs.
This commit is contained in:
osa 2022-03-10 18:40:44 +00:00
parent 966add1bb9
commit 2c48ce0dc4
7 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/CHANGES-2022
View file

@ -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 infrastructure in 2022:
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]

4
www/nginx-devel/Makefile
View file

@ -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
PKGREVISION= 2
PKGREVISION= 3
.include "../../www/nginx/Makefile.common"
.include "../../mk/bsd.pkg.mk"

3
www/nginx-devel/PLIST
View file

@ -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/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

4
www/nginx/Makefile
View file

@ -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
PKGREVISION= 3
PKGREVISION= 4
.include "../../www/nginx/Makefile.common"
.include "../../mk/bsd.pkg.mk"

14
www/nginx/Makefile.common
View file

@ -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"

3
www/nginx/PLIST
View file

@ -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/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

3
www/nginx/options.mk
View file

@ -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