Date: Mon, 27 Apr 2015 02:16:04 +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: r384807 - in head/www: nginx nginx-devel nginx-devel/files nginx/files Message-ID: <201504270216.t3R2G4qF018035@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Mon Apr 27 02:16:04 2015 New Revision: 384807 URL: https://svnweb.freebsd.org/changeset/ports/384807 Log: Remove support for next unsupported third-party modules: o) http_upload; o) postgres; o) supervisord; o) tcp_proxy; Add back third-party http_upstream_sticky module's checksums. Deleted: head/www/nginx-devel/files/extra-patch-ngx_postgres-config head/www/nginx/files/extra-patch-ngx_postgres-config Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx/Makefile head/www/nginx/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sun Apr 26 22:04:57 2015 (r384806) +++ head/www/nginx-devel/Makefile Mon Apr 27 02:16:04 2015 (r384807) @@ -74,7 +74,6 @@ OPTIONS_DEFINE= \ HTTP_REDIS \ HTTP_RESPONSE \ HTTP_SUBS_FILTER \ - HTTP_UPLOAD \ HTTP_UPLOAD_PROGRESS \ HTTP_UPSTREAM_FAIR \ HTTP_UPSTREAM_STICKY \ @@ -91,7 +90,6 @@ OPTIONS_DEFINE= \ MODSECURITY \ NAXSI \ PASSENGER \ - POSTGRES \ RDS_CSV \ RDS_JSON \ REDIS2 \ @@ -100,8 +98,6 @@ OPTIONS_DEFINE= \ SFLOW \ SLOWFS_CACHE \ SRCACHE \ - SUPERVISORD \ - TCP_PROXY \ UDPLOG \ XRID_HEADER \ XSS \ @@ -163,7 +159,6 @@ HTTP_PUSH_STREAM_DESC= 3rd party push s HTTP_REDIS_DESC= 3rd party http_redis module HTTP_RESPONSE_DESC= 3rd party http_response module HTTP_SUBS_FILTER_DESC= 3rd party subs filter module -HTTP_UPLOAD_DESC= 3rd party upload module HTTP_UPLOAD_PROGRESS_DESC= 3rd party uploadprogress module HTTP_UPSTREAM_FAIR_DESC= 3rd party upstream fair module HTTP_UPSTREAM_STICKY_DESC= 3rd party upstream sticky module @@ -180,7 +175,6 @@ MEMC_DESC= 3rd party memc (memcached) MODSECURITY_DESC= 3rd party mod_security module NAXSI_DESC= 3rd party naxsi module PASSENGER_DESC= 3rd party passenger module -POSTGRES_DESC= 3rd party postgresql module RDS_CSV_DESC= 3rd party rds_csv module RDS_JSON_DESC= 3rd party rds_json module REDIS2_DESC= 3rd party redis2 module @@ -189,8 +183,6 @@ SET_MISC_DESC= 3rd party set_misc modu SFLOW_DESC= 3rd party sflow module SLOWFS_CACHE_DESC= 3rd party slowfs_cache module SRCACHE_DESC= 3rd party srcache module -SUPERVISORD_DESC= 3rd party supervisord module -TCP_PROXY_DESC= 3rd party tcp_proxy module UDPLOG_DESC= 3rd party udplog (syslog) module XRID_HEADER_DESC= 3rd party x-rid header module XSS_DESC= 3rd party xss module @@ -325,15 +317,6 @@ DISTFILES+= ngx_cache_purge-${NGINX_CACH CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION} .endif -.if ${PORT_OPTIONS:MCTPP2} -IGNORE= CTPP2: update require -LIB_DEPENDS+= libctpp2.so:${PORTSDIR}/textproc/ctpp2 -NGINX_CTPP2_VERSION= 0.5 -MASTER_SITES+= http://dl.vbart.ru/ngx-ctpp/:ctpp2 -DISTFILES+= ngx_ctpp2-${NGINX_CTPP2_VERSION}.tar.gz:ctpp2 -CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_ctpp2-${NGINX_CTPP2_VERSION} -.endif - .if ${PORT_OPTIONS:MECHO} NGINX_ECHO_VERSION= 0.57 GIT_ECHO_VERSION= 0-g91ee9a8 @@ -502,15 +485,6 @@ CONFIGURE_ARGS+=--with-http_stub_status_ CONFIGURE_ARGS+=--with-http_sub_module .endif -.if ${PORT_OPTIONS:MHTTP_UPLOAD} -IGNORE= UPLOAD: update require -NGINX_UPLOAD_VERSION= 2.2.0 -MASTER_SITES+= http://www.grid.net.ru/nginx/download/:upload -DISTFILES+= nginx_upload_module-${NGINX_UPLOAD_VERSION}.tar.gz:upload -CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_VERSION} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upload_module.c -.endif - .if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS} NGINX_UPLOADPROGRESS_VERSION= 0.9.0 GIT_UPLOADPROGRESS_VERSION= 0-ga788dea @@ -519,7 +493,7 @@ DISTFILES+= masterzen-nginx-upload-progr CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${GIT_UPLOADPROGRESS_VERSION:S/^0-g//} .endif -.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) || !empty(PORT_OPTIONS:MSUPERVISORD) +.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) NGINX_UPSTREAM_FAIR_VERSION= 20090923 MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:upstreamfair/} MASTER_SITE_SUBDIR+= osa/:upstreamfair @@ -655,16 +629,6 @@ CFLAGS+= -DNDEBUG .endif .endif -.if ${PORT_OPTIONS:MPOSTGRES} -IGNORE= POSTGRES: update require -USES+= pgsql -NGINX_POSTGRES_VERSION= 0.9 -MASTER_SITES+= http://labs.frickle.com/files/:postgres -DISTFILES+= ngx_postgres-${NGINX_POSTGRES_VERSION}.tar.gz:postgres -CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres-config -.endif - .if ${PORT_OPTIONS:MRDS_CSV} NGINX_RDS_CSV_VERSION= 0.05 GIT_RDS_CSV_VERSION= 0-g607e26b @@ -730,23 +694,6 @@ DISTFILES+= openresty-srcache-nginx-modu CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//} .endif -.if ${PORT_OPTIONS:MSUPERVISORD} -IGNORE= SUPERVISORD: update require -NGINX_SUPERVISORD_VERSION= 1.4 -MASTER_SITES+= http://labs.frickle.com/files/:supervisord -DISTFILES+= ngx_supervisord-${NGINX_SUPERVISORD_VERSION}.tar.gz:supervisord -CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_VERSION} -.endif - -.if ${PORT_OPTIONS:MTCP_PROXY} -IGNORE= TCP_PROXY: update require -NGINX_TCP_PROXY_VERSION= 0.26 -GIT_TCP_PROXY_VERSION= 0-gb83e5a6 -MASTER_SITES+= https://github.com/yaoweibin/nginx_tcp_proxy_module/tarball/v${NGINX_TCP_PROXY_VERSION}/:tcp_proxy -DISTFILES+= yaoweibin-nginx_tcp_proxy_module-v${NGINX_TCP_PROXY_VERSION}-${GIT_TCP_PROXY_VERSION}.tar.gz:tcp_proxy -CONFIGURE_ARGS+=--add-module=${WRKDIR}/yaoweibin-nginx_tcp_proxy_module-${GIT_TCP_PROXY_VERSION:S/^0-g//} -.endif - .if ${PORT_OPTIONS:MUDPLOG} NGINX_UDPLOG_VERSION= 1.0.0 MASTER_SITES+= http://www.grid.net.ru/nginx/download/:udplog @@ -910,11 +857,6 @@ post-patch: s!-Iext/libeio!!' \ ${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb .endif -.if ${PORT_OPTIONS:MPOSTGRES} - @${REINPLACE_CMD} \ - 's!%%PREFIX%%!${LOCALBASE}!g' \ - ${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION}/config -.endif .if ${PORT_OPTIONS:MSFLOW} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ @@ -926,19 +868,6 @@ post-patch: ${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}/src/ngx_http_lua_socket_tcp.c .endif .endif -.if ${PORT_OPTIONS:MSUPERVISORD} - ( cd ${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} && \ - ${PATCH} -p0 < \ - ${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_VERSION}/patches/ngx_http_upstream_fair_module.patch ) - ( cd ${WRKSRC} && \ - ${PATCH} -p0 < \ - ${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_VERSION}/patches/ngx_http_upstream_init_busy-0.8.17.patch ) -.endif -.if ${PORT_OPTIONS:MTCP_PROXY} - ( cd ${WRKSRC} && \ - ${PATCH} -p1 < \ - ${WRKDIR}/yaoweibin-nginx_tcp_proxy_module-${GIT_TCP_PROXY_VERSION:S/^0-g//}/tcp.patch ) -.endif .if ${PORT_OPTIONS:MICONV} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Sun Apr 26 22:04:57 2015 (r384806) +++ head/www/nginx-devel/distinfo Mon Apr 27 02:16:04 2015 (r384807) @@ -12,8 +12,6 @@ SHA256 (ngx_http_auth_pam_module-1.2.tar SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c SIZE (ngx_cache_purge-2.3.tar.gz) = 12248 -SHA256 (ngx_ctpp2-0.5.tar.gz) = f8adfecc23e2c23af95df8549ef92fd52598b21506a9d9df2278b2605668d5a6 -SIZE (ngx_ctpp2-0.5.tar.gz) = 19686 SHA256 (openresty-echo-nginx-module-v0.57-0-g91ee9a8.tar.gz) = 1c20511adb616917cfa13868a19b8dfefe7f9c7c31730a81ad6f0a8a67d61d04 SIZE (openresty-echo-nginx-module-v0.57-0-g91ee9a8.tar.gz) = 65082 SHA256 (openresty-headers-more-nginx-module-v0.26-0-gd20bf26.tar.gz) = 5ef76a714f4a0444f8c0ff12c50ca7cc2ba21c76799bd84d8e14fbfc0d43b646 @@ -40,8 +38,6 @@ SHA256 (ngx_http_response-0.3.tar.gz) = SIZE (ngx_http_response-0.3.tar.gz) = 2244 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0.6.2-0-g27a01b3.tar.gz) = 81864aa6ca85df70d55a2574ce8aefd21ad7ea88fc012a328e59c125e56d1e77 SIZE (yaoweibin-ngx_http_substitutions_filter_module-0.6.2-0-g27a01b3.tar.gz) = 91895 -SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805 -SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796 SHA256 (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2 SIZE (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 17020 SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b @@ -74,8 +70,6 @@ SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d SIZE (naxsi-core-0.50.tgz) = 49809 SHA256 (passenger-5.0.6.tar.gz) = c82e9fbd7dcdac592b791a6f6de4cf2decd038f76509704c600c113e4f8b2fca SIZE (passenger-5.0.6.tar.gz) = 4949137 -SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec -SIZE (ngx_postgres-0.9.tar.gz) = 41022 SHA256 (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = d5f14e45c6dc0d039ad52ae889775b5af1ff80a1c8edb69361c1581aca5d0b8f SIZE (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18416 SHA256 (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = e0813f2d1e0d499c4f44f7957253c7804ccc0d3a7d4446ac0c6eec834e9c21f4 @@ -94,10 +88,6 @@ SHA256 (ngx_slowfs_cache-1.10.tar.gz) = SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809 SHA256 (openresty-srcache-nginx-module-v0.29-0-gc521830.tar.gz) = 3d671f7e07b89fa4d8130aec419c3fd3b7e070b09d1fda58468793f0d95364fc SIZE (openresty-srcache-nginx-module-v0.29-0-gc521830.tar.gz) = 58867 -SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b -SIZE (ngx_supervisord-1.4.tar.gz) = 19351 -SHA256 (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 4d843b8d0511b269382938ba5546f902ec24dbfa76c12f6bd6961d7aaaf3866a -SIZE (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 127346 SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45f9818cb8a0d848c2c83785c6e659 SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284 SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3f12cc8063ce817901f9b8a624e12fbc6035 @@ -110,3 +100,5 @@ SHA256 (calio-form-input-nginx-module-v0 SIZE (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = 10580 SHA256 (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = e90a406a14d5f419bd500e19082da81390e8ba6040926857926f1a899a53379d SIZE (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = 12510 +SHA256 (1.2.4.tar.gz) = f79521a25322cb4f504547a0b0f76fd9d024c14440e5d790e26dda70ea4f701a +SIZE (1.2.4.tar.gz) = 120448 Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sun Apr 26 22:04:57 2015 (r384806) +++ head/www/nginx/Makefile Mon Apr 27 02:16:04 2015 (r384807) @@ -74,7 +74,6 @@ OPTIONS_DEFINE= \ HTTP_REDIS \ HTTP_RESPONSE \ HTTP_SUBS_FILTER \ - HTTP_UPLOAD \ HTTP_UPLOAD_PROGRESS \ HTTP_UPSTREAM_FAIR \ HTTP_UPSTREAM_STICKY \ @@ -91,7 +90,6 @@ OPTIONS_DEFINE= \ MODSECURITY \ NAXSI \ PASSENGER \ - POSTGRES \ RDS_CSV \ RDS_JSON \ REDIS2 \ @@ -100,8 +98,6 @@ OPTIONS_DEFINE= \ SFLOW \ SLOWFS_CACHE \ SRCACHE \ - SUPERVISORD \ - TCP_PROXY \ UDPLOG \ XRID_HEADER \ XSS \ @@ -163,7 +159,6 @@ HTTP_PUSH_STREAM_DESC= 3rd party push s HTTP_REDIS_DESC= 3rd party http_redis module HTTP_RESPONSE_DESC= 3rd party http_response module HTTP_SUBS_FILTER_DESC= 3rd party subs filter module -HTTP_UPLOAD_DESC= 3rd party upload module HTTP_UPLOAD_PROGRESS_DESC= 3rd party uploadprogress module HTTP_UPSTREAM_FAIR_DESC= 3rd party upstream fair module HTTP_UPSTREAM_STICKY_DESC= 3rd party upstream sticky module @@ -180,7 +175,6 @@ MEMC_DESC= 3rd party memc (memcached) MODSECURITY_DESC= 3rd party mod_security module NAXSI_DESC= 3rd party naxsi module PASSENGER_DESC= 3rd party passenger module -POSTGRES_DESC= 3rd party postgresql module RDS_CSV_DESC= 3rd party rds_csv module RDS_JSON_DESC= 3rd party rds_json module REDIS2_DESC= 3rd party redis2 module @@ -189,8 +183,6 @@ SET_MISC_DESC= 3rd party set_misc modu SFLOW_DESC= 3rd party sflow module SLOWFS_CACHE_DESC= 3rd party slowfs_cache module SRCACHE_DESC= 3rd party srcache module -SUPERVISORD_DESC= 3rd party supervisord module -TCP_PROXY_DESC= 3rd party tcp_proxy module UDPLOG_DESC= 3rd party udplog (syslog) module XRID_HEADER_DESC= 3rd party x-rid header module XSS_DESC= 3rd party xss module @@ -325,15 +317,6 @@ DISTFILES+= ngx_cache_purge-${NGINX_CACH CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION} .endif -.if ${PORT_OPTIONS:MCTPP2} -IGNORE= CTPP2: update require -LIB_DEPENDS+= libctpp2.so:${PORTSDIR}/textproc/ctpp2 -NGINX_CTPP2_VERSION= 0.5 -MASTER_SITES+= http://dl.vbart.ru/ngx-ctpp/:ctpp2 -DISTFILES+= ngx_ctpp2-${NGINX_CTPP2_VERSION}.tar.gz:ctpp2 -CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_ctpp2-${NGINX_CTPP2_VERSION} -.endif - .if ${PORT_OPTIONS:MECHO} NGINX_ECHO_VERSION= 0.57 GIT_ECHO_VERSION= 0-g91ee9a8 @@ -502,15 +485,6 @@ CONFIGURE_ARGS+=--with-http_stub_status_ CONFIGURE_ARGS+=--with-http_sub_module .endif -.if ${PORT_OPTIONS:MHTTP_UPLOAD} -IGNORE= UPLOAD: update require -NGINX_UPLOAD_VERSION= 2.2.0 -MASTER_SITES+= http://www.grid.net.ru/nginx/download/:upload -DISTFILES+= nginx_upload_module-${NGINX_UPLOAD_VERSION}.tar.gz:upload -CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_VERSION} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upload_module.c -.endif - .if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS} NGINX_UPLOADPROGRESS_VERSION= 0.9.0 GIT_UPLOADPROGRESS_VERSION= 0-ga788dea @@ -519,7 +493,7 @@ DISTFILES+= masterzen-nginx-upload-progr CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${GIT_UPLOADPROGRESS_VERSION:S/^0-g//} .endif -.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) || !empty(PORT_OPTIONS:MSUPERVISORD) +.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) NGINX_UPSTREAM_FAIR_VERSION= 20090923 MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:upstreamfair/} MASTER_SITE_SUBDIR+= osa/:upstreamfair @@ -655,16 +629,6 @@ CFLAGS+= -DNDEBUG .endif .endif -.if ${PORT_OPTIONS:MPOSTGRES} -IGNORE= POSTGRES: update require -USES+= pgsql -NGINX_POSTGRES_VERSION= 0.9 -MASTER_SITES+= http://labs.frickle.com/files/:postgres -DISTFILES+= ngx_postgres-${NGINX_POSTGRES_VERSION}.tar.gz:postgres -CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres-config -.endif - .if ${PORT_OPTIONS:MRDS_CSV} NGINX_RDS_CSV_VERSION= 0.05 GIT_RDS_CSV_VERSION= 0-g607e26b @@ -730,23 +694,6 @@ DISTFILES+= openresty-srcache-nginx-modu CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//} .endif -.if ${PORT_OPTIONS:MSUPERVISORD} -IGNORE= SUPERVISORD: update require -NGINX_SUPERVISORD_VERSION= 1.4 -MASTER_SITES+= http://labs.frickle.com/files/:supervisord -DISTFILES+= ngx_supervisord-${NGINX_SUPERVISORD_VERSION}.tar.gz:supervisord -CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_VERSION} -.endif - -.if ${PORT_OPTIONS:MTCP_PROXY} -IGNORE= TCP_PROXY: update require -NGINX_TCP_PROXY_VERSION= 0.26 -GIT_TCP_PROXY_VERSION= 0-gb83e5a6 -MASTER_SITES+= https://github.com/yaoweibin/nginx_tcp_proxy_module/tarball/v${NGINX_TCP_PROXY_VERSION}/:tcp_proxy -DISTFILES+= yaoweibin-nginx_tcp_proxy_module-v${NGINX_TCP_PROXY_VERSION}-${GIT_TCP_PROXY_VERSION}.tar.gz:tcp_proxy -CONFIGURE_ARGS+=--add-module=${WRKDIR}/yaoweibin-nginx_tcp_proxy_module-${GIT_TCP_PROXY_VERSION:S/^0-g//} -.endif - .if ${PORT_OPTIONS:MUDPLOG} NGINX_UDPLOG_VERSION= 1.0.0 MASTER_SITES+= http://www.grid.net.ru/nginx/download/:udplog @@ -910,11 +857,6 @@ post-patch: s!-Iext/libeio!!' \ ${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb .endif -.if ${PORT_OPTIONS:MPOSTGRES} - @${REINPLACE_CMD} \ - 's!%%PREFIX%%!${LOCALBASE}!g' \ - ${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION}/config -.endif .if ${PORT_OPTIONS:MSFLOW} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ @@ -926,19 +868,6 @@ post-patch: ${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}/src/ngx_http_lua_socket_tcp.c .endif .endif -.if ${PORT_OPTIONS:MSUPERVISORD} - ( cd ${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} && \ - ${PATCH} -p0 < \ - ${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_VERSION}/patches/ngx_http_upstream_fair_module.patch ) - ( cd ${WRKSRC} && \ - ${PATCH} -p0 < \ - ${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_VERSION}/patches/ngx_http_upstream_init_busy-0.8.17.patch ) -.endif -.if ${PORT_OPTIONS:MTCP_PROXY} - ( cd ${WRKSRC} && \ - ${PATCH} -p1 < \ - ${WRKDIR}/yaoweibin-nginx_tcp_proxy_module-${GIT_TCP_PROXY_VERSION:S/^0-g//}/tcp.patch ) -.endif .if ${PORT_OPTIONS:MICONV} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Sun Apr 26 22:04:57 2015 (r384806) +++ head/www/nginx/distinfo Mon Apr 27 02:16:04 2015 (r384807) @@ -12,8 +12,6 @@ SHA256 (ngx_http_auth_pam_module-1.2.tar SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c SIZE (ngx_cache_purge-2.3.tar.gz) = 12248 -SHA256 (ngx_ctpp2-0.5.tar.gz) = f8adfecc23e2c23af95df8549ef92fd52598b21506a9d9df2278b2605668d5a6 -SIZE (ngx_ctpp2-0.5.tar.gz) = 19686 SHA256 (openresty-echo-nginx-module-v0.57-0-g91ee9a8.tar.gz) = 1c20511adb616917cfa13868a19b8dfefe7f9c7c31730a81ad6f0a8a67d61d04 SIZE (openresty-echo-nginx-module-v0.57-0-g91ee9a8.tar.gz) = 65082 SHA256 (openresty-headers-more-nginx-module-v0.26-0-gd20bf26.tar.gz) = 5ef76a714f4a0444f8c0ff12c50ca7cc2ba21c76799bd84d8e14fbfc0d43b646 @@ -40,8 +38,6 @@ SHA256 (ngx_http_response-0.3.tar.gz) = SIZE (ngx_http_response-0.3.tar.gz) = 2244 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0.6.2-0-g27a01b3.tar.gz) = 81864aa6ca85df70d55a2574ce8aefd21ad7ea88fc012a328e59c125e56d1e77 SIZE (yaoweibin-ngx_http_substitutions_filter_module-0.6.2-0-g27a01b3.tar.gz) = 91895 -SHA256 (nginx_upload_module-2.2.0.tar.gz) = b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805 -SIZE (nginx_upload_module-2.2.0.tar.gz) = 25796 SHA256 (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2 SIZE (masterzen-nginx-upload-progress-module-v0.9.0-0-ga788dea.tar.gz) = 17020 SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b @@ -74,8 +70,6 @@ SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d SIZE (naxsi-core-0.50.tgz) = 49809 SHA256 (passenger-5.0.6.tar.gz) = c82e9fbd7dcdac592b791a6f6de4cf2decd038f76509704c600c113e4f8b2fca SIZE (passenger-5.0.6.tar.gz) = 4949137 -SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec -SIZE (ngx_postgres-0.9.tar.gz) = 41022 SHA256 (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = d5f14e45c6dc0d039ad52ae889775b5af1ff80a1c8edb69361c1581aca5d0b8f SIZE (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18416 SHA256 (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = e0813f2d1e0d499c4f44f7957253c7804ccc0d3a7d4446ac0c6eec834e9c21f4 @@ -94,10 +88,6 @@ SHA256 (ngx_slowfs_cache-1.10.tar.gz) = SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809 SHA256 (openresty-srcache-nginx-module-v0.29-0-gc521830.tar.gz) = 3d671f7e07b89fa4d8130aec419c3fd3b7e070b09d1fda58468793f0d95364fc SIZE (openresty-srcache-nginx-module-v0.29-0-gc521830.tar.gz) = 58867 -SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b -SIZE (ngx_supervisord-1.4.tar.gz) = 19351 -SHA256 (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 4d843b8d0511b269382938ba5546f902ec24dbfa76c12f6bd6961d7aaaf3866a -SIZE (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 127346 SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45f9818cb8a0d848c2c83785c6e659 SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284 SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3f12cc8063ce817901f9b8a624e12fbc6035 @@ -110,3 +100,5 @@ SHA256 (calio-form-input-nginx-module-v0 SIZE (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = 10580 SHA256 (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = e90a406a14d5f419bd500e19082da81390e8ba6040926857926f1a899a53379d SIZE (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = 12510 +SHA256 (1.2.4.tar.gz) = f79521a25322cb4f504547a0b0f76fd9d024c14440e5d790e26dda70ea4f701a +SIZE (1.2.4.tar.gz) = 120448
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504270216.t3R2G4qF018035>