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

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

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

Bump PKGREVISIONs.
This commit is contained in:
osa 2022-03-14 02:49:09 +00:00
parent dc851d38de
commit 96456ce492
5 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
www/nginx-devel/Makefile
View file

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

3
www/nginx-devel/PLIST
View file

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

4
www/nginx/Makefile
View file

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

14
www/nginx/Makefile.common
View file

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

3
www/nginx/PLIST
View file

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