diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2013-05-28 16:03:07 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2013-05-28 16:03:07 +0000 |
| commit | a6ced1ba932784b6d8e3c693203bd1f75917a12c (patch) | |
| tree | 559266ab12d1e2ee540e6500786ff5adbb9ac875 /www/nginx | |
| parent | fe65acf33b55bee867e8dfb8ed84da611e3d12d8 (diff) | |
| download | ports-a6ced1ba932784b6d8e3c693203bd1f75917a12c.tar.gz ports-a6ced1ba932784b6d8e3c693203bd1f75917a12c.zip | |
Update from 3.0.19 to 4.0.4:
o) www/rubygem-passenger;
o) third-party passenger module for www/nginx and www/nginx-devel.
Notes
Notes:
svn path=/head/; revision=319318
Diffstat (limited to 'www/nginx')
| -rw-r--r-- | www/nginx/Makefile | 20 | ||||
| -rw-r--r-- | www/nginx/distinfo | 4 | ||||
| -rw-r--r-- | www/nginx/files/extra-patch-passenger-build-nginx.rb | 44 |
3 files changed, 28 insertions, 40 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 03b4aee992b8..6f1d4faa9b8a 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -643,8 +643,8 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \ .endif .if ${PORT_OPTIONS:MPASSENGER} -PASSENGER_VERSION= 3.0.19 -MASTER_SITES+= RF/passenger/:passenger +PASSENGER_VERSION= 4.0.4 +MASTER_SITES+= http://phusion-passenger.googlecode.com/files/: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 @@ -903,16 +903,20 @@ post-patch: ${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/config .endif .if ${PORT_OPTIONS:MPASSENGER} - @${REINPLACE_CMD} 's!-Wall!!g; \ - s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \ - s!-O2!!g; \ - 42s!true!false!' \ - ${WRKDIR}/passenger-${PASSENGER_VERSION}/build/config.rb + @${REINPLACE_CMD} \ + '177,179s!true!false!' \ + ${WRKDIR}/passenger-${PASSENGER_VERSION}/build/basics.rb @${REINPLACE_CMD} \ 's!-I/usr/include/libev!!; \ s!-lev!!; \ - s!-Iext/libev!!' \ + s!-Iext/libev!!; \ + s!-I/usr/include/libeio!!; \ + s!-leio!!; \ + s!-Iext/libeio!!' \ ${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb + @${REINPLACE_CMD} \ + 's!-lpthread!${PTHREAD_LIBS}!g' \ + ${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info/cxx_portability.rb .endif .if ${PORT_OPTIONS:MPOSTGRES} @${REINPLACE_CMD} \ diff --git a/www/nginx/distinfo b/www/nginx/distinfo index bb4d2a0cfd67..ed1d558ea746 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -72,8 +72,8 @@ SHA256 (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 8c6f7a421346be1f SIZE (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 39778 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef SIZE (naxsi-core-0.50.tgz) = 49809 -SHA256 (passenger-3.0.19.tar.gz) = 7a4dc7eeaca1ac81636167ebfe1cf69b18fc2f09f52a882b73c05a9e9ec12d98 -SIZE (passenger-3.0.19.tar.gz) = 2663368 +SHA256 (passenger-4.0.4.tar.gz) = 6f211101d1982da21c5dfcd9323f719235c7006b71e37604e2061fd1d44e89ec +SIZE (passenger-4.0.4.tar.gz) = 3622528 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 diff --git a/www/nginx/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb index 0780fb1f46ac..5d67be3c3a42 100644 --- a/www/nginx/files/extra-patch-passenger-build-nginx.rb +++ b/www/nginx/files/extra-patch-passenger-build-nginx.rb @@ -1,34 +1,18 @@ ---- ../passenger-3.0.19/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300 -+++ ../passenger-3.0.19/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300 -@@ -23,10 +23,7 @@ - - desc "Build Nginx helper agent" +--- ../passenger-4.0.4/build/nginx.rb.orig 2013-05-28 01:13:38.000000000 +0400 ++++ ../passenger-4.0.4/build/nginx.rb 2013-05-28 19:21:20.000000000 +0400 +@@ -24,14 +24,11 @@ + desc "Build Nginx support files" task :nginx => [ -- AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent', + :nginx_without_native_support, ++ LIBBOOST_OXT, + NATIVE_SUPPORT_TARGET + ].compact + + task :nginx_without_native_support => [ +- AGENT_OUTPUT_DIR + 'PassengerHelperAgent', - AGENT_OUTPUT_DIR + 'PassengerWatchdog', - AGENT_OUTPUT_DIR + 'PassengerLoggingAgent', -- :native_support -+ AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent' - ] - - dependencies = [ -@@ -51,18 +48,7 @@ - LIBCOMMON, - ] - file AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent' => dependencies do -- output_dir = "#{AGENT_OUTPUT_DIR}nginx" -- sh "mkdir -p #{output_dir}" if !File.directory?(output_dir) -- create_executable "#{output_dir}/PassengerHelperAgent", -- 'ext/nginx/HelperAgent.cpp', -- "-Iext -Iext/common " << -- "#{PlatformInfo.portability_cflags} " << -- "#{EXTRA_CXXFLAGS} " << -- "#{LIBCOMMON} " << -- "#{LIBBOOST_OXT} " << -- "#{PlatformInfo.portability_ldflags} " << -- "#{AGENT_LDFLAGS} " << -- "#{EXTRA_LDFLAGS}" -+ true - end +- AGENT_OUTPUT_DIR + 'SpawnPreparer', + COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects + ].flatten - task :clean => 'nginx:clean' |