svn commit: r417368 - in head/mail: opensmtpd-extras opensmtpd-extras-filter-clamav opensmtpd-extras-filter-dkim opensmtpd-extras-filter-dnsbl opensmtpd-extras-filter-lua opensmtpd-extras-filter-mo...

Thu Jun 23 12:00:39 UTC 2016

Author: fluffy
Date: Thu Jun 23 12:00:36 2016
New Revision: 417368
URL: https://svnweb.freebsd.org/changeset/ports/417368

Log:
  - Update OpenSMTPD-extras to 201606230001 snapshot
  - Consolidate all -extras under one maintainership
  
  NOTE:	Author still warning everyone about experimental status of filters.
  	All --with-filter-XXX replaced with --with-experimental-filter-XXX
  
  Approved by:	adamw

Modified:
  head/mail/opensmtpd-extras-filter-clamav/Makefile
  head/mail/opensmtpd-extras-filter-dkim/Makefile
  head/mail/opensmtpd-extras-filter-dnsbl/Makefile
  head/mail/opensmtpd-extras-filter-lua/Makefile
  head/mail/opensmtpd-extras-filter-monkey/Makefile
  head/mail/opensmtpd-extras-filter-pause/Makefile
  head/mail/opensmtpd-extras-filter-perl/Makefile
  head/mail/opensmtpd-extras-filter-python/Makefile
  head/mail/opensmtpd-extras-filter-regex/Makefile
  head/mail/opensmtpd-extras-filter-spamassassin/Makefile
  head/mail/opensmtpd-extras-queue-python/Makefile
  head/mail/opensmtpd-extras-queue-ram/Makefile
  head/mail/opensmtpd-extras-scheduler-python/Makefile
  head/mail/opensmtpd-extras-scheduler-ram/Makefile
  head/mail/opensmtpd-extras-table-ldap/Makefile
  head/mail/opensmtpd-extras-tool-stats/Makefile
  head/mail/opensmtpd-extras/Makefile
  head/mail/opensmtpd-extras/distinfo

Modified: head/mail/opensmtpd-extras-filter-clamav/Makefile
==============================================================================

--- head/mail/opensmtpd-extras-filter-clamav/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-filter-clamav/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,14 +5,13 @@ PKGNAMESUFFIX=		-filter-clamav
 PORTREVISION=		0
 
 COMMENT=		Check messages with ClamAV in OpenSMTPD
-MAINTAINER=		adamw at FreeBSD.org
 
 RUN_DEPENDS=		clamscan:security/clamav
 
 PLIST_FILES=		libexec/opensmtpd/filter-clamav \
 			man/man8/filter-clamav.8.gz
 
-CONFIGURE_ARGS+=	--with-filter-clamav
+CONFIGURE_ARGS+=	--with-experimental-filter-clamav
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes

Modified: head/mail/opensmtpd-extras-filter-dkim/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-filter-dkim/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-filter-dkim/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,12 +5,11 @@ PKGNAMESUFFIX=		-filter-dkim
 PORTREVISION=		0
 
 COMMENT=		DKIM-signing filter for OpenSMTPD
-MAINTAINER=		adamw at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/filter-dkim-signer \
 			man/man8/filter-dkim-signer.8.gz
 
-CONFIGURE_ARGS+=	--with-filter-dkim-signer
+CONFIGURE_ARGS+=	--with-experimental-filter-dkim-signer
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes

Modified: head/mail/opensmtpd-extras-filter-dnsbl/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-filter-dnsbl/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-filter-dnsbl/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,12 +5,11 @@ PKGNAMESUFFIX=		-filter-dnsbl
 PORTREVISION=		0
 
 COMMENT=		DNSBL-checking filter for OpenSMTPD
-MAINTAINER=		adamw at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/filter-dnsbl \
 			man/man8/filter-dnsbl.8.gz
 
-CONFIGURE_ARGS+=	--with-filter-dnsbl
+CONFIGURE_ARGS+=	--with-experimental-filter-dnsbl
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes

Modified: head/mail/opensmtpd-extras-filter-lua/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-filter-lua/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-filter-lua/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,11 +5,10 @@ PKGNAMESUFFIX=		-filter-lua
 PORTREVISION=		0
 
 COMMENT=		LUA-script filter support for OpenSMTPD
-MAINTAINER=		fluffy at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/filter-lua
 
-CONFIGURE_ARGS+=	--with-filter-lua --with-lua-type=lua-${LUA_VER}
+CONFIGURE_ARGS+=	--with-experimental-filter-lua --with-lua-type=lua-${LUA_VER}
 
 USES=			lua pkgconfig
 

Modified: head/mail/opensmtpd-extras-filter-monkey/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-filter-monkey/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-filter-monkey/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,9 +5,8 @@ PKGNAMESUFFIX=		-filter-monkey
 PORTREVISION=		0
 
 COMMENT=		Arbitrary delay or reject filter for OpenSMTPD
-MAINTAINER=		fluffy at FreeBSD.org
 
-CONFIGURE_ARGS+=	--with-filter-monkey
+CONFIGURE_ARGS+=	--with-experimental-filter-monkey
 
 PLIST=			${.CURDIR}/pkg-plist
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
@@ -15,7 +14,7 @@ SLAVE_PORT=		yes
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
-	${INSTALL_DATA} ${WRKSRC}/extras/wip/filters/filter-monkey/filter-monkey.conf \
+	${INSTALL_DATA} ${WRKSRC}/extras/filters/filter-monkey/filter-monkey.conf \
 		${STAGEDIR}${PREFIX}/etc/mail/filter-monkey.conf.sample
 
 .include "${MASTERDIR}/Makefile"

Modified: head/mail/opensmtpd-extras-filter-pause/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-filter-pause/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-filter-pause/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,12 +5,11 @@ PKGNAMESUFFIX=		-filter-pause
 PORTREVISION=		0
 
 COMMENT=		Pause incoming OpenSMTPD messages to reduce spam
-MAINTAINER=		adamw at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/filter-pause \
 			man/man8/filter-pause.8.gz
 
-CONFIGURE_ARGS+=	--with-filter-pause
+CONFIGURE_ARGS+=	--with-experimental-filter-pause
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes

Modified: head/mail/opensmtpd-extras-filter-perl/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-filter-perl/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-filter-perl/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,11 +5,10 @@ PKGNAMESUFFIX=		-filter-perl
 PORTREVISION=		0
 
 COMMENT=		Perl-script filter support for OpenSMTPD
-MAINTAINER=		fluffy at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/filter-perl
 
-CONFIGURE_ARGS+=	--with-filter-perl --with-perl-type=${perl_VERSION}
+CONFIGURE_ARGS+=	--with-experimental-filter-perl --with-perl-type=${perl_VERSION}
 
 USES=			perl5
 

Modified: head/mail/opensmtpd-extras-filter-python/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-filter-python/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-filter-python/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,11 +5,10 @@ PKGNAMESUFFIX=		-filter-python
 PORTREVISION=		0
 
 COMMENT=		Python-script filter support for OpenSMTPD
-MAINTAINER=		fluffy at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/filter-python
 
-CONFIGURE_ARGS+=	--with-filter-python --with-python-type=${PYTHON_VERSION}
+CONFIGURE_ARGS+=	--with-experimental-filter-python --with-python-type=${PYTHON_VERSION}
 
 USES=			python:2 pkgconfig
 

Modified: head/mail/opensmtpd-extras-filter-regex/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-filter-regex/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-filter-regex/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,9 +5,8 @@ PKGNAMESUFFIX=		-filter-regex
 PORTREVISION=		0
 
 COMMENT=		Regular expression filter for OpenSMTPD
-MAINTAINER=		adamw at FreeBSD.org
 
-CONFIGURE_ARGS+=	--with-filter-regex
+CONFIGURE_ARGS+=	--with-experimental-filter-regex
 
 PLIST=			${.CURDIR}/pkg-plist
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
@@ -15,7 +14,7 @@ SLAVE_PORT=		yes
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
-	${INSTALL_DATA} ${WRKSRC}/extras/wip/filters/filter-regex/filter-regex.conf \
+	${INSTALL_DATA} ${WRKSRC}/extras/filters/filter-regex/filter-regex.conf \
 		${STAGEDIR}${PREFIX}/etc/mail/filter-regex.conf.sample
 
 .include "${MASTERDIR}/Makefile"

Modified: head/mail/opensmtpd-extras-filter-spamassassin/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-filter-spamassassin/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-filter-spamassassin/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,12 +5,11 @@ PKGNAMESUFFIX=		-filter-spamassassin
 PORTREVISION=		0
 
 COMMENT=		Spamassassin filter addon for OpenSMTPD
-MAINTAINER=		adamw at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/filter-spamassassin \
 			man/man8/filter-spamassassin.8.gz
 
-CONFIGURE_ARGS+=	--with-filter-spamassassin
+CONFIGURE_ARGS+=	--with-experimental-filter-spamassassin
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes

Modified: head/mail/opensmtpd-extras-queue-python/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-queue-python/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-queue-python/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,7 +5,6 @@ PKGNAMESUFFIX=		-queue-python
 PORTREVISION=		0
 
 COMMENT=		Python queue support for OpenSMTPD
-MAINTAINER=		fluffy at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/queue-python
 

Modified: head/mail/opensmtpd-extras-queue-ram/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-queue-ram/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-queue-ram/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,7 +5,6 @@ PKGNAMESUFFIX=		-queue-ram
 PORTREVISION=		0
 
 COMMENT=		RAM queue support for OpenSMTPD
-MAINTAINER=		fluffy at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/queue-ram
 

Modified: head/mail/opensmtpd-extras-scheduler-python/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-scheduler-python/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-scheduler-python/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,7 +5,6 @@ PKGNAMESUFFIX=		-scheduler-python
 PORTREVISION=		0
 
 COMMENT=		Python scheduler support for OpenSMTPD
-MAINTAINER=		fluffy at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/scheduler-python
 

Modified: head/mail/opensmtpd-extras-scheduler-ram/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-scheduler-ram/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-scheduler-ram/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,7 +5,6 @@ PKGNAMESUFFIX=		-scheduler-ram
 PORTREVISION=		0
 
 COMMENT=		RAM scheduler support for OpenSMTPD
-MAINTAINER=		fluffy at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/scheduler-ram
 

Modified: head/mail/opensmtpd-extras-table-ldap/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-table-ldap/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-table-ldap/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,7 +5,6 @@ PKGNAMESUFFIX=		-table-ldap
 PORTREVISION=		0
 
 COMMENT=		LDAP table support for OpenSMTPD
-MAINTAINER=		fluffy at FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/table-ldap
 

Modified: head/mail/opensmtpd-extras-tool-stats/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-tool-stats/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras-tool-stats/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -5,7 +5,6 @@ PKGNAMESUFFIX=		-tool-stats
 PORTREVISION=		0
 
 COMMENT=		Statistics tool for OpenSMTPD
-MAINTAINER=		fluffy at FreeBSD.org
 
 PLIST_FILES=		bin/tool-stats \
 			man/man8/tool-stats.8.gz

Modified: head/mail/opensmtpd-extras/Makefile
==============================================================================
--- head/mail/opensmtpd-extras/Makefile	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras/Makefile	Thu Jun 23 12:00:36 2016	(r417368)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opensmtpd-extras
-PORTVERSION=	201606212257
+PORTVERSION=	201606230001
 PORTREVISION?=	0
 CATEGORIES+=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.opensmtpd.org/a
 # NB: Please reset PORTREVISION to 0 in all slave subports
 # while updating PORTVERSION for master port
 
-MAINTAINER?=	fluffy at FreeBSD.org
+MAINTAINER=	fluffy at FreeBSD.org
 COMMENT?=	Addons for OpenSMTPD
 
 LICENSE?=	ISCL
@@ -135,7 +135,9 @@ TOOL_STATS_RUN_DEPENDS=			tool-stats:mai
 # Only install this for the opensmtpd-extras master port
 pre-patch:
 	@${REINPLACE_CMD} -e '/man_MANS.*filter_api.3/s/^/#/' \
-		${WRKSRC}/extras/wip/filters/Makefile.am
+		${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
 
 .endif
 

Modified: head/mail/opensmtpd-extras/distinfo
==============================================================================
--- head/mail/opensmtpd-extras/distinfo	Thu Jun 23 12:00:04 2016	(r417367)
+++ head/mail/opensmtpd-extras/distinfo	Thu Jun 23 12:00:36 2016	(r417368)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466588494
-SHA256 (opensmtpd-extras-201606212257.tar.gz) = dc2d3f60947a0f1c22ab4f9cf5d9efdca774a835bcf055c38a072160a59ccc34
-SIZE (opensmtpd-extras-201606212257.tar.gz) = 631713
+TIMESTAMP = 1466658022
+SHA256 (opensmtpd-extras-201606230001.tar.gz) = 4675ed506cd6dc277a6b784cdbf5abeb5710b8ee56b44faeec71c1cfec48174d
+SIZE (opensmtpd-extras-201606230001.tar.gz) = 630831
