Accordingly add third party supervisord module, version 1.2.

Do not bump PORTREVISIONs.

4 files changed, 42 insertions, 4 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 2d75345b587b..f592ab57df00 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -59,7 +59,8 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		HTTP_UPSTREAM_FAIR	"3rd party upstream fair module" off \
 		HTTP_UPSTREAM_KEEPALIVE "3rd party upstream keepalive module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
-		PASSENGER_MODULE	"3rd party passenger module" off
+		PASSENGER_MODULE	"3rd party passenger module" off \
+		SUPERVISORD_MODULE	"3rd party supervisord modle" off
 
 WANT_GNOME=	yes
 MAKE_JOBS_SAFE=	yes
@@ -276,7 +277,7 @@ DISTFILES+=	nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}.t
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}
 .endif
 
-.if defined(WITH_HTTP_UPSTREAM_FAIR)
+.if defined(WITH_HTTP_UPSTREAM_FAIR) || defined(WITH_SUPERVISORD_MODULE)
 NGINX_UPSTREAM_FAIR_VERSION=	20081012
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:upstreamfair/}
 MASTER_SITE_SUBDIR+=	osa/:upstreamfair
@@ -320,6 +321,13 @@ DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
 .endif
 
+.if defined(WITH_SUPERVISORD_MODULE)
+NGINX_SUPERVISORD_MODULE_VERSION=	1.2
+MASTER_SITES+=	http://labs.frickle.com/files/:supervisord
+DISTFILES+=	ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}.tar.gz:supervisord
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}
+.endif
+
 .if defined(WITH_WWW)
 PLIST_SUB+=	WWWDATA=""
 .else
@@ -400,6 +408,14 @@ post-patch:
 		s!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info.rb
 .endif
+.if defined(WITH_SUPERVISORD_MODULE)
+	( cd ${WRKDIR}/nginx_upstream_fair-20081012 && \
+		${PATCH} -p0 < \
+			${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}/patches/ngx_http_upstream_fair_module.patch )
+	( cd ${WRKSRC} && \
+		${PATCH} -p0 < \
+			${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}/patches/ngx_http_upstream_init_busy-0.8.17.patch )
+.endif
 
 do-build:
 	@cd ${WRKSRC} && ${MAKE}
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 7ccc9af16361..79b87d066892 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -49,3 +49,6 @@ SIZE (mod_zip-1.1.5.tar.gz) = 19126
 MD5 (passenger-2.2.8.tar.gz) = a5632323a573a039ea889c93396ad986
 SHA256 (passenger-2.2.8.tar.gz) = bfd37266f4afa7ab08c47cd731ce2048fc2195b793384882211ad61824893d52
 SIZE (passenger-2.2.8.tar.gz) = 1993046
+MD5 (ngx_supervisord-1.2.tar.gz) = eb21b2d927a027c94da35af984db6371
+SHA256 (ngx_supervisord-1.2.tar.gz) = c4fcf58639b98a7dcdc923d4eff75f90a07c15b05fc44c6d9aa5d41c6810a126
+SIZE (ngx_supervisord-1.2.tar.gz) = 15209
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 9fab1feec3e7..4cc7238149ef 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -56,7 +56,8 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		HTTP_UPSTREAM_FAIR	"3rd party upstream fair module" off \
 		HTTP_UPSTREAM_KEEPALIVE "3rd party upstream keepalive module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
-		PASSENGER_MODULE	"3rd party passenger module" off
+		PASSENGER_MODULE	"3rd party passenger module" off \
+		SUPERVISORD_MODULE	"3rd party supervisord modle" off
 
 WANT_GNOME=	yes
 MAKE_JOBS_SAFE=	yes
@@ -264,7 +265,7 @@ DISTFILES+=	nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}.t
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}
 .endif
 
-.if defined(WITH_HTTP_UPSTREAM_FAIR)
+.if defined(WITH_HTTP_UPSTREAM_FAIR) || defined(WITH_SUPERVISORD_MODULE)
 NGINX_UPSTREAM_FAIR_VERSION=	20081012
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:upstreamfair/}
 MASTER_SITE_SUBDIR+=	osa/:upstreamfair
@@ -308,6 +309,13 @@ DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
 .endif
 
+.if defined(WITH_SUPERVISORD_MODULE)
+NGINX_SUPERVISORD_MODULE_VERSION=	1.2
+MASTER_SITES+=	http://labs.frickle.com/files/:supervisord
+DISTFILES+=	ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}.tar.gz:supervisord
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}
+.endif
+
 .if defined(WITH_WWW)
 PLIST_SUB+=	WWWDATA=""
 .else
@@ -384,6 +392,14 @@ post-patch:
 		s!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info.rb
 .endif
+.if defined(WITH_SUPERVISORD_MODULE)
+	( cd ${WRKDIR}/nginx_upstream_fair-20081012 && \
+		${PATCH} -p0 < \
+			${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}/patches/ngx_http_upstream_fair_module.patch )
+	( cd ${WRKSRC} && \
+		${PATCH} -p0 < \
+			${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}/patches/ngx_http_upstream_init_busy-0.8.0.patch )
+.endif
 
 do-build:
 	@cd ${WRKSRC} && ${MAKE}
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index ba81c0107d37..e2dd04bdd1d6 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -49,3 +49,6 @@ SIZE (mod_zip-1.1.5.tar.gz) = 19126
 MD5 (passenger-2.2.8.tar.gz) = a5632323a573a039ea889c93396ad986
 SHA256 (passenger-2.2.8.tar.gz) = bfd37266f4afa7ab08c47cd731ce2048fc2195b793384882211ad61824893d52
 SIZE (passenger-2.2.8.tar.gz) = 1993046
+MD5 (ngx_supervisord-1.2.tar.gz) = eb21b2d927a027c94da35af984db6371
+SHA256 (ngx_supervisord-1.2.tar.gz) = c4fcf58639b98a7dcdc923d4eff75f90a07c15b05fc44c6d9aa5d41c6810a126
+SIZE (ngx_supervisord-1.2.tar.gz) = 15209