diff options
| author | osa <osa@FreeBSD.org> | 2014-05-05 00:41:16 +0800 |
|---|---|---|
| committer | osa <osa@FreeBSD.org> | 2014-05-05 00:41:16 +0800 |
| commit | 28dd8293d2bae8eccbae67e4d133c6126c0a6a75 (patch) | |
| tree | 1d7e1664f7e3277b3e654010fd19bccbca0c7b54 /www/nginx | |
| parent | 58524fb3915c690615cc5378dbd5013b4a739871 (diff) | |
| download | freebsd-ports-gnome-28dd8293d2bae8eccbae67e4d133c6126c0a6a75.tar.gz freebsd-ports-gnome-28dd8293d2bae8eccbae67e4d133c6126c0a6a75.tar.zst freebsd-ports-gnome-28dd8293d2bae8eccbae67e4d133c6126c0a6a75.zip | |
Update from 1.4.7 to 1.6.0.
Temporary disable third-party modules and patches:
o http_upstream_sticky
o postgres
o syslog_support
o tcp_proxy
ChangeLog: http://nginx.org/en/CHANGES-1.6
Diffstat (limited to 'www/nginx')
| -rw-r--r-- | www/nginx/Makefile | 7 | ||||
| -rw-r--r-- | www/nginx/distinfo | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 358999914809..72dbf486690e 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTVERSION= 1.4.7 -PORTREVISION= 1 +PORTVERSION= 1.6.0 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ @@ -535,6 +534,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upstream.h .endif .if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} +IGNORE= STICKY: update require USE_HTTP_SSL= yes NGINX_UPSTREAM_STICKY_VERSION= 1.1 MASTER_SITES+= http://nginx-sticky-module.googlecode.com/files/:upstreamsticky @@ -660,6 +660,7 @@ CFLAGS+= -DNDEBUG .endif .if ${PORT_OPTIONS:MPOSTGRES} +IGNORE= POSTGRES: update require USE_PGSQL= yes NGINX_POSTGRES_VERSION= 0.9 MASTER_SITES+= http://labs.frickle.com/files/:postgres @@ -740,12 +741,14 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_VERSI .endif .if ${PORT_OPTIONS:MSYSLOG_SUPPORT} +IGNORE= SYSLOG: update require NGINX_SYSLOG_SUPPORT_FACILITY?= LOG_DAEMON CONFIGURE_ARGS+=--with-syslog --with-syslog-facility=${NGINX_SYSLOG_SUPPORT_FACILITY} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-syslog_support .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 diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 9f76e5638214..698ce53a004e 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,5 +1,5 @@ -SHA256 (nginx-1.4.7.tar.gz) = 23b8ff4a76817090678f91b0efbfcef59a93492f6612dc8370c44c1f1ce1b626 -SIZE (nginx-1.4.7.tar.gz) = 769153 +SHA256 (nginx-1.6.0.tar.gz) = 943ad757a1c3e8b3df2d5c4ddacc508861922e36fa10ea6f8e3a348fc9abfc1a +SIZE (nginx-1.6.0.tar.gz) = 802956 SHA256 (giom-nginx_accept_language_module-2f69842.tar.gz) = fbcdf792160a1eff7b9549aeb5209d6e76716ff8e86b05e42c90b2d2f858e011 SIZE (giom-nginx_accept_language_module-2f69842.tar.gz) = 3399 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1 |