From f0dcb0e336f24598f18caaf463267af0647a50ee Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Mon, 1 Jan 2007 00:00:22 +0000
Subject: [PATCH] - Update to 0.54.0

PR:		107375
Submitted by:	Milan Obuch<bsd@dino.sk> (maintainer)
---
 mail/courier/Makefile                   |  2 +-
 mail/courier/distinfo                   |  6 +++---
 mail/courier/files/patch-imap__outbox.c | 15 +++++++++++++++
 mail/courier/files/patch-imap__outbox.h | 11 +++++++++++
 mail/courier/files/patch-imap__smap.c   | 11 +++++++++++
 5 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 mail/courier/files/patch-imap__outbox.c
 create mode 100644 mail/courier/files/patch-imap__outbox.h
 create mode 100644 mail/courier/files/patch-imap__smap.c

diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 23351086edc7..073508b0b85c 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.53.3
+PORTVERSION=	0.54.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
diff --git a/mail/courier/distinfo b/mail/courier/distinfo
index 77c47c949d54..98836f6ff4d8 100644
--- a/mail/courier/distinfo
+++ b/mail/courier/distinfo
@@ -1,3 +1,3 @@
-MD5 (courier-0.53.3.tar.bz2) = e75013df7deebd463656b81cc3e245f4
-SHA256 (courier-0.53.3.tar.bz2) = e6aa3e9572e96f65dd06c01f76a926724c9e243e2b824004eef441a3a3276144
-SIZE (courier-0.53.3.tar.bz2) = 6944509
+MD5 (courier-0.54.0.tar.bz2) = 9495a444ecaa7920da478584969d8e4e
+SHA256 (courier-0.54.0.tar.bz2) = 63c860edd57f61ae93e1bcb3cf1739c14fc6c28c22e9913938a70459e68718e3
+SIZE (courier-0.54.0.tar.bz2) = 7028765
diff --git a/mail/courier/files/patch-imap__outbox.c b/mail/courier/files/patch-imap__outbox.c
new file mode 100644
index 000000000000..61f2df1de141
--- /dev/null
+++ b/mail/courier/files/patch-imap__outbox.c
@@ -0,0 +1,15 @@
+--- imap/outbox.c.orig	Tue Jul 13 00:35:27 2004
++++ imap/outbox.c	Sun Dec 31 13:24:50 2006
+@@ -92,10 +92,10 @@
+ 		argv[5]=NULL;
+ 	}
+ 
+-	return (sendmsg(message, argv, errlogger));
++	return (ci_sendmsg(message, argv, errlogger));
+ }
+ 
+-int sendmsg(const char *message, char **argv, void (*err_func)(char *))
++int ci_sendmsg(const char *message, char **argv, void (*err_func)(char *))
+ {
+ 	char buffer[512];
+ 	int i;
diff --git a/mail/courier/files/patch-imap__outbox.h b/mail/courier/files/patch-imap__outbox.h
new file mode 100644
index 000000000000..321f2da3051d
--- /dev/null
+++ b/mail/courier/files/patch-imap__outbox.h
@@ -0,0 +1,11 @@
+--- imap/outbox.h.orig	Tue May 27 17:55:10 2003
++++ imap/outbox.h	Sun Dec 31 13:24:27 2006
+@@ -10,7 +10,7 @@
+ 
+ int check_outbox(const char *message, const char *mailbox);
+ int is_outbox(const char *mailbox);
+-int sendmsg(const char *message, char **argv, void (*err_func)(char *));
++int ci_sendmsg(const char *message, char **argv, void (*err_func)(char *));
+ const char *defaultSendFrom();
+ 
+ #endif
diff --git a/mail/courier/files/patch-imap__smap.c b/mail/courier/files/patch-imap__smap.c
new file mode 100644
index 000000000000..c2401d4d5297
--- /dev/null
+++ b/mail/courier/files/patch-imap__smap.c
@@ -0,0 +1,11 @@
+--- imap/smap.c.orig	Tue Nov 22 02:17:31 2005
++++ imap/smap.c	Sun Dec 31 13:25:19 2006
+@@ -3496,7 +3496,7 @@
+ 						}
+ 						argvec[i]=0;
+ 
+-						i=sendmsg(tmpname, argvec,
++						i=ci_sendmsg(tmpname, argvec,
+ 							  &senderr);
+ 						free(argvec);
+ 						if (i)