Index: head/mail/opensmtpd-extras/Makefile
===================================================================
--- head/mail/opensmtpd-extras/Makefile	(revision 415953)
+++ head/mail/opensmtpd-extras/Makefile	(revision 415954)
@@ -1,78 +1,97 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	opensmtpd-extras
 PORTVERSION=	201605232202
-PORTREVISION?=	0
+PORTREVISION?=	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?=	gahr@FreeBSD.org
 COMMENT?=	Addons for OpenSMTPD
 
 LICENSE?=	ISCL
 
 LIB_DEPENDS+=	libevent.so:devel/libevent2
-RUN_DEPENDS+=	${LOCALBASE}/sbin/smtpctl:mail/opensmtpd
 
-USES+=		autoreconf libtool pkgconfig
+USES+=		autoreconf libtool
 USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=	yes
 GNU_CONFIGURE=	yes
 
+CONFIGURE_ARGS+=	--sysconfdir="${PREFIX}/etc/mail"
+
 # NB: Please *DO NOT* add the following; they are NOT for end-users:
-# filter-monkey, filter-stub, filter-trace, filter-void
+# 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
+
+OPENSMTP_DEVEL_DESC=	Depend on opensmtpd-devel (opensmtpd if off)
+OPENSMTP_DEVEL_BUILD_DEPENDS_OFF=	smtpctl:${PORTSDIR}/mail/opensmtpd
+OPENSMTP_DEVEL_RUN_DEPENDS_OFF=		smtpctl:${PORTSDIR}/mail/opensmtpd
+OPENSMTP_DEVEL_BUILD_DEPENDS=	smtpctl:${PORTSDIR}/mail/opensmtpd-devel
+OPENSMTP_DEVEL_RUN_DEPENDS=	smtpctl:${PORTSDIR}/mail/opensmtpd-devel
+
 .if empty(SLAVE_PORT)
 OPTIONS_GROUP=		FILTER TABLE
 OPTIONS_GROUP_FILTER=	CLAMAV DKIM DNSBL PAUSE REGEX SPAMASSASSIN
 OPTIONS_GROUP_TABLE=	LDAP MYSQL PASSWD PGSQL PYTHON REDIS SMAP SQLITE
 OPTIONS_DEFAULT=	${OPTIONS_GROUP_FILTER} ${OPTIONS_GROUP_TABLE}
+
+# Groups
+FILTER_DESC=			BASE FILTERS
+TABLE_DESC=			BASE TABLES
 
 # Filters
 CLAMAV_DESC=		Check messages with ClamAV
 DKIM_DESC=		Sign messages with DKIM
 DNSBL_DESC=		Check messages against DNSBLs
 PAUSE_DESC=		Pause incoming messages to reduce spam
 SPAMASSASSIN_DESC=	Check messages with SpamAssassin
 # Tables
 PASSWD_DESC=		passwd(5) table support
 SMAP_DESC=		Socketmap protocol support
 
 PLIST_FILES=	man/man3/filter_api.3.gz
 INSTALL_DIR=	${LOCALBASE}/libexec/opensmtpd
 
 NO_ARCH=	yes
 
 #
 # Filters
 #
 CLAMAV_RUN_DEPENDS=		${INSTALL_DIR}/filter-clamav:mail/opensmtpd-extras-filter-clamav
 DKIM_RUN_DEPENDS=		${INSTALL_DIR}/filter-dkim-signer:mail/opensmtpd-extras-filter-dkim
 DNSBL_RUN_DEPENDS=		${INSTALL_DIR}/filter-dnsbl:mail/opensmtpd-extras-filter-dnsbl
 PAUSE_RUN_DEPENDS=		${INSTALL_DIR}/filter-pause:mail/opensmtpd-extras-filter-pause
 REGEX_RUN_DEPENDS=		${INSTALL_DIR}/filter-regex:mail/opensmtpd-extras-filter-regex
 SPAMASSASSIN_RUN_DEPENDS=	${INSTALL_DIR}/filter-spamassassin:mail/opensmtpd-extras-filter-spamassassin
 
 #
 # Tables
 #
 MYSQL_RUN_DEPENDS=	${INSTALL_DIR}/table-mysql:mail/opensmtpd-extras-table-mysql
 PASSWD_RUN_DEPENDS=	${INSTALL_DIR}/table-passwd:mail/opensmtpd-extras-table-passwd
 PGSQL_RUN_DEPENDS=	${INSTALL_DIR}/table-postgres:mail/opensmtpd-extras-table-postgresql
 PYTHON_RUN_DEPENDS=	${INSTALL_DIR}/table-python:mail/opensmtpd-extras-table-python
 REDIS_RUN_DEPENDS=	${INSTALL_DIR}/table-redis:mail/opensmtpd-extras-table-redis
 SMAP_RUN_DEPENDS=	${INSTALL_DIR}/table-socketmap:mail/opensmtpd-extras-table-socketmap
 SQLITE_RUN_DEPENDS=	${INSTALL_DIR}/table-sqlite:mail/opensmtpd-extras-table-sqlite
 .else
 
 # 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
 
 .endif
 
 .include <bsd.port.mk>
Index: head/mail/opensmtpd-extras-filter-clamav/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-clamav/Makefile	(revision 415953)
+++ head/mail/opensmtpd-extras-filter-clamav/Makefile	(revision 415954)
@@ -1,17 +1,20 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-clamav
+PORTREVISION=		1
 
 COMMENT=		Check messages with ClamAV in OpenSMTPD
 MAINTAINER=		adamw@FreeBSD.org
+
+RUN_DEPENDS=		clamscan:security/clamav
 
 PLIST_FILES=		libexec/opensmtpd/filter-clamav \
 			man/man8/filter-clamav.8.gz
 
 CONFIGURE_ARGS+=	--with-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 415953)
+++ head/mail/opensmtpd-extras-filter-dkim/Makefile	(revision 415954)
@@ -1,17 +1,18 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-dkim
+PORTREVISION=		1
 
 COMMENT=		DKIM-signing filter for OpenSMTPD
 MAINTAINER=		adamw@FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/filter-dkim-signer \
 			man/man8/filter-dkim-signer.8.gz
 
 CONFIGURE_ARGS+=	--with-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 415953)
+++ head/mail/opensmtpd-extras-filter-dnsbl/Makefile	(revision 415954)
@@ -1,19 +1,18 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-dnsbl
+PORTREVISION=		1
 
 COMMENT=		DNSBL-checking filter for OpenSMTPD
 MAINTAINER=		adamw@FreeBSD.org
-
-LIB_DEPENDS=		libasr.so:dns/libasr
 
 PLIST_FILES=		libexec/opensmtpd/filter-dnsbl \
 			man/man8/filter-dnsbl.8.gz
 
 CONFIGURE_ARGS+=	--with-filter-dnsbl
 
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/mail/opensmtpd-extras-filter-pause/Makefile
===================================================================
--- head/mail/opensmtpd-extras-filter-pause/Makefile	(revision 415953)
+++ head/mail/opensmtpd-extras-filter-pause/Makefile	(revision 415954)
@@ -1,17 +1,18 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-pause
+PORTREVISION=		1
 
 COMMENT=		Pause incoming OpenSMTPD messages to reduce spam
 MAINTAINER=		adamw@FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/filter-pause \
 			man/man8/filter-pause.8.gz
 
 CONFIGURE_ARGS+=	--with-filter-pause
 
 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 415953)
+++ head/mail/opensmtpd-extras-filter-regex/Makefile	(revision 415954)
@@ -1,20 +1,21 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-regex
+PORTREVISION=		1
 
 COMMENT=		Regular expression filter for OpenSMTPD
 MAINTAINER=		adamw@FreeBSD.org
 
 CONFIGURE_ARGS+=	--with-filter-regex
 
 PLIST=			${.CURDIR}/pkg-plist
 MASTERDIR=		${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=		yes
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
 	${INSTALL_DATA} ${WRKSRC}/extras/wip/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 415953)
+++ head/mail/opensmtpd-extras-filter-spamassassin/Makefile	(revision 415954)
@@ -1,17 +1,18 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-spamassassin
+PORTREVISION=		1
 
 COMMENT=		Spamassassin filter addon for OpenSMTPD
 MAINTAINER=		adamw@FreeBSD.org
 
 PLIST_FILES=		libexec/opensmtpd/filter-spamassassin \
 			man/man8/filter-spamassassin.8.gz
 
 CONFIGURE_ARGS+=	--with-filter-spamassassin
 
 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 415953)
+++ head/mail/opensmtpd-extras-table-mysql/Makefile	(revision 415954)
@@ -1,18 +1,20 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-mysql
+PORTREVISION=	1
 
-COMMENT=	MySQL table support for opensmtpd
+COMMENT=	MySQL table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-mysql
 
-CONFIGURE_ARGS=	--with-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 415953)
+++ head/mail/opensmtpd-extras-table-passwd/Makefile	(revision 415954)
@@ -1,17 +1,17 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-passwd
+PORTREVISION=	1
 
-COMMENT=	passwd(5) table support for opensmtpd
+COMMENT=	passwd(5) table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-passwd \
 		man/man5/table-passwd.5.gz
 
-CONFIGURE_ARGS=	--with-table-passwd
-LDFLAGS+=	-L${LOCALBASE}/lib/mysql
+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 415953)
+++ head/mail/opensmtpd-extras-table-postgresql/Makefile	(revision 415954)
@@ -1,17 +1,18 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-postgresql
+PORTREVISION=	1
 
-COMMENT=	PostgreSQL table support for opensmtpd
+COMMENT=	PostgreSQL table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-postgres
 
-CONFIGURE_ARGS=	--with-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 415953)
+++ head/mail/opensmtpd-extras-table-python/Makefile	(revision 415954)
@@ -1,17 +1,18 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-python
+PORTREVISION=	1
 
-COMMENT=	Python table support for opensmtpd
+COMMENT=	Python table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-python
 
-CONFIGURE_ARGS=	--with-table-python --with-python-type=${PYTHON_VERSION}
+CONFIGURE_ARGS+=	--with-table-python --with-python-type=${PYTHON_VERSION}
 
-USES=		python
+USES=		python 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 415953)
+++ head/mail/opensmtpd-extras-table-redis/Makefile	(revision 415954)
@@ -1,20 +1,23 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-redis
+PORTREVISION=	1
 
-COMMENT=	Redis table support for opensmtpd
+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_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 415953)
+++ head/mail/opensmtpd-extras-table-socketmap/Makefile	(revision 415954)
@@ -1,16 +1,17 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-socketmap
+PORTREVISION=	1
 
-COMMENT=	Socketmap table support for opensmtpd
+COMMENT=	Socketmap table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-socketmap \
 		man/man5/table-socketmap.5.gz
 
-CONFIGURE_ARGS=	--with-table-socketmap
+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 415953)
+++ head/mail/opensmtpd-extras-table-sqlite/Makefile	(revision 415954)
@@ -1,18 +1,19 @@
 # Created by: gahr
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-table-sqlite
+PORTREVISION=	1
 
-COMMENT=	SQLite table support for opensmtpd
+COMMENT=	SQLite table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-sqlite \
 		man/man5/table-sqlite.5.gz
 
-CONFIGURE_ARGS=	--with-table-sqlite
+CONFIGURE_ARGS+=	--with-table-sqlite
 
-USES=		sqlite
+USES=		sqlite pkgconfig
 
 MASTERDIR=	${.CURDIR}/../opensmtpd-extras
 SLAVE_PORT=	yes
 
 .include "${MASTERDIR}/Makefile"