Index: opensmtpd-extras-filter-clamav/Makefile
===================================================================
--- opensmtpd-extras-filter-clamav/Makefile
+++ opensmtpd-extras-filter-clamav/Makefile
@@ -2,10 +2,13 @@
 # $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
 
Index: opensmtpd-extras-filter-dkim/Makefile
===================================================================
--- opensmtpd-extras-filter-dkim/Makefile
+++ opensmtpd-extras-filter-dkim/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-dkim
+PORTREVISION=		0
 
 COMMENT=		DKIM-signing filter for OpenSMTPD
 MAINTAINER=		adamw@FreeBSD.org
Index: opensmtpd-extras-filter-dnsbl/Makefile
===================================================================
--- opensmtpd-extras-filter-dnsbl/Makefile
+++ opensmtpd-extras-filter-dnsbl/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-dnsbl
+PORTREVISION=		0
 
 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
 
Index: opensmtpd-extras-filter-pause/Makefile
===================================================================
--- opensmtpd-extras-filter-pause/Makefile
+++ opensmtpd-extras-filter-pause/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-pause
+PORTREVISION=		0
 
 COMMENT=		Pause incoming OpenSMTPD messages to reduce spam
 MAINTAINER=		adamw@FreeBSD.org
Index: opensmtpd-extras-filter-regex/Makefile
===================================================================
--- opensmtpd-extras-filter-regex/Makefile
+++ opensmtpd-extras-filter-regex/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-regex
+PORTREVISION=		0
 
 COMMENT=		Regular expression filter for OpenSMTPD
 MAINTAINER=		adamw@FreeBSD.org
Index: opensmtpd-extras-filter-spamassassin/Makefile
===================================================================
--- opensmtpd-extras-filter-spamassassin/Makefile
+++ opensmtpd-extras-filter-spamassassin/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=		-filter-spamassassin
+PORTREVISION=		0
 
 COMMENT=		Spamassassin filter addon for OpenSMTPD
 MAINTAINER=		adamw@FreeBSD.org
Index: opensmtpd-extras-table-mysql/Makefile
===================================================================
--- opensmtpd-extras-table-mysql/Makefile
+++ opensmtpd-extras-table-mysql/Makefile
@@ -1,18 +1,20 @@
 # Created by: gahr
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-table-mysql
+PKGNAMESUFFIX=		-table-mysql
+PORTREVISION=		0
 
-COMMENT=	MySQL table support for opensmtpd
+COMMENT=		MySQL table support for OpenSMTPD
 
-PLIST_FILES=	libexec/opensmtpd/table-mysql
+PLIST_FILES=		libexec/opensmtpd/table-mysql
 
-CONFIGURE_ARGS=	--with-table-mysql
-LDFLAGS+=	-L${LOCALBASE}/lib/mysql
+CONFIGURE_ARGS+=	--with-table-mysql
+CFLAGS+=		-I${LOCALBASE}/include/mysql
+LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 
-USES=		mysql
+USES=			mysql
 
-MASTERDIR=	${.CURDIR}/../opensmtpd-extras
-SLAVE_PORT=	yes
+MASTERDIR=		${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: opensmtpd-extras-table-passwd/Makefile
===================================================================
--- opensmtpd-extras-table-passwd/Makefile
+++ opensmtpd-extras-table-passwd/Makefile
@@ -1,17 +1,17 @@
 # Created by: gahr
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-table-passwd
+PKGNAMESUFFIX=		-table-passwd
+PORTREVISION=		0
 
-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
+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
+MASTERDIR=		${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: opensmtpd-extras-table-postgresql/Makefile
===================================================================
--- opensmtpd-extras-table-postgresql/Makefile
+++ opensmtpd-extras-table-postgresql/Makefile
@@ -1,17 +1,18 @@
 # Created by: gahr
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-table-postgresql
+PKGNAMESUFFIX=		-table-postgresql
+PORTREVISION=		0
 
-COMMENT=	PostgreSQL table support for opensmtpd
+COMMENT=		PostgreSQL table support for OpenSMTPD
 
-PLIST_FILES=	libexec/opensmtpd/table-postgres
+PLIST_FILES=		libexec/opensmtpd/table-postgres
 
-CONFIGURE_ARGS=	--with-table-postgres
+CONFIGURE_ARGS+=	--with-table-postgres
 
-USES=		pgsql
+USES=			pgsql
 
-MASTERDIR=	${.CURDIR}/../opensmtpd-extras
-SLAVE_PORT=	yes
+MASTERDIR=		${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: opensmtpd-extras-table-python/Makefile
===================================================================
--- opensmtpd-extras-table-python/Makefile
+++ opensmtpd-extras-table-python/Makefile
@@ -1,17 +1,18 @@
 # Created by: gahr
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-table-python
+PKGNAMESUFFIX=		-table-python
+PORTREVISION=		0
 
-COMMENT=	Python table support for opensmtpd
+COMMENT=		Python table support for OpenSMTPD
 
-PLIST_FILES=	libexec/opensmtpd/table-python
+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
+MASTERDIR=		${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: opensmtpd-extras-table-redis/Makefile
===================================================================
--- opensmtpd-extras-table-redis/Makefile
+++ opensmtpd-extras-table-redis/Makefile
@@ -1,20 +1,21 @@
 # Created by: gahr
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-table-redis
+PKGNAMESUFFIX=		-table-redis
+PORTREVISION=		0
 
-COMMENT=	Redis table support for opensmtpd
+COMMENT=		Redis table support for OpenSMTPD
 
-LIB_DEPENDS=	libhiredis.so:databases/hiredis
+LIB_DEPENDS=		libhiredis.so:databases/hiredis
 
-PLIST_FILES=	libexec/opensmtpd/table-redis \
+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
+CONFIGURE_ARGS+=	--with-table-redis
+CONFIGURE_ENV=		REDIS_CONFIG=${LOCALBASE}/bin/pkgconf
+CFLAGS+=		-I${LOCALBASE}/include/hiredis
 
-MASTERDIR=	${.CURDIR}/../opensmtpd-extras
-SLAVE_PORT=	yes
+MASTERDIR=		${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: opensmtpd-extras-table-socketmap/Makefile
===================================================================
--- opensmtpd-extras-table-socketmap/Makefile
+++ opensmtpd-extras-table-socketmap/Makefile
@@ -1,16 +1,17 @@
 # Created by: gahr
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-table-socketmap
+PKGNAMESUFFIX=		-table-socketmap
+PORTREVISION=		0
 
-COMMENT=	Socketmap table support for opensmtpd
+COMMENT=		Socketmap table support for OpenSMTPD
 
-PLIST_FILES=	libexec/opensmtpd/table-socketmap \
-		man/man5/table-socketmap.5.gz
+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
+MASTERDIR=		${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"
Index: opensmtpd-extras-table-sqlite/Makefile
===================================================================
--- opensmtpd-extras-table-sqlite/Makefile
+++ opensmtpd-extras-table-sqlite/Makefile
@@ -1,18 +1,19 @@
 # Created by: gahr
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-table-sqlite
+PKGNAMESUFFIX=		-table-sqlite
+PORTREVISION=		0
 
-COMMENT=	SQLite table support for opensmtpd
+COMMENT=		SQLite table support for OpenSMTPD
 
-PLIST_FILES=	libexec/opensmtpd/table-sqlite \
-		man/man5/table-sqlite.5.gz
+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
+MASTERDIR=		${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=		yes
 
 .include "${MASTERDIR}/Makefile"