Update from 4.0.23 to 4.0.24:

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

Try to fix build www/rubygem-passenger with upcoming FreeBSD 10.

8 files changed, 15 insertions, 15 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 290ffa4639fc..7c3a5409a772 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -652,7 +652,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	4.0.23
+PASSENGER_VERSION=	4.0.24
 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 ddd07ac033b7..ff370b561c6c 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -72,8 +72,8 @@ SHA256 (modsecurity-apache_2.7.5.tar.gz) = 9e907536278d8da80d3dbb29aeffe9c4ec37c
 SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387
 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
 SIZE (naxsi-core-0.50.tgz) = 49809
-SHA256 (passenger-4.0.23.tar.gz) = 4654c53f0442d3ed440a9cb428bca7dbcc7d3e8cec9ff835f91bff3e62b66439
-SIZE (passenger-4.0.23.tar.gz) = 4128960
+SHA256 (passenger-4.0.24.tar.gz) = c89dec3f92c8ba5997060496a9b98eafaec8b6550542ebcd8179cfa62e450f69
+SIZE (passenger-4.0.24.tar.gz) = 4134840
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
 SIZE (ngx_postgres-0.9.tar.gz) = 41022
 SHA256 (agentzh-rds-csv-nginx-module-v0.05rc2-0-gc15d3a4.tar.gz) = 5b135136b646c2647de2d89007bafd1136b06f20379555f8ebbc903b55000023
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 bca59ec4e805..d5e75724416c 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-4.0.23/build/nginx.rb.orig	2013-10-12 11:05:08.000000000 +0400
-+++ ../passenger-4.0.23/build/nginx.rb	2013-10-12 11:06:18.000000000 +0400
+--- ../passenger-4.0.24/build/nginx.rb.orig	2013-10-12 11:05:08.000000000 +0400
++++ ../passenger-4.0.24/build/nginx.rb	2013-10-12 11:06:18.000000000 +0400
 @@ -32,16 +32,12 @@
  desc "Build Nginx support files"
  task :nginx => [
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 8827a746e583..9e6afa5e0147 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -653,7 +653,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	4.0.23
+PASSENGER_VERSION=	4.0.24
 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 7d7bad14f28f..cdbc09f4c2a7 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -74,8 +74,8 @@ SHA256 (modsecurity-apache_2.7.5.tar.gz) = 9e907536278d8da80d3dbb29aeffe9c4ec37c
 SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387
 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
 SIZE (naxsi-core-0.50.tgz) = 49809
-SHA256 (passenger-4.0.23.tar.gz) = 4654c53f0442d3ed440a9cb428bca7dbcc7d3e8cec9ff835f91bff3e62b66439
-SIZE (passenger-4.0.23.tar.gz) = 4128960
+SHA256 (passenger-4.0.24.tar.gz) = c89dec3f92c8ba5997060496a9b98eafaec8b6550542ebcd8179cfa62e450f69
+SIZE (passenger-4.0.24.tar.gz) = 4134840
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
 SIZE (ngx_postgres-0.9.tar.gz) = 41022
 SHA256 (agentzh-rds-csv-nginx-module-v0.05rc2-0-gc15d3a4.tar.gz) = 5b135136b646c2647de2d89007bafd1136b06f20379555f8ebbc903b55000023
diff --git a/www/nginx/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb
index bca59ec4e805..d5e75724416c 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-4.0.23/build/nginx.rb.orig	2013-10-12 11:05:08.000000000 +0400
-+++ ../passenger-4.0.23/build/nginx.rb	2013-10-12 11:06:18.000000000 +0400
+--- ../passenger-4.0.24/build/nginx.rb.orig	2013-10-12 11:05:08.000000000 +0400
++++ ../passenger-4.0.24/build/nginx.rb	2013-10-12 11:06:18.000000000 +0400
 @@ -32,16 +32,12 @@
  desc "Build Nginx support files"
  task :nginx => [
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 7e496c356569..f28e7a3e6e00 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	4.0.23
+PORTVERSION=	4.0.24
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
@@ -102,12 +102,12 @@ post-install:
 		's!-lpthread!${PTHREAD_LIBS}!g' \
 		${PREFIX}/${GEM_LIB_DIR}/lib/phusion_passenger/platform_info/cxx_portability.rb
 .if ${PORT_OPTIONS:MAPACHE22}
-	(${PREFIX}/bin/passenger-install-apache2-module --auto)
+	(CC=${CC} CXX=${CXX} ${PREFIX}/bin/passenger-install-apache2-module --auto)
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 .if ${PORT_OPTIONS:MNGINX}
-	(cd ${PREFIX}/${GEM_LIB_DIR} && ${RAKE_BIN} nginx)
+	(cd ${PREFIX}/${GEM_LIB_DIR} && CC=${CC} CXX=${CXX} ${RAKE_BIN} nginx)
 .endif
 
 	${FIND} ${PREFIX}/${GEM_LIB_DIR} -name '*.o' -delete
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index afe2718ba38d..e4b318b16a80 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/passenger-4.0.23.gem) = 3caf002b92b56313eed7da46b15eae9be73a67acaec4c7d03477c4bc305c08c1
-SIZE (rubygem/passenger-4.0.23.gem) = 4136448
+SHA256 (rubygem/passenger-4.0.24.gem) = 9834834fe1dcba1b2f23ed257c129e19bd5e118b5e21aba74a9c4017b8d3a25d
+SIZE (rubygem/passenger-4.0.24.gem) = 4179456