Remove options for database backend selection.

Database access is now fully abstracted through databases/libzdb and
dbmail itself is agnostic about which backend support is present.
Bump PKGREVSION.

3 files changed, 54 insertions, 102 deletions

diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 943f55a92ee..95be229736a 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2015/08/30 17:52:27 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2015/09/12 14:23:59 tnn Exp $
 
 DISTNAME=	dbmail-3.2.3
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pjstevns/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -10,7 +11,7 @@ HOMEPAGE=	http://www.dbmail.org/
 COMMENT=	Store and retrieve mail messages in a database
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake pkg-config pax
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -43,6 +44,9 @@ INSTALLATION_DIRS=	lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbi
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${DESTDIR}${EGDIR}
+.for f in mysql postgresql sqlite
+	cd ${WRKSRC}/sql && pax -rw ${f} ${DESTDIR}${DATADIR}/sql/.
+.endfor
 
 .include "options.mk"
 
diff --git a/mail/dbmail/PLIST b/mail/dbmail/PLIST
index 0dddcafd68a..23c31718005 100644
--- a/mail/dbmail/PLIST
+++ b/mail/dbmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2015/08/30 17:52:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/09/12 14:23:59 tnn Exp $
 ${PLIST.ldap}lib/dbmail/libauth_ldap.la
 lib/dbmail/libauth_sql.la
 lib/dbmail/libdbmail.la
@@ -13,48 +13,48 @@ ${PLIST.sieve}sbin/dbmail-sievecmd
 ${PLIST.sieve}sbin/dbmail-timsieved
 sbin/dbmail-users
 sbin/dbmail-util
-${PLIST.mysql}share/dbmail/sql/mysql/2_1_7-2_2_0.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/2_2-3_0.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/2_2_5-2_3_0.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/2_3_0-2_3_2.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/2_3_4-2_3_5.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/2_3_5-2_3_6.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/2_3_6-3_0_0.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/3_0_2-3_1_0.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/create_tables.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/fix_foreign_keys.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/migrate_from_1.x_to_2.0_innodb.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/migrate_from_2.0_to_2.2.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/update_headervalue_01.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/upgrades/32001.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/upgrades/32002.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/upgrades/32003.mysql
-${PLIST.mysql}share/dbmail/sql/mysql/upgrades/32004.mysql
-${PLIST.pgsql}share/dbmail/sql/postgresql/2_1_7-2_2_0.pgsql
-${PLIST.pgsql}share/dbmail/sql/postgresql/2_2-3_0.pgsql
-${PLIST.pgsql}share/dbmail/sql/postgresql/2_2_5-2_3_0.pgsql
-${PLIST.pgsql}share/dbmail/sql/postgresql/2_3_4-2_3_5.pgsql
-${PLIST.pgsql}share/dbmail/sql/postgresql/2_3_5-2_3_6.pgsql
-${PLIST.pgsql}share/dbmail/sql/postgresql/2_3_6-3_0_0.pgsql
-${PLIST.pgsql}share/dbmail/sql/postgresql/3_0_2-3_1_0.psql
-${PLIST.pgsql}share/dbmail/sql/postgresql/create_tables.pgsql
-${PLIST.pgsql}share/dbmail/sql/postgresql/migrate_from_1.x_to_2.0.pgsql
-${PLIST.pgsql}share/dbmail/sql/postgresql/migrate_from_2.0_to_2.2.pgsql
-${PLIST.pgsql}share/dbmail/sql/postgresql/upgrades/32001.psql
-${PLIST.pgsql}share/dbmail/sql/postgresql/upgrades/32002.psql
-${PLIST.pgsql}share/dbmail/sql/postgresql/upgrades/32003.psql
-${PLIST.pgsql}share/dbmail/sql/postgresql/upgrades/32004.psql
-${PLIST.sqlite}share/dbmail/sql/sqlite/2_1_7-2_2_0.sqlite
-${PLIST.sqlite}share/dbmail/sql/sqlite/2_2-3_0.sqlite
-${PLIST.sqlite}share/dbmail/sql/sqlite/2_2_5-2_3_0.sqlite
-${PLIST.sqlite}share/dbmail/sql/sqlite/2_3_4-2_3_5.sqlite
-${PLIST.sqlite}share/dbmail/sql/sqlite/2_3_5-2_3_6.sqlite
-${PLIST.sqlite}share/dbmail/sql/sqlite/2_3_6-3_0_0.sqlite
-${PLIST.sqlite}share/dbmail/sql/sqlite/3_0_2-3_1_0.sqlite
-${PLIST.sqlite}share/dbmail/sql/sqlite/create_tables.sqlite
-${PLIST.sqlite}share/dbmail/sql/sqlite/trigger.tmpl.sql
-${PLIST.sqlite}share/dbmail/sql/sqlite/upgrades/32001.sqlite
-${PLIST.sqlite}share/dbmail/sql/sqlite/upgrades/32002.sqlite
-${PLIST.sqlite}share/dbmail/sql/sqlite/upgrades/32003.sqlite
-${PLIST.sqlite}share/dbmail/sql/sqlite/upgrades/32004.sqlite
+share/dbmail/sql/mysql/2_1_7-2_2_0.mysql
+share/dbmail/sql/mysql/2_2-3_0.mysql
+share/dbmail/sql/mysql/2_2_5-2_3_0.mysql
+share/dbmail/sql/mysql/2_3_0-2_3_2.mysql
+share/dbmail/sql/mysql/2_3_4-2_3_5.mysql
+share/dbmail/sql/mysql/2_3_5-2_3_6.mysql
+share/dbmail/sql/mysql/2_3_6-3_0_0.mysql
+share/dbmail/sql/mysql/3_0_2-3_1_0.mysql
+share/dbmail/sql/mysql/create_tables.mysql
+share/dbmail/sql/mysql/fix_foreign_keys.mysql
+share/dbmail/sql/mysql/migrate_from_1.x_to_2.0_innodb.mysql
+share/dbmail/sql/mysql/migrate_from_2.0_to_2.2.mysql
+share/dbmail/sql/mysql/update_headervalue_01.mysql
+share/dbmail/sql/mysql/upgrades/32001.mysql
+share/dbmail/sql/mysql/upgrades/32002.mysql
+share/dbmail/sql/mysql/upgrades/32003.mysql
+share/dbmail/sql/mysql/upgrades/32004.mysql
+share/dbmail/sql/postgresql/2_1_7-2_2_0.pgsql
+share/dbmail/sql/postgresql/2_2-3_0.pgsql
+share/dbmail/sql/postgresql/2_2_5-2_3_0.pgsql
+share/dbmail/sql/postgresql/2_3_4-2_3_5.pgsql
+share/dbmail/sql/postgresql/2_3_5-2_3_6.pgsql
+share/dbmail/sql/postgresql/2_3_6-3_0_0.pgsql
+share/dbmail/sql/postgresql/3_0_2-3_1_0.psql
+share/dbmail/sql/postgresql/create_tables.pgsql
+share/dbmail/sql/postgresql/migrate_from_1.x_to_2.0.pgsql
+share/dbmail/sql/postgresql/migrate_from_2.0_to_2.2.pgsql
+share/dbmail/sql/postgresql/upgrades/32001.psql
+share/dbmail/sql/postgresql/upgrades/32002.psql
+share/dbmail/sql/postgresql/upgrades/32003.psql
+share/dbmail/sql/postgresql/upgrades/32004.psql
+share/dbmail/sql/sqlite/2_1_7-2_2_0.sqlite
+share/dbmail/sql/sqlite/2_2-3_0.sqlite
+share/dbmail/sql/sqlite/2_2_5-2_3_0.sqlite
+share/dbmail/sql/sqlite/2_3_4-2_3_5.sqlite
+share/dbmail/sql/sqlite/2_3_5-2_3_6.sqlite
+share/dbmail/sql/sqlite/2_3_6-3_0_0.sqlite
+share/dbmail/sql/sqlite/3_0_2-3_1_0.sqlite
+share/dbmail/sql/sqlite/create_tables.sqlite
+share/dbmail/sql/sqlite/trigger.tmpl.sql
+share/dbmail/sql/sqlite/upgrades/32001.sqlite
+share/dbmail/sql/sqlite/upgrades/32002.sqlite
+share/dbmail/sql/sqlite/upgrades/32003.sqlite
+share/dbmail/sql/sqlite/upgrades/32004.sqlite
 share/examples/dbmail/dbmail.conf
diff --git a/mail/dbmail/options.mk b/mail/dbmail/options.mk
index ea3ac2aca4f..1910289042c 100644
--- a/mail/dbmail/options.mk
+++ b/mail/dbmail/options.mk
@@ -1,44 +1,12 @@
-# $NetBSD: options.mk,v 1.11 2015/08/30 17:52:27 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2015/09/12 14:23:59 tnn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dbmail
 PKG_SUPPORTED_OPTIONS=	ldap sieve
-PKG_OPTIONS_NONEMPTY_SETS=	sql
-PKG_OPTIONS_SET.sql=	mysql pgsql sqlite
-PKG_SUGGESTED_OPTIONS=	mysql sieve
+PKG_SUGGESTED_OPTIONS=	sieve
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		ldap mysql pgsql sieve sqlite
-
-###
-### MySQL database support
-###
-.if !empty(PKG_OPTIONS:Mmysql)
-.include "../../mk/mysql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-mysql
-PLIST.mysql=		yes
-INSTALLATION_DIRS+=	${DATADIR}/sql/mysql/upgrades
-.endif
-
-###
-### PostgreSQL database support
-###
-.if !empty(PKG_OPTIONS:Mpgsql)
-.include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pgsql
-PLIST.pgsql=		yes
-INSTALLATION_DIRS+=	${DATADIR}/sql/postgresql/upgrades
-.endif
-
-###
-### SQLite database support
-###
-.if !empty(PKG_OPTIONS:Msqlite)
-.include "../../databases/sqlite3/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-sqlite
-PLIST.sqlite=		yes
-INSTALLATION_DIRS+=	${DATADIR}/sql/sqlite/upgrades
-.endif
+PLIST_VARS+=		ldap sieve
 
 ###
 ### Sieve support
@@ -61,23 +29,3 @@ FILES_SUBST+=		TIMSIEVED=""
 CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap-client}
 PLIST.ldap=		yes
 .endif
-
-###
-### Migration scripts
-###
-post-install: dbmail-install-scripts
-
-.PHONY: dbmail-install-scripts
-dbmail-install-scripts:
-.if !empty(PKG_OPTIONS:Mmysql)
-	${INSTALL_DATA} ${WRKSRC}/sql/mysql/*.* ${DESTDIR}${DATADIR}/sql/mysql
-	${INSTALL_DATA} ${WRKSRC}/sql/mysql/upgrades/*.* ${DESTDIR}${DATADIR}/sql/mysql/upgrades
-.endif
-.if !empty(PKG_OPTIONS:Mpgsql)
-	${INSTALL_DATA} ${WRKSRC}/sql/postgresql/*.* ${DESTDIR}${DATADIR}/sql/postgresql
-	${INSTALL_DATA} ${WRKSRC}/sql/postgresql/upgrades/*.* ${DESTDIR}${DATADIR}/sql/postgresql/upgrades
-.endif
-.if !empty(PKG_OPTIONS:Msqlite)
-	${INSTALL_DATA} ${WRKSRC}/sql/sqlite/*.* ${DESTDIR}${DATADIR}/sql/sqlite
-	${INSTALL_DATA} ${WRKSRC}/sql/sqlite/upgrades/*.* ${DESTDIR}${DATADIR}/sql/sqlite/upgrades
-.endif