From nobody@FreeBSD.org  Mon Aug 20 21:07:17 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1ECFE10658D4
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 20 Aug 2012 21:07:17 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 0AAEF8FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 20 Aug 2012 21:07:17 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q7KL7GgE014048
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 20 Aug 2012 21:07:16 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q7KL7GHI014031;
	Mon, 20 Aug 2012 21:07:16 GMT
	(envelope-from nobody)
Message-Id: <201208202107.q7KL7GHI014031@red.freebsd.org>
Date: Mon, 20 Aug 2012 21:07:16 GMT
From: Artis Caune <Artis.Caune@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] www/nginx: fix HTTP_UPSTREAM_FAIR ports option
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         170795
>Category:       ports
>Synopsis:       [PATCH] www/nginx: fix HTTP_UPSTREAM_FAIR ports option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    osa
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 20 21:10:14 UTC 2012
>Closed-Date:    Tue Aug 21 03:39:09 UTC 2012
>Last-Modified:  Tue Aug 21 03:40:10 UTC 2012
>Originator:     Artis Caune
>Release:        stable/9
>Organization:
>Environment:
FreeBSD freebsd 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE r239148: Fri Aug 10 00:00:00 UTC 2012 root@freebsd:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
There is a typo in Makefile for MHTTP_UPSTREAM_FAIR port options. Only display message is affected.
Same typo in www/nginx-devel
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2012-08-21 08:59:39.980183338 +1200
+++ Makefile	2012-08-21 09:01:17.653853264 +1200
@@ -845,7 +845,7 @@
 
 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}


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->osa 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Aug 20 21:10:27 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170795 
State-Changed-From-To: open->closed 
State-Changed-By: osa 
State-Changed-When: Tue Aug 21 03:38:50 UTC 2012 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170795 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170795: commit references a PR
Date: Tue, 21 Aug 2012 03:38:40 +0000 (UTC)

 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 <Artis.Caune@gmail.com>	[*]
   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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
