diff -ruN opensmtpd.orig/Makefile opensmtpd/Makefile
--- opensmtpd.orig/Makefile	2019-10-18 06:23:47.534970000 -0500
+++ opensmtpd/Makefile	2019-10-21 19:34:42.321433000 -0500
@@ -2,9 +2,9 @@
 # $FreeBSD: head/mail/opensmtpd/Makefile 507877 2019-08-02 13:30:40Z jbeich $
 
 PORTNAME=	opensmtpd
-PORTVERSION=	5.9.2p1
+PORTVERSION=	6.4.2p1
 PORTEPOCH=	1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
 		http://distfiles.pirateparty.in/ashish/
@@ -13,12 +13,13 @@
 COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
 
 LICENSE=	ISCL
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_SSL=	openssl111
 BROKEN_SSL_REASON_openssl111=		Incompatible with Openssl 1.1.x yet
 
 LIB_DEPENDS=	libevent.so:devel/libevent
+LIB_DEPENDS=    libssl.so:security/libressl
+LIB_DEPENDS=	libcrypto.so:security/libressl
 
 OPTIONS_DEFINE=	CA_BUNDLE LIBASRDEVEL MAILERCONF PAM TABLE_DB
 
@@ -29,7 +30,7 @@
 MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
 TABLE_DB_DESC=		Build table-db plugin (aliases)
 
-USES=		cpe groff libtool ssl
+USES=		cpe libtool ssl groff
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	openbsd
@@ -66,9 +67,10 @@
 BROKEN=		Incompatible with Openssl 1.1.x yet
 .endif
 
-post-patch:
-	${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in
-
+post-install:
+	@${MKDIR} ${PREFIX}/etc/mail
+	@${CP} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/smtpd/smtpd.conf ${PREFIX}/etc/mail/smtpd.conf
+ 
 post-install-TABLE_DB-on:
 	@${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap
 
diff -ruN opensmtpd.orig/distinfo opensmtpd/distinfo
--- opensmtpd.orig/distinfo	2019-10-18 06:23:47.535264000 -0500
+++ opensmtpd/distinfo	2019-10-18 07:39:11.921156000 -0500
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463428051
-SHA256 (opensmtpd-5.9.2p1.tar.gz) = 3522f273c1630c781facdb2b921228e338ed4e651909316735df775d6a70a71d
-SIZE (opensmtpd-5.9.2p1.tar.gz) = 681855
+TIMESTAMP = 1571402351
+SHA256 (opensmtpd-6.4.2p1.tar.gz) = 6d71155b15fa4ef0198d10dfb7b1905845c9d36d4a02321245a99da80002fb5d
+SIZE (opensmtpd-6.4.2p1.tar.gz) = 720987
diff -ruN opensmtpd.orig/files/patch-mk_smtpd_Makefile.in opensmtpd/files/patch-mk_smtpd_Makefile.in
--- opensmtpd.orig/files/patch-mk_smtpd_Makefile.in	2019-10-18 06:23:47.535778000 -0500
+++ opensmtpd/files/patch-mk_smtpd_Makefile.in	1969-12-31 18:00:00.000000000 -0600
@@ -1,17 +0,0 @@
---- mk/smtpd/Makefile.in.orig	2016-02-02 20:40:51 UTC
-+++ mk/smtpd/Makefile.in
-@@ -1365,13 +1365,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP
- 	$(MKDIR_P) $(DESTDIR)$(bindir)
- 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
- 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
--
--	@if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then			\
--		$(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \
--	else									\
--		echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \
--	fi
--
-+	$(INSTALL) -m 644 smtpd.conf.out	$(DESTDIR)$(sysconfdir)/smtpd.conf.sample
- 	$(INSTALL) -m 644 aliases.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5
- 	$(INSTALL) -m 644 forward.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/forward.5
- 	$(INSTALL) -m 644 table.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/table.5
diff -ruN opensmtpd.orig/files/patch-smtpd-rfc2822.c opensmtpd/files/patch-smtpd-rfc2822.c
--- opensmtpd.orig/files/patch-smtpd-rfc2822.c	2019-10-18 06:23:47.536027000 -0500
+++ opensmtpd/files/patch-smtpd-rfc2822.c	1969-12-31 18:00:00.000000000 -0600
@@ -1,19 +0,0 @@
---- smtpd/rfc2822.c.orig	2018-05-01 13:33:10.000000000 +0000
-+++ smtpd/rfc2822.c	2018-05-01 13:34:47.931554000 +0000
-@@ -53,4 +53,7 @@
- 	struct rfc2822_hdr_miss_cb	*hdr_miss_cb;
-+ 	
-+ 	if (!rp->in_hdr)
-+		goto end;
- 
- 	TAILQ_FOREACH(hdr_cb, &rp->hdr_cb, next)
- 	    if (strcasecmp(hdr_cb->name, rp->header.name) == 0) {
-@@ -151,6 +152,8 @@
- 		return;
- 
- 	header_callback(rp);
-+
-+	missing_headers_callback(rp);
- }
- 
- void
diff -ruN opensmtpd.orig/files/patch-smtpd-smtp_session.c opensmtpd/files/patch-smtpd-smtp_session.c
--- opensmtpd.orig/files/patch-smtpd-smtp_session.c	2019-10-18 06:23:47.536301000 -0500
+++ opensmtpd/files/patch-smtpd-smtp_session.c	1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
---- smtpd/smtp_session.c.orig	2018-05-01 13:35:00.375262000 +0000
-+++ smtpd/smtp_session.c	2018-05-01 13:37:22.637096000 +0000
-@@ -1345,6 +1345,8 @@
- 			s->dataeom = 1;
- 			if (iobuf_queued(&s->obuf) == 0)
- 				smtp_data_io_done(s);
-+			else
-+				io_reload(&s->oev);
- 			return;
- 		}
- 
diff -ruN opensmtpd.orig/files/patch-src_mda.c opensmtpd/files/patch-src_mda.c
--- opensmtpd.orig/files/patch-src_mda.c	2019-10-18 06:23:47.536534000 -0500
+++ opensmtpd/files/patch-src_mda.c	1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
---- smtpd/mda.c.orig	2016-05-13 02:56:04.000000000 +1000
-+++ smtpd/mda.c	2018-04-26 10:28:45.373358000 +1000
-@@ -274,7 +274,7 @@
- 					 * if any
- 					 */
- 					n = iobuf_fqueue(&s->iobuf,
--					    "Return-Path: %s\n"
-+					    "Return-Path: <%s>\n"
- 					    "Delivered-To: %s\n",
- 					    e->sender,
- 					    e->rcpt ? e->rcpt : e->dest);
diff -ruN opensmtpd.orig/pkg-plist opensmtpd/pkg-plist
--- opensmtpd.orig/pkg-plist	2019-10-18 06:23:47.537837000 -0500
+++ opensmtpd/pkg-plist	2019-10-18 20:07:59.602133000 -0500
@@ -1,9 +1,9 @@
-@sample etc/mail/smtpd.conf.sample
 libexec/opensmtpd/encrypt
 libexec/opensmtpd/mail.local
 %%TABLE_DB%%libexec/opensmtpd/makemap
 @(,,2555) sbin/smtpctl
 sbin/smtpd
+etc/mail/smtpd.conf
 man/man5/aliases.5.gz
 man/man5/forward.5.gz
 man/man5/smtpd.conf.5.gz