Date: Tue, 28 May 2013 16:03:07 +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: r319318 - in head/www: nginx nginx-devel nginx-devel/files nginx/files rubygem-passenger Message-ID: <201305281603.r4SG37J4038987@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Tue May 28 16:03:07 2013 New Revision: 319318 URL: http://svnweb.freebsd.org/changeset/ports/319318 Log: 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. 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 Tue May 28 15:54:09 2013 (r319317) +++ head/www/nginx-devel/Makefile Tue May 28 16:03:07 2013 (r319318) @@ -643,8 +643,8 @@ CONFIGURE_ARGS+=--without-http_rewrite_m .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} \ Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue May 28 15:54:09 2013 (r319317) +++ head/www/nginx-devel/distinfo Tue May 28 16:03:07 2013 (r319318) @@ -72,8 +72,8 @@ SHA256 (agentzh-memc-nginx-module-v0.13r 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 Modified: head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb ============================================================================== --- head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Tue May 28 15:54:09 2013 (r319317) +++ head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Tue May 28 16:03:07 2013 (r319318) @@ -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' Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Tue May 28 15:54:09 2013 (r319317) +++ head/www/nginx/Makefile Tue May 28 16:03:07 2013 (r319318) @@ -643,8 +643,8 @@ CONFIGURE_ARGS+=--without-http_rewrite_m .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} \ Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Tue May 28 15:54:09 2013 (r319317) +++ head/www/nginx/distinfo Tue May 28 16:03:07 2013 (r319318) @@ -72,8 +72,8 @@ SHA256 (agentzh-memc-nginx-module-v0.13r 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 Modified: head/www/nginx/files/extra-patch-passenger-build-nginx.rb ============================================================================== --- head/www/nginx/files/extra-patch-passenger-build-nginx.rb Tue May 28 15:54:09 2013 (r319317) +++ head/www/nginx/files/extra-patch-passenger-build-nginx.rb Tue May 28 16:03:07 2013 (r319318) @@ -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' Modified: head/www/rubygem-passenger/Makefile ============================================================================== --- head/www/rubygem-passenger/Makefile Tue May 28 15:54:09 2013 (r319317) +++ head/www/rubygem-passenger/Makefile Tue May 28 16:03:07 2013 (r319318) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= passenger -PORTVERSION= 3.0.19 +PORTVERSION= 4.0.4 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMEPREFIX= rubygem- @@ -38,11 +38,12 @@ BUILD_DEPENDS+= nginx:${PORTSDIR}/www/ng .endif .endif -LIB_DEPENDS+= ev.4:${PORTSDIR}/devel/libev \ - curl.6:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= eio:${PORTSDIR}/devel/libeio \ + ev:${PORTSDIR}/devel/libev \ + curl:${PORTSDIR}/ftp/curl BUILD_DEPENDS+= rubygem-fastthread>=1.0.1:${PORTSDIR}/devel/rubygem-fastthread \ rubygem-rack>=0:${PORTSDIR}/www/rubygem-rack \ - rubygem-daemon_controller>=0.2.5:${PORTSDIR}/devel/rubygem-daemon_controller + rubygem-daemon_controller>=1.1.0:${PORTSDIR}/devel/rubygem-daemon_controller RUN_DEPENDS:= ${BUILD_DEPENDS} SUB_LIST+= GEM_LIB_DIR=${GEM_LIB_DIR} RUBY=${RUBY} @@ -77,22 +78,28 @@ post-install: s!g++!${CXX}!g; \ s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \ s!-O2!!g; \ - 46s!true!false!' \ - ${PREFIX}/${GEM_LIB_DIR}/build/config.rb + s! -feliminate-unused-debug-symbols -feliminate-unused-debug-types!!g; \ + 177,179s!true!false!' \ + ${PREFIX}/${GEM_LIB_DIR}/build/basics.rb .if ${PORT_OPTIONS:NDEBUG} @${REINPLACE_CMD} \ 's!-DPASSENGER_DEBUG!-DNDEBUG!g' \ - ${PREFIX}/${GEM_LIB_DIR}/build/config.rb + ${PREFIX}/${GEM_LIB_DIR}/build/basics.rb .endif @${REINPLACE_CMD} \ 's!#{LIBEV_LIBS}!-L${LOCALBASE}/lib -lev!g' \ ${PREFIX}/${GEM_LIB_DIR}/build/agents.rb @${REINPLACE_CMD} \ 's!-Iext/libev!!; \ - 268s!/usr/include/libev!${LOCALBASE}/include!; \ - 269s!-lev!-L${LOCALBASE}/lib -lev!' \ + s!/usr/include/libev!${LOCALBASE}/include!; \ + s!-lev!-L${LOCALBASE}/lib -lev!; \ + s!-Iext/libeio!!; \ + s!/usr/include/libeio!${LOCALBASE}/include!; \ + s!-leio!-L${LOCALBASE}/lib -leio!' \ ${PREFIX}/${GEM_LIB_DIR}/build/common_library.rb - + @${REINPLACE_CMD} \ + 's!-lpthread!${PTHREAD_LIBS}!g' \ + ${PREFIX}/${GEM_LIB_DIR}/lib/phusion_passenger/platform_info/cxx_portability.rb .if ${PORT_OPTIONS:MAPACHE22} (${PREFIX}/bin/passenger-install-apache2-module --auto) @${CAT} ${PKGMESSAGE} Modified: head/www/rubygem-passenger/distinfo ============================================================================== --- head/www/rubygem-passenger/distinfo Tue May 28 15:54:09 2013 (r319317) +++ head/www/rubygem-passenger/distinfo Tue May 28 16:03:07 2013 (r319318) @@ -1,2 +1,2 @@ -SHA256 (rubygem/passenger-3.0.19.gem) = e29f7ab9430bfce765dc78c5291e3f4d022ab01177565e79d5d5a48d30321963 -SIZE (rubygem/passenger-3.0.19.gem) = 2641408 +SHA256 (rubygem/passenger-4.0.4.gem) = f7905c19ccbb7e4304a8d237d042c8b6aa0e06f095792867329e821d4e5c12f3 +SIZE (rubygem/passenger-4.0.4.gem) = 3669504
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305281603.r4SG37J4038987>