Index: head/mail/opensmtpd/Makefile
===================================================================
--- head/mail/opensmtpd/Makefile	(revision 527011)
+++ head/mail/opensmtpd/Makefile	(revision 527012)
@@ -1,67 +1,70 @@
 # Created by: Ashish SHUKLA <ashish@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	opensmtpd
-PORTVERSION=	6.6.3
+PORTVERSION=	6.6.4
 DISTVERSIONSUFFIX=	p1
 PORTEPOCH=	1
 PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 OPTIONS_DEFINE=	CA_BUNDLE LIBASRDEVEL MAILERCONF PAM TABLE_DB
 
 OPTIONS_DEFAULT=	CA_BUNDLE PAM TABLE_DB
 
 CA_BUNDLE_DESC=		Use NSS CA bundle for SSL instead of /etc/ssl/cert.pem
 LIBASRDEVEL_DESC=	Use development version of libasr
 MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
 TABLE_DB_DESC=		Build table-db plugin (aliases)
 
 USES=		cpe groff libtool ssl
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	openbsd
 
 USE_RC_SUBR=	smtpd
 SUB_FILES=	pkg-install pkg-deinstall pkg-message
 
 CONFLICTS_INSTALL=	postfix-[0-9]* sendmail-[0-9]* opensmtpd-devel-[0-9]*
 
 USERS=		_smtpd _smtpq
 GROUPS=		_smtpd _smtpq
 
 OPTIONS_SUB=	yes
 
 CA_BUNDLE_CONFIGURE_WITH=	path-CAfile=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 LIBASRDEVEL_LIB_DEPENDS_OFF=	libasr.so:dns/libasr
 LIBASRDEVEL_LIB_DEPENDS=	libasr.so:dns/libasr-devel
 
 PAM_CONFIGURE_WITH=	auth-pam=smtpd
 TABLE_DB_CONFIGURE_WITH=	table-db
 
 CONFIGURE_ARGS+=	--with-libasr=${LOCALBASE} \
 			--with-libevent=${LOCALBASE} \
-			--sysconfdir=${PREFIX}/etc/mail/
+			--sysconfdir=${PREFIX}/etc/mail/ \
+			--with-user-smtpd=_smtpd \
+			--with-user-queue=_smtpq \
+			--with-group-queue=_smtpq
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && \
     (${OSVERSION} < 1200084 && ${SSL_DEFAULT} == "base")
 BROKEN=		Openssl 1.0 API is EoL, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=[openssl|libressl*] to /etc/make.conf
 .endif
 
 post-install-TABLE_DB-on:
 	@${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap
 
 .include <bsd.port.post.mk>
Index: head/mail/opensmtpd/distinfo
===================================================================
--- head/mail/opensmtpd/distinfo	(revision 527011)
+++ head/mail/opensmtpd/distinfo	(revision 527012)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581434283
-SHA256 (opensmtpd-6.6.3p1.tar.gz) = 9ef7c0eb7ffc5c84dca7651cec69bd7b180014cd5227f6dbc7a303eaa9d41eb7
-SIZE (opensmtpd-6.6.3p1.tar.gz) = 787196
+TIMESTAMP = 1582566329
+SHA256 (opensmtpd-6.6.4p1.tar.gz) = e2f9962a6b99b3cc1572b63a10db648fdca4ad2b58079b680b4202cc7c82d7cf
+SIZE (opensmtpd-6.6.4p1.tar.gz) = 790754
Index: head/mail/opensmtpd/pkg-plist
===================================================================
--- head/mail/opensmtpd/pkg-plist	(revision 527011)
+++ head/mail/opensmtpd/pkg-plist	(revision 527012)
@@ -1,22 +1,22 @@
 @sample etc/mail/smtpd.conf.sample
 bin/smtp
 libexec/opensmtpd/encrypt
 libexec/opensmtpd/lockspool
 libexec/opensmtpd/mail.lmtp
 libexec/opensmtpd/mail.local
 libexec/opensmtpd/mail.maildir
 libexec/opensmtpd/mail.mboxfile
 libexec/opensmtpd/mail.mda
 %%TABLE_DB%%libexec/opensmtpd/makemap
-@(,,2555) sbin/smtpctl
+@(,_smtpq,2555) sbin/smtpctl
 sbin/smtpd
 man/man1/smtp.1.gz
 man/man5/aliases.5.gz
 man/man5/forward.5.gz
 man/man5/smtpd.conf.5.gz
 man/man5/table.5.gz
 %%TABLE_DB%%man/man8/makemap.8.gz
 %%TABLE_DB%%man/man8/newaliases.8.gz
 man/man8/sendmail.8.gz
 man/man8/smtpctl.8.gz
 man/man8/smtpd.8.gz