diff options
| author | osa <osa@FreeBSD.org> | 2010-01-06 06:06:43 +0800 |
|---|---|---|
| committer | osa <osa@FreeBSD.org> | 2010-01-06 06:06:43 +0800 |
| commit | 8dac272dc3c1946696c49d5b617b35bc27d0d8a9 (patch) | |
| tree | aa9181cd7c41faab7c46b7ffda9d7399b3304911 /www/nginx/Makefile | |
| parent | 03aefe6f79e7a6ccc58b2a0f15326bf34453c5ae (diff) | |
| download | freebsd-ports-gnome-8dac272dc3c1946696c49d5b617b35bc27d0d8a9.tar.gz freebsd-ports-gnome-8dac272dc3c1946696c49d5b617b35bc27d0d8a9.tar.zst freebsd-ports-gnome-8dac272dc3c1946696c49d5b617b35bc27d0d8a9.zip | |
Accordingly commit changes for third-party modules in www/nginx
and www/nginx-devel:
o) update uploadprogress from 0.7 to 0.8;
o) update upstream_fair from 20081012 to 20090923;
o) update supervisord from 1.2 to 1.3;
o) add udplog (syslog) module version 1.0.0;
o) s/modle/module/ for both Makefiles.
Remove needless patches.
Do not bump PORTREVISIONs.
Diffstat (limited to 'www/nginx/Makefile')
| -rw-r--r-- | www/nginx/Makefile | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index c9da30e12a0a..2ac1ef30257b 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -60,7 +60,8 @@ OPTIONS= DEBUG "Build with debug" off \ HTTP_ZIP_MODULE "3rd party http_zip module" off \ PASSENGER_MODULE "3rd party passenger module" off \ SLOWFS_CACHE_MODULE "3rd party slowfs_cache module" off \ - SUPERVISORD_MODULE "3rd party supervisord modle" off + SUPERVISORD_MODULE "3rd party supervisord module" off \ + UDPLOG_MODULE "3rd party updlog (syslog) module" off WANT_GNOME= yes MAKE_JOBS_SAFE= yes @@ -271,7 +272,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_MODULE .endif .if defined(WITH_HTTP_UPLOAD_PROGRESS) -NGINX_UPLOADPROGRESS_MODULE_VERSION= 0.7 +NGINX_UPLOADPROGRESS_MODULE_VERSION= 0.8 MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:uploadprogress/} MASTER_SITE_SUBDIR+= osa/:uploadprogress DISTFILES+= nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}.tar.gz:uploadprogress @@ -279,7 +280,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_uploadprogress_module-${NGINX_UPLOA .endif .if defined(WITH_HTTP_UPSTREAM_FAIR) || defined(WITH_SUPERVISORD_MODULE) -NGINX_UPSTREAM_FAIR_VERSION= 20081012 +NGINX_UPSTREAM_FAIR_VERSION= 20090923 MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:upstreamfair/} MASTER_SITE_SUBDIR+= osa/:upstreamfair DISTFILES+= nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfair @@ -330,12 +331,19 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_MOD .endif .if defined(WITH_SUPERVISORD_MODULE) -NGINX_SUPERVISORD_MODULE_VERSION= 1.2 +NGINX_SUPERVISORD_MODULE_VERSION= 1.3 MASTER_SITES+= http://labs.frickle.com/files/:supervisord DISTFILES+= ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}.tar.gz:supervisord CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION} .endif +.if defined(WITH_UDPLOG_MODULE) +NGINX_UDPLOG_MODULE_VERSION= 1.0.0 +MASTER_SITES+= http://www.grid.net.ru/nginx/download/:udplog +DISTFILES+= nginx_udplog_module-${NGINX_UDPLOG_MODULE_VERSION}.tar.gz:udplog +CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_udplog_module-${NGINX_UDPLOG_MODULE_VERSION} +.endif + .if defined(WITH_WWW) PLIST_SUB+= WWWDATA="" .else @@ -397,10 +405,6 @@ post-patch: @${PATCH} ${PATCH_ARGS} < \ ${PATCHDIR}/extra-patch-ngx_http_notice_module.c .endif -.if defined(WITH_HTTP_UPLOAD_PROGRESS) - @${PATCH} ${PATCH_ARGS} < \ - ${PATCHDIR}/extra-patch-ngx_http_uploadprogress_module.c -.endif .if defined(WITH_PASSENGER_MODULE) @${REINPLACE_CMD} 's!g++!${CXX}!' \ ${WRKDIR}/passenger-${PASSENGER_VERSION}/Rakefile @@ -409,7 +413,7 @@ post-patch: ${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info.rb .endif .if defined(WITH_SUPERVISORD_MODULE) - ( cd ${WRKDIR}/nginx_upstream_fair-20081012 && \ + ( cd ${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} && \ ${PATCH} -p0 < \ ${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}/patches/ngx_http_upstream_fair_module.patch ) ( cd ${WRKSRC} && \ |