Add support for passenger 3.0.0.

<Note>

www/nginx and www/nginx-devel build support for nginx only.
For full support www/rubygem-passenger port compiled with
option WITH_NGINXPORT should be installed.

</Note>

Do not bump PORTREVISIONs.

6 files changed, 122 insertions, 0 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 442feb9edf67..c66e66921382 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -70,6 +70,7 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		HTTP_UPSTREAM_KEEPALIVE "3rd party upstream keepalive module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
 		MEMC_MODULE		"3rd party memc (memcached) module" off \
+		PASSENGER_MODULE	"3rd party passenger module" off \
 		SLOWFS_CACHE_MODULE	"3rd party slowfs_cache module" off \
 		SUPERVISORD_MODULE	"3rd party supervisord module" off \
 		UDPLOG_MODULE		"3rd party udplog (syslog) module" off
@@ -79,6 +80,12 @@ MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.options.mk>
 
+.if defined(WITH_PASSENGER_MODULE)
+CATEGORIES+=	ruby
+USE_RUBY=	yes
+USE_RAKE=	yes
+.endif
+
 NGINX_VARDIR?=	/var
 NGINX_LOGDIR?=	${NGINX_VARDIR}/log
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
@@ -387,6 +394,14 @@ LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=--with-pcre
 .endif
 
+.if defined(WITH_PASSENGER_MODULE)
+PASSENGER_VERSION=	3.0.0
+MASTER_SITES+=	RF/passenger/:passenger
+DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger::build::nginx.rb
+.endif
+
 .if defined(WITH_SLOWFS_CACHE_MODULE)
 NGINX_SLOWFS_CACHE_MODULE_VERSION=	1.5
 MASTER_SITES+=	http://labs.frickle.com/files/:slowfs_cache
@@ -450,6 +465,9 @@ pre-everything::
 .if defined(WITH_HTTP_UPSTREAM_FAIR)
 	@${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support"
 .endif
+.if defined(WITH_PASSENGER_MODULE)
+	@${ECHO_MSG} "This port install Passenger module only"
+.endif
 	@${ECHO_MSG}
 
 post-patch:
@@ -461,6 +479,17 @@ post-patch:
 		's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
 		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_MODULE_VERSION}/config
 .endif
+.if defined(WITH_PASSENGER_MODULE)
+	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
+		${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx/config
+	@${REINPLACE_CMD} 's!-Wall!!g; \
+		s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \
+		s!-O2!!g; \
+		35s!true!false!' \
+		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/config.rb
+	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
+		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info/compiler.rb
+.endif
 .if defined(WITH_SUPERVISORD_MODULE)
 	( cd ${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} && \
 		${PATCH} -p0 < \
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index d89a2a5ccd32..5dfc19bdfbc1 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -46,6 +46,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.0.tar.gz) = 6e769fb3c294ad437057438e38982b14aff023c1f914ab281bfd23fcd8681a59
+SIZE (passenger-3.0.0.tar.gz) = 3048705
 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
new file mode 100644
index 000000000000..374f502e9379
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb
@@ -0,0 +1,30 @@
+--- ../passenger-3.0.0/build/nginx.rb.orig	2010-10-01 14:22:34.000000000 +0400
++++ ../passenger-3.0.0/build/nginx.rb	2010-12-01 11:52:32.000000000 +0300
+@@ -17,8 +17,6 @@
+ desc "Build Nginx helper agent"
+ task :nginx => [
+ 	'agents/nginx/PassengerHelperAgent',
+-	'agents/PassengerWatchdog',
+-	'agents/PassengerLoggingAgent',
+ 	:native_support
+ ]
+ 
+@@ -44,17 +42,7 @@
+ 	LIBCOMMON,
+ ]
+ file 'agents/nginx/PassengerHelperAgent' => dependencies do
+-	sh "mkdir -p agents/nginx" if !File.directory?("agents/nginx")
+-	create_executable "agents/nginx/PassengerHelperAgent",
+-		'ext/nginx/HelperAgent.cpp',
+-		"-Iext -Iext/common " <<
+-		"#{PlatformInfo.portability_cflags} " <<
+-		"#{EXTRA_CXXFLAGS}  " <<
+-		"#{LIBCOMMON} " <<
+-		"#{LIBBOOST_OXT} " <<
+-		"#{PlatformInfo.portability_ldflags} " <<
+-		"#{AGENT_LDFLAGS} " <<
+-		"#{EXTRA_LDFLAGS}"
++	true
+ end
+ 
+ task :clean => 'nginx:clean'
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index b89c4e4d61c5..003f5cc5c542 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -70,6 +70,7 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		HTTP_UPSTREAM_KEEPALIVE "3rd party upstream keepalive module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
 		MEMC_MODULE		"3rd party memc (memcached) module" off \
+		PASSENGER_MODULE	"3rd party passenger module" off \
 		SLOWFS_CACHE_MODULE	"3rd party slowfs_cache module" off \
 		SUPERVISORD_MODULE	"3rd party supervisord module" off \
 		UDPLOG_MODULE		"3rd party udplog (syslog) module" off
@@ -79,6 +80,12 @@ MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.options.mk>
 
+.if defined(WITH_PASSENGER_MODULE)
+CATEGORIES+=	ruby
+USE_RUBY=	yes
+USE_RAKE=	yes
+.endif
+
 NGINX_VARDIR?=	/var
 NGINX_LOGDIR?=	${NGINX_VARDIR}/log
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
@@ -389,6 +396,14 @@ LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=--with-pcre
 .endif
 
+.if defined(WITH_PASSENGER_MODULE)
+PASSENGER_VERSION=	3.0.0
+MASTER_SITES+=	RF/passenger/:passenger
+DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger::build::nginx.rb
+.endif
+
 .if defined(WITH_SLOWFS_CACHE_MODULE)
 NGINX_SLOWFS_CACHE_MODULE_VERSION=	1.5
 MASTER_SITES+=	http://labs.frickle.com/files/:slowfs_cache
@@ -452,6 +467,9 @@ pre-everything::
 .if defined(WITH_HTTP_UPSTREAM_FAIR)
 	@${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support"
 .endif
+.if defined(WITH_PASSENGER_MODULE)
+	@${ECHO_MSG} "This port install Passenger module only"
+.endif
 	@${ECHO_MSG}
 
 post-patch:
@@ -463,6 +481,17 @@ post-patch:
 		's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
 		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_MODULE_VERSION}/config
 .endif
+.if defined(WITH_PASSENGER_MODULE)
+	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
+		${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx/config
+	@${REINPLACE_CMD} 's!-Wall!!g; \
+		s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \
+		s!-O2!!g; \
+		35s!true!false!' \
+		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/config.rb
+	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
+		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info/compiler.rb
+.endif
 .if defined(WITH_SUPERVISORD_MODULE)
 	( cd ${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} && \
 		${PATCH} -p0 < \
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index b1e7f7a66bf5..47af37dafe79 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -46,6 +46,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.0.tar.gz) = 6e769fb3c294ad437057438e38982b14aff023c1f914ab281bfd23fcd8681a59
+SIZE (passenger-3.0.0.tar.gz) = 3048705
 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
new file mode 100644
index 000000000000..374f502e9379
--- /dev/null
+++ b/www/nginx/files/extra-patch-passenger::build::nginx.rb
@@ -0,0 +1,30 @@
+--- ../passenger-3.0.0/build/nginx.rb.orig	2010-10-01 14:22:34.000000000 +0400
++++ ../passenger-3.0.0/build/nginx.rb	2010-12-01 11:52:32.000000000 +0300
+@@ -17,8 +17,6 @@
+ desc "Build Nginx helper agent"
+ task :nginx => [
+ 	'agents/nginx/PassengerHelperAgent',
+-	'agents/PassengerWatchdog',
+-	'agents/PassengerLoggingAgent',
+ 	:native_support
+ ]
+ 
+@@ -44,17 +42,7 @@
+ 	LIBCOMMON,
+ ]
+ file 'agents/nginx/PassengerHelperAgent' => dependencies do
+-	sh "mkdir -p agents/nginx" if !File.directory?("agents/nginx")
+-	create_executable "agents/nginx/PassengerHelperAgent",
+-		'ext/nginx/HelperAgent.cpp',
+-		"-Iext -Iext/common " <<
+-		"#{PlatformInfo.portability_cflags} " <<
+-		"#{EXTRA_CXXFLAGS}  " <<
+-		"#{LIBCOMMON} " <<
+-		"#{LIBBOOST_OXT} " <<
+-		"#{PlatformInfo.portability_ldflags} " <<
+-		"#{AGENT_LDFLAGS} " <<
+-		"#{EXTRA_LDFLAGS}"
++	true
+ end
+ 
+ task :clean => 'nginx:clean'