Index: www/nginx/Makefile
===================================================================
--- www/nginx/Makefile	(revision 402634)
+++ www/nginx/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
@@ -216,13 +216,13 @@
 .endif
 
 NGINX_VARDIR?=	/var
-NGINX_LOGDIR?=	${NGINX_VARDIR}/log
+NGINX_LOGDIR?=	${NGINX_VARDIR}/log/nginx
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
 NGINX_TMPDIR?=	${NGINX_VARDIR}/tmp/nginx
 HTTP_PORT?=	80
 
-NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/nginx-access.log
-NGINX_ERRORLOG?=	${NGINX_LOGDIR}/nginx-error.log
+NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
+NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
 
 CONFLICTS?=	nginx-devel-1.*
 USE_RC_SUBR=	nginx
@@ -896,7 +896,7 @@
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
 .endif
 
-PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} NGINX_LOGDIR=${NGINX_LOGDIR}
 
 USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
@@ -1017,6 +1017,7 @@
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
+	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
 .for i in koi-utf koi-win win-utf
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}
Index: www/nginx/pkg-plist
===================================================================
--- www/nginx/pkg-plist	(revision 402634)
+++ www/nginx/pkg-plist	(working copy)
@@ -25,4 +25,5 @@
 %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
 sbin/nginx
 @dir %%NGINX_TMPDIR%%
+@dir %%NGINX_LOGDIR%%
 man/man8/nginx.8.gz