Accordingly (www/nginx and www/nginx-devel):

*) update third party memc module from 0.08 to 0.11;
*) remove third party passenger module, since it possible to run as
   standalone server.

4 files changed, 8 insertions, 62 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index ac38c820b0bd..1098a4295e61 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -70,7 +70,6 @@ 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
@@ -80,12 +79,6 @@ 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
@@ -375,7 +368,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_MODULE_VERSION}
 .endif
 
 .if defined(WITH_MEMC_MODULE)
-NGINX_MEMC_MODULE_VERSION=	0.08
+NGINX_MEMC_MODULE_VERSION=	0.11
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:memc/}
 MASTER_SITE_SUBDIR+=	osa/:memc
 DISTFILES+=	ngx_http_memc_module-${NGINX_MEMC_MODULE_VERSION}.tar.gz:memc
@@ -391,13 +384,6 @@ LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=--with-pcre
 .endif
 
-.if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION=	2.2.15
-MASTER_SITES+=	RF/passenger/:passenger
-DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
-.endif
-
 .if defined(WITH_SLOWFS_CACHE_MODULE)
 NGINX_SLOWFS_CACHE_MODULE_VERSION=	1.5
 MASTER_SITES+=	http://labs.frickle.com/files/:slowfs_cache
@@ -461,9 +447,6 @@ 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:
@@ -475,13 +458,6 @@ 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!g++!${CXX}!' \
-		${WRKDIR}/passenger-${PASSENGER_VERSION}/Rakefile
-	@${REINPLACE_CMD} '377s!-g!${CXXFLAGS}!; \
-		s!-lpthread!${PTHREAD_LIBS}!g' \
-		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info.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 83990ba00172..38b42385e261 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -67,12 +67,9 @@ SIZE (ngx_http_upstream_keepalive-0.3.tar.gz) = 8049
 MD5 (mod_zip-1.1.6.tar.gz) = bad2c11552f34f5424d4a5168fd9f371
 SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
-MD5 (ngx_http_memc_module-0.08.tar.gz) = b18562b966fc2ae116762612da704407
-SHA256 (ngx_http_memc_module-0.08.tar.gz) = 1d786ba382d3fa5f0036d1831c8a21e1c787f5aa64ebec50820510bf72f2ccce
-SIZE (ngx_http_memc_module-0.08.tar.gz) = 92182
-MD5 (passenger-2.2.15.tar.gz) = a156bb47e79b00d063d08fc5715dec0c
-SHA256 (passenger-2.2.15.tar.gz) = 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436
-SIZE (passenger-2.2.15.tar.gz) = 2128473
+MD5 (ngx_http_memc_module-0.11.tar.gz) = c05ac1dc22fc8d5329014228c1f27434
+SHA256 (ngx_http_memc_module-0.11.tar.gz) = 9ece68bdae2c170fb845c1082da6502401763ffd3e4b443226ff9303df65951f
+SIZE (ngx_http_memc_module-0.11.tar.gz) = 98042
 MD5 (ngx_slowfs_cache-1.5.tar.gz) = 165c93b1adc6b5cebc2b2aa28f881682
 SHA256 (ngx_slowfs_cache-1.5.tar.gz) = 8f3d1afd6bcaaeba89bc4f9d5e5ba3e2b334bf8e7e5b56bd37f25b5cbac8d828
 SIZE (ngx_slowfs_cache-1.5.tar.gz) = 9785
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index ecd76a20c9d7..dee83f433c2e 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -69,7 +69,6 @@ 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,12 +78,6 @@ 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
@@ -374,7 +367,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_MODULE_VERSION}
 .endif
 
 .if defined(WITH_MEMC_MODULE)
-NGINX_MEMC_MODULE_VERSION=	0.08
+NGINX_MEMC_MODULE_VERSION=	0.11
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:memc/}
 MASTER_SITE_SUBDIR+=	osa/:memc
 DISTFILES+=	ngx_http_memc_module-${NGINX_MEMC_MODULE_VERSION}.tar.gz:memc
@@ -390,13 +383,6 @@ LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=--with-pcre
 .endif
 
-.if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION=	2.2.15
-MASTER_SITES+=	RF/passenger/:passenger
-DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
-.endif
-
 .if defined(WITH_SLOWFS_CACHE_MODULE)
 NGINX_SLOWFS_CACHE_MODULE_VERSION=	1.5
 MASTER_SITES+=	http://labs.frickle.com/files/:slowfs_cache
@@ -460,9 +446,6 @@ 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:
@@ -474,13 +457,6 @@ 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!g++!${CXX}!' \
-		${WRKDIR}/passenger-${PASSENGER_VERSION}/Rakefile
-	@${REINPLACE_CMD} '377s!-g!${CXXFLAGS}!; \
-		s!-lpthread!${PTHREAD_LIBS}!g' \
-		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info.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 83990ba00172..38b42385e261 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -67,12 +67,9 @@ SIZE (ngx_http_upstream_keepalive-0.3.tar.gz) = 8049
 MD5 (mod_zip-1.1.6.tar.gz) = bad2c11552f34f5424d4a5168fd9f371
 SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
-MD5 (ngx_http_memc_module-0.08.tar.gz) = b18562b966fc2ae116762612da704407
-SHA256 (ngx_http_memc_module-0.08.tar.gz) = 1d786ba382d3fa5f0036d1831c8a21e1c787f5aa64ebec50820510bf72f2ccce
-SIZE (ngx_http_memc_module-0.08.tar.gz) = 92182
-MD5 (passenger-2.2.15.tar.gz) = a156bb47e79b00d063d08fc5715dec0c
-SHA256 (passenger-2.2.15.tar.gz) = 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436
-SIZE (passenger-2.2.15.tar.gz) = 2128473
+MD5 (ngx_http_memc_module-0.11.tar.gz) = c05ac1dc22fc8d5329014228c1f27434
+SHA256 (ngx_http_memc_module-0.11.tar.gz) = 9ece68bdae2c170fb845c1082da6502401763ffd3e4b443226ff9303df65951f
+SIZE (ngx_http_memc_module-0.11.tar.gz) = 98042
 MD5 (ngx_slowfs_cache-1.5.tar.gz) = 165c93b1adc6b5cebc2b2aa28f881682
 SHA256 (ngx_slowfs_cache-1.5.tar.gz) = 8f3d1afd6bcaaeba89bc4f9d5e5ba3e2b334bf8e7e5b56bd37f25b5cbac8d828
 SIZE (ngx_slowfs_cache-1.5.tar.gz) = 9785