Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Sep 2013 10:31:24 +0000 (UTC)
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r326622 - in head/www: nginx nginx-devel nginx-devel/files nginx/files rubygem-passenger
Message-ID:  <201309071031.r87AVOAo081897@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Sat Sep  7 10:31:24 2013
New Revision: 326622
URL: http://svnweb.freebsd.org/changeset/ports/326622

Log:
  Update from 4.0.14 to 4.0.16:
  
  o) www/rubygem-passenger;
  o) third-party modules for www/nginx and www/nginx-devel.
  
  Also, convert to perl framework nginx ports.

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/distinfo
  head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
  head/www/nginx/Makefile
  head/www/nginx/distinfo
  head/www/nginx/files/extra-patch-passenger-build-nginx.rb
  head/www/rubygem-passenger/Makefile
  head/www/rubygem-passenger/distinfo

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Sat Sep  7 10:28:26 2013	(r326621)
+++ head/www/nginx-devel/Makefile	Sat Sep  7 10:31:24 2013	(r326622)
@@ -436,7 +436,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-
 .if ${PORT_OPTIONS:MHTTP_PERL}
 CATEGORIES+=	perl5
 CONFIGURE_ARGS+=--with-http_perl_module
-USE_PERL5=	yes
+USES+=		perl5
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_PUSH}
@@ -655,7 +655,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_m
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	4.0.14
+PASSENGER_VERSION=	4.0.16
 MASTER_SITES+=	http://s3.amazonaws.com/phusion-passenger/releases/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx

Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo	Sat Sep  7 10:28:26 2013	(r326621)
+++ head/www/nginx-devel/distinfo	Sat Sep  7 10:31:24 2013	(r326622)
@@ -74,8 +74,8 @@ SHA256 (modsecurity-apache_2.7.5.tar.gz)
 SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387
 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
 SIZE (naxsi-core-0.50.tgz) = 49809
-SHA256 (passenger-4.0.14.tar.gz) = 332f561ae0ecccafd4889c4cf1b5e38ed350e6d91e6b82d465a77e661866596e
-SIZE (passenger-4.0.14.tar.gz) = 3869042
+SHA256 (passenger-4.0.16.tar.gz) = 5d0f9e6603c128e078d2d1e337efe6e88ae64c6145536f08c2b746da1df9a396
+SIZE (passenger-4.0.16.tar.gz) = 3899199
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
 SIZE (ngx_postgres-0.9.tar.gz) = 41022
 SHA256 (agentzh-rds-csv-nginx-module-v0.05rc2-0-gc15d3a4.tar.gz) = 5b135136b646c2647de2d89007bafd1136b06f20379555f8ebbc903b55000023

Modified: head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
==============================================================================
--- head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb	Sat Sep  7 10:28:26 2013	(r326621)
+++ head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb	Sat Sep  7 10:31:24 2013	(r326622)
@@ -1,6 +1,6 @@
---- ../passenger-4.0.14/build/nginx.rb.orig	2013-05-28 01:13:38.000000000 +0400
-+++ ../passenger-4.0.14/build/nginx.rb	2013-05-28 19:21:20.000000000 +0400
-@@ -24,14 +24,11 @@
+--- ../passenger-4.0.16/build/nginx.rb.orig	2013-09-07 14:09:13.000000000 +0400
++++ ../passenger-4.0.16/build/nginx.rb	2013-09-07 14:10:31.000000000 +0400
+@@ -32,15 +32,12 @@
  desc "Build Nginx support files"
  task :nginx => [
  	:nginx_without_native_support,
@@ -9,6 +9,7 @@
  ].compact
  
  task :nginx_without_native_support => [
+ 	auto_generated_sources,
 -	AGENT_OUTPUT_DIR + 'PassengerHelperAgent',
 -	AGENT_OUTPUT_DIR + 'PassengerWatchdog',
 -	AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Sat Sep  7 10:28:26 2013	(r326621)
+++ head/www/nginx/Makefile	Sat Sep  7 10:31:24 2013	(r326622)
@@ -439,7 +439,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-
 .if ${PORT_OPTIONS:MHTTP_PERL}
 CATEGORIES+=	perl5
 CONFIGURE_ARGS+=--with-http_perl_module
-USE_PERL5=	yes
+USES+=		perl5
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_PUSH}
@@ -656,7 +656,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_m
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	4.0.14
+PASSENGER_VERSION=	4.0.16
 MASTER_SITES+=	http://s3.amazonaws.com/phusion-passenger/releases/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx

Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo	Sat Sep  7 10:28:26 2013	(r326621)
+++ head/www/nginx/distinfo	Sat Sep  7 10:31:24 2013	(r326622)
@@ -74,8 +74,8 @@ SHA256 (modsecurity-apache_2.7.5.tar.gz)
 SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387
 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
 SIZE (naxsi-core-0.50.tgz) = 49809
-SHA256 (passenger-4.0.14.tar.gz) = 332f561ae0ecccafd4889c4cf1b5e38ed350e6d91e6b82d465a77e661866596e
-SIZE (passenger-4.0.14.tar.gz) = 3869042
+SHA256 (passenger-4.0.16.tar.gz) = 5d0f9e6603c128e078d2d1e337efe6e88ae64c6145536f08c2b746da1df9a396
+SIZE (passenger-4.0.16.tar.gz) = 3899199
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
 SIZE (ngx_postgres-0.9.tar.gz) = 41022
 SHA256 (agentzh-rds-csv-nginx-module-v0.05rc2-0-gc15d3a4.tar.gz) = 5b135136b646c2647de2d89007bafd1136b06f20379555f8ebbc903b55000023

Modified: head/www/nginx/files/extra-patch-passenger-build-nginx.rb
==============================================================================
--- head/www/nginx/files/extra-patch-passenger-build-nginx.rb	Sat Sep  7 10:28:26 2013	(r326621)
+++ head/www/nginx/files/extra-patch-passenger-build-nginx.rb	Sat Sep  7 10:31:24 2013	(r326622)
@@ -1,6 +1,6 @@
---- ../passenger-4.0.14/build/nginx.rb.orig	2013-05-28 01:13:38.000000000 +0400
-+++ ../passenger-4.0.14/build/nginx.rb	2013-05-28 19:21:20.000000000 +0400
-@@ -24,14 +24,11 @@
+--- ../passenger-4.0.16/build/nginx.rb.orig	2013-09-07 14:09:13.000000000 +0400
++++ ../passenger-4.0.16/build/nginx.rb	2013-09-07 14:10:31.000000000 +0400
+@@ -32,15 +32,12 @@
  desc "Build Nginx support files"
  task :nginx => [
  	:nginx_without_native_support,
@@ -9,6 +9,7 @@
  ].compact
  
  task :nginx_without_native_support => [
+ 	auto_generated_sources,
 -	AGENT_OUTPUT_DIR + 'PassengerHelperAgent',
 -	AGENT_OUTPUT_DIR + 'PassengerWatchdog',
 -	AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',

Modified: head/www/rubygem-passenger/Makefile
==============================================================================
--- head/www/rubygem-passenger/Makefile	Sat Sep  7 10:28:26 2013	(r326621)
+++ head/www/rubygem-passenger/Makefile	Sat Sep  7 10:31:24 2013	(r326622)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	4.0.14
+PORTVERSION=	4.0.16
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
@@ -79,7 +79,7 @@ post-install:
 		s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \
 		s!-O2!!g; \
 		s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \
-		196,198s!true!false!' \
+		199,201s!true!false!' \
 		${PREFIX}/${GEM_LIB_DIR}/build/basics.rb
 .if ${PORT_OPTIONS:NDEBUG}
 	@${REINPLACE_CMD} \

Modified: head/www/rubygem-passenger/distinfo
==============================================================================
--- head/www/rubygem-passenger/distinfo	Sat Sep  7 10:28:26 2013	(r326621)
+++ head/www/rubygem-passenger/distinfo	Sat Sep  7 10:31:24 2013	(r326622)
@@ -1,2 +1,2 @@
-SHA256 (rubygem/passenger-4.0.14.gem) = a002e340572e2834a98ebf5b3171f719683d43296790e240b40b19607dea5584
-SIZE (rubygem/passenger-4.0.14.gem) = 3910144
+SHA256 (rubygem/passenger-4.0.16.gem) = c9b7f83dfdb509d664bf4eef6ce394bee10dc70ed0bdc9b962b4d91e7c37f2e5
+SIZE (rubygem/passenger-4.0.16.gem) = 3942400



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309071031.r87AVOAo081897>