Update from 3.0.1 to 3.0.2:

o) www/rubygem-passenger; [*]
o) passenger support for www/nginx and www/nginx-devel.

Remove needless extra patches.

Approved by:	maintainer [*]

12 files changed, 21 insertions, 109 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 244354f16595..6479a1441c45 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -396,13 +396,11 @@ CONFIGURE_ARGS+=--with-pcre
 .endif
 
 .if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION=	3.0.1
+PASSENGER_VERSION=	3.0.2
 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 \
-		${PATCHDIR}/extra-patch-passenger::ext::common::Utils.cpp \
-		${PATCHDIR}/extra-patch-passenger::ext::nginx::config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger::build::nginx.rb
 .endif
 
 .if defined(WITH_SLOWFS_CACHE_MODULE)
@@ -497,8 +495,8 @@ post-patch:
 		42s!true!false!' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/config.rb
 	@${REINPLACE_CMD} \
-		'258s!-I/usr/include/libev!!; \
-		259s!-lev!!' \
+		'259s!-I/usr/include/libev!!; \
+		260s!-lev!!' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb
 	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info/compiler.rb
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 57b3303975e4..aaa36bc7f997 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -46,8 +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.1.tar.gz) = 765b5528f23a5f65f2cc4b72f2e90d9b93ae777dc36a1f7b6d957b39f3cd55cd
-SIZE (passenger-3.0.1.tar.gz) = 2958200
+SHA256 (passenger-3.0.2.tar.gz) = a1a665280a6559fe0fa6c92b74ae7e145ee23c30606967919faddb292cf00da8
+SIZE (passenger-3.0.2.tar.gz) = 2969570
 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 6864d0e241ff..64ef1c9ac6b7 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.1/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
-+++ ../passenger-3.0.1/build/nginx.rb	2010-12-07 13:58:13.000000000 +0300
+--- ../passenger-3.0.2/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
++++ ../passenger-3.0.2/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-devel/files/extra-patch-passenger::ext::common::Utils.cpp b/www/nginx-devel/files/extra-patch-passenger::ext::common::Utils.cpp
deleted file mode 100644
index 5d70afbc89b8..000000000000
--- a/www/nginx-devel/files/extra-patch-passenger::ext::common::Utils.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../passenger-3.0.1/ext/common/Utils.cpp.orig	2010-12-12 04:49:20.000000000 +0300
-+++ ../passenger-3.0.1/ext/common/Utils.cpp	2010-12-12 04:54:51.000000000 +0300
-@@ -837,7 +837,19 @@
- 		sigaction(SIGFPE, &action, NULL);
- 		sigaction(SIGABRT, &action, NULL);
- 		
--		DIR *dir = opendir("/dev/fd");
-+		DIR *dir = NULL;
-+		#ifdef __APPLE__
-+			dir = opendir("/dev/fd");
-+		#else
-+			struct stat dirbuf1,dirbuf2;
-+			if (stat("/dev", &dirbuf1) == -1
-+				|| stat("/dev/fd", &dirbuf2) == -1) {
-+				_exit(1);
-+			}
-+			if (dirbuf1.st_dev != dirbuf2.st_dev) {
-+				dir = opendir("/dev/fd");
-+			}
-+		#endif
- 		if (dir == NULL) {
- 			dir = opendir("/proc/self/fd");
- 			if (dir == NULL) {
diff --git a/www/nginx-devel/files/extra-patch-passenger::ext::nginx::config b/www/nginx-devel/files/extra-patch-passenger::ext::nginx::config
deleted file mode 100644
index bc4078bf82d8..000000000000
--- a/www/nginx-devel/files/extra-patch-passenger::ext::nginx::config
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../passenger-3.0.1/ext/nginx/config.orig	2010-12-07 14:18:47.000000000 +0300
-+++ ../passenger-3.0.1/ext/nginx/config	2010-12-07 14:19:38.000000000 +0300
-@@ -2,13 +2,11 @@
-    ! test -f "$ngx_addon_dir/../common/libboost_oxt.a"; then
-     echo "*** The Phusion Passenger support files are not yet compiled. Compiling them for you... ***"
-     echo "*** Running 'rake nginx RELEASE=yes' in $ngx_addon_dir... ***"
--    if ! cd $ngx_addon_dir; then
-+    if ! (cd $ngx_addon_dir; rake nginx); then
-         exit 1
-+    else
-+        echo "*** Phusion Passenger support files have been successfully compiled. ***"
-     fi
--    if ! rake nginx RELEASE=yes; then
--        exit 1
--    fi
--    echo "*** Phusion Passenger support files have been successfully compiled. ***"
- fi
- 
- ngx_feature="Math library"
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 1d6da40ce9e2..2523b5298c26 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -397,13 +397,11 @@ CONFIGURE_ARGS+=--with-pcre
 .endif
 
 .if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION=	3.0.1
+PASSENGER_VERSION=	3.0.2
 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 \
-		${PATCHDIR}/extra-patch-passenger::ext::common::Utils.cpp \
-		${PATCHDIR}/extra-patch-passenger::ext::nginx::config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger::build::nginx.rb
 .endif
 
 .if defined(WITH_SLOWFS_CACHE_MODULE)
@@ -498,8 +496,8 @@ post-patch:
 		42s!true!false!' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/config.rb
 	@${REINPLACE_CMD} \
-		'258s!-I/usr/include/libev!!; \
-		259s!-lev!!' \
+		'259s!-I/usr/include/libev!!; \
+		260s!-lev!!' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb
 	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info/compiler.rb
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 766c7b9f6201..6eed990e6178 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -46,8 +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.1.tar.gz) = 765b5528f23a5f65f2cc4b72f2e90d9b93ae777dc36a1f7b6d957b39f3cd55cd
-SIZE (passenger-3.0.1.tar.gz) = 2958200
+SHA256 (passenger-3.0.2.tar.gz) = a1a665280a6559fe0fa6c92b74ae7e145ee23c30606967919faddb292cf00da8
+SIZE (passenger-3.0.2.tar.gz) = 2969570
 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 6864d0e241ff..64ef1c9ac6b7 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.1/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
-+++ ../passenger-3.0.1/build/nginx.rb	2010-12-07 13:58:13.000000000 +0300
+--- ../passenger-3.0.2/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
++++ ../passenger-3.0.2/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/files/extra-patch-passenger::ext::common::Utils.cpp b/www/nginx/files/extra-patch-passenger::ext::common::Utils.cpp
deleted file mode 100644
index 5d70afbc89b8..000000000000
--- a/www/nginx/files/extra-patch-passenger::ext::common::Utils.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../passenger-3.0.1/ext/common/Utils.cpp.orig	2010-12-12 04:49:20.000000000 +0300
-+++ ../passenger-3.0.1/ext/common/Utils.cpp	2010-12-12 04:54:51.000000000 +0300
-@@ -837,7 +837,19 @@
- 		sigaction(SIGFPE, &action, NULL);
- 		sigaction(SIGABRT, &action, NULL);
- 		
--		DIR *dir = opendir("/dev/fd");
-+		DIR *dir = NULL;
-+		#ifdef __APPLE__
-+			dir = opendir("/dev/fd");
-+		#else
-+			struct stat dirbuf1,dirbuf2;
-+			if (stat("/dev", &dirbuf1) == -1
-+				|| stat("/dev/fd", &dirbuf2) == -1) {
-+				_exit(1);
-+			}
-+			if (dirbuf1.st_dev != dirbuf2.st_dev) {
-+				dir = opendir("/dev/fd");
-+			}
-+		#endif
- 		if (dir == NULL) {
- 			dir = opendir("/proc/self/fd");
- 			if (dir == NULL) {
diff --git a/www/nginx/files/extra-patch-passenger::ext::nginx::config b/www/nginx/files/extra-patch-passenger::ext::nginx::config
deleted file mode 100644
index bc4078bf82d8..000000000000
--- a/www/nginx/files/extra-patch-passenger::ext::nginx::config
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../passenger-3.0.1/ext/nginx/config.orig	2010-12-07 14:18:47.000000000 +0300
-+++ ../passenger-3.0.1/ext/nginx/config	2010-12-07 14:19:38.000000000 +0300
-@@ -2,13 +2,11 @@
-    ! test -f "$ngx_addon_dir/../common/libboost_oxt.a"; then
-     echo "*** The Phusion Passenger support files are not yet compiled. Compiling them for you... ***"
-     echo "*** Running 'rake nginx RELEASE=yes' in $ngx_addon_dir... ***"
--    if ! cd $ngx_addon_dir; then
-+    if ! (cd $ngx_addon_dir; rake nginx); then
-         exit 1
-+    else
-+        echo "*** Phusion Passenger support files have been successfully compiled. ***"
-     fi
--    if ! rake nginx RELEASE=yes; then
--        exit 1
--    fi
--    echo "*** Phusion Passenger support files have been successfully compiled. ***"
- fi
- 
- ngx_feature="Math library"
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 8df29becd3c3..c094ecc36ede 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	3.0.1
+PORTVERSION=	3.0.2
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
@@ -90,8 +90,8 @@ post-install:
 		's!#{LIBEV_LIBS}!-L${LOCALBASE}/lib -lev!g' \
 		${PREFIX}/${GEM_LIB_DIR}/build/agents.rb
 	@${REINPLACE_CMD} \
-		'258s!/usr/include/libev!${LOCALBASE}/include!; \
-		259s!-lev!-L${LOCALBASE}/lib -lev!' \
+		'259s!/usr/include/libev!${LOCALBASE}/include!; \
+		260s!-lev!-L${LOCALBASE}/lib -lev!' \
 		${PREFIX}/${GEM_LIB_DIR}/build/common_library.rb
 
 .if !defined(WITHOUT_APACHEPORT)
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index 5ecad79c9ae3..ec56c0ae3d7e 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/passenger-3.0.1.gem) = ba75e54b33c3568fc8c379b0159b9e06971d660bf5407926b4c1d0b3f533b833
-SIZE (rubygem/passenger-3.0.1.gem) = 2959360
+SHA256 (rubygem/passenger-3.0.2.gem) = 0ad96885c258af9bf7ceb43c080e367087cc0773f3e33d1f07e48ee3ff39acad
+SIZE (rubygem/passenger-3.0.2.gem) = 2972160