aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorosa <osa@FreeBSD.org>2011-04-04 15:59:12 +0800
committerosa <osa@FreeBSD.org>2011-04-04 15:59:12 +0800
commit304c414261974e0d676e5770f74d449c0e827af5 (patch)
tree0a1c7dcd2826a5c6f8f2c4181a192806d261ff27 /www
parent01001bb98c43a0d119592f0b75e136075a6fb8c6 (diff)
downloadfreebsd-ports-gnome-304c414261974e0d676e5770f74d449c0e827af5.tar.gz
freebsd-ports-gnome-304c414261974e0d676e5770f74d449c0e827af5.tar.zst
freebsd-ports-gnome-304c414261974e0d676e5770f74d449c0e827af5.zip
Update from 3.0.5 to 3.0.6:
o) www/rubygem-passenger; [*] o) passenger support for www/nginx and www/nginx-devel. More accurate for detect dependence of nginx ports. [*] Approved by: maintainer [*]
Diffstat (limited to 'www')
-rw-r--r--www/nginx-devel/Makefile6
-rw-r--r--www/nginx-devel/distinfo4
-rw-r--r--www/nginx-devel/files/extra-patch-passenger::build::nginx.rb4
-rw-r--r--www/nginx/Makefile6
-rw-r--r--www/nginx/distinfo4
-rw-r--r--www/nginx/files/extra-patch-passenger::build::nginx.rb4
-rw-r--r--www/rubygem-passenger/Makefile9
-rw-r--r--www/rubygem-passenger/distinfo4
8 files changed, 23 insertions, 18 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 1636a8adda05..89535587ddfa 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -396,7 +396,7 @@ CONFIGURE_ARGS+=--with-pcre
.endif
.if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION= 3.0.5
+PASSENGER_VERSION= 3.0.6
MASTER_SITES+= RF/passenger/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
@@ -495,8 +495,8 @@ post-patch:
42s!true!false!' \
${WRKDIR}/passenger-${PASSENGER_VERSION}/build/config.rb
@${REINPLACE_CMD} \
- '259s!-I/usr/include/libev!!; \
- 260s!-lev!!' \
+ 's!-I/usr/include/libev!!; \
+ s!-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 0e50d74b6fcd..109fc415dae9 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.5.tar.gz) = d657c71c97697b4efc32facc43280cdd13cde8b899a4597c521dd860bfd8a932
-SIZE (passenger-3.0.5.tar.gz) = 2990671
+SHA256 (passenger-3.0.6.tar.gz) = a0ce96d88721147125d4475b13d208fdbcd22e83bbcee9decbdd49ec34f2b6f6
+SIZE (passenger-3.0.6.tar.gz) = 2837833
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 cf0487c22386..6cc5a2f9c4d7 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.5/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300
-+++ ../passenger-3.0.5/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300
+--- ../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
@@ -23,10 +23,7 @@
desc "Build Nginx helper agent"
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 319b2bd7dc08..ec517f0fcf8c 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -398,7 +398,7 @@ CONFIGURE_ARGS+=--with-pcre
.endif
.if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION= 3.0.5
+PASSENGER_VERSION= 3.0.6
MASTER_SITES+= RF/passenger/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
@@ -497,8 +497,8 @@ post-patch:
42s!true!false!' \
${WRKDIR}/passenger-${PASSENGER_VERSION}/build/config.rb
@${REINPLACE_CMD} \
- '259s!-I/usr/include/libev!!; \
- 260s!-lev!!' \
+ 's!-I/usr/include/libev!!; \
+ s!-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 6e637074b4d6..e757b2424444 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.5.tar.gz) = d657c71c97697b4efc32facc43280cdd13cde8b899a4597c521dd860bfd8a932
-SIZE (passenger-3.0.5.tar.gz) = 2990671
+SHA256 (passenger-3.0.6.tar.gz) = a0ce96d88721147125d4475b13d208fdbcd22e83bbcee9decbdd49ec34f2b6f6
+SIZE (passenger-3.0.6.tar.gz) = 2837833
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 cf0487c22386..6cc5a2f9c4d7 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.5/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300
-+++ ../passenger-3.0.5/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300
+--- ../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
@@ -23,10 +23,7 @@
desc "Build Nginx helper agent"
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 569f6217ce4a..025931b473e2 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= passenger
-PORTVERSION= 3.0.5
+PORTVERSION= 3.0.6
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMEPREFIX= rubygem-
@@ -34,7 +34,12 @@ USE_APACHE= 2.2+
.endif
.if defined(WITH_NGINXPORT)
-BUILD_DEPENDS+= nginx>=0.8.54:${PORTSDIR}/www/nginx
+NGINXVERSION!= ${PKG_INFO} -qO www/nginx-devel 2>/dev/null || true
+.if empty(NGINXVERSION)
+BUILD_DEPENDS+= nginx:${PORTSDIR}/www/nginx
+.else
+BUILD_DEPENDS+= nginx:${PORTSDIR}/www/nginx-devel
+.endif
.endif
LIB_DEPENDS+= ev.3:${PORTSDIR}/devel/libev \
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index b42f670e7f6b..4c5eee722c8f 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/passenger-3.0.5.gem) = baf52e96da593a1532217a9b297f301fb70420208a8c106183a1adfdb9d777fd
-SIZE (rubygem/passenger-3.0.5.gem) = 2990592
+SHA256 (rubygem/passenger-3.0.6.gem) = 5f9a5984bc0672ae3235470db12cd82a5f39f33cf63b72a578b514a407dd9812
+SIZE (rubygem/passenger-3.0.6.gem) = 2840576
generated by cgit (git 2.34.1) at 2024-11-20 21:21:48 +0800