From 56fc617980caaa5568414abe5fc54ae0b9c4f4c8 Mon Sep 17 00:00:00 2001
From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Date: Thu, 26 Nov 2009 11:37:29 +0300
Subject: [PATCH] mail/dovecot: update to 1.2.8

Also bumped version of mail/dovecot-antispam per maintainer recipe.

Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
---
 mail/dovecot-antispam/Makefile                  |    2 +-
 mail/dovecot/Makefile                           |    9 ++-------
 mail/dovecot/distinfo                           |   12 ++++++------
 mail/dovecot/files/patch-src-auth-mech-gssapi.c |   13 -------------
 mail/dovecot/pkg-plist                          |    5 +++--
 5 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 mail/dovecot/files/patch-src-auth-mech-gssapi.c

diff --git a/mail/dovecot-antispam/Makefile b/mail/dovecot-antispam/Makefile
index 56a5361..5ebbb11 100644
--- a/mail/dovecot-antispam/Makefile
+++ b/mail/dovecot-antispam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dovecot-antispam
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://johannes.sipsolutions.net/download/dovecot-antispam/ \
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index c65020b..550516d 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTVERSION=	1.2.8
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${DOVECOTVERSION}/ \
 		http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
@@ -104,15 +103,11 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 ## POP3 support
 #
-.if defined(WITHOUT_POP3)
-CONFIGURE_ARGS+=	--without-pop3d
-PLIST_SUB+=		POP3="@comment "
-.else
+.if defined(WITH_POP3)
 PROTOCOLS+=		pop3
 .if defined(WITH_SSL) && !defined(WITHOUT_SSL)
 PROTOCOLS+=		pop3s
 .endif
-PLIST_SUB+=		POP3=""
 .endif
 
 ## LDA support
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index d7fa49e..7d2321b 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,6 +1,6 @@
-MD5 (dovecot-1.2.4.tar.gz) = 3e5717d13e3d6b32d3f4b809df397dbf
-SHA256 (dovecot-1.2.4.tar.gz) = df6406f96f5c040f4656ce7526c45b2f333851c7895e8bbab928db02fa6ac3ca
-SIZE (dovecot-1.2.4.tar.gz) = 2637375
-MD5 (dovecot-1.2.4-managesieve-0.11.9.diff.gz) = 6dd2ef2d46b3b63238237455558a14e1
-SHA256 (dovecot-1.2.4-managesieve-0.11.9.diff.gz) = 7fad7de933ae5698ae77574ef265587e71232737116348352a282658c773de7a
-SIZE (dovecot-1.2.4-managesieve-0.11.9.diff.gz) = 6422
+MD5 (dovecot-1.2.8.tar.gz) = c6d6c061413d299ccea7b55c3e4faa0a
+SHA256 (dovecot-1.2.8.tar.gz) = 145c5dd8519d526c4bc2c1b4d6b5eeb09ba000f57fe5e16af1f72a73acc788c7
+SIZE (dovecot-1.2.8.tar.gz) = 2702887
+MD5 (dovecot-1.2.8-managesieve-0.11.9.diff.gz) = 4e3d658b2040f1319e7ec5f389aa94ff
+SHA256 (dovecot-1.2.8-managesieve-0.11.9.diff.gz) = 740e3174022c9902577a6184ec2f237dda58208818ca49382e79553d7a2614eb
+SIZE (dovecot-1.2.8-managesieve-0.11.9.diff.gz) = 6298
diff --git a/mail/dovecot/files/patch-src-auth-mech-gssapi.c b/mail/dovecot/files/patch-src-auth-mech-gssapi.c
deleted file mode 100644
index e707703..0000000
--- a/mail/dovecot/files/patch-src-auth-mech-gssapi.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/auth/mech-gssapi.c.orig	2009-08-15 03:14:11.000000000 +1000
-+++ src/auth/mech-gssapi.c	2009-08-29 07:02:43.000000000 +1000
-@@ -218,6 +218,10 @@
- 	const unsigned char *c = data;
- 	unsigned int i;
- 
-+	/* apparently all names end with NUL? */
-+	if (len > 0 && c[len-1] == '\0')
-+		len--;
-+
- 	for (i = 0; i < len; i++) {
- 		if (c[i] == '\0')
- 			return TRUE;
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index c1364cd..d506c66 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -91,6 +91,7 @@ lib/dovecot/lib21_fts_squat_plugin.a
 lib/dovecot/lib21_fts_squat_plugin.la
 lib/dovecot/lib21_fts_squat_plugin.so
 @dirrmtry lib/dovecot
+libexec/dovecot/authtest
 libexec/dovecot/checkpassword-reply
 libexec/dovecot/convert-tool
 %%LDA%%libexec/dovecot/deliver
@@ -105,8 +106,8 @@ libexec/dovecot/imap-utf7
 libexec/dovecot/listview
 libexec/dovecot/logview
 libexec/dovecot/maildirlock
-%%POP3%%libexec/dovecot/pop3
-%%POP3%%libexec/dovecot/pop3-login
+libexec/dovecot/pop3
+libexec/dovecot/pop3-login
 libexec/dovecot/rawlog
 libexec/dovecot/ssl-build-param
 libexec/dovecot/threadview
-- 
1.6.5.3