svn commit: r350664 - in head/www: nginx nginx-devel nginx-devel/files nginx/files rubygem-passenger
Sergey A. Osokin
osa at FreeBSD.org
Wed Apr 9 02:36:11 UTC 2014
Author: osa
Date: Wed Apr 9 02:36:08 2014
New Revision: 350664
URL: http://svnweb.freebsd.org/changeset/ports/350664
QAT: https://qat.redports.org/buildarchive/r350664/
Log:
Update from 4.0.35 to 4.0.41:
o) www/rubygem-passenger;
o) third-party modules for www/nginx and www/nginx-devel.
STAGEfy www/rubygem-passenger.
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 Wed Apr 9 02:33:59 2014 (r350663)
+++ head/www/nginx-devel/Makefile Wed Apr 9 02:36:08 2014 (r350664)
@@ -645,7 +645,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_m
.endif
.if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION= 4.0.35
+PASSENGER_VERSION= 4.0.41
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 Wed Apr 9 02:33:59 2014 (r350663)
+++ head/www/nginx-devel/distinfo Wed Apr 9 02:36:08 2014 (r350664)
@@ -72,8 +72,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.35.tar.gz) = a8b7eeed2ef12e8137d36418a11c928969aaf6b13a91e81445de2a156245f774
-SIZE (passenger-4.0.35.tar.gz) = 4039531
+SHA256 (passenger-4.0.41.tar.gz) = 7b1857e02280066d4be9123a1c13ead1eba280e60e3eba7b4f0e16279fd71259
+SIZE (passenger-4.0.41.tar.gz) = 4060645
SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
SIZE (ngx_postgres-0.9.tar.gz) = 41022
SHA256 (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 3fa9cb3960a97f505c9ad0cc8683c8fe17ba98aa98d003e255bf214e5144751c
Modified: head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
==============================================================================
--- head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Wed Apr 9 02:33:59 2014 (r350663)
+++ head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Wed Apr 9 02:36:08 2014 (r350664)
@@ -1,5 +1,5 @@
---- ../passenger-4.0.35/build/nginx.rb.orig 2013-10-12 11:05:08.000000000 +0400
-+++ ../passenger-4.0.35/build/nginx.rb 2013-10-12 11:06:18.000000000 +0400
+--- ../passenger-4.0.41/build/nginx.rb.orig 2013-10-12 11:05:08.000000000 +0400
++++ ../passenger-4.0.41/build/nginx.rb 2013-10-12 11:06:18.000000000 +0400
@@ -32,16 +32,12 @@
desc "Build Nginx support files"
task :nginx => [
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Wed Apr 9 02:33:59 2014 (r350663)
+++ head/www/nginx/Makefile Wed Apr 9 02:36:08 2014 (r350664)
@@ -647,7 +647,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_m
.endif
.if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION= 4.0.35
+PASSENGER_VERSION= 4.0.41
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 Wed Apr 9 02:33:59 2014 (r350663)
+++ head/www/nginx/distinfo Wed Apr 9 02:36:08 2014 (r350664)
@@ -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.35.tar.gz) = a8b7eeed2ef12e8137d36418a11c928969aaf6b13a91e81445de2a156245f774
-SIZE (passenger-4.0.35.tar.gz) = 4039531
+SHA256 (passenger-4.0.41.tar.gz) = 7b1857e02280066d4be9123a1c13ead1eba280e60e3eba7b4f0e16279fd71259
+SIZE (passenger-4.0.41.tar.gz) = 4060645
SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
SIZE (ngx_postgres-0.9.tar.gz) = 41022
SHA256 (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 3fa9cb3960a97f505c9ad0cc8683c8fe17ba98aa98d003e255bf214e5144751c
Modified: head/www/nginx/files/extra-patch-passenger-build-nginx.rb
==============================================================================
--- head/www/nginx/files/extra-patch-passenger-build-nginx.rb Wed Apr 9 02:33:59 2014 (r350663)
+++ head/www/nginx/files/extra-patch-passenger-build-nginx.rb Wed Apr 9 02:36:08 2014 (r350664)
@@ -1,5 +1,5 @@
---- ../passenger-4.0.35/build/nginx.rb.orig 2013-10-12 11:05:08.000000000 +0400
-+++ ../passenger-4.0.35/build/nginx.rb 2013-10-12 11:06:18.000000000 +0400
+--- ../passenger-4.0.41/build/nginx.rb.orig 2013-10-12 11:05:08.000000000 +0400
++++ ../passenger-4.0.41/build/nginx.rb 2013-10-12 11:06:18.000000000 +0400
@@ -32,16 +32,12 @@
desc "Build Nginx support files"
task :nginx => [
Modified: head/www/rubygem-passenger/Makefile
==============================================================================
--- head/www/rubygem-passenger/Makefile Wed Apr 9 02:33:59 2014 (r350663)
+++ head/www/rubygem-passenger/Makefile Wed Apr 9 02:36:08 2014 (r350664)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= passenger
-PORTVERSION= 4.0.35
+PORTVERSION= 4.0.41
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMEPREFIX= rubygem-
@@ -15,7 +15,7 @@ OPTIONS_SINGLE= SERVER
OPTIONS_SINGLE_SERVER= APACHE22 NGINX
APACHE22_DESC= Build with apache22 support
NGINX_DESC= Build with nginx support
-SYMLINK_DESC= Create passenger symlink
+SYMLINK_DESC= Create passenger symlink
OPTIONS_DEFAULT= APACHE22
USE_RUBY= yes
@@ -23,7 +23,6 @@ USE_RAKE= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MAPACHE22}
@@ -72,7 +71,6 @@ pre-patch:
@${ECHO_CMD}
.endif
-post-install:
@${REINPLACE_CMD} \
's!-Wall!!g; \
s!gcc!${CC}!g; \
@@ -81,15 +79,15 @@ post-install:
s!-O2!!g; \
s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \
201,203s!true!false!' \
- ${PREFIX}/${GEM_LIB_DIR}/build/basics.rb
+ ${WRKSRC}/build/basics.rb
.if ${PORT_OPTIONS:NDEBUG}
@${REINPLACE_CMD} \
's!-DPASSENGER_DEBUG!-DNDEBUG!g' \
- ${PREFIX}/${GEM_LIB_DIR}/build/basics.rb
+ ${WRKSRC}/build/basics.rb
.endif
@${REINPLACE_CMD} \
's!#{LIBEV_LIBS}!-L${LOCALBASE}/lib -lev!g' \
- ${PREFIX}/${GEM_LIB_DIR}/build/agents.rb
+ ${WRKSRC}/build/agents.rb
@${REINPLACE_CMD} \
's!-Iext/libev!!; \
s!/usr/include/libev!${LOCALBASE}/include!; \
@@ -97,23 +95,25 @@ post-install:
s!-Iext/libeio!!; \
s!/usr/include/libeio!${LOCALBASE}/include!; \
s!-leio!-L${LOCALBASE}/lib -leio!' \
- ${PREFIX}/${GEM_LIB_DIR}/build/common_library.rb
+ ${WRKSRC}/build/common_library.rb
@${REINPLACE_CMD} \
's!-lpthread!${PTHREAD_LIBS}!g' \
- ${PREFIX}/${GEM_LIB_DIR}/lib/phusion_passenger/platform_info/cxx_portability.rb
+ ${WRKSRC}/lib/phusion_passenger/platform_info/cxx_portability.rb
+
+post-build:
.if ${PORT_OPTIONS:MAPACHE22}
- (CC=${CC} CXX=${CXX} ${PREFIX}/bin/passenger-install-apache2-module --auto)
+ (CC=${CC} CXX=${CXX} ${STAGE}${PREFIX}/bin/passenger-install-apache2-module --auto)
@${CAT} ${PKGMESSAGE}
.endif
.if ${PORT_OPTIONS:MNGINX}
- (cd ${PREFIX}/${GEM_LIB_DIR} && CC=${CC} CXX=${CXX} ${RAKE_BIN} nginx)
+ (cd ${WRKSRC} && CC=${CC} CXX=${CXX} ${RAKE_BIN} nginx)
.endif
-
- ${FIND} ${PREFIX}/${GEM_LIB_DIR} -name '*.o' -delete
- ${FIND} ${PREFIX}/${GEM_LIB_DIR} -name '*.bak' -delete
.if ${PORT_OPTIONS:MSYMLINK}
- ${LN} -s ${PREFIX}/${GEM_LIB_DIR} ${PREFIX}/${GEMS_DIR}/${PORTNAME}
+ ${LN} -s ${GEM_LIB_DIR} ${STAGE}${PREFIX}/${GEMS_DIR}/${PORTNAME}
.endif
+ ${FIND} ${WRKSRC} -name '*.o' -delete
+ ${FIND} ${WRKSRC} -name '*.bak' -delete
+
.include <bsd.port.mk>
Modified: head/www/rubygem-passenger/distinfo
==============================================================================
--- head/www/rubygem-passenger/distinfo Wed Apr 9 02:33:59 2014 (r350663)
+++ head/www/rubygem-passenger/distinfo Wed Apr 9 02:36:08 2014 (r350664)
@@ -1,2 +1,2 @@
-SHA256 (rubygem/passenger-4.0.35.gem) = 72edb6d5ed3af9c07f4b5fd51f88a023d0ba5a4d779c1a5919157fb7559efcd8
-SIZE (rubygem/passenger-4.0.35.gem) = 4053504
+SHA256 (rubygem/passenger-4.0.41.gem) = ea69711a7820c1ac434523235a129114b0e2957dae3b9b8b91868af5eeb067d8
+SIZE (rubygem/passenger-4.0.41.gem) = 4074496
More information about the svn-ports-all
mailing list