diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2011-09-14 17:01:32 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2011-09-14 17:01:32 +0000 |
| commit | 885515b7c39c8c1e4f291652eb98feaa966936e1 (patch) | |
| tree | cceeb4e85fb27682c35bf1ef1d8a1df5eda33602 /www | |
| parent | 559e44f0eb3037f8a22f28b60431c4d1d5d41a2f (diff) | |
| download | ports-885515b7c39c8c1e4f291652eb98feaa966936e1.tar.gz ports-885515b7c39c8c1e4f291652eb98feaa966936e1.zip | |
Update from 1.1.2 to 1.1.3.
Original http_mp4 and third-party http_mp4_h268 modules are
incompatible, add note about.
Change state from BROKEN to IGNORE for building third-party lua
module with devel_kit module.
<ChangeLog>
*) Feature: the module ngx_http_mp4_module.
*) Bugfix: in Linux AIO combined with open_file_cache.
*) Bugfix: open_file_cache did not update file info on retest if file
was not atomically changed.
*) Bugfix: nginx could not be built on MacOSX 10.7.
</ChangeLog>
Notes
Notes:
svn path=/head/; revision=281772
Diffstat (limited to 'www')
| -rw-r--r-- | www/nginx-devel/Makefile | 14 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 6822d7600f84..8dfc8f301d7e 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nginx -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= ${MASTER_SITE_LOCAL} @@ -33,6 +32,7 @@ OPTIONS= DEBUG "Enable nginx debugging" off \ HTTP_GEOIP_MODULE "Enable http_geoip module" off \ HTTP_GZIP_STATIC_MODULE "Enable http_gzip_static module" off \ HTTP_IMAGE_FILTER_MODULE "Enable http_image_filter module" off \ + HTTP_MP4_MODULE "Enable http_mp4 module" off \ HTTP_PERL_MODULE "Enable http_perl module" off \ HTTP_RANDOM_INDEX_MODULE "Enable http_random_index module" off \ HTTP_REALIP_MODULE "Enable http_realip module" off \ @@ -268,6 +268,14 @@ LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd CONFIGURE_ARGS+=--with-http_image_filter_module .endif +.if defined(WITH_HTTP_MP4_MODULE) && defined(WITH_HTTP_MP4_H264_MODULE) +IGNORE= http_mp4 and third-party http_mp4_h264 modules are incompatible. Please select one +.endif + +.if defined(WITH_HTTP_MP4_MODULE) +CONFIUGURE_ARGS+=--with-http_mp4_module +.endif + .if defined(WITH_HTTP_MOGILEFS_MODULE) NGINX_MOGILEFS_MODULE_VERSION= 1.0.4 MASTER_SITES+= http://www.grid.net.ru/nginx/download/:mogilefs @@ -435,7 +443,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_MODULE_ .if defined(WITH_LUA_MODULE) .if !defined(WITH_DEVEL_KIT_MODULE) -BROKEN= for lua module build devel_kit also should be defined +IGNORE= for lua module build devel_kit also should be defined .endif USE_LUA= 5.1+ NGINX_LUA_MODULE_VERSION= 0.3.0 diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 3ce5ab13b639..5edd01007dfb 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,5 +1,5 @@ -SHA256 (nginx-1.1.2.tar.gz) = cc64476ae800c45d2ba810274387139e5d8cbb8c1e45e8701416eea2a377151b -SIZE (nginx-1.1.2.tar.gz) = 674101 +SHA256 (nginx-1.1.3.tar.gz) = b058563eb271eec2257cffd5ae88c4c0942231d5eec6035fc31b6e2d0b50a602 +SIZE (nginx-1.1.3.tar.gz) = 685151 SHA256 (giom-nginx_accept_language_module-02262ce.tar.gz) = 3191f4caa70d9a8942c4f10b6abaaa96af451991d4b5e1e3d7b991376b00bf0c SIZE (giom-nginx_accept_language_module-02262ce.tar.gz) = 3398 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1 |