diff options
author | triaxx <triaxx@pkgsrc.org> | 2019-07-03 06:09:22 +0000 |
---|---|---|
committer | triaxx <triaxx@pkgsrc.org> | 2019-07-03 06:09:22 +0000 |
commit | a0aed3aa004b996bc7ba97229623c9c15b40de50 (patch) | |
tree | 9e34bd08423346f342c8df998f2e3a26b764d3b0 /mail/dovecot2 | |
parent | a1720448bbb0ebd982461a98b02a460d5aedf73e (diff) | |
download | pkgsrc-a0aed3aa004b996bc7ba97229623c9c15b40de50.tar.gz |
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--)
Diffstat (limited to 'mail/dovecot2')
-rw-r--r-- | mail/dovecot2/Makefile | 4 | ||||
-rw-r--r-- | mail/dovecot2/Makefile.common | 4 | ||||
-rw-r--r-- | mail/dovecot2/buildlink3.mk | 4 | ||||
-rw-r--r-- | mail/dovecot2/distinfo | 4 | ||||
-rw-r--r-- | mail/dovecot2/patches/patch-aa | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile index af172cf1172..0e6129faf30 100644 --- a/mail/dovecot2/Makefile +++ b/mail/dovecot2/Makefile @@ -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/dovecot share/examples/dovecot/conf.d 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} diff --git a/mail/dovecot2/Makefile.common b/mail/dovecot2/Makefile.common index c26c6299121..393b3973380 100644 --- a/mail/dovecot2/Makefile.common +++ b/mail/dovecot2/Makefile.common @@ -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" diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk index b7780b6efaa..06f3447b78a 100644 --- a/mail/dovecot2/buildlink3.mk +++ b/mail/dovecot2/buildlink3.mk @@ -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" diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo index 1d429884f0b..2481f360fca 100644 --- a/mail/dovecot2/distinfo +++ b/mail/dovecot2/distinfo @@ -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 diff --git a/mail/dovecot2/patches/patch-aa b/mail/dovecot2/patches/patch-aa index 456e6b96800..33e4bb03db2 100644 --- a/mail/dovecot2/patches/patch-aa +++ b/mail/dovecot2/patches/patch-aa @@ -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 |