diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2020-09-04 18:08:51 +0000 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2020-09-04 18:08:51 +0000 |
| commit | 5ec7129847f085a2375fdc8ad7a1ef684a06a1fc (patch) | |
| tree | 46c71f50f7ea0d9fb2b1903fd552e9709135a116 /www/nginx | |
| parent | 185377ea687a1312dcf5fedf04b17f9ec637a82d (diff) | |
| download | ports-5ec7129847f085a2375fdc8ad7a1ef684a06a1fc.tar.gz ports-5ec7129847f085a2375fdc8ad7a1ef684a06a1fc.zip | |
Update njs module to 0.4.3
While I'm here soften some variables and target definitions to
prepare the port for a separate build of dynamic modules.
Sponsored by: Netzkommune GmbH
Notes
Notes:
svn path=/head/; revision=547559
Diffstat (limited to 'www/nginx')
| -rw-r--r-- | www/nginx/Makefile | 6 | ||||
| -rw-r--r-- | www/nginx/Makefile.extmod | 2 | ||||
| -rw-r--r-- | www/nginx/distinfo | 10 |
3 files changed, 11 insertions, 7 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 20ab11188ec4..1dd554a18a1a 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION?= 24 +PORTREVISION?= 25 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ @@ -320,6 +320,7 @@ post-patch-VOD-on: pre-configure-SMALL_LIGHT-on: ( cd ${WRKSRC_small_light} && ./setup ) +.if !target(do-install) do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}${NGINX_TMPDIR} @@ -355,7 +356,9 @@ do-install-NAXSI-on: do-install-NJS-on: ${INSTALL_PROGRAM} ${WRKSRC_njs}/build/njs ${STAGEDIR}${PREFIX}/sbin +.endif +.if !target(post-install) post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles @@ -366,5 +369,6 @@ post-install-WWW-on: ${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/nginx-dist && \ ${TOUCH} ${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING) +.endif .include <bsd.port.post.mk> diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index ac4b5898c3ca..dd64355c0d53 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -228,7 +228,7 @@ NAXSI_NGINX_VER= 0.56 NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src -NJS_GH_TUPLE= nginx:njs:b12fc23:njs +NJS_GH_TUPLE= nginx:njs:0.4.3:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx NJS_USES= libedit diff --git a/www/nginx/distinfo b/www/nginx/distinfo index da5e3ea70106..6cec7ec96d28 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,8 +1,6 @@ -TIMESTAMP = 1595611397 +TIMESTAMP = 1599161483 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99 SIZE (nginx-1.18.0.tar.gz) = 1039530 -SHA256 (nginx-modules-ngx_cache_purge-23dc16a_GH0.tar.gz) = a6ecc65e2488f9a0394f8aa6c012144708b6b4b37983aa45ea09945ec235ad08 -SIZE (nginx-modules-ngx_cache_purge-23dc16a_GH0.tar.gz) = 16816 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19 @@ -21,6 +19,8 @@ SHA256 (anomalizer-ngx_aws_auth-75c94e6_GH0.tar.gz) = d3c84268e42892b2875adc06f7 SIZE (anomalizer-ngx_aws_auth-75c94e6_GH0.tar.gz) = 15326 SHA256 (eustas-ngx_brotli-8104036_GH0.tar.gz) = 16c8fc9f96cf272b20244fd10baa09b4d2b75f6661ce4a428999f0fc6d1aa4d7 SIZE (eustas-ngx_brotli-8104036_GH0.tar.gz) = 12673 +SHA256 (nginx-modules-ngx_cache_purge-23dc16a_GH0.tar.gz) = a6ecc65e2488f9a0394f8aa6c012144708b6b4b37983aa45ea09945ec235ad08 +SIZE (nginx-modules-ngx_cache_purge-23dc16a_GH0.tar.gz) = 16816 SHA256 (nginx-clojure-nginx-clojure-v0.5.1_GH0.tar.gz) = dd7f6760b4040722e28e8262765596959cbc11b6dc5e058a0a897ca697ffa4cb SIZE (nginx-clojure-nginx-clojure-v0.5.1_GH0.tar.gz) = 742237 SHA256 (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = b4ceae549b9dbf84b2e511633982e4efeee0388e3b7a038a8bac555008a77b88 @@ -109,8 +109,8 @@ SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz) = c969a78659bb47c84929de SIZE (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz) = 31920 SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4 SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120 -SHA256 (nginx-njs-b12fc23_GH0.tar.gz) = eac5bfadd368f8df735dbecc24ed8d3f00e6b19de80cd275b2193774a0bdf240 -SIZE (nginx-njs-b12fc23_GH0.tar.gz) = 454868 +SHA256 (nginx-njs-0.4.3_GH0.tar.gz) = 463df8004ccbc4a7420c7fc501260ff9b273c69f4a8b6a21a39836c9d47f36d4 +SIZE (nginx-njs-0.4.3_GH0.tar.gz) = 460997 SHA256 (opentracing-contrib-nginx-opentracing-2d81c29_GH0.tar.gz) = b082bb8e0f4de2e3361c9cae79e266856de1e5b26a43611e08446b7c2bc0b2b4 SIZE (opentracing-contrib-nginx-opentracing-2d81c29_GH0.tar.gz) = 664357 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b |