From 605df406dbe06f61f93e0b705f0565db805a180e Mon Sep 17 00:00:00 2001
From: giovanni <giovanni@openbsd.org>
Date: Mon, 9 May 2011 09:32:19 +0000
Subject: [PATCH] Update to 2.5.3

---
 mail/maildrop/Makefile                      |  5 ++---
 mail/maildrop/distinfo                      | 10 ++++-----
 mail/maildrop/patches/patch-rfc822_rfc822_c | 23 ---------------------
 3 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 mail/maildrop/patches/patch-rfc822_rfc822_c

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 29c43e10331..88161dc7a4d 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.38 2010/11/19 07:23:06 espie Exp $
+# $OpenBSD: Makefile,v 1.39 2011/05/09 09:32:19 giovanni Exp $
 
 COMMENT-main=		mail delivery agent with filtering abilities
 COMMENT-utils=		quota tools for the Courier mail suite
 
-V=			2.5.0
+V=			2.5.3
 DISTNAME=		maildrop-$V
 PKGNAME-main=		maildrop-${V}
-REVISION-main =		0
 FULLPKGNAME-utils=	courier-utils-$V
 FULLPKGPATH-utils=	mail/maildrop,-utils
 CATEGORIES=		mail
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index be960487e45..bfe4a5672f0 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,5 +1,5 @@
-MD5 (maildrop-2.5.0.tar.bz2) = 792aEySqDFtCenfTBe1eyw==
-RMD160 (maildrop-2.5.0.tar.bz2) = rXiAus5ubmE12bwlrsc5fXrJaDc=
-SHA1 (maildrop-2.5.0.tar.bz2) = 4JJV3sF515blWvAIqKU2R5rsVaw=
-SHA256 (maildrop-2.5.0.tar.bz2) = SaNaKb9XuF4YV3yMJwVQrkP1p3LdI00/OzVkuIxO9K0=
-SIZE (maildrop-2.5.0.tar.bz2) = 2413245
+MD5 (maildrop-2.5.3.tar.bz2) = W6UiNs7ClH51+vzWFG/YzQ==
+RMD160 (maildrop-2.5.3.tar.bz2) = QS+VUDATtnRewOT/mIFRSbDT+wQ=
+SHA1 (maildrop-2.5.3.tar.bz2) = yx2CJkoNGv5r+4dFYFAXhkvME14=
+SHA256 (maildrop-2.5.3.tar.bz2) = Rgz9lI08yg9HtVwFcKbAgnpUGzcd6QIo+ZT2ZhCeHmU=
+SIZE (maildrop-2.5.3.tar.bz2) = 2082338
diff --git a/mail/maildrop/patches/patch-rfc822_rfc822_c b/mail/maildrop/patches/patch-rfc822_rfc822_c
deleted file mode 100644
index 342455f34fe..00000000000
--- a/mail/maildrop/patches/patch-rfc822_rfc822_c
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-rfc822_rfc822_c,v 1.2 2010/07/08 16:35:58 giovanni Exp $
---- rfc822/rfc822.c.orig	Mon Nov 23 04:27:19 2009
-+++ rfc822/rfc822.c	Tue Jun 29 15:15:32 2010
-@@ -627,6 +627,9 @@ static int rfc822_print_common_nameaddr(const struct r
- 	p=(*decode_func)(addrbuf, chset, 1);
- 	free(addrbuf);
- 
-+	if (!p)
-+		return -1;
-+
- 	if (print_braces)
- 		(*print_func)(' ', ptr);
- 
-@@ -640,9 +643,6 @@ static int rfc822_print_common_nameaddr(const struct r
- 
- 	if (print_braces)
- 		(*print_func)('<', ptr);
--
--	if (!p)
--		return -1;
- 
- 	for (addrbuf=p; *p; p++)
- 		(*print_func)(*p, ptr);