Index: head/www/unit/Makefile
===================================================================
--- head/www/unit/Makefile	(revision 528538)
+++ head/www/unit/Makefile	(revision 528539)
@@ -1,111 +1,121 @@
 # Created by: Sergey A. Osokin <osa@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	unit
 PORTVERSION=	1.16.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://unit.nginx.org/download/
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT?=	Dynamic web application server
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES+=		compiler:c11 cpe
 
 CPE_VENDOR=	nginx
 CPE_PRODUCT=	unit
 
 OPTIONS_DEFINE?=	\
 	DEBUG \
 	DEVKIT \
 	IPV6 \
 	SSL \
 	UNIXSOCK
 OPTIONS_DEFAULT?=UNIXSOCK
 
 DEBUG_DESC=	Enable debug logging
 DEVKIT_DESC=	Install headers and library
 SSL_DESC=	Enable SSL/TLS
 UNIXSOCK_DESC=	Enable unix sockets
 
 .include <bsd.port.options.mk>
 
 HAS_CONFIGURE=	yes
 
 UNIT_VARDIR?=	/var
 UNIT_LOGDIR?=	${UNIT_VARDIR}/log/${PORTNAME}
 UNIT_LOGFILE?=	${UNIT_LOGDIR}/${PORTNAME}.log
 UNIT_PIDFILE?=	${UNIT_RUNDIR}/${PORTNAME}.pid
 UNIT_RUNDIR?=	${UNIT_VARDIR}/run/unit
 UNIT_SOCK?=	${UNIT_RUNDIR}/control.unit.sock
 UNIT_TMPDIR?=	${UNIT_VARDIR}/tmp/unit
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--ld-opt="-L${LOCALBASE}/lib" \
 		--log=${UNIT_LOGFILE} \
 		--modules=libexec/unit/modules \
 		--pid=${UNIT_PIDFILE} \
 		--state=libexec/unit \
-		--tmp=${UNIT_TMPDIR}
+		--tmp=${UNIT_TMPDIR} \
+		--user=${WWWOWN} --group=${WWWGRP}
 
-PLIST_FILES?=	sbin/unitd
+USERS?=	${WWWOWN}
+GROUPS?=${WWWGRP}
+
+ALL_TARGET=
+
 PLIST_DIRS?=	libexec/unit/modules \
 		libexec/unit
+PLIST_FILES?=	sbin/unitd
 
 USE_RC_SUBR?=	unitd
 SUB_LIST=	PREFIX=${PREFIX} \
 		UNIT_PIDFILE=${UNIT_PIDFILE} \
-		UNIT_SOCK=${UNIT_SOCK}
+		UNIT_SOCK=${UNIT_SOCK} \
+		UNIT_TMPDIR=${UNIT_TMPDIR} \
+		WWWOWN=${WWWOWN} \
+		WWWGRP=${WWWGRP}
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--debug
 .endif
 
 .if ${PORT_OPTIONS:MDEVKIT}
 PLIST_FILES+=	include/nxt_unit_field.h \
 		include/nxt_unit_request.h \
 		include/nxt_unit_response.h \
 		include/nxt_unit_sptr.h \
 		include/nxt_unit_typedefs.h \
 		include/nxt_unit_websocket.h \
 		include/nxt_unit.h \
 		include/nxt_version.h \
 		include/nxt_websocket_header.h \
 		lib/libunit.a
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=--no-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=--openssl
 USES+=		ssl
 .endif
 
 .if empty(PORT_OPTIONS:MUNIXSOCK)
 CONFIGURE_ARGS+=--no-unix-sockets
 .else
 CONFIGURE_ARGS+=--control=unix:${UNIT_SOCK}
 .endif
 
 post-build-DEVKIT-on:
 	@cd ${WRKSRC} && ${MAKE} build/libunit.a
 
 .if !target(post-install)
 post-install:
 	${MKDIR} ${STAGEDIR}${UNIT_LOGDIR}
 	${MKDIR} ${STAGEDIR}${UNIT_RUNDIR}
 	${MKDIR} ${STAGEDIR}${UNIT_TMPDIR}
 	${ECHO_CMD} @dir ${UNIT_LOGDIR} >> ${TMPPLIST}
 	${ECHO_CMD} @dir ${UNIT_RUNDIR} >> ${TMPPLIST}
 	${ECHO_CMD} @dir ${UNIT_TMPDIR} >> ${TMPPLIST}
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules
 
 post-install-DEVKIT-on:
 	${MAKE} -C ${WRKSRC} libunit-install DESTDIR=${STAGEDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/www/unit/files/unitd.in
===================================================================
--- head/www/unit/files/unitd.in	(revision 528538)
+++ head/www/unit/files/unitd.in	(revision 528539)
@@ -1,44 +1,55 @@
 #!/bin/sh
 #
 # $FreeBSD$
 
 # PROVIDE: unitd
 # REQUIRE: LOGIN cleanvar
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable nginx:
 # unitd_enable (bool):          Set to "NO" by default.
 #                               Set it to "YES" to enable unit
 # unitd_sockfile (str):         Set to "" by default.
 #                               Set it to "127.0.0.1:8443" to enable the unit control
 #                               socket on the network address
 
 . /etc/rc.subr
 
 name="unitd"
 rcvar=unitd_enable
 
 command="%%PREFIX%%/sbin/unitd"
 start_precmd=start_precmd
+_tmpprefix="%%UNIT_TMPDIR%%"
 
+unitd_checktmpdir()
+{
+    if [ ! -d ${_tmpprefix} ] ; then
+        install -d -o %%WWWOWN%% -g %%WWWGRP%% -m 755 ${_tmpprefix}
+    else
+        chown -R %%WWWOWN%%:%%WWWGRP%% ${_tmpprefix}
+    fi
+}
+
 start_precmd()
 {
+    unitd_checktmpdir
     rm -f %%UNIT_SOCK%%
 }
 
 load_rc_config $name
 
 # Default value
 : ${unitd_sockfile=""}
 
 pidfile=${unit_pidfile:-"%%UNIT_PIDFILE%%"}
 unitd_enable=${unitd_enable:-"NO"}
 sockfile=${unitd_sockfile}
 
 if [ x${sockfile} != "x" ]
 then
     command_args="--control ${sockfile}"
 fi
 
 run_rc_command "$1"