pkg/45317: [PATCH] update www/nginx from 1.0.4 to latest stable version 1.0.6

[osa%FreeBSD.ORG@localhost]

>Number:         45317
>Category:       pkg
>Synopsis:       [PATCH] update www/nginx from 1.0.4 to latest stable version 
>1.0.6
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Aug 31 10:05:00 +0000 2011
>Originator:     Sergey A. Osokin
>Release:        NetBSD 5.1 i386
>Organization:
n/a
>Environment:
NetBSD nbsd5.FreeBSD.ORG.ru 5.1 NetBSD 5.1 (GENERIC) #0: Sun Nov  7 14:39:56 
UTC 2010  
builds%b6.netbsd.org@localhost:/home/builds/ab/netbsd-5-1-RELEASE/i386/201011061943Z-obj/home/builds/ab/netbsd-5-1-RELEASE/src/sys/arch/i386/compile/GENERIC
 i386
>Description:
29 Aug 2011 released latest stable version of nginx - 1.0.6.

I don't know how to submit the patch against current (1.0.4) version.
>How-To-Repeat:
% cd /usr/pkgsrc/www/nginx && make -V DISTNAME
nginx-1.0.4
% 
>Fix:
Index: pkgsrc/www/nginx/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/nginx/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- pkgsrc/www/nginx/Makefile   10 Jun 2011 10:36:18 -0000      1.16
+++ pkgsrc/www/nginx/Makefile   31 Aug 2011 08:08:19 -0000
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.16 2011/06/10 10:36:18 joerg Exp $

-DISTNAME=              nginx-1.0.4
+DISTNAME=              nginx-1.0.6
 DISTFILES=             ${DEFAULT_DISTFILES}
 CATEGORIES=            www
-MASTER_SITES=          http://sysoev.ru/nginx/
+MASTER_SITES=          http://nginx.org/download/

 MAINTAINER=            joerg%NetBSD.org@localhost
 HOMEPAGE=              http://nginx.net/
@@ -43,8 +43,8 @@
 CONFIGURE_ARGS+=       --error-log-path=${NGINX_LOGDIR}/error.log
 CONFIGURE_ARGS+=       --http-log-path=${NGINX_LOGDIR}/access.log
 CONFIGURE_ARGS+=       
--http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp
-CONFIGURE_ARGS+=       --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp
 CONFIGURE_ARGS+=       --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
+CONFIGURE_ARGS+=       --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp

 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/www/nginx/PLIST
===================================================================

RCS file: /cvsroot/pkgsrc/www/nginx/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkgsrc/www/nginx/PLIST      10 Jun 2011 10:36:18 -0000      1.5
+++ pkgsrc/www/nginx/PLIST      31 Aug 2011 08:08:19 -0000
@@ -7,6 +7,7 @@
 share/examples/nginx/conf/koi-win
 share/examples/nginx/conf/mime.types
 share/examples/nginx/conf/nginx.conf
+${PLIST.scgi}share/examples/nginx/conf/scgi_params
 ${PLIST.uwsgi}share/examples/nginx/conf/uwsgi_params
 share/examples/nginx/conf/win-utf
 share/examples/nginx/html/50x.html
Index: pkgsrc/www/nginx/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/nginx/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- pkgsrc/www/nginx/distinfo   10 Jun 2011 10:36:18 -0000      1.13
+++ pkgsrc/www/nginx/distinfo   31 Aug 2011 08:08:19 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.13 2011/06/10 10:36:18 joerg Exp $

-SHA1 (nginx-1.0.4.tar.gz) = 0496b7377e583116497f18453003cba3269417e9
-RMD160 (nginx-1.0.4.tar.gz) = 378b303ed91dc76cda12f2984b26c3aae9337599
-Size (nginx-1.0.4.tar.gz) = 661444 bytes
+SHA1 (nginx-1.0.6.tar.gz) = e8b61da1aa5e53e0d298ec0159c4fca785dccd70
+RMD160 (nginx-1.0.6.tar.gz) = c0f81d1f15bccea44321c31e3f08e299e5e2e564
+Size (nginx-1.0.6.tar.gz) = 670835 bytes
 SHA1 (patch-aa) = 1ef1a800f0d7dffe182b8a74f115105ded205f8e
 SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191

Index: pkgsrc/www/nginx/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/nginx/options.mk,v
retrieving revision 1.10
diff -u -r1.10 options.mk
--- pkgsrc/www/nginx/options.mk 27 Jun 2010 18:00:24 -0000      1.10
+++ pkgsrc/www/nginx/options.mk 31 Aug 2011 08:08:19 -0000
@@ -2,10 +2,10 @@

 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache pcre \
-                       push realip ssl sub uwsgi
+                       push realip scgi ssl sub uwsgi
 PKG_SUGGESTED_OPTIONS= pcre ssl

-PLIST_VARS+=           uwsgi
+PLIST_VARS+=           scgi uwsgi

 .include "../../mk/bsd.options.mk"

@@ -54,9 +54,16 @@
 CONFIGURE_ARGS+=       --with-ipv6
 .endif

+.if !empty(PKG_OPTIONS:Mscgi)
+EGFILES+=              scgi_params
+PLIST.scgi=            yes
+CONFIGURE_ARGS+=       --http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp
+.endif
+
 .if !empty(PKG_OPTIONS:Muwsgi)

 EGFILES+=              uwsgi_params
 PLIST.uwsgi=           yes
+CONFIGURE_ARGS+=       --http-uwsgi-temp-path=${NGINX_DATADIR}/uwsgi_temp
 .else

 .if !empty(PKG_OPTIONS:Mpush)