Split opensmtpd-extras into a bunch of slave ports. Right now -extras

only has the table stuff, but there are many more pieces. Having
the default package install postgresql, redis, and mysql when all you
wanted was passwd support, is overkill. Ports for filters will come
soon.

The -extras port retains its OPTIONS (and still installs everything
possible, so there's no disruption for current users).

Approved by:	gahr (maintainer)

9 files changed, 175 insertions, 44 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 909e41686703..19b71fc4e1e0 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -293,6 +293,13 @@
     SUBDIR += opensmtpd
     SUBDIR += opensmtpd-devel
     SUBDIR += opensmtpd-extras
+    SUBDIR += opensmtpd-extras-table-mysql
+    SUBDIR += opensmtpd-extras-table-passwd
+    SUBDIR += opensmtpd-extras-table-postgresql
+    SUBDIR += opensmtpd-extras-table-python
+    SUBDIR += opensmtpd-extras-table-redis
+    SUBDIR += opensmtpd-extras-table-socketmap
+    SUBDIR += opensmtpd-extras-table-sqlite
     SUBDIR += openwebmail
     SUBDIR += osbf-lua
     SUBDIR += ovs
diff --git a/mail/opensmtpd-extras-table-mysql/Makefile b/mail/opensmtpd-extras-table-mysql/Makefile
new file mode 100644
index 000000000000..4b590f453bd1
--- /dev/null
+++ b/mail/opensmtpd-extras-table-mysql/Makefile
@@ -0,0 +1,18 @@
+# Created by: gahr
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-table-mysql
+
+COMMENT=	MySQL table support for opensmtpd
+
+PLIST_FILES=	libexec/opensmtpd/table-mysql
+
+CONFIGURE_ARGS=	--with-table-mysql
+LDFLAGS+=	-L${LOCALBASE}/lib/mysql
+
+USE_MYSQL=	client
+
+MASTERDIR=	${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/opensmtpd-extras-table-passwd/Makefile b/mail/opensmtpd-extras-table-passwd/Makefile
new file mode 100644
index 000000000000..41afecb6c8b6
--- /dev/null
+++ b/mail/opensmtpd-extras-table-passwd/Makefile
@@ -0,0 +1,17 @@
+# Created by: gahr
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-table-passwd
+
+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
+
+MASTERDIR=	${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/opensmtpd-extras-table-postgresql/Makefile b/mail/opensmtpd-extras-table-postgresql/Makefile
new file mode 100644
index 000000000000..f9374a86d215
--- /dev/null
+++ b/mail/opensmtpd-extras-table-postgresql/Makefile
@@ -0,0 +1,17 @@
+# Created by: gahr
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-table-postgresql
+
+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"
diff --git a/mail/opensmtpd-extras-table-python/Makefile b/mail/opensmtpd-extras-table-python/Makefile
new file mode 100644
index 000000000000..983b9a6ffe8d
--- /dev/null
+++ b/mail/opensmtpd-extras-table-python/Makefile
@@ -0,0 +1,17 @@
+# Created by: gahr
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-table-python
+
+COMMENT=	Python table support for opensmtpd
+
+PLIST_FILES=	libexec/opensmtpd/table-python
+
+CONFIGURE_ARGS=	--with-table-python --with-python-type=${PYTHON_VERSION}
+
+USES=		python
+
+MASTERDIR=	${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/opensmtpd-extras-table-redis/Makefile b/mail/opensmtpd-extras-table-redis/Makefile
new file mode 100644
index 000000000000..c7c0336cca24
--- /dev/null
+++ b/mail/opensmtpd-extras-table-redis/Makefile
@@ -0,0 +1,20 @@
+# Created by: gahr
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-table-redis
+
+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
+
+MASTERDIR=	${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/opensmtpd-extras-table-socketmap/Makefile b/mail/opensmtpd-extras-table-socketmap/Makefile
new file mode 100644
index 000000000000..1ebab9eb449e
--- /dev/null
+++ b/mail/opensmtpd-extras-table-socketmap/Makefile
@@ -0,0 +1,16 @@
+# Created by: gahr
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-table-socketmap
+
+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"
diff --git a/mail/opensmtpd-extras-table-sqlite/Makefile b/mail/opensmtpd-extras-table-sqlite/Makefile
new file mode 100644
index 000000000000..302af3ef3597
--- /dev/null
+++ b/mail/opensmtpd-extras-table-sqlite/Makefile
@@ -0,0 +1,18 @@
+# Created by: gahr
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-table-sqlite
+
+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
+
+MASTERDIR=	${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/opensmtpd-extras/Makefile b/mail/opensmtpd-extras/Makefile
index f013fd43ae86..30e43a6bea79 100644
--- a/mail/opensmtpd-extras/Makefile
+++ b/mail/opensmtpd-extras/Makefile
@@ -3,14 +3,24 @@
 
 PORTNAME=	opensmtpd-extras
 PORTVERSION=	201602042118
-CATEGORIES=	mail
+PORTREVISION?=	1
+CATEGORIES+=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/
 
-MAINTAINER=	gahr@FreeBSD.org
-COMMENT=	Addons for OpenSMTPD
+MAINTAINER?=	gahr@FreeBSD.org
+COMMENT?=	Addons for OpenSMTPD
 
-LICENSE=	ISCL
+LICENSE?=	ISCL
 
+LIB_DEPENDS+=	libevent.so:devel/libevent2
+RUN_DEPENDS+=	${LOCALBASE}/sbin/smtpctl:mail/opensmtpd
+
+USES+=		autoreconf libtool pkgconfig
+USE_OPENSSL=	yes
+WITH_OPENSSL_PORT=	yes
+GNU_CONFIGURE=	yes
+
+.if empty(SLAVE_PORT)
 OPTIONS_GROUP=		TABLE
 OPTIONS_GROUP_TABLE=	LDAP MYSQL PASSWD PGSQL PYTHON REDIS SMAP SQLITE
 OPTIONS_DEFAULT=	LDAP MYSQL PASSWD PGSQL PYTHON REDIS SMAP SQLITE
@@ -20,50 +30,41 @@ SMAP_DESC=	Socketmap protocol support
 
 OPTIONS_SUB=	yes
 
-LIB_DEPENDS=	libevent.so:devel/libevent2
-RUN_DEPENDS=	${LOCALBASE}/sbin/smtpctl:mail/opensmtpd
-
-USES=		autoreconf libtool pkgconfig
-USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=	yes
-GNU_CONFIGURE=	yes
 PLIST_FILES=	man/man3/filter_api.3.gz
-INSTALL_DIR=	libexec/opensmtpd
+INSTALL_DIR=	${LOCALBASE}/libexec/opensmtpd
+
+NO_ARCH=	yes
 
 #
 # Tables
 #
-MYSQL_CONFIGURE_WITH=	table-mysql
-MYSQL_VARS=		USE_MYSQL=client \
-			LDFLAGS+=-L${LOCALBASE}/lib/mysql \
-			PLIST_FILES+=${INSTALL_DIR}/table-mysql
-
-PASSWD_CONFIGURE_WITH=	table-passwd
-PASSWD_VARS=		PLIST_FILES+=${INSTALL_DIR}/table-passwd \
-			PLIST_FILES+=man/man5/table-passwd.5.gz
-
-PGSQL_CONFIGURE_WITH= 	table-postgres
-PGSQL_USES=		pgsql
-PGSQL_VARS=		PLIST_FILES+=${INSTALL_DIR}/table-postgres
-
-PYTHON_CONFIGURE_WITH=	table-python python-type=${PYTHON_VERSION}
-PYTHON_USES=		python
-PYTHON_VARS=		PLIST_FILES+=${INSTALL_DIR}/table-python
-
-REDIS_CONFIGURE_WITH=	table-redis
-REDIS_CONFIGURE_ENV=	REDIS_CONFIG=${LOCALBASE}/bin/pkgconf
-REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
-REDIS_VARS=		CFLAGS+=-I${LOCALBASE}/include/hiredis \
-			PLIST_FILES+=${INSTALL_DIR}/table-redis \
-			PLIST_FILES+=man/man5/table-redis.5.gz
-
-SMAP_CONFIGURE_WITH=	table-socketmap
-SMAP_VARS=		PLIST_FILES+=${INSTALL_DIR}/table-socketmap \
-			PLIST_FILES+=man/man5/table-socketmap.5.gz
-
-SQLITE_CONFIGURE_WITH=	table-sqlite
-SQLITE_USES=		sqlite
-SQLITE_VARS=		PLIST_FILES+=${INSTALL_DIR}/table-sqlite \
-			PLIST_FILES+=man/man5/table-sqlite.5.gz
+
+MYSQL_BUILD_DEPENDS=	${INSTALL_DIR}/table-mysql:mail/opensmtpd-extras-table-mysql
+MYSQL_RUN_DEPENDS=	${MYSQL_BUILD_DEPENDS}
+
+PASSWD_BUILD_DEPENDS=	${INSTALL_DIR}/table-passwd:mail/opensmtpd-extras-table-passwd
+PASSWD_RUN_DEPENDS=	${PASSWD_BUILD_DEPENDS}
+
+PGSQL_BUILD_DEPENDS=	${INSTALL_DIR}/table-postgres:mail/opensmtpd-extras-table-postgresql
+PGSQL_RUN_DEPENDS=	${PGSQL_BUILD_DEPENDS}
+
+PYTHON_BUILD_DEPENDS=	${INSTALL_DIR}/table-python:mail/opensmtpd-extras-table-python
+PYTHON_RUN_DEPENDS=	${PYTHON_BUILD_DEPENDS}
+
+REDIS_BUILD_DEPENDS=	${INSTALL_DIR}/table-redis:mail/opensmtpd-extras-table-redis
+REDIS_RUN_DEPENDS=	${REDIS_BUILD_DEPENDS}
+
+SMAP_BUILD_DEPENDS=	${INSTALL_DIR}/table-socketmap:mail/opensmtpd-extras-table-socketmap
+SMAP_RUN_DEPENDS=	${SMAP_BUILD_DEPENDS}
+
+SQLITE_BUILD_DEPENDS=	${INSTALL_DIR}/table-sqlite:mail/opensmtpd-extras-table-sqlite
+SQLITE_RUN_DEPENDS=	${SQLITE_BUILD_DEPENDS}
+.else
+
+# Only install this for the opensmtpd-extras master port
+post-install:
+	@${RM} ${STAGEDIR}${MAN3PREFIX}/man/man3/filter_api.3
+
+.endif
 
 .include <bsd.port.mk>