Quell most of the pkglint warnings.

6 files changed, 17 insertions, 10 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 890f7166418..4c1d75e8182 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2022/01/08 11:28:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.110 2022/01/08 11:41:21 schmonz Exp $
 
 .include "../../mail/dovecot2/Makefile.common"
 
@@ -35,6 +35,7 @@ OWN_DIRS+=		${PKG_SYSCONFDIR}/dovecot/conf.d
 REPLACE_BASH+=		src/util/dovecot-sysreport
 REPLACE_BASH+=		src/util/health-check.sh
 
+.PHONY: enable-manz-by-replacing-roff-includes-with-symlinks
 enable-manz-by-replacing-roff-includes-with-symlinks:
 	cd ${DESTDIR}${PREFIX}/${PKGMANDIR} && \
 	for i in $$(${GREP} -lr ^\\.so .); do \
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index 817aa54dee2..2dfe0e9fb3c 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2021/08/08 15:16:15 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2022/01/08 11:41:21 schmonz Exp $
 
 BUILDLINK_TREE+=	dovecot
 
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2
 
 pkgbase:=	dovecot
 .include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.dovecot:Mssl)
+.if ${PKG_BUILD_OPTIONS.dovecot:Mssl}
 .  include "../../security/openssl/buildlink3.mk"
 .endif
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index ba3f801740d..3b242f51094 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.115 2021/12/07 16:57:26 adam Exp $
+$NetBSD: distinfo,v 1.116 2022/01/08 11:41:21 schmonz Exp $
 
 BLAKE2s (dovecot-2.3.17.1.tar.gz) = 102a6b1b9bdfc5c2e642313c194ed2779fdff03711ab9d60f854af82d9cb0330
 SHA512 (dovecot-2.3.17.1.tar.gz) = 976aa4f68e86f401e5766017e1702740d5b03892aff98f31f9ef0c6d242311d0f4b50d7faa426306bf1c902d7fc6d021438977bc887fa66ee360b069ec32ad79
 Size (dovecot-2.3.17.1.tar.gz) = 7700848 bytes
 SHA1 (patch-aa) = 3af01aa4a8cea1a3fb840b6243a744de77069611
-SHA1 (patch-ab) = 9db15fd853ba47ef4bf04f2adc9ab24f71ee4d1e
-SHA1 (patch-ae) = c795585df9f415ceabb28eec1ff691ee26168d3b
-SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498
+SHA1 (patch-ab) = 685ab3d0e21515bf157e9897ebdebf484f0ece96
+SHA1 (patch-ae) = c1e76d75fab4b13d3b9b33af800bac18c90989da
+SHA1 (patch-af) = 15aa10e75845ef258cd6934b8209a7744eb5aa4c
 SHA1 (patch-src_imap_imap-client.h) = 1a2bf95ab6af57d88862a1512624bf263f4c2ce7
 SHA1 (patch-src_lib-ldap_ldap-private.h) = 2d5ce32330ad4164cc75f8d209ba499d37ed01fc
 SHA1 (patch-src_lib_connection.h) = c147511f4ff50e4b5a048c3a363f0af90ee4c6ad
diff --git a/mail/dovecot2/patches/patch-ab b/mail/dovecot2/patches/patch-ab
index 18aa3c580a8..883c4c76313 100644
--- a/mail/dovecot2/patches/patch-ab
+++ b/mail/dovecot2/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2018/01/02 15:52:44 fhajny Exp $
+$NetBSD: patch-ab,v 1.6 2022/01/08 11:41:21 schmonz Exp $
+
+Enable all protocols by default.
 
 --- doc/example-config/dovecot.conf.orig	2017-12-22 13:53:36.000000000 +0000
 +++ doc/example-config/dovecot.conf
diff --git a/mail/dovecot2/patches/patch-ae b/mail/dovecot2/patches/patch-ae
index 76958081a6f..54307ef5c7e 100644
--- a/mail/dovecot2/patches/patch-ae
+++ b/mail/dovecot2/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2018/01/02 15:52:44 fhajny Exp $
+$NetBSD: patch-ae,v 1.3 2022/01/08 11:41:21 schmonz Exp $
+
+Default to passwd, not pam, for passdb.
 
 --- doc/example-config/conf.d/auth-system.conf.ext.orig	2017-12-22 13:53:36.000000000 +0000
 +++ doc/example-config/conf.d/auth-system.conf.ext
diff --git a/mail/dovecot2/patches/patch-af b/mail/dovecot2/patches/patch-af
index f0c72291088..d6eb07b3841 100644
--- a/mail/dovecot2/patches/patch-af
+++ b/mail/dovecot2/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.6 2013/05/23 19:45:50 adam Exp $
+$NetBSD: patch-af,v 1.7 2022/01/08 11:41:21 schmonz Exp $
+
+Support hier(7).
 
 --- doc/example-config/conf.d/Makefile.in.orig	2013-05-19 23:04:29.000000000 +0000
 +++ doc/example-config/conf.d/Makefile.in