16 files changed, 12 insertions, 292 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 73ae213022b4..8f0b947f4025 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -273,16 +273,6 @@
     SUBDIR += opensmtpd
     SUBDIR += opensmtpd-devel
     SUBDIR += opensmtpd-extras
-    SUBDIR += opensmtpd-extras-filter-clamav
-    SUBDIR += opensmtpd-extras-filter-dkim
-    SUBDIR += opensmtpd-extras-filter-dnsbl
-    SUBDIR += opensmtpd-extras-filter-lua
-    SUBDIR += opensmtpd-extras-filter-monkey
-    SUBDIR += opensmtpd-extras-filter-pause
-    SUBDIR += opensmtpd-extras-filter-perl
-    SUBDIR += opensmtpd-extras-filter-python
-    SUBDIR += opensmtpd-extras-filter-regex
-    SUBDIR += opensmtpd-extras-filter-spamassassin
     SUBDIR += opensmtpd-extras-queue-python
     SUBDIR += opensmtpd-extras-queue-ram
     SUBDIR += opensmtpd-extras-scheduler-python
@@ -295,7 +285,6 @@
     SUBDIR += opensmtpd-extras-table-redis
     SUBDIR += opensmtpd-extras-table-socketmap
     SUBDIR += opensmtpd-extras-table-sqlite
-    SUBDIR += opensmtpd-extras-tool-stats
     SUBDIR += openwebmail
     SUBDIR += osbf-lua
     SUBDIR += ovs
diff --git a/mail/opensmtpd-extras-filter-clamav/Makefile b/mail/opensmtpd-extras-filter-clamav/Makefile
deleted file mode 100644
index 336cff7c2fc4..000000000000
--- a/mail/opensmtpd-extras-filter-clamav/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-filter-clamav
-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"
diff --git a/mail/opensmtpd-extras-filter-dkim/Makefile b/mail/opensmtpd-extras-filter-dkim/Makefile
deleted file mode 100644
index 724be8489c40..000000000000
--- a/mail/opensmtpd-extras-filter-dkim/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-filter-dkim
-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"
diff --git a/mail/opensmtpd-extras-filter-dnsbl/Makefile b/mail/opensmtpd-extras-filter-dnsbl/Makefile
deleted file mode 100644
index 5edf6f431dd4..000000000000
--- a/mail/opensmtpd-extras-filter-dnsbl/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-filter-dnsbl
-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"
diff --git a/mail/opensmtpd-extras-filter-lua/Makefile b/mail/opensmtpd-extras-filter-lua/Makefile
deleted file mode 100644
index 9325427382a1..000000000000
--- a/mail/opensmtpd-extras-filter-lua/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: fluffy
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-filter-lua
-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"
diff --git a/mail/opensmtpd-extras-filter-monkey/Makefile b/mail/opensmtpd-extras-filter-monkey/Makefile
deleted file mode 100644
index e951a8c0326c..000000000000
--- a/mail/opensmtpd-extras-filter-monkey/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: fluffy
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-filter-monkey
-PORTVERSION=		201703132115
-PORTREVISION=		0
-PORTEPOCH=		1
-
-COMMENT=		Arbitrary delay or reject filter for OpenSMTPD
-
-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"
diff --git a/mail/opensmtpd-extras-filter-monkey/pkg-plist b/mail/opensmtpd-extras-filter-monkey/pkg-plist
deleted file mode 100644
index d51106eff835..000000000000
--- a/mail/opensmtpd-extras-filter-monkey/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@sample etc/mail/filter-monkey.conf.sample
-libexec/opensmtpd/filter-monkey
-man/man5/filter-monkey.conf.5.gz
-man/man8/filter-monkey.8.gz
diff --git a/mail/opensmtpd-extras-filter-pause/Makefile b/mail/opensmtpd-extras-filter-pause/Makefile
deleted file mode 100644
index 3b090406fef6..000000000000
--- a/mail/opensmtpd-extras-filter-pause/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-filter-pause
-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"
diff --git a/mail/opensmtpd-extras-filter-perl/Makefile b/mail/opensmtpd-extras-filter-perl/Makefile
deleted file mode 100644
index 3d014a944e0e..000000000000
--- a/mail/opensmtpd-extras-filter-perl/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: fluffy
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-filter-perl
-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"
diff --git a/mail/opensmtpd-extras-filter-python/Makefile b/mail/opensmtpd-extras-filter-python/Makefile
deleted file mode 100644
index be74221936d4..000000000000
--- a/mail/opensmtpd-extras-filter-python/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: fluffy
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-filter-python
-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"
diff --git a/mail/opensmtpd-extras-filter-regex/Makefile b/mail/opensmtpd-extras-filter-regex/Makefile
deleted file mode 100644
index d6e82276b037..000000000000
--- a/mail/opensmtpd-extras-filter-regex/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-filter-regex
-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"
diff --git a/mail/opensmtpd-extras-filter-regex/pkg-plist b/mail/opensmtpd-extras-filter-regex/pkg-plist
deleted file mode 100644
index f6f5757e5f51..000000000000
--- a/mail/opensmtpd-extras-filter-regex/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@sample etc/mail/filter-regex.conf.sample
-libexec/opensmtpd/filter-regex
-man/man5/filter-regex.conf.5.gz
-man/man8/filter-regex.8.gz
diff --git a/mail/opensmtpd-extras-filter-spamassassin/Makefile b/mail/opensmtpd-extras-filter-spamassassin/Makefile
deleted file mode 100644
index 3fe625f13dba..000000000000
--- a/mail/opensmtpd-extras-filter-spamassassin/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-filter-spamassassin
-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"
diff --git a/mail/opensmtpd-extras-tool-stats/Makefile b/mail/opensmtpd-extras-tool-stats/Makefile
deleted file mode 100644
index 86685d73fb8c..000000000000
--- a/mail/opensmtpd-extras-tool-stats/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: fluffy
-# $FreeBSD$
-
-PKGNAMESUFFIX=		-tool-stats
-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"
diff --git a/mail/opensmtpd-extras/Makefile b/mail/opensmtpd-extras/Makefile
index 70439b68394b..04220a47059a 100644
--- a/mail/opensmtpd-extras/Makefile
+++ b/mail/opensmtpd-extras/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opensmtpd-extras
-PORTVERSION?=	6.4.0
+PORTVERSION?=	6.6.0
 PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES+=	mail
@@ -23,12 +23,15 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${OPENSSLLIB}
 CFLAGS+=	-I${OPENSSLINC}
 
-CONFIGURE_ARGS+=	--sysconfdir="${PREFIX}/etc/mail"
+WRKSRC=		${WRKDIR}/OpenSMTPD-extras-${PORTVERSION}
+
+CONFIGURE_ARGS+=	--sysconfdir="${PREFIX}/etc/mail" \
+			--with-libevent=${LOCALBASE} \
+			--with-libssl=${OPENSSLBASE}
 
 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
@@ -48,35 +51,16 @@ RUN_DEPENDS=	smtpctl:mail/opensmtpd
 
 
 .if empty(SLAVE_PORT)
-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=			TABLE QUEUE SCHEDULER
 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_TABLE} ${OPTIONS_GROUP_TOOLS}
+OPTIONS_DEFAULT=		${OPTIONS_GROUP_TABLE}
 
 # 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
@@ -96,26 +80,10 @@ 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
 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
@@ -134,14 +102,7 @@ TABLE_REDIS_RUN_DEPENDS=		${INSTALL_DIR}/table-redis:mail/opensmtpd-extras-table
 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
+#.else
 
 .endif
 
diff --git a/mail/opensmtpd-extras/distinfo b/mail/opensmtpd-extras/distinfo
index 681f09623186..ab7c36135497 100644
--- a/mail/opensmtpd-extras/distinfo
+++ b/mail/opensmtpd-extras/distinfo
@@ -1,5 +1,3 @@
-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
+TIMESTAMP = 1573830614
+SHA256 (opensmtpd-extras-6.6.0.tar.gz) = 126b023602e8bb222bf24543a056ee0a548343dc86d184669ff9d82dfca1fbdf
+SIZE (opensmtpd-extras-6.6.0.tar.gz) = 124234