Index: head/mail/opensmtpd/Makefile
===================================================================
--- head/mail/opensmtpd/Makefile	(revision 515713)
+++ head/mail/opensmtpd/Makefile	(revision 515714)
@@ -1,75 +1,71 @@
 # Created by: Ashish SHUKLA <ashish@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	opensmtpd
-PORTVERSION=	5.9.2p1
+PORTVERSION=	6.6.0
+DISTVERSIONSUFFIX=	p1
 PORTEPOCH=	1
-PORTREVISION=	7
+PORTREVISION=	0
 CATEGORIES=	mail
-MASTER_SITES=	http://www.opensmtpd.org/archives/ \
-		http://distfiles.pirateparty.in/ashish/
+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
 
-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=		Incompatible with Openssl 1.1.x yet
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=		Openssl 1.0 API is EoL, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=[openssl111|libressl*] to /etc/make.conf
 
 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=	Install CA bundle for SSL
+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} \
-			--with-libssl=${OPENSSLBASE} \
 			--sysconfdir=${PREFIX}/etc/mail/
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && \
-    ((${OSVERSION} > 1200084 && ${SSL_DEFAULT} == "base") || \
-    (${SSL_DEFAULT} == "openssl111"))
-BROKEN=		Incompatible with Openssl 1.1.x yet
+    ((${OSVERSION} < 1200084 && ${SSL_DEFAULT} == "base") || \
+    (${SSL_DEFAULT} == "openssl"))
+BROKEN=		Openssl 1.0 API is EoL, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=[openssl111|libressl*] to /etc/make.conf
 .endif
-
-post-patch:
-	${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in
 
 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 515713)
+++ head/mail/opensmtpd/distinfo	(revision 515714)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463428051
-SHA256 (opensmtpd-5.9.2p1.tar.gz) = 3522f273c1630c781facdb2b921228e338ed4e651909316735df775d6a70a71d
-SIZE (opensmtpd-5.9.2p1.tar.gz) = 681855
+TIMESTAMP = 1572104052
+SHA256 (opensmtpd-6.6.0p1.tar.gz) = 75a420941963a672b21fe6c820c51de07f1ac94a0d6d4aa4f7364124d85efce9
+SIZE (opensmtpd-6.6.0p1.tar.gz) = 771510
Index: head/mail/opensmtpd/files/patch-src_mda.c
===================================================================
--- head/mail/opensmtpd/files/patch-src_mda.c	(revision 515713)
+++ head/mail/opensmtpd/files/patch-src_mda.c	(nonexistent)
@@ -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);

Property changes on: head/mail/opensmtpd/files/patch-src_mda.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/opensmtpd/files/patch-smtpd-rfc2822.c
===================================================================
--- head/mail/opensmtpd/files/patch-smtpd-rfc2822.c	(revision 515713)
+++ head/mail/opensmtpd/files/patch-smtpd-rfc2822.c	(nonexistent)
@@ -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

Property changes on: head/mail/opensmtpd/files/patch-smtpd-rfc2822.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/opensmtpd/files/patch-smtpd-smtp_session.c
===================================================================
--- head/mail/opensmtpd/files/patch-smtpd-smtp_session.c	(revision 515713)
+++ head/mail/opensmtpd/files/patch-smtpd-smtp_session.c	(nonexistent)
@@ -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;
- 		}
- 

Property changes on: head/mail/opensmtpd/files/patch-smtpd-smtp_session.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
===================================================================
--- head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in	(revision 515713)
+++ head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in	(revision 515714)
@@ -1,17 +1,17 @@
---- mk/smtpd/Makefile.in.orig	2016-02-02 20:40:51 UTC
+--- mk/smtpd/Makefile.in.orig	2019-10-26 11:56:36 UTC
 +++ mk/smtpd/Makefile.in
-@@ -1365,13 +1365,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP
+@@ -1404,13 +1404,7 @@ install-exec-hook: $(CONFIGFILES) $(MANPAGES)
  	$(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
Index: head/mail/opensmtpd/files/pkg-message.in
===================================================================
--- head/mail/opensmtpd/files/pkg-message.in	(revision 515713)
+++ head/mail/opensmtpd/files/pkg-message.in	(revision 515714)
@@ -1,27 +1,27 @@
 [
 { type: install
   message: <<EOM
-If you are upgrading from OpenSMTPD version 5.7.3 or earlier, please
+If you are upgrading from OpenSMTPD version 5.7.3/201303011853 or earlier, please
 follow the procedure below to update the permissions on the OpenSMTPD
 spool directories:
 
   1. Stop 'smtpd' service:
 
-     # %%PREFIX%%/sbin/smtpctl stop
+     # service smtpd stop
 
   2. Update permissions:
 
      # chown -R _smtpq:wheel /var/spool/smtpd/corrupt
      # chown -R root:_smtpq /var/spool/smtpd/offline
      # chown -R _smtpq:wheel /var/spool/smtpd/purge
      # chown -R _smtpq:wheel /var/spool/smtpd/queue
      # chown -R _smtpq:wheel /var/spool/smtpd/temporary
      # chmod -R 770 /var/spool/smtpd/offline
      # chmod -R 700 /var/spool/smtpd/purge
 
   3. Start 'smtpd' service:
 
      # service smtpd start
 EOM
 }
 ]
Index: head/mail/opensmtpd/pkg-plist
===================================================================
--- head/mail/opensmtpd/pkg-plist	(revision 515713)
+++ head/mail/opensmtpd/pkg-plist	(revision 515714)
@@ -1,15 +1,21 @@
 @sample etc/mail/smtpd.conf.sample
+bin/smtp
 libexec/opensmtpd/encrypt
+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
 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
Index: head/mail/opensmtpd-extras/Makefile
===================================================================
--- head/mail/opensmtpd-extras/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras/Makefile	(revision 515714)
@@ -1,145 +1,148 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	opensmtpd-extras
-PORTVERSION=	201606230001
-PORTREVISION?=	5
+PORTVERSION?=	6.4.0
+PORTREVISION?=	0
+PORTEPOCH?=	1
 CATEGORIES+=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/
 
 # NB: Please reset PORTREVISION to 0 in all slave subports
 # while updating PORTVERSION for master port
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT?=	Addons for OpenSMTPD
 
 LICENSE?=	ISCL
 
 LIB_DEPENDS+=	libevent.so:devel/libevent
 
 USES+=		autoreconf ssl libtool
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${OPENSSLLIB}
 CFLAGS+=	-I${OPENSSLINC}
 
 CONFIGURE_ARGS+=	--sysconfdir="${PREFIX}/etc/mail"
 
 NO_OPTIONS_SORT=	yes
 
 # NB: Please *DO NOT* add the following; they are NOT for end-users:
 # filter-stub, filter-trace, filter-void
 # queue-null, queue-stub
 # scheduler-stub
 # table-stub
 
 #
 # Pass OpenSMTPD branch selection to all extras
 #
-OPTIONS_DEFINE=	OPENSMTP_DEVEL
+#OPTIONS_DEFINE=	OPENSMTP_DEVEL
 
-OPENSMTP_DEVEL_DESC=	Depend on opensmtpd-devel (opensmtpd if off)
-OPENSMTP_DEVEL_BUILD_DEPENDS_OFF=	smtpctl:mail/opensmtpd
-OPENSMTP_DEVEL_RUN_DEPENDS_OFF=		smtpctl:mail/opensmtpd
-OPENSMTP_DEVEL_BUILD_DEPENDS=	smtpctl:mail/opensmtpd-devel
-OPENSMTP_DEVEL_RUN_DEPENDS=	smtpctl:mail/opensmtpd-devel
+#OPENSMTP_DEVEL_DESC=	Depend on opensmtpd-devel (opensmtpd if off)
+#OPENSMTP_DEVEL_BUILD_DEPENDS_OFF=	smtpctl:mail/opensmtpd
+#OPENSMTP_DEVEL_RUN_DEPENDS_OFF=		smtpctl:mail/opensmtpd
+#OPENSMTP_DEVEL_BUILD_DEPENDS=	smtpctl:mail/opensmtpd-devel
+#OPENSMTP_DEVEL_RUN_DEPENDS=	smtpctl:mail/opensmtpd-devel
+BUILD_DEPENDS=	smtpctl:mail/opensmtpd
+RUN_DEPENDS=	smtpctl:mail/opensmtpd
 
+
 .if empty(SLAVE_PORT)
-OPTIONS_GROUP=			TOOLS TABLE FILTER FILTER_EXP QUEUE SCHEDULER
-OPTIONS_GROUP_FILTER=		FILTER_CLAMAV FILTER_DKIM FILTER_DNSBL FILTER_MONKEY FILTER_PAUSE FILTER_REGEX FILTER_SPAMASSASSIN
-OPTIONS_GROUP_FILTER_EXP=	FILTER_LUA FILTER_PERL FILTER_PYTHON
+OPTIONS_GROUP=			FILTER TOOLS TABLE QUEUE SCHEDULER
+OPTIONS_GROUP_FILTER=		FILTER_MONKEY
+#OPTIONS_GROUP_FILTER=		FILTER_CLAMAV FILTER_DKIM FILTER_DNSBL FILTER_MONKEY FILTER_PAUSE FILTER_REGEX FILTER_SPAMASSASSIN
+#OPTIONS_GROUP_FILTER_EXP=	FILTER_LUA FILTER_PERL FILTER_PYTHON
 OPTIONS_GROUP_QUEUE=		QUEUE_PYTHON QUEUE_RAM
 OPTIONS_GROUP_SCHEDULER=	SCHEDULER_PYTHON SCHEDULER_RAM
 OPTIONS_GROUP_TABLE=		TABLE_LDAP TABLE_MYSQL TABLE_PASSWD TABLE_PGSQL TABLE_PYTHON TABLE_REDIS TABLE_SOCKETMAP TABLE_SQLITE
 OPTIONS_GROUP_TOOLS=		TOOL_STATS
-OPTIONS_DEFAULT=		${OPTIONS_GROUP_FILTER} ${OPTIONS_GROUP_TABLE} ${OPTIONS_GROUP_TOOLS}
+OPTIONS_DEFAULT=		${OPTIONS_GROUP_TABLE} ${OPTIONS_GROUP_TOOLS}
 
 # Groups
 FILTER_DESC=			BASE FILTERS
 FILTER_EXP_DESC=		EXPERIMENTAL FILTERS
 QUEUE_DESC=			EXPERIMENTAL QUEUES
 SCHEDULER_DESC=			EXPERIMENTAL SCHEDULERS
 TABLE_DESC=			BASE TABLES
 TOOLS_DESC=			BASE TOOLS
 
 # Filters
 FILTER_CLAMAV_DESC=		Check messages with ClamAV
 FILTER_DKIM_DESC=		Sign messages with DKIM
 FILTER_DNSBL_DESC=		Check incoming senders against DNSBLs
 FILTER_LUA_DESC=		Lua-filter interface
 FILTER_MONKEY_DESC=		Filter to arbitrary reject or delay mails
 FILTER_PAUSE_DESC=		Pause before SMTP greeting to reduce spam
 FILTER_PERL_DESC=		Perl-filter interface
 FILTER_PYTHON_DESC=		Python-filter interface
 FILTER_REGEX_DESC=		${REGEX_DESC}
 FILTER_SPAMASSASSIN_DESC=	Check messages with SpamAssassin
 
 # Queues
 QUEUE_PYTHON_DESC=		The queue-python
 QUEUE_RAM_DESC=			The queue-ram
 
 # Schedulers
 SCHEDULER_PYTHON_DESC=		The scheduler-python
 SCHEDULER_RAM_DESC=		The scheduler-ram
 
 # Tables
 TABLE_LDAP_DESC=		LDAP table support
 TABLE_MYSQL_DESC=		MySQL table support
 TABLE_PASSWD_DESC=		passwd(5) table support
 TABLE_PGSQL_DESC=		PgSQL table support
 TABLE_PYTHON_DESC=		Python table support
 TABLE_REDIS_DESC=		REDIS table support
 TABLE_SOCKETMAP_DESC=		Socketmap protocol support
 TABLE_SQLITE_DESC=		SQLite table support
 
 # Tools
 TOOL_STATS_DESC=		Stats tool for OpenSMTPD
 
-PLIST_FILES=			man/man3/filter_api.3.gz
+#PLIST_FILES=			man/man3/filter_api.3.gz
 INSTALL_DIR=			${LOCALBASE}/libexec/opensmtpd
 
 NO_ARCH=	yes
 
 # Filters
 FILTER_CLAMAV_RUN_DEPENDS=		${INSTALL_DIR}/filter-clamav:mail/opensmtpd-extras-filter-clamav
 FILTER_DKIM_RUN_DEPENDS=		${INSTALL_DIR}/filter-dkim-signer:mail/opensmtpd-extras-filter-dkim
 FILTER_DNSBL_RUN_DEPENDS=		${INSTALL_DIR}/filter-dnsbl:mail/opensmtpd-extras-filter-dnsbl
 FILTER_LUA_RUN_DEPENDS=			${INSTALL_DIR}/filter-lua:mail/opensmtpd-extras-filter-lua
 FILTER_MONKEY_RUN_DEPENDS=		${INSTALL_DIR}/filter-monkey:mail/opensmtpd-extras-filter-monkey
 FILTER_PAUSE_RUN_DEPENDS=		${INSTALL_DIR}/filter-pause:mail/opensmtpd-extras-filter-pause
 FILTER_PERL_RUN_DEPENDS=		${INSTALL_DIR}/filter-perl:mail/opensmtpd-extras-filter-perl
 FILTER_PYTHON_RUN_DEPENDS=		${INSTALL_DIR}/filter-python:mail/opensmtpd-extras-filter-python
 FILTER_REGEX_RUN_DEPENDS=		${INSTALL_DIR}/filter-regex:mail/opensmtpd-extras-filter-regex
 FILTER_SPAMASSASSIN_RUN_DEPENDS=	${INSTALL_DIR}/filter-spamassassin:mail/opensmtpd-extras-filter-spamassassin
 
 # Queues
 QUEUE_PYTHON_RUN_DEPENDS=		${INSTALL_DIR}/queue-python:mail/opensmtpd-extras-queue-python
 QUEUE_RAM_RUN_DEPENDS=			${INSTALL_DIR}/queue-ram:mail/opensmtpd-extras-queue-ram
 
 # Schedulers
 SCHEDULER_PYTHON_RUN_DEPENDS=		${INSTALL_DIR}/scheduler-python:mail/opensmtpd-extras-scheduler-python
 SCHEDULER_RAM_RUN_DEPENDS=		${INSTALL_DIR}/scheduler-ram:mail/opensmtpd-extras-scheduler-ram
 
 # Tables
 TABLE_LDAP_RUN_DEPENDS=			${INSTALL_DIR}/table-ldap:mail/opensmtpd-extras-table-ldap
 TABLE_MYSQL_RUN_DEPENDS=		${INSTALL_DIR}/table-mysql:mail/opensmtpd-extras-table-mysql
 TABLE_PASSWD_RUN_DEPENDS=		${INSTALL_DIR}/table-passwd:mail/opensmtpd-extras-table-passwd
 TABLE_PGSQL_RUN_DEPENDS=		${INSTALL_DIR}/table-postgres:mail/opensmtpd-extras-table-postgresql
 TABLE_PYTHON_RUN_DEPENDS=		${INSTALL_DIR}/table-python:mail/opensmtpd-extras-table-python
 TABLE_REDIS_RUN_DEPENDS=		${INSTALL_DIR}/table-redis:mail/opensmtpd-extras-table-redis
 TABLE_SOCKETMAP_RUN_DEPENDS=		${INSTALL_DIR}/table-socketmap:mail/opensmtpd-extras-table-socketmap
 TABLE_SQLITE_RUN_DEPENDS=		${INSTALL_DIR}/table-sqlite:mail/opensmtpd-extras-table-sqlite
 
 # Tools
 TOOL_STATS_RUN_DEPENDS=			tool-stats:mail/opensmtpd-extras-tool-stats
 .else
 
 # Only install this for the opensmtpd-extras master port
-pre-patch:
-	@${REINPLACE_CMD} -e '/man_MANS.*filter_api.3/s/^/#/' \
-		${WRKSRC}/extras/filters/Makefile.am
-# While filters still experimental feature, suppress extra call warnings from logs
-	${REINPLACE_CMD} -e '/is EXPERIMENTAL/d' ${WRKSRC}/api/filter_api.c
+#pre-patch:
+#	@${REINPLACE_CMD} -e '/man_MANS.*filter_api.3/s/^/#/' \
+#		${WRKSRC}/extras/filters/Makefile.am
 
 .endif
 
 .include <bsd.port.mk>
Index: head/mail/opensmtpd-extras/distinfo
===================================================================
--- head/mail/opensmtpd-extras/distinfo	(revision 515713)
+++ head/mail/opensmtpd-extras/distinfo	(revision 515714)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1466658022
-SHA256 (opensmtpd-extras-201606230001.tar.gz) = 4675ed506cd6dc277a6b784cdbf5abeb5710b8ee56b44faeec71c1cfec48174d
-SIZE (opensmtpd-extras-201606230001.tar.gz) = 630831
+TIMESTAMP = 1541745103
+SHA256 (opensmtpd-extras-6.4.0.tar.gz) = cb66986b7c0d0113210f4fb9ca1447b7f50ca088165e6ca61b9015ff0f2d6226
+SIZE (opensmtpd-extras-6.4.0.tar.gz) = 522988
+SHA256 (opensmtpd-extras-201703132115.tar.gz) = 4672afdd756ef279c0adcfcbf8151d6d8a370d5a628a705967373a1c83ee0ef5
+SIZE (opensmtpd-extras-201703132115.tar.gz) = 564165
Index: head/mail/opensmtpd-extras-filter-clamav/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-clamav/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-filter-clamav/Makefile	(revision 515714)
@@ -1,19 +1,21 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-clamav
-PORTREVISION=		2
+PORTREVISION=		0
 
 COMMENT=		Check messages with ClamAV in OpenSMTPD
+
+IGNORE=			temporary unavailable
 
 RUN_DEPENDS=		clamscan:security/clamav
 
 PLIST_FILES=		libexec/opensmtpd/filter-clamav \
 			man/man8/filter-clamav.8.gz
 
 CONFIGURE_ARGS+=	--with-experimental-filter-clamav
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-filter-dkim/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-dkim/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-filter-dkim/Makefile	(revision 515714)
@@ -1,17 +1,19 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-dkim
-PORTREVISION=		2
+PORTREVISION=		0
 
 COMMENT=		DKIM-signing filter for OpenSMTPD
+
+IGNORE=			temporary unavailable
 
 PLIST_FILES=		libexec/opensmtpd/filter-dkim-signer \
 			man/man8/filter-dkim-signer.8.gz
 
 CONFIGURE_ARGS+=	--with-experimental-filter-dkim-signer
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-filter-dnsbl/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-dnsbl/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-filter-dnsbl/Makefile	(revision 515714)
@@ -1,17 +1,19 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-dnsbl
-PORTREVISION=		2
+PORTREVISION=		0
 
 COMMENT=		DNSBL-checking filter for OpenSMTPD
+
+IGNORE=			temporary unavailable
 
 PLIST_FILES=		libexec/opensmtpd/filter-dnsbl \
 			man/man8/filter-dnsbl.8.gz
 
 CONFIGURE_ARGS+=	--with-experimental-filter-dnsbl
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-filter-lua/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-lua/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-filter-lua/Makefile	(revision 515714)
@@ -1,18 +1,20 @@
 # Created by: fluffy
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-lua
-PORTREVISION=		2
+PORTREVISION=		0
 
 COMMENT=		LUA-script filter support for OpenSMTPD
+
+IGNORE=			temporary unavailable
 
 PLIST_FILES=		libexec/opensmtpd/filter-lua
 
 CONFIGURE_ARGS+=	--with-experimental-filter-lua --with-lua-type=lua-${LUA_VER}
 
 USES=			lua pkgconfig
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-filter-monkey/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-monkey/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-filter-monkey/Makefile	(revision 515714)
@@ -1,20 +1,22 @@
 # Created by: fluffy
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-monkey
-PORTREVISION=		2
+PORTVERSION=		201703132115
+PORTREVISION=		0
+PORTREPOCH=		0
 
 COMMENT=		Arbitrary delay or reject filter for OpenSMTPD
 
-CONFIGURE_ARGS+=	--with-experimental-filter-monkey
+CONFIGURE_ARGS+=	--with-filter-monkey
 
 PLIST=			${.CURDIR}/pkg-plist
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
 	${INSTALL_DATA} ${WRKSRC}/extras/filters/filter-monkey/filter-monkey.conf \
 		${STAGEDIR}${PREFIX}/etc/mail/filter-monkey.conf.sample
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-filter-pause/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-pause/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-filter-pause/Makefile	(revision 515714)
@@ -1,17 +1,19 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-pause
-PORTREVISION=		2
+PORTREVISION=		-0
 
 COMMENT=		Pause incoming OpenSMTPD messages to reduce spam
+
+IGNORE=			temporary unavailable
 
 PLIST_FILES=		libexec/opensmtpd/filter-pause \
 			man/man8/filter-pause.8.gz
 
 CONFIGURE_ARGS+=	--with-experimental-filter-pause
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-filter-perl/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-perl/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-filter-perl/Makefile	(revision 515714)
@@ -1,18 +1,20 @@
 # Created by: fluffy
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-perl
-PORTREVISION=		2
+PORTREVISION=		0
 
 COMMENT=		Perl-script filter support for OpenSMTPD
+
+IGNORE=			temporary unavailable
 
 PLIST_FILES=		libexec/opensmtpd/filter-perl
 
 CONFIGURE_ARGS+=	--with-experimental-filter-perl --with-perl-type=${perl_VERSION}
 
 USES=			perl5
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-filter-python/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-python/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-filter-python/Makefile	(revision 515714)
@@ -1,18 +1,20 @@
 # Created by: fluffy
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-python
-PORTREVISION=		3
+PORTREVISION=		0
 
 COMMENT=		Python-script filter support for OpenSMTPD
+
+IGNORE=			temporary unavailable
 
 PLIST_FILES=		libexec/opensmtpd/filter-python
 
 CONFIGURE_ARGS+=	--with-experimental-filter-python --with-python-type=${PYTHON_VERSION}
 
 USES=			python:2.7 pkgconfig
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-filter-regex/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-regex/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-filter-regex/Makefile	(revision 515714)
@@ -1,20 +1,22 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-regex
-PORTREVISION=		2
+PORTREVISION=		0
 
 COMMENT=		Regular expression filter for OpenSMTPD
+
+IGNORE=			temporary unavailable
 
 CONFIGURE_ARGS+=	--with-experimental-filter-regex
 
 PLIST=			${.CURDIR}/pkg-plist
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
 	${INSTALL_DATA} ${WRKSRC}/extras/filters/filter-regex/filter-regex.conf \
 		${STAGEDIR}${PREFIX}/etc/mail/filter-regex.conf.sample
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-filter-spamassassin/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-spamassassin/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-filter-spamassassin/Makefile	(revision 515714)
@@ -1,17 +1,19 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-spamassassin
-PORTREVISION=		2
+PORTREVISION=		0
 
 COMMENT=		Spamassassin filter addon for OpenSMTPD
+
+IGNORE=			temporary unavailable
 
 PLIST_FILES=		libexec/opensmtpd/filter-spamassassin \
 			man/man8/filter-spamassassin.8.gz
 
 CONFIGURE_ARGS+=	--with-experimental-filter-spamassassin
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-queue-python/Makefile
===================================================================
--- head/mail/opensmtpd-extras-queue-python/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-queue-python/Makefile	(revision 515714)
@@ -1,18 +1,18 @@
 # Created by: fluffy
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-queue-python
-PORTREVISION=		3
+PORTREVISION=		0
 
 COMMENT=		Python queue support for OpenSMTPD
 
 PLIST_FILES=		libexec/opensmtpd/queue-python
 
 CONFIGURE_ARGS+=	--with-queue-python --with-python-type=${PYTHON_VERSION}
 
 USES=			python:2.7 pkgconfig
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-queue-ram/Makefile
===================================================================
--- head/mail/opensmtpd-extras-queue-ram/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-queue-ram/Makefile	(revision 515714)
@@ -1,16 +1,16 @@
 # Created by: fluffy
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-queue-ram
-PORTREVISION=		2
+PORTREVISION=		0
 
 COMMENT=		RAM queue support for OpenSMTPD
 
 PLIST_FILES=		libexec/opensmtpd/queue-ram
 
 CONFIGURE_ARGS+=	--with-queue-ram
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-scheduler-python/Makefile
===================================================================
--- head/mail/opensmtpd-extras-scheduler-python/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-scheduler-python/Makefile	(revision 515714)
@@ -1,18 +1,18 @@
 # Created by: fluffy
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-scheduler-python
-PORTREVISION=		3
+PORTREVISION=		0
 
 COMMENT=		Python scheduler support for OpenSMTPD
 
 PLIST_FILES=		libexec/opensmtpd/scheduler-python
 
 CONFIGURE_ARGS+=	--with-scheduler-python --with-python-type=${PYTHON_VERSION}
 
 USES=			python:2.7 pkgconfig
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-scheduler-ram/Makefile
===================================================================
--- head/mail/opensmtpd-extras-scheduler-ram/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-scheduler-ram/Makefile	(revision 515714)
@@ -1,16 +1,16 @@
 # Created by: fluffy
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-scheduler-ram
-PORTREVISION=		2
+PORTREVISION=		0
 
 COMMENT=		RAM scheduler support for OpenSMTPD
 
 PLIST_FILES=		libexec/opensmtpd/scheduler-ram
 
 CONFIGURE_ARGS+=	--with-scheduler-ram
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-table-ldap/Makefile
===================================================================
--- head/mail/opensmtpd-extras-table-ldap/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-table-ldap/Makefile	(revision 515714)
@@ -1,18 +1,18 @@
 # Created by: fluffy
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-table-ldap
-PORTREVISION=		2
+PORTREVISION=		0
 
 COMMENT=		LDAP table support for OpenSMTPD
 
 PLIST_FILES=		libexec/opensmtpd/table-ldap
 
 CONFIGURE_ARGS+=	--with-table-ldap
 
 USE_OPENLDAP=		client
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-table-mysql/Makefile
===================================================================
--- head/mail/opensmtpd-extras-table-mysql/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-table-mysql/Makefile	(revision 515714)
@@ -1,20 +1,20 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-mysql
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	MySQL table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-mysql
 
 CONFIGURE_ARGS+=	--with-table-mysql
 CFLAGS+=	-I${LOCALBASE}/include/mysql
 LDFLAGS+=	-L${LOCALBASE}/lib/mysql
 
 USES=		mysql
 
 MASTERDIR=	${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-table-passwd/Makefile
===================================================================
--- head/mail/opensmtpd-extras-table-passwd/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-table-passwd/Makefile	(revision 515714)
@@ -1,17 +1,17 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-passwd
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	passwd(5) table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-passwd \
 		man/man5/table-passwd.5.gz
 
 CONFIGURE_ARGS+=	--with-table-passwd
 
 MASTERDIR=	${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-table-postgresql/Makefile
===================================================================
--- head/mail/opensmtpd-extras-table-postgresql/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-table-postgresql/Makefile	(revision 515714)
@@ -1,18 +1,18 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-postgresql
-PORTREVISION=	4
+PORTREVISION=	0
 
 COMMENT=	PostgreSQL table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-postgres
 
 CONFIGURE_ARGS+=	--with-table-postgres
 
 USES=		pgsql
 
 MASTERDIR=	${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-table-python/Makefile
===================================================================
--- head/mail/opensmtpd-extras-table-python/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-table-python/Makefile	(revision 515714)
@@ -1,18 +1,18 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-python
-PORTREVISION=	3
+PORTREVISION=	0
 
 COMMENT=	Python table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-python
 
 CONFIGURE_ARGS+=	--with-table-python --with-python-type=${PYTHON_VERSION}
 
 USES=		python:2.7 pkgconfig
 
 MASTERDIR=	${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-table-redis/Makefile
===================================================================
--- head/mail/opensmtpd-extras-table-redis/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-table-redis/Makefile	(revision 515714)
@@ -1,23 +1,23 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-redis
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	Redis table support for OpenSMTPD
 
 LIB_DEPENDS=	libhiredis.so:databases/hiredis
 
 PLIST_FILES=	libexec/opensmtpd/table-redis \
 			man/man5/table-redis.5.gz
 
 CONFIGURE_ARGS+=	--with-table-redis
 CONFIGURE_ENV=	REDIS_CONFIG=${LOCALBASE}/bin/pkgconf
 CFLAGS+=	-I${LOCALBASE}/include/hiredis
 
 USES=		pkgconfig
 
 MASTERDIR=	${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-table-socketmap/Makefile
===================================================================
--- head/mail/opensmtpd-extras-table-socketmap/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-table-socketmap/Makefile	(revision 515714)
@@ -1,17 +1,17 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-socketmap
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	Socketmap table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-socketmap \
 		man/man5/table-socketmap.5.gz
 
 CONFIGURE_ARGS+=	--with-table-socketmap
 
 MASTERDIR=	${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-table-sqlite/Makefile
===================================================================
--- head/mail/opensmtpd-extras-table-sqlite/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-table-sqlite/Makefile	(revision 515714)
@@ -1,19 +1,19 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-sqlite
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	SQLite table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-sqlite \
 		man/man5/table-sqlite.5.gz
 
 CONFIGURE_ARGS+=	--with-table-sqlite
 
 USES=		sqlite pkgconfig
 
 MASTERDIR=	${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-tool-stats/Makefile
===================================================================
--- head/mail/opensmtpd-extras-tool-stats/Makefile	(revision 515713)
+++ head/mail/opensmtpd-extras-tool-stats/Makefile	(revision 515714)
@@ -1,17 +1,19 @@
 # Created by: fluffy
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-tool-stats
-PORTREVISION=		2
+PORTVERSION=		201703132115
+PORTREVISION=		0
+PORTEPOCH=		0
 
 COMMENT=		Statistics tool for OpenSMTPD
 
 PLIST_FILES=		bin/tool-stats \
 			man/man8/tool-stats.8.gz
 
 CONFIGURE_ARGS+=	--with-tool-stats
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"