svn commit: r311809 - in head/www: nginx nginx-devel
Sergey A. Osokin
osa at FreeBSD.org
Thu Feb 7 03:16:18 UTC 2013
Author: osa
Date: Thu Feb 7 03:16:16 2013
New Revision: 311809
URL: http://svnweb.freebsd.org/changeset/ports/311809
Log:
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 (*)
Modified:
head/www/nginx-devel/Makefile
head/www/nginx-devel/distinfo
head/www/nginx/Makefile
head/www/nginx/distinfo
Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile Thu Feb 7 02:10:29 2013 (r311808)
+++ head/www/nginx-devel/Makefile Thu Feb 7 03:16:16 2013 (r311809)
@@ -553,8 +553,16 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/c
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
@@ -589,7 +597,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a
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
@@ -682,7 +689,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a
.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
@@ -808,17 +814,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
@@ -828,7 +824,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a
.endif
.if ${PORT_OPTIONS:MFORMINPUT}
-USE_NGINX_DEVEL_KIT= yes
NGINX_FORMINPUT_VERSION= 0.07rc5
GIT_FORMINPUT_VERSION= 0-gd41681d
FETCH_ARGS= -pRr
@@ -839,7 +834,6 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/c
.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
Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo Thu Feb 7 02:10:29 2013 (r311808)
+++ head/www/nginx-devel/distinfo Thu Feb 7 03:16:16 2013 (r311809)
@@ -98,8 +98,8 @@ SHA256 (gabor-nginx-x-rid-header-0daa3cc
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
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Thu Feb 7 02:10:29 2013 (r311808)
+++ head/www/nginx/Makefile Thu Feb 7 03:16:16 2013 (r311809)
@@ -565,8 +565,16 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/c
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}/a
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}/a
.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}/a
.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}/c
.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
Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo Thu Feb 7 02:10:29 2013 (r311808)
+++ head/www/nginx/distinfo Thu Feb 7 03:16:16 2013 (r311809)
@@ -102,8 +102,8 @@ SHA256 (gabor-nginx-x-rid-header-0daa3cc
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
More information about the svn-ports-head
mailing list