From owner-svn-ports-all@FreeBSD.ORG Tue Aug 21 03:38:26 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CEC4106564A; Tue, 21 Aug 2012 03:38:26 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0E5098FC0C; Tue, 21 Aug 2012 03:38:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7L3cP3v052070; Tue, 21 Aug 2012 03:38:25 GMT (envelope-from osa@svn.freebsd.org) Received: (from osa@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7L3cPvw052065; Tue, 21 Aug 2012 03:38:25 GMT (envelope-from osa@svn.freebsd.org) Message-Id: <201208210338.q7L3cPvw052065@svn.freebsd.org> From: "Sergey A. Osokin" Date: Tue, 21 Aug 2012 03:38:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302838 - in head/www: nginx nginx-devel nginx/files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Aug 2012 03:38:26 -0000 Author: osa Date: Tue Aug 21 03:38:25 2012 New Revision: 302838 URL: http://svn.freebsd.org/changeset/ports/302838 Log: Update third-party http_substitutions_filter module from 0.5.2.r59 to 0.6.0, relocated to github. Fix typo for upstream_fair module. [*] Submitted by: Artis Caune [*] PR: 170795 [*] Deleted: head/www/nginx/files/extra-patch-ngx_http_subs_filter_module.c 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 Tue Aug 21 01:40:15 2012 (r302837) +++ head/www/nginx-devel/Makefile Tue Aug 21 03:38:25 2012 (r302838) @@ -457,12 +457,11 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .endif .if ${PORT_OPTIONS:MHTTP_SUBS_FILTER} -USE_HTTP_REWRITE= yes -NGINX_HTTP_SUBS_FILTER_VERSION= 0.5.2.r59 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:subs_filter/} -MASTER_SITE_SUBDIR+= osa/:subs_filter -DISTFILES+= ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION}.tar.gz:subs_filter -CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION} +GIT_HTTP_SUBS_FILTER_VERSION= 0-gb32237d +FETCH_ARGS= -pRr +MASTER_SITES+= https://github.com/yaoweibin/ngx_http_substitutions_filter_module/tarball/master/:subs_filter +DISTFILES+= yaoweibin-ngx_http_substitutions_filter_module-${GIT_HTTP_SUBS_FILTER_VERSION}.tar.gz:subs_filter +CONFIGURE_ARGS+=--add-module=${WRKDIR}/yaoweibin-ngx_http_substitutions_filter_module-${GIT_HTTP_SUBS_FILTER_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MHTTP_SECURE_LINK} @@ -854,7 +853,7 @@ USE_OPENSSL= yes pre-everything:: @${ECHO_MSG} -.if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) +.if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR} @${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support" .endif .if ${PORT_OPTIONS:MPASSENGER} Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Aug 21 01:40:15 2012 (r302837) +++ head/www/nginx-devel/distinfo Tue Aug 21 03:38:25 2012 (r302838) @@ -36,8 +36,8 @@ SHA256 (ngx_http_redis-0.3.6.tar.gz) = 9 SIZE (ngx_http_redis-0.3.6.tar.gz) = 12099 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045 SIZE (ngx_http_response-0.3.tar.gz) = 2244 -SHA256 (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 8fd9a185f092320a5290ad8b9f19bf0f7499167db275990c7f0228cd9aefb6fe -SIZE (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 95092 +SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0-gb32237d.tar.gz) = f190a9bcf18f730a36e871aca52c0047291b7106d72da687889508be75b9afd6 +SIZE (yaoweibin-ngx_http_substitutions_filter_module-0-gb32237d.tar.gz) = 91778 SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805 SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796 SHA256 (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2 Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Tue Aug 21 01:40:15 2012 (r302837) +++ head/www/nginx/Makefile Tue Aug 21 03:38:25 2012 (r302838) @@ -456,12 +456,11 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .if ${PORT_OPTIONS:MHTTP_SUBS_FILTER} USE_HTTP_REWRITE= yes -NGINX_HTTP_SUBS_FILTER_VERSION= 0.5.2.r59 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:subs_filter/} -MASTER_SITE_SUBDIR+= osa/:subs_filter -DISTFILES+= ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION}.tar.gz:subs_filter -CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_VERSION} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_subs_filter_module.c +GIT_HTTP_SUBS_FILTER_VERSION= 0-gb32237d +FETCH_ARGS= -pRr +MASTER_SITES+= https://github.com/yaoweibin/ngx_http_substitutions_filter_module/tarball/master/:subs_filter +DISTFILES+= yaoweibin-ngx_http_substitutions_filter_module-${GIT_HTTP_SUBS_FILTER_VERSION}.tar.gz:subs_filter +CONFIGURE_ARGS+=--add-module=${WRKDIR}/yaoweibin-ngx_http_substitutions_filter_module-${GIT_HTTP_SUBS_FILTER_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MHTTP_SECURE_LINK} @@ -845,7 +844,7 @@ USE_OPENSSL= yes pre-everything:: @${ECHO_MSG} -.if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) +.if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR} @${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support" .endif .if ${PORT_OPTIONS:MPASSENGER} Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Tue Aug 21 01:40:15 2012 (r302837) +++ head/www/nginx/distinfo Tue Aug 21 03:38:25 2012 (r302838) @@ -36,8 +36,8 @@ SHA256 (ngx_http_redis-0.3.6.tar.gz) = 9 SIZE (ngx_http_redis-0.3.6.tar.gz) = 12099 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045 SIZE (ngx_http_response-0.3.tar.gz) = 2244 -SHA256 (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 8fd9a185f092320a5290ad8b9f19bf0f7499167db275990c7f0228cd9aefb6fe -SIZE (ngx_http_subs_filter_module-0.5.2.r59.tar.gz) = 95092 +SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0-gb32237d.tar.gz) = f190a9bcf18f730a36e871aca52c0047291b7106d72da687889508be75b9afd6 +SIZE (yaoweibin-ngx_http_substitutions_filter_module-0-gb32237d.tar.gz) = 91778 SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805 SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796 SHA256 (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2