12 files changed, 68 insertions, 34 deletions

diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 8ce3ba11a521..23351086edc7 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.53.2
+PORTVERSION=	0.53.3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
 
-MAINTAINER=	yds@CoolRat.org
+MAINTAINER=	bsd@dino.sk
 COMMENT=	Courier SMTP IMAP POP3 HTTP mail server suite
 
 BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
@@ -68,11 +68,7 @@ USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_SUBMAKE=	yes
 
-.if defined(WITH_RCORDER)
-USE_RCORDER=	courier.sh
-.else
 USE_RC_SUBR=	courier.sh
-.endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -218,7 +214,7 @@ CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/ispell
 .endif
 
 .if defined(WITH_ASPELL) && defined(WITH_ISPELL)
-BROKEN=	"ASpell and ISpell are mutually exclusive. Run 'make config' to (re)configure ${PKGNAME}"
+BROKEN=	ASpell and ISpell are mutually exclusive. Run 'make config' to (re)configure ${PKGNAME}
 .endif
 
 .if !defined(WITH_ASPELL) && !defined(WITH_ISPELL)
@@ -261,6 +257,12 @@ CONFIGURE_ARGS+=--with-ipv6
 CONFIGURE_ARGS+=--without-ipv6
 .endif
 
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-maildir__maildirfilter.c \
+		${FILESDIR}/extrapatch-webmail__folder.c \
+		${FILESDIR}/extrapatch-webmail__newmsg.c
+.endif
+
 pre-everything::
 	@${ECHO_MSG} "===> --------------------------------------------------------"
 	@${ECHO_MSG} "===>	Run 'make config' to (re)configure ${PKGNAME}"
diff --git a/mail/courier/distinfo b/mail/courier/distinfo
index 44c79feac666..77c47c949d54 100644
--- a/mail/courier/distinfo
+++ b/mail/courier/distinfo
@@ -1,3 +1,3 @@
-MD5 (courier-0.53.2.tar.bz2) = 9ac1f892dcd2505a85d4e60edb61120c
-SHA256 (courier-0.53.2.tar.bz2) = 0b44e02652084ca4023646ca0cdd3d173dcbadf919e81aa012b42666b3acf726
-SIZE (courier-0.53.2.tar.bz2) = 6942557
+MD5 (courier-0.53.3.tar.bz2) = e75013df7deebd463656b81cc3e245f4
+SHA256 (courier-0.53.3.tar.bz2) = e6aa3e9572e96f65dd06c01f76a926724c9e243e2b824004eef441a3a3276144
+SIZE (courier-0.53.3.tar.bz2) = 6944509
diff --git a/mail/courier/files/extrapatch-maildir__maildirfilter.c b/mail/courier/files/extrapatch-maildir__maildirfilter.c
new file mode 100644
index 000000000000..1e353fb88cb3
--- /dev/null
+++ b/mail/courier/files/extrapatch-maildir__maildirfilter.c
@@ -0,0 +1,18 @@
+--- maildir/maildirfilter.c.orig	Sat Jul  1 02:44:48 2006
++++ maildir/maildirfilter.c	Sat Dec  9 21:38:05 2006
+@@ -100,13 +100,13 @@
+ 
+ 	/* rule name: may not already exist */
+ 	*errcode=MF_ERR_EXISTS;
+-	
++{
+ 	struct maildirfilterrule *pom;
+ 	for (pom=r->first; pom->next; pom=pom->next) {
+ 	    if (p!=pom && !strcmp(name, pom->rulename))
+ 		return (-1);
+ 	}
+-
++}
+ 	/* rule type: we must know what it is */
+ 
+ 	switch (type)	{
diff --git a/mail/courier/files/extrapatch-webmail__folder.c b/mail/courier/files/extrapatch-webmail__folder.c
new file mode 100644
index 000000000000..a4f79cd51ae2
--- /dev/null
+++ b/mail/courier/files/extrapatch-webmail__folder.c
@@ -0,0 +1,20 @@
+--- webmail/folder.c.orig	Sun Jul 23 00:09:04 2006
++++ webmail/folder.c	Sat Dec  9 22:23:23 2006
+@@ -287,7 +287,7 @@
+ 			(unsigned long)pos);
+ 		return;
+ 	    }
+-	    
++{
+ 	    char *cur = malloc(strlen(deldir)+5);
+ 	    strcpy(cur, deldir);
+ 	    strcat(cur, "/cur");
+@@ -298,7 +298,7 @@
+ 	    maildir_info_destroy(&minfo);
+ 	    free(deldir);
+ 	    free(cur);
+-	    
++}
+ 	}
+ 	else if (*cgi("cmdmove"))
+ 	{
diff --git a/mail/courier/files/extrapatch-webmail__newmsg.c b/mail/courier/files/extrapatch-webmail__newmsg.c
new file mode 100644
index 000000000000..0fa698c7588b
--- /dev/null
+++ b/mail/courier/files/extrapatch-webmail__newmsg.c
@@ -0,0 +1,18 @@
+--- webmail/newmsg.c.orig	Sun Jul 30 21:01:42 2006
++++ webmail/newmsg.c	Sat Dec  9 22:27:06 2006
+@@ -630,13 +630,14 @@
+ 	printf("<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\" class=\"new-message-box\"><tr><td>\n");
+ 
+ 	printf("<table border=\"0\" width=\"100%%\">\n");
++{
+ 	int wbnochangingfrom=auth_getoptionenvint("wbnochangingfrom");
+ 	if (wbnochangingfrom < 2)
+ 		newmsg_header_rfc822(fromlab, "headerfrom", curfrom,
+ 			*cgi("from") ? cgi("from"):
+ 			pref_from && *pref_from ? pref_from:
+ 			login_fromhdr(), wbnochangingfrom ? 1:0);
+-
++}
+ 	printf("<tr valign=\"middle\"><th align=\"right\">"
+ 	       "<p class=\"new-message-header\">"
+ 	       "<span class=\"new-message-header-addressbook\">"
diff --git a/mail/courier/files/patch-courier::configure b/mail/courier/files/patch-courier__configure
index d56e7d14f2f7..d56e7d14f2f7 100644
--- a/mail/courier/files/patch-courier::configure
+++ b/mail/courier/files/patch-courier__configure
diff --git a/mail/courier/files/patch-courier::doc::Makefile.in b/mail/courier/files/patch-courier__doc__Makefile.in
index 1d70f7f64cf6..1d70f7f64cf6 100644
--- a/mail/courier/files/patch-courier::doc::Makefile.in
+++ b/mail/courier/files/patch-courier__doc__Makefile.in
diff --git a/mail/courier/files/patch-courier::module.fax b/mail/courier/files/patch-courier__module.fax
index e0651b1727a1..e0651b1727a1 100644
--- a/mail/courier/files/patch-courier::module.fax
+++ b/mail/courier/files/patch-courier__module.fax
diff --git a/mail/courier/files/patch-courier::perms.sh.in b/mail/courier/files/patch-courier__perms.sh.in
index 03feaf7a3202..03feaf7a3202 100644
--- a/mail/courier/files/patch-courier::perms.sh.in
+++ b/mail/courier/files/patch-courier__perms.sh.in
diff --git a/mail/courier/files/patch-courier::submit.C b/mail/courier/files/patch-courier__submit.C
index ad3ac19f74b0..ad3ac19f74b0 100644
--- a/mail/courier/files/patch-courier::submit.C
+++ b/mail/courier/files/patch-courier__submit.C
diff --git a/mail/courier/files/patch-liblock::locktest.c b/mail/courier/files/patch-liblock__locktest.c
index 9f701700d7f2..9f701700d7f2 100644
--- a/mail/courier/files/patch-liblock::locktest.c
+++ b/mail/courier/files/patch-liblock__locktest.c
diff --git a/mail/courier/files/patch-rfc2045_rfc2045reply.c b/mail/courier/files/patch-rfc2045_rfc2045reply.c
deleted file mode 100644
index 3daa709ee032..000000000000
--- a/mail/courier/files/patch-rfc2045_rfc2045reply.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- rfc2045/rfc2045reply.c.orig	Thu Jun 29 15:07:18 2006
-+++ rfc2045/rfc2045reply.c	Thu Jun 29 15:07:47 2006
-@@ -592,6 +592,10 @@
- 	int errflag=0;
- 	struct rfc2045headerinfo *hi;
- 
-+#if	HAVE_UNICODE
-+	const struct unicode_info *uiptr=NULL;
-+#endif
-+
- 	oldtocc=0;
- 	oldtolist=0;
- 	oldfrom=0;
-@@ -600,9 +604,8 @@
- 	oldmsgid=0;
- 	oldreferences=0;
- 	whowrote=0;
--#if	HAVE_UNICODE
--	const struct unicode_info *uiptr=NULL;
- 
-+#if	HAVE_UNICODE
- 	if (ri->charset && *(ri->charset))
- 		uiptr = unicode_find(ri->charset);
- #endif