Update from 3.0.6 to 3.0.7:

1) www/rubygem-passenger;

2) passenger support for www/nginx and www/nginx-devel;
   update passenger's version for patches.

3) for speed-up rails applications build passenger without
   debugging information by default.  Otherwise WITH_DEBUG
   required.

Approved by:	maintainer [1,3]

8 files changed, 22 insertions, 13 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 7dc11f3c363b..387f90443410 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -405,7 +405,7 @@ CONFIGURE_ARGS+=--with-pcre
 .endif
 
 .if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION=	3.0.6
+PASSENGER_VERSION=	3.0.7
 MASTER_SITES+=	RF/passenger/: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 58a09b823552..d273aeca28f3 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -48,8 +48,8 @@ SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a11032
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
 SHA256 (ngx_http_memc_module-0.11.tar.gz) = 9ece68bdae2c170fb845c1082da6502401763ffd3e4b443226ff9303df65951f
 SIZE (ngx_http_memc_module-0.11.tar.gz) = 98042
-SHA256 (passenger-3.0.6.tar.gz) = a0ce96d88721147125d4475b13d208fdbcd22e83bbcee9decbdd49ec34f2b6f6
-SIZE (passenger-3.0.6.tar.gz) = 2837833
+SHA256 (passenger-3.0.7.tar.gz) = 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d34958b2b7ed42bddc85
+SIZE (passenger-3.0.7.tar.gz) = 2830376
 SHA256 (ngx_slowfs_cache-1.5.tar.gz) = 8f3d1afd6bcaaeba89bc4f9d5e5ba3e2b334bf8e7e5b56bd37f25b5cbac8d828
 SIZE (ngx_slowfs_cache-1.5.tar.gz) = 9785
 SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b
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 6cc5a2f9c4d7..fc556de2dee6 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-3.0.6/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
-+++ ../passenger-3.0.6/build/nginx.rb	2010-12-07 13:58:13.000000000 +0300
+--- ../passenger-3.0.7/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
++++ ../passenger-3.0.7/build/nginx.rb	2010-12-07 13:58:13.000000000 +0300
 @@ -23,10 +23,7 @@
  
  desc "Build Nginx helper agent"
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 6b68f11d2fee..763ad627c474 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -404,7 +404,7 @@ CONFIGURE_ARGS+=--with-pcre
 .endif
 
 .if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION=	3.0.6
+PASSENGER_VERSION=	3.0.7
 MASTER_SITES+=	RF/passenger/: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 58a09b823552..d273aeca28f3 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -48,8 +48,8 @@ SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a11032
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
 SHA256 (ngx_http_memc_module-0.11.tar.gz) = 9ece68bdae2c170fb845c1082da6502401763ffd3e4b443226ff9303df65951f
 SIZE (ngx_http_memc_module-0.11.tar.gz) = 98042
-SHA256 (passenger-3.0.6.tar.gz) = a0ce96d88721147125d4475b13d208fdbcd22e83bbcee9decbdd49ec34f2b6f6
-SIZE (passenger-3.0.6.tar.gz) = 2837833
+SHA256 (passenger-3.0.7.tar.gz) = 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d34958b2b7ed42bddc85
+SIZE (passenger-3.0.7.tar.gz) = 2830376
 SHA256 (ngx_slowfs_cache-1.5.tar.gz) = 8f3d1afd6bcaaeba89bc4f9d5e5ba3e2b334bf8e7e5b56bd37f25b5cbac8d828
 SIZE (ngx_slowfs_cache-1.5.tar.gz) = 9785
 SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b
diff --git a/www/nginx/files/extra-patch-passenger::build::nginx.rb b/www/nginx/files/extra-patch-passenger::build::nginx.rb
index 6cc5a2f9c4d7..fc556de2dee6 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-3.0.6/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
-+++ ../passenger-3.0.6/build/nginx.rb	2010-12-07 13:58:13.000000000 +0300
+--- ../passenger-3.0.7/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
++++ ../passenger-3.0.7/build/nginx.rb	2010-12-07 13:58:13.000000000 +0300
 @@ -23,10 +23,7 @@
  
  desc "Build Nginx helper agent"
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 025931b473e2..838f56673a59 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	3.0.6
+PORTVERSION=	3.0.7
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
@@ -15,6 +15,7 @@ COMMENT=	Modules for running Ruby on Rails and Rack applications
 
 OPTIONS=	APACHEPORT	"Use apache22"			on  \
 		NGINXPORT	"Use nginx"			off \
+		DEBUG		"Build with debugging info"	off \
 		SYMLINK 	"Create 'passenger' symlink"	off
 
 USE_RUBY=	yes
@@ -88,6 +89,14 @@ post-install:
 		s!-O2!!g; \
 		42s!true!false!' \
 		${PREFIX}/${GEM_LIB_DIR}/build/config.rb
+.if !defined(WITH_DEBUG)
+	@${REINPLACE_CMD} \
+		's!-DPASSENGER_DEBUG!-DNDEBUG!g' \
+		${PREFIX}/${GEM_LIB_DIR}/build/config.rb
+	@${REINPLACE_CMD} \
+		'31s!^!#include <sys/errno.h>!g' \
+		${PREFIX}/${GEM_LIB_DIR}/ext/common/Logging.h
+.endif
 	@${REINPLACE_CMD} \
 		's!-lpthread!${PTHREAD_LIBS}!g' \
 		${PREFIX}/${GEM_LIB_DIR}/lib/phusion_passenger/platform_info/compiler.rb
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index 4c5eee722c8f..14e52a9c458f 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/passenger-3.0.6.gem) = 5f9a5984bc0672ae3235470db12cd82a5f39f33cf63b72a578b514a407dd9812
-SIZE (rubygem/passenger-3.0.6.gem) = 2840576
+SHA256 (rubygem/passenger-3.0.7.gem) = ee15ba38addce748c11f59d8efaf38f325373ac77ea4d12413ac14519b2c2bd2
+SIZE (rubygem/passenger-3.0.7.gem) = 2833408