Upgrade from 5.0.8 to 5.0.9:

o) www/rubygem-passenger;
o) third-party modules for www/nginx and www/nginx-devel.

8 files changed, 15 insertions, 20 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 5880bdeb4b09..c94f8cfc6043 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -621,7 +621,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	5.0.8
+PASSENGER_VERSION=	5.0.9
 MASTER_SITES+=	http://s3.amazonaws.com/phusion-passenger/releases/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 42c67886a052..7a139fc9f30b 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -28,8 +28,8 @@ SHA256 (modsecurity-2.9.0.tar.gz) = e2bbf789966c1f80094d88d9085a81bde082b2054f8e
 SIZE (modsecurity-2.9.0.tar.gz) = 4246467
 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
 SIZE (naxsi-core-0.50.tgz) = 49809
-SHA256 (passenger-5.0.8.tar.gz) = 4da783986fad73f898a00aa118ada33ea99d83ff065fd11ab3d508a4f63f0920
-SIZE (passenger-5.0.8.tar.gz) = 4964167
+SHA256 (passenger-5.0.9.tar.gz) = c826e2ebee3025571422317fee90176a8bc01487dadf7787452ac036c069caaa
+SIZE (passenger-5.0.9.tar.gz) = 5536218
 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
 SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
diff --git a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
index 1a72af5849c1..81a9b65683e3 100644
--- a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
+++ b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-5.0.8/build/nginx.rb.orig	2013-10-27 02:00:00.000000000 +0400
-+++ ../passenger-5.0.8/build/nginx.rb	2015-03-07 06:07:38.000000000 +0300
+--- ../passenger-5.0.9/build/nginx.rb.orig	2013-10-27 02:00:00.000000000 +0400
++++ ../passenger-5.0.9/build/nginx.rb	2015-03-07 06:07:38.000000000 +0300
 @@ -32,6 +32,7 @@
  desc "Build Nginx support files"
  task :nginx => [
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 069b9642e2db..034646484b16 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -617,7 +617,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	5.0.8
+PASSENGER_VERSION=	5.0.9
 MASTER_SITES+=	http://s3.amazonaws.com/phusion-passenger/releases/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index a8a03a140fa4..1eac7c53b984 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -28,8 +28,8 @@ SHA256 (modsecurity-2.9.0.tar.gz) = e2bbf789966c1f80094d88d9085a81bde082b2054f8e
 SIZE (modsecurity-2.9.0.tar.gz) = 4246467
 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
 SIZE (naxsi-core-0.50.tgz) = 49809
-SHA256 (passenger-5.0.8.tar.gz) = 4da783986fad73f898a00aa118ada33ea99d83ff065fd11ab3d508a4f63f0920
-SIZE (passenger-5.0.8.tar.gz) = 4964167
+SHA256 (passenger-5.0.9.tar.gz) = c826e2ebee3025571422317fee90176a8bc01487dadf7787452ac036c069caaa
+SIZE (passenger-5.0.9.tar.gz) = 5536218
 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
 SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
diff --git a/www/nginx/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb
index 1a72af5849c1..81a9b65683e3 100644
--- a/www/nginx/files/extra-patch-passenger-build-nginx.rb
+++ b/www/nginx/files/extra-patch-passenger-build-nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-5.0.8/build/nginx.rb.orig	2013-10-27 02:00:00.000000000 +0400
-+++ ../passenger-5.0.8/build/nginx.rb	2015-03-07 06:07:38.000000000 +0300
+--- ../passenger-5.0.9/build/nginx.rb.orig	2013-10-27 02:00:00.000000000 +0400
++++ ../passenger-5.0.9/build/nginx.rb	2015-03-07 06:07:38.000000000 +0300
 @@ -32,6 +32,7 @@
  desc "Build Nginx support files"
  task :nginx => [
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index e5a042d59bb1..ceddddc2bee4 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	5.0.8
+PORTVERSION=	5.0.9
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
@@ -34,7 +34,7 @@ RUBYGEM_AUTOPLIST=	yes
 USE_APACHE=	22+
 .endif
 
-LIB_DEPENDS+=	libeio.so:${PORTSDIR}/devel/libeio \
+LIB_DEPENDS+=	libuv.so:${PORTSDIR}/devel/libuv \
 		libcurl.so:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS+=	rubygem-fastthread>=1.0.1:${PORTSDIR}/devel/rubygem-fastthread \
 		rubygem-rack>=0:${PORTSDIR}/www/rubygem-rack \
@@ -73,18 +73,13 @@ pre-patch:
 		s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \
 		s!-O2!!g; \
 		s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \
-		212s!true!false!' \
+		215s!true!false!' \
 		${WRKSRC}/build/basics.rb
 .if ${PORT_OPTIONS:NDEBUG}
 	@${REINPLACE_CMD} \
 		's!-DPASSENGER_DEBUG!-DNDEBUG!g' \
 		${WRKSRC}/build/basics.rb
 .endif
-	@${REINPLACE_CMD} \
-		's!-Iext/libeio!!; \
-		s!/usr/include/libeio!${LOCALBASE}/include!; \
-		s!-leio!-L${LOCALBASE}/lib -leio!' \
-		${WRKSRC}/build/common_library.rb
 
 post-build:
 .if ${PORT_OPTIONS:MAPACHE22}
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index f32baa2531d3..2e850ef2b451 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/passenger-5.0.8.gem) = 860a83e911110eb7f9b4fd8918671f3c62791d9e27bade5bf4be23bb9c677729
-SIZE (rubygem/passenger-5.0.8.gem) = 4976128
+SHA256 (rubygem/passenger-5.0.9.gem) = 44003379dec5a7cc50f605c5ba78ad6e5ec607b2cd65f127e93922b03496f3c3
+SIZE (rubygem/passenger-5.0.9.gem) = 5546496