git: 4410e9dd23bb - main - mail/dbmail: Update version 3.2.5=>3.2.6

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4410e9dd23bb38145c90eafac90d7a51cf0db597

commit 4410e9dd23bb38145c90eafac90d7a51cf0db597
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-01-10 09:07:30 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-01-10 09:09:32 +0000

    mail/dbmail: Update version 3.2.5=>3.2.6
    
    - Pet portfmt/portclippy
    
    PR: 261076
    Reported by: fluffy
    Relnotes: https://github.com/dbmail/dbmail/releases/tag/v3.2.6
---
 mail/dbmail/Makefile  | 54 +++++++++++++++++++++++++--------------------------
 mail/dbmail/distinfo  |  6 +++---
 mail/dbmail/pkg-plist |  6 ++++++
 3 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 7458324ab93f..cb53b153717e 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,7 +1,7 @@
 # Created by: Clement Laforet <sheepkiller@cultdeadsheep.org>
 
 PORTNAME=	dbmail
-PORTVERSION=	3.2.5
+PORTVERSION=	3.2.6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
@@ -12,54 +12,52 @@ LICENSE=	GPLv2
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 
-LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
-		libzdb.so:databases/libzdb \
-		libmhash.so:security/mhash \
-		libevent.so:devel/libevent
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
-		xmlto:textproc/xmlto \
-		docbook-sgml>0:textproc/docbook-sgml
+		docbook-sgml>0:textproc/docbook-sgml \
+		xmlto:textproc/xmlto
+LIB_DEPENDS=	libevent.so:devel/libevent \
+		libgmime-2.6.so:mail/gmime26 \
+		libmhash.so:security/mhash \
+		libzdb.so:databases/libzdb
 
-USES=		autoreconf gmake gnome libtool localbase pkgconfig \
-		shebangfix ssl
+USES=		autoreconf gmake gnome libtool localbase pkgconfig shebangfix \
+		ssl
 USE_GITHUB=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
 
-CONFLICTS=	dbmail22
+SHEBANG_FILES=	man/fixsp.pl
 
-OPTIONS_DEFINE=	DOCS LDAP SIEVE
-OPTIONS_DEFAULT=	SIEVE
-OPTIONS_SUB=	yes
-SIEVE_DESC=	Sieve mail sorting language support
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-manpages \
+			--sysconfdir=${LOCALBASE}/etc \
+			--with-zdb=${LOCALBASE}
 
+MAKE_ARGS+=	mandir=${MANPREFIX}/man
 INSTALL_TARGET=	install-strip
-GNU_CONFIGURE=	yes
 
-SHEBANG_FILES=	man/fixsp.pl
-
-CONFIGURE_ARGS+=	--with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc --enable-manpages
+PLIST_SUB+=	DBMAIL_GROUP="${DBMAIL_GROUP}" \
+		DBMAIL_USER="${DBMAIL_USER}" \
+		PIDDIR="${PIDDIR}"
 
-MAKE_ARGS+=	mandir=${MANPREFIX}/man
+OPTIONS_DEFINE=		DOCS LDAP SIEVE
+OPTIONS_DEFAULT=	SIEVE
+OPTIONS_SUB=		yes
+SIEVE_DESC=		Sieve mail sorting language support
 
 DOCS=		AUTHORS CHANGELOG.md INSTALL README THANKS UPGRADING
 
-SIEVE_CONFIGURE_WITH=	sieve
-SIEVE_LIB_DEPENDS=	libsieve.so:mail/libsieve
-
-LDAP_CONFIGURE_WITH=	ldap
-LDAP_USE=		OPENLDAP=yes
 LDAP_USES=		gettext-runtime
+LDAP_USE=		OPENLDAP=yes
+LDAP_CONFIGURE_WITH=	ldap
+SIEVE_LIB_DEPENDS=	libsieve.so:mail/libsieve
+SIEVE_CONFIGURE_WITH=	sieve
 
 DBMAIL_USER?=	mailnull
 DBMAIL_GROUP?=	mail
 PIDDIR?=	/var/run/dbmail
 
-PLIST_SUB+=	DBMAIL_USER="${DBMAIL_USER}" \
-		DBMAIL_GROUP="${DBMAIL_GROUP}" \
-		PIDDIR="${PIDDIR}"
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf.sample
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index 6a9b342be171..32dbb388d5b0 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596742176
-SHA256 (dbmail-dbmail-v3.2.5_GH0.tar.gz) = 54cea77c0be8098c62035adf46ba7d951ab8e121374f916c70498161884115f0
-SIZE (dbmail-dbmail-v3.2.5_GH0.tar.gz) = 2463966
+TIMESTAMP = 1641803985
+SHA256 (dbmail-dbmail-v3.2.6_GH0.tar.gz) = bc073c3f15c5e73516e4b066958fbe4fc56d41b3ab334f0fa2bd362f036a2b01
+SIZE (dbmail-dbmail-v3.2.6_GH0.tar.gz) = 2520233
diff --git a/mail/dbmail/pkg-plist b/mail/dbmail/pkg-plist
index bf4fe854614c..bd6cc859c211 100644
--- a/mail/dbmail/pkg-plist
+++ b/mail/dbmail/pkg-plist
@@ -52,6 +52,8 @@ sbin/dbmail-util
 %%DATADIR%%/mysql/upgrades/32003.mysql
 %%DATADIR%%/mysql/upgrades/32004.mysql
 %%DATADIR%%/mysql/upgrades/32005.mysql
+%%DATADIR%%/mysql/upgrades/32006.mysql
+%%DATADIR%%/mysql/upgrades/upgrade.mysql
 %%DATADIR%%/oracle/dbmail_grant.sql
 %%DATADIR%%/oracle/dbmail_schema.sql
 %%DATADIR%%/oracle/dbmail_ts.sql
@@ -70,6 +72,8 @@ sbin/dbmail-util
 %%DATADIR%%/postgresql/upgrades/32003.psql
 %%DATADIR%%/postgresql/upgrades/32004.psql
 %%DATADIR%%/postgresql/upgrades/32005.psql
+%%DATADIR%%/postgresql/upgrades/32006.psql
+%%DATADIR%%/postgresql/upgrades/upgrade.psql
 %%DATADIR%%/sqlite/2_1_7-2_2_0.sqlite
 %%DATADIR%%/sqlite/2_2-3_0.sqlite
 %%DATADIR%%/sqlite/2_2_5-2_3_0.sqlite
@@ -84,6 +88,8 @@ sbin/dbmail-util
 %%DATADIR%%/sqlite/upgrades/32003.sqlite
 %%DATADIR%%/sqlite/upgrades/32004.sqlite
 %%DATADIR%%/sqlite/upgrades/32005.sqlite
+%%DATADIR%%/sqlite/upgrades/32006.sqlite
+%%DATADIR%%/sqlite/upgrades/upgrade.sqlite
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL