Upgrade from 5.0.18 to 5.0.20:

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

8 files changed, 18 insertions, 18 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 9ae24c6ba557..5cae5371be76 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -701,10 +701,10 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	5.0.18
+PASSENGER_VERSION=	5.0.20
 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
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger-build-nginx.rb
 .if empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 6937625e25a6..7581d2d70541 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.18.tar.gz) = 8a92393f5413bb20686295f62a586e3af3b68e631b679413c990b5f0b58ba767
-SIZE (passenger-5.0.18.tar.gz) = 4927106
+SHA256 (passenger-5.0.20.tar.gz) = a5b35780beb7ecd39d18375acab3e4fa1a2e104b7a324f41a1f89c99e7b8b04c
+SIZE (passenger-5.0.20.tar.gz) = 5307200
 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 f5e648ed288d..c94488110f39 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.18/build/nginx.rb.orig	2013-10-27 02:00:00.000000000 +0400
-+++ ../passenger-5.0.18/build/nginx.rb	2015-03-07 06:07:38.000000000 +0300
+--- ../passenger-5.0.20/build/nginx.rb.orig	2013-10-27 02:00:00.000000000 +0400
++++ ../passenger-5.0.20/build/nginx.rb	2015-09-26 02:05:27.664684000 +0300
 @@ -32,6 +32,7 @@
  desc "Build Nginx support files"
  task :nginx => [
@@ -12,7 +12,7 @@
  
  task :nginx_without_native_support => [
    auto_generated_sources,
--  AGENT_OUTPUT_DIR + AGENT_EXE,
+-  AGENT_TARGET,
    COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects
  ].flatten
  
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 16857c664d65..93e1238c56eb 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -687,10 +687,10 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	5.0.18
+PASSENGER_VERSION=	5.0.20
 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
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger-build-nginx.rb
 .if empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index a85445028a0f..4d25d0bbcff9 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.18.tar.gz) = 8a92393f5413bb20686295f62a586e3af3b68e631b679413c990b5f0b58ba767
-SIZE (passenger-5.0.18.tar.gz) = 4927106
+SHA256 (passenger-5.0.20.tar.gz) = a5b35780beb7ecd39d18375acab3e4fa1a2e104b7a324f41a1f89c99e7b8b04c
+SIZE (passenger-5.0.20.tar.gz) = 5307200
 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 f5e648ed288d..c94488110f39 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.18/build/nginx.rb.orig	2013-10-27 02:00:00.000000000 +0400
-+++ ../passenger-5.0.18/build/nginx.rb	2015-03-07 06:07:38.000000000 +0300
+--- ../passenger-5.0.20/build/nginx.rb.orig	2013-10-27 02:00:00.000000000 +0400
++++ ../passenger-5.0.20/build/nginx.rb	2015-09-26 02:05:27.664684000 +0300
 @@ -32,6 +32,7 @@
  desc "Build Nginx support files"
  task :nginx => [
@@ -12,7 +12,7 @@
  
  task :nginx_without_native_support => [
    auto_generated_sources,
--  AGENT_OUTPUT_DIR + AGENT_EXE,
+-  AGENT_TARGET,
    COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects
  ].flatten
  
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 7ca6eb6e0f50..8629ef50d28f 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	5.0.18
+PORTVERSION=	5.0.20
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
@@ -71,7 +71,7 @@ pre-patch:
 		s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \
 		s!-O2!!g; \
 		s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \
-		215s!true!false!' \
+		229s!true!false!' \
 		${WRKSRC}/build/basics.rb
 .if ${PORT_OPTIONS:NDEBUG}
 	@${REINPLACE_CMD} \
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index d898905c3822..dd3a3821a709 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/passenger-5.0.18.gem) = af3fa2ffcb641e00e34e7b320ed909b3b5a83c047b6b834def803ff26562a313
-SIZE (rubygem/passenger-5.0.18.gem) = 4936192
+SHA256 (rubygem/passenger-5.0.20.gem) = b8fac856bd028dc9e0cbb1efce2dcb90c98bed8b7733b6fa0c9145813f1a4516
+SIZE (rubygem/passenger-5.0.20.gem) = 5316608