diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2013-02-07 03:16:16 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2013-02-07 03:16:16 +0000 |
| commit | 5af383c8da414fb17e14b85fec1ea57ae44d3717 (patch) | |
| tree | 0bf2db08bbaacf6eed5ee4b4ec87b0fd3ea81736 /www/nginx | |
| parent | 4bdcfb44da251d7b5db49e1d50f7d39d22b4a3e8 (diff) | |
| download | ports-5af383c8da414fb17e14b85fec1ea57ae44d3717.tar.gz ports-5af383c8da414fb17e14b85fec1ea57ae44d3717.zip | |
Update devel-kit third-party module from 0.2.17 to 0.2.18.
USE_NGINX_DEVEL_KIT internal knob has been deprecated.
Fix third-party modules build by change configure order.
Fix build with iconv third-party module. (*)
Do not bump PORTREVISION.
PR: 175862 (*)
Notes
Notes:
svn path=/head/; revision=311809
Diffstat (limited to 'www/nginx')
| -rw-r--r-- | www/nginx/Makefile | 24 | ||||
| -rw-r--r-- | www/nginx/distinfo | 4 |
2 files changed, 11 insertions, 17 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 7cdaee0ab709..8d608e07ca58 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -565,8 +565,16 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DR EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module-config .endif +.if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MSET_MISC} +NGINX_DEVEL_KIT_VERSION= 0.2.18 +GIT_DEVEL_KIT_VERSION= 0-g48bc5dd +FETCH_ARGS= -pRr +MASTER_SITES+= https://github.com/simpl/ngx_devel_kit/tarball/v${NGINX_DEVEL_KIT_VERSION}/:devel_kit +DISTFILES+= simpl-ngx_devel_kit-v${NGINX_DEVEL_KIT_VERSION}-${GIT_DEVEL_KIT_VERSION}.tar.gz:devel_kit +CONFIGURE_ARGS+=--add-module=${WRKDIR}/simpl-ngx_devel_kit-${GIT_DEVEL_KIT_VERSION:S/^0-g//} +.endif + .if ${PORT_OPTIONS:MENCRYPTSESSION} -USE_NGINX_DEVEL_KIT= yes NGINX_ENCRYPTSESSION_VERSION= 0.02 GIT_ENCRYPTSESSION_VERSION= 0-gc752861 FETCH_ARGS= -pRr @@ -601,7 +609,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-let-module-${GIT_LET_VERSION:S LIB_DEPENDS+= luajit-5.1:${PORTSDIR}/lang/luajit CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0" CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib" -USE_NGINX_DEVEL_KIT= yes NGINX_LUA_VERSION= 0.6.10 GIT_LUA_VERSION= 0-g73d8dd2 FETCH_ARGS= -pRr @@ -694,7 +701,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/arut-nginx-rtmp-module-${GIT_RTMP_VERSION .endif .if ${PORT_OPTIONS:MSET_MISC} -USE_NGINX_DEVEL_KIT= yes NGINX_SET_MISC_VERSION= 0.22rc8 GIT_SET_MISC_VERSION= 0-g658c235 FETCH_ARGS= -pRr @@ -809,17 +815,7 @@ NGINX_OPENSSL= yes CONFIGURE_ARGS+=--with-http_ssl_module .endif -.if defined(USE_NGINX_DEVEL_KIT) -NGINX_DEVEL_KIT_VERSION= 0.2.17 -GIT_DEVEL_KIT_VERSION= 0-gbc97eea -FETCH_ARGS= -pRr -MASTER_SITES+= https://github.com/simpl/ngx_devel_kit/tarball/v${NGINX_DEVEL_KIT_VERSION}/:devel_kit -DISTFILES+= simpl-ngx_devel_kit-v${NGINX_DEVEL_KIT_VERSION}-${GIT_DEVEL_KIT_VERSION}.tar.gz:devel_kit -CONFIGURE_ARGS+=--add-module=${WRKDIR}/simpl-ngx_devel_kit-${GIT_DEVEL_KIT_VERSION:S/^0-g//} -.endif - .if ${PORT_OPTIONS:MARRAYVAR} -USE_NGINX_DEVEL_KIT= yes NGINX_ARRAYVAR_VERSION= 0.03rc1 GIT_ARRAYVAR_VERSION= 0-gfed751a FETCH_ARGS= -pRr @@ -829,7 +825,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-array-var-nginx-module-${GIT_ARRA .endif .if ${PORT_OPTIONS:MFORMINPUT} -USE_NGINX_DEVEL_KIT= yes NGINX_FORMINPUT_VERSION= 0.07rc5 GIT_FORMINPUT_VERSION= 0-gd41681d FETCH_ARGS= -pRr @@ -840,7 +835,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-form-input-nginx-module-${GIT_FORMI .if ${PORT_OPTIONS:MICONV} LIB_DEPENDS+= iconv:${PORTSDIR}/converters/libiconv -USE_NGINX_DEVEL_KIT= yes NGINX_ICONV_VERSION= 0.10rc7 GIT_ICONV_VERSION= 0-gabdac17 FETCH_ARGS= -pRr diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 63b5c85d5fbd..5ec8e3a7cd8d 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -102,8 +102,8 @@ SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3 SIZE (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 2714 SHA256 (agentzh-xss-nginx-module-v0.03rc9-0-gbeddbe1.tar.gz) = 444d7e319bb2af4c7892815407f53e4ffe21183f3e6711eafe86ed7523a3531b SIZE (agentzh-xss-nginx-module-v0.03rc9-0-gbeddbe1.tar.gz) = 9891 -SHA256 (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = bf5540d76d1867b4411091f16c6c786fd66759099c59483c76c68434020fdb02 -SIZE (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = 64964 +SHA256 (simpl-ngx_devel_kit-v0.2.18-0-g48bc5dd.tar.gz) = bfd737ee5608c1ec2e59409c47cb29e390aeb882b8c0bf00d7322e74585cebae +SIZE (simpl-ngx_devel_kit-v0.2.18-0-g48bc5dd.tar.gz) = 64972 SHA256 (agentzh-array-var-nginx-module-v0.03rc1-0-gfed751a.tar.gz) = 345e60d7a479409b7a7aba933a042629d59fd4fbfaed1d0f7fe43cc688e48ced SIZE (agentzh-array-var-nginx-module-v0.03rc1-0-gfed751a.tar.gz) = 9500 SHA256 (calio-form-input-nginx-module-v0.07rc5-0-gd41681d.tar.gz) = 831bb3fa339206130b6395aa2cb4dfe4cdf9222e2a7da9de8d3de4a1a4620abc |