MFH: r447740

- www/nginx-devel: Update from 1.13.3 to 1.13.4
- pet Portlint

- Changelog:
  *) Feature: the ngx_http_mirror_module.

  *) Bugfix: client connections might be dropped during configuration
       testing when using the "reuseport" parameter of the "listen"
       directive on Linux.

  *) Bugfix: request body might not be available in subrequests if it was
       saved to a file and proxying was used.

  *) Bugfix: cleaning cache based on the "max_size" parameter did not work
       on Windows.

  *) Bugfix: any shared memory allocation required 4096 bytes on Windows.

  *) Bugfix: nginx worker might be terminated abnormally when using the
       "zone" directive inside the "upstream" block on Windows.

Approved by:	osa (maintainer)
Approved by:	miwi (mentor)
Differential Revision:	https://reviews.freebsd.org/D11951

Approved by:	ports-secteam (feld)

2 files changed, 16 insertions, 16 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index a308d841b8b3..bbcd4d104b76 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nginx
-PORTVERSION=	1.13.3
+PORTVERSION=	1.13.4
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -241,9 +241,9 @@ WANT_GNOME=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
-IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
 .else
-IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick-nox11
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick-nox11
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
@@ -262,10 +262,10 @@ HTTP_PORT?=	80
 NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
 NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
 
-CONFLICTS?=     nginx-1.* \
-                nginx-full-1.* \
-                nginx-lite-1.* \
-                nginx-naxsi-1.*
+CONFLICTS?=	nginx-1.* \
+			nginx-full-1.* \
+			nginx-lite-1.* \
+			nginx-naxsi-1.*
 USE_RC_SUBR=	nginx
 SUB_FILES=	pkg-message
 SUB_LIST+=	WWWOWN=${WWWOWN} \
@@ -467,11 +467,11 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_echo_request_info.c
 .endif
 
 .if ${PORT_OPTIONS:MFASTDFS}
-NGINX_FASTDFS_VERSION=     5a8110f
-GH_ACCOUNT+=    happyfish100:fastdfs
-GH_PROJECT+=    fastdfs-nginx-module:fastdfs
-GH_TAGNAME+=    ${NGINX_FASTDFS_VERSION}:fastdfs
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config
+NGINX_FASTDFS_VERSION=	5a8110f
+GH_ACCOUNT+=	happyfish100:fastdfs
+GH_PROJECT+=	fastdfs-nginx-module:fastdfs
+GH_TAGNAME+=	${NGINX_FASTDFS_VERSION}:fastdfs
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-fastdfs-src-config
 BUILD_DEPENDS+=	${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
 		${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs
 LIB_DEPENDS+=	libfastcommon.so:devel/libfastcommon \
@@ -763,7 +763,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_sticky_misc.c
 
 .if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR}
 NGINX_VIDEO_THUMBEXTRACTOR_VERSION=	0.7.0
-LIB_DEPENDS+= 	libavformat.so:multimedia/ffmpeg \
+LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg \
 		libavcodec.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 0cf0a12c95ae..e744a6fac4e7 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1499818490
-SHA256 (nginx-1.13.3.tar.gz) = 5b73f98004c302fb8e4a172abf046d9ce77739a82487e4873b39f9b0dcbb0d72
-SIZE (nginx-1.13.3.tar.gz) = 985931
+TIMESTAMP = 1502363751
+SHA256 (nginx-1.13.4.tar.gz) = de21f3c49ba65c611329d8759a63d72e5fcf719bc6f2a3270e2541348ef1fbba
+SIZE (nginx-1.13.4.tar.gz) = 988415
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
 SIZE (ngx_cache_purge-2.3.tar.gz) = 12248
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae