CVS commit: pkgsrc/mail/dovecot2

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed Jul  3 06:09:22 UTC 2019

Modified Files:
        pkgsrc/mail/dovecot2: Makefile Makefile.common buildlink3.mk distinfo
        pkgsrc/mail/dovecot2/patches: patch-aa

Log Message:
dovecot2: update blk3 to follow gnutls disabling

Do not bump revision since binary cannot be altered

pkgsrc changes:
---------------
  * make blk3 conform to options.mk
  * move BUILD_DEFS (pkglint WARN--)
  * comment an explicit patch (pkglint ERROR--)


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/mail/dovecot2/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/dovecot2/Makefile.common
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/dovecot2/buildlink3.mk
cvs rdiff -u -r1.92 -r1.93 pkgsrc/mail/dovecot2/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/dovecot2/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/dovecot2/Makefile
diff -u pkgsrc/mail/dovecot2/Makefile:1.97 pkgsrc/mail/dovecot2/Makefile:1.98
--- pkgsrc/mail/dovecot2/Makefile:1.97  Tue Oct 23 16:29:18 2018
+++ pkgsrc/mail/dovecot2/Makefile       Wed Jul  3 06:09:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2018/10/23 16:29:18 adam Exp $
+# $NetBSD: Makefile,v 1.98 2019/07/03 06:09:22 triaxx Exp $
 
 .include "../../mail/dovecot2/Makefile.common"
 
@@ -32,8 +32,6 @@ INSTALLATION_DIRS+=   share/examples/dovec
 OWN_DIRS=              ${PKG_SYSCONFDIR}/dovecot/
 OWN_DIRS+=             ${PKG_SYSCONFDIR}/dovecot/conf.d
 
-BUILD_DEFS+=           VARBASE
-
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DESTDIR}${EGDIR}
        ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DESTDIR}${EGDIR}

Index: pkgsrc/mail/dovecot2/Makefile.common
diff -u pkgsrc/mail/dovecot2/Makefile.common:1.29 pkgsrc/mail/dovecot2/Makefile.common:1.30
--- pkgsrc/mail/dovecot2/Makefile.common:1.29   Sun Jun  9 22:10:45 2019
+++ pkgsrc/mail/dovecot2/Makefile.common        Wed Jul  3 06:09:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2019/06/09 22:10:45 nia Exp $
+# $NetBSD: Makefile.common,v 1.30 2019/07/03 06:09:22 triaxx Exp $
 #
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
@@ -27,6 +27,8 @@ USE_LIBTOOL=          yes
 USE_TOOLS+=            gmake pkg-config rpcgen
 GNU_CONFIGURE=         yes
 
+BUILD_DEFS+=           VARBASE
+
 .include "../../mk/bsd.prefs.mk"
 
 .if "${PKGPATH}" != "mail/dovecot2"

Index: pkgsrc/mail/dovecot2/buildlink3.mk
diff -u pkgsrc/mail/dovecot2/buildlink3.mk:1.30 pkgsrc/mail/dovecot2/buildlink3.mk:1.31
--- pkgsrc/mail/dovecot2/buildlink3.mk:1.30     Tue Mar  5 17:05:46 2019
+++ pkgsrc/mail/dovecot2/buildlink3.mk  Wed Jul  3 06:09:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2019/03/05 17:05:46 hauke Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2019/07/03 06:09:22 triaxx Exp $
 
 BUILDLINK_TREE+=       dovecot
 
@@ -14,8 +14,6 @@ pkgbase:=     dovecot
 .include "../../mk/pkg-build-options.mk"
 .if !empty(PKG_BUILD_OPTIONS.dovecot:Mssl)
 .  include "../../security/openssl/buildlink3.mk"
-.elif !empty(PKG_BUILD_OPTIONS.dovecot:Mgnutls)
-.  include "../../security/gnutls/buildlink3.mk"
 .endif
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/mail/dovecot2/distinfo
diff -u pkgsrc/mail/dovecot2/distinfo:1.92 pkgsrc/mail/dovecot2/distinfo:1.93
--- pkgsrc/mail/dovecot2/distinfo:1.92  Tue Apr 30 15:21:06 2019
+++ pkgsrc/mail/dovecot2/distinfo       Wed Jul  3 06:09:22 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.92 2019/04/30 15:21:06 taca Exp $
+$NetBSD: distinfo,v 1.93 2019/07/03 06:09:22 triaxx Exp $
 
 SHA1 (dovecot-2.3.6.tar.gz) = 7b939bb83bca6d2bbc932d33d5b450bd66d9d124
 RMD160 (dovecot-2.3.6.tar.gz) = 584e72ed6d8901960aa2ba48c0d3716db4222e95
 SHA512 (dovecot-2.3.6.tar.gz) = ec28af2efcbd4ab534298c3342709251074dcdb0f0f4bcad0d24b996b273387e2ce557d7ab54abafb69be3ed7dd61f25c82b9710d78156932e2eff7f941c9eb2
 Size (dovecot-2.3.6.tar.gz) = 6980135 bytes
-SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
+SHA1 (patch-aa) = 3af01aa4a8cea1a3fb840b6243a744de77069611
 SHA1 (patch-ab) = 9db15fd853ba47ef4bf04f2adc9ab24f71ee4d1e
 SHA1 (patch-ae) = c795585df9f415ceabb28eec1ff691ee26168d3b
 SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498

Index: pkgsrc/mail/dovecot2/patches/patch-aa
diff -u pkgsrc/mail/dovecot2/patches/patch-aa:1.6 pkgsrc/mail/dovecot2/patches/patch-aa:1.7
--- pkgsrc/mail/dovecot2/patches/patch-aa:1.6   Thu May 23 19:45:50 2013
+++ pkgsrc/mail/dovecot2/patches/patch-aa       Wed Jul  3 06:09:22 2019
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2013/05/23 19:45:50 adam Exp $
+$NetBSD: patch-aa,v 1.7 2019/07/03 06:09:22 triaxx Exp $
+
+* Make the example directory pkgsrc compliant.
 
 --- doc/example-config/Makefile.in.orig        2013-05-19 23:04:29.000000000 +0000
 +++ doc/example-config/Makefile.in