Update to 3.2.3. Next major version, no good changelog found.

6 files changed, 81 insertions, 83 deletions

diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 3c49828f7d7..943f55a92ee 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2015/04/06 08:17:31 adam Exp $
+# $NetBSD: Makefile,v 1.47 2015/08/30 17:52:27 wiz Exp $
 
-DISTNAME=	dbmail-2.2.17
-PKGREVISION=	20
+DISTNAME=	dbmail-3.2.3
 CATEGORIES=	mail
-MASTER_SITES=	http://www.dbmail.org/download/2.2/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=pjstevns/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dbmail.org/
@@ -18,6 +18,7 @@ CONFIGURE_ARGS+=	--with-logdir=${VARBASE}/log
 CONFIGURE_ARGS+=	--with-pkglibdir=${PREFIX}/lib/dbmail
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/run
+CONFIGURE_ARGS+=	--with-zdb=${BUILDLINK_PREFIX.libzdb}
 
 BUILD_DEFS+=		VARBASE
 
@@ -26,14 +27,7 @@ CONF_FILES_PERMS+=	${EGDIR}/dbmail.conf ${PKG_SYSCONFDIR}/dbmail.conf \
 			  ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0640
 RCD_SCRIPTS=		dbmail dbmailimapd dbmaillmtpd dbmailpop3d
 DATADIR=		${PREFIX}/share/dbmail
-DOCSDIR=		${PREFIX}/share/doc/dbmail
-DOCS=			AUTHORS BUGS COPYING INSTALL NEWS README
-DOCS+=			README.aliases README.exim README.ldap
-DOCS+=			README.postfix README.qmail README.sieve
-DOCS+=			README.smtp README.solaris README.usermap
-DOCS+=			THANKS UPGRADING
-
-MESSAGE_SUBST+=		DOCSDIR=${DOCSDIR}
+
 MESSAGE_SUBST+=		DATADIR=${DATADIR}
 
 SUBST_CLASSES+=		sysconf
@@ -45,19 +39,17 @@ SUBST_FILES.sysconf+=	man/dbmail-sievecmd.8 mail/dbmail-timsieved.8
 SUBST_SED.sysconf=	-e 's|/etc/dbmail\.conf|${PKG_SYSCONFDIR}/dbmail.conf|g'
 SUBST_MESSAGE.sysconf=	Fixing sysconf paths.
 
-INSTALLATION_DIRS=	lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin ${DOCSDIR} ${EGDIR} ${DATADIR}/sql
+INSTALLATION_DIRS=	lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin ${EGDIR} ${DATADIR}/sql
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${DESTDIR}${EGDIR}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCSDIR}
-.endfor
 
 .include "options.mk"
 
+.include "../../databases/libzdb/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gmime20+=	gmime20>=2.2.10
-.include "../../mail/gmime20/buildlink3.mk"
+.include "../../mail/gmime/buildlink3.mk"
+.include "../../security/mhash/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/dbmail/PLIST b/mail/dbmail/PLIST
index 3c1b9044e1d..0dddcafd68a 100644
--- a/mail/dbmail/PLIST
+++ b/mail/dbmail/PLIST
@@ -1,57 +1,60 @@
-@comment $NetBSD: PLIST,v 1.10 2014/03/11 14:05:02 jperkin Exp $
-${PLIST.mysql}lib/dbmail/libmysql.la
-${PLIST.pgsql}lib/dbmail/libpgsql.la
-${PLIST.sqlite}lib/dbmail/libsqlite.la
+@comment $NetBSD: PLIST,v 1.11 2015/08/30 17:52:27 wiz Exp $
 ${PLIST.ldap}lib/dbmail/libauth_ldap.la
 lib/dbmail/libauth_sql.la
 lib/dbmail/libdbmail.la
 ${PLIST.sieve}lib/dbmail/libsort_sieve.la
-man/man1/dbmail-smtp.1
-man/man1/dbmail.1
-man/man5/dbmail.conf.5
-man/man8/dbmail-export.8
-man/man8/dbmail-imapd.8
-man/man8/dbmail-lmtpd.8
-man/man8/dbmail-pop3d.8
-man/man8/dbmail-sievecmd.8
-man/man8/dbmail-timsieved.8
-man/man8/dbmail-users.8
-man/man8/dbmail-util.8
+sbin/dbmail-deliver
 sbin/dbmail-export
+sbin/dbmail-httpd
 sbin/dbmail-imapd
 sbin/dbmail-lmtpd
 sbin/dbmail-pop3d
 ${PLIST.sieve}sbin/dbmail-sievecmd
-sbin/dbmail-smtp
 ${PLIST.sieve}sbin/dbmail-timsieved
 sbin/dbmail-users
 sbin/dbmail-util
-share/doc/dbmail/AUTHORS
-share/doc/dbmail/BUGS
-share/doc/dbmail/COPYING
-share/doc/dbmail/INSTALL
-share/doc/dbmail/NEWS
-share/doc/dbmail/README
-share/doc/dbmail/README.aliases
-share/doc/dbmail/README.exim
-share/doc/dbmail/README.ldap
-share/doc/dbmail/README.postfix
-share/doc/dbmail/README.qmail
-share/doc/dbmail/README.sieve
-share/doc/dbmail/README.smtp
-share/doc/dbmail/README.solaris
-share/doc/dbmail/README.usermap
-share/doc/dbmail/THANKS
-share/doc/dbmail/UPGRADING
-share/examples/dbmail/dbmail.conf
 ${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/examples/dbmail/dbmail.conf
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index c2bf03a9043..ac78bc2baa3 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2010/09/09 12:42:27 adam Exp $
+$NetBSD: distinfo,v 1.15 2015/08/30 17:52:27 wiz Exp $
 
-SHA1 (dbmail-2.2.17.tar.gz) = be9b2bd2d2bd375a162a214cf51fbf8d4b0cf096
-RMD160 (dbmail-2.2.17.tar.gz) = 3014e82fc960a6e3896f9cecc4233b99ac2640f6
-Size (dbmail-2.2.17.tar.gz) = 896838 bytes
-SHA1 (patch-aa) = 082714ef215972e02348a344f57f422d21f5ff11
+SHA1 (dbmail-3.2.3.tar.gz) = 63f2c84deb5e0926ac558f8eabc18927a28ca64a
+RMD160 (dbmail-3.2.3.tar.gz) = 1b3276cbd10a0c1659d9efaacb76ebe0c73c9d3c
+Size (dbmail-3.2.3.tar.gz) = 2444227 bytes
+SHA1 (patch-src_dbmail.h.in) = 293d8075d502e4c44af34bf70de34289fd091eb1
diff --git a/mail/dbmail/options.mk b/mail/dbmail/options.mk
index be6e54a4067..ea3ac2aca4f 100644
--- a/mail/dbmail/options.mk
+++ b/mail/dbmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2014/02/13 11:39:05 fhajny Exp $
+# $NetBSD: options.mk,v 1.11 2015/08/30 17:52:27 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dbmail
 PKG_SUPPORTED_OPTIONS=	ldap sieve
@@ -17,7 +17,7 @@ PLIST_VARS+=		ldap mysql pgsql sieve sqlite
 .include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-mysql
 PLIST.mysql=		yes
-INSTALLATION_DIRS+=	${DATADIR}/sql/mysql
+INSTALLATION_DIRS+=	${DATADIR}/sql/mysql/upgrades
 .endif
 
 ###
@@ -27,7 +27,7 @@ INSTALLATION_DIRS+=	${DATADIR}/sql/mysql
 .include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pgsql
 PLIST.pgsql=		yes
-INSTALLATION_DIRS+=	${DATADIR}/sql/postgresql
+INSTALLATION_DIRS+=	${DATADIR}/sql/postgresql/upgrades
 .endif
 
 ###
@@ -37,7 +37,7 @@ INSTALLATION_DIRS+=	${DATADIR}/sql/postgresql
 .include "../../databases/sqlite3/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-sqlite
 PLIST.sqlite=		yes
-INSTALLATION_DIRS+=	${DATADIR}/sql/sqlite
+INSTALLATION_DIRS+=	${DATADIR}/sql/sqlite/upgrades
 .endif
 
 ###
@@ -70,11 +70,14 @@ 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/*.* ${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/*.* ${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/*.* ${DESTDIR}${DATADIR}/sql/sqlite
+	${INSTALL_DATA} ${WRKSRC}/sql/sqlite/upgrades/*.* ${DESTDIR}${DATADIR}/sql/sqlite/upgrades
 .endif
diff --git a/mail/dbmail/patches/patch-aa b/mail/dbmail/patches/patch-aa
deleted file mode 100644
index 06c3189c16c..00000000000
--- a/mail/dbmail/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2010/01/23 04:50:22 obache Exp $
-
-* getaddrinfo(3) is in XNS5.2, require _XOPEN_SOURCE>=520
-* _NETBSD_SORCE is required for NI_MAXHOST/NI_MAXSERVE on NetBSD.
-
---- dbmail.h.in.orig	2010-01-22 12:57:30.000000000 +0000
-+++ dbmail.h.in
-@@ -33,7 +33,10 @@
- #ifdef __FreeBSD__
- #define _XOPEN_SOURCE
- #else
--#define _XOPEN_SOURCE 	500
-+#define _XOPEN_SOURCE 	520
-+#endif
-+#ifdef __NetBSD__
-+#define _NETBSD_SOURCE
- #endif
- 
- #define __EXTENSIONS__ 		/* solaris */
diff --git a/mail/dbmail/patches/patch-src_dbmail.h.in b/mail/dbmail/patches/patch-src_dbmail.h.in
new file mode 100644
index 00000000000..27ed8ebefbe
--- /dev/null
+++ b/mail/dbmail/patches/patch-src_dbmail.h.in
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_dbmail.h.in,v 1.1 2015/08/30 17:52:27 wiz Exp $
+
+Define _NETBSD_SOURCE so that _NI_* are defined.
+Do not included features.h because it doesn't exist.
+
+--- src/dbmail.h.in.orig	2015-01-25 10:20:50.000000000 +0000
++++ src/dbmail.h.in
+@@ -39,7 +39,11 @@
+ #else
+ 
+ #define _XOPEN_SOURCE	500
++#ifdef __NetBSD__
++#define _NETBSD_SOURCE
++#else
+ #include <features.h>
++#endif
+ 
+ #endif
+