5 files changed, 119 insertions, 7 deletions

diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 69f5ff595387..ac783066cbda 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.60.0
+PORTVERSION=	0.61.1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -54,7 +54,6 @@ MAILUID=	465
 MAILGID=	465
 ETCDIR=		${PREFIX}/etc
 SYSCONFDIR=	${ETCDIR}/courier
-USERDB?=	${ETCDIR}/userdb
 LIBEXECDIR=	${PREFIX}/libexec
 LOCALSTATEDIR=	/var/spool/courier
 CACHEDIR=	/var/spool/webmail
@@ -79,7 +78,8 @@ CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' \
 		LDFLAGS='${LDFLAGS}'
 MAKE_ENV:=	${CONFIGURE_ENV}
 
-CONFIGURE_ARGS=	--disable-root-check --with-db=db \
+CONFIGURE_ARGS=	--disable-root-check \
+		--with-db=db \
 		--enable-syslog=1 --enable-use-flock \
 		--program-transform-name=s,^,, \
 		--enable-utf7-folder-encoding \
@@ -90,7 +90,6 @@ CONFIGURE_ARGS=	--disable-root-check --with-db=db \
 		--with-mailgid=${MAILGID} \
 		--with-etcdir=${ETCDIR} \
 		--sysconfdir=${SYSCONFDIR} \
-		--with-userdb=${USERDB} \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
 		--localstatedir=${LOCALSTATEDIR} \
@@ -175,6 +174,27 @@ OPTIONS+=on
 OPTIONS+=off
 .endif
 
+OPTIONS+=MAILDROPFLAGS "maildrop set flags patch"
+.if defined(WITH_MAILDROPFLAGS)
+OPTIONS+=on
+.else
+OPTIONS+=off
+.endif
+
+OPTIONS+=WEBMAILXFACE "experimental webmail X-Face patch"
+.if defined(WITH_WEBMAILXFACE)
+OPTIONS+=on
+.else
+OPTIONS+=off
+.endif
+
+OPTIONS+=WEBMAILRSENT "enable Autorename Sent folder"
+.if !defined(WITHOUT_WEBMAILRSENT)
+OPTIONS+=on
+.else
+OPTIONS+=off
+.endif
+
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.doc"
 .include "${.CURDIR}/Makefile.man"
@@ -258,6 +278,20 @@ CONFIGURE_ARGS+=--with-ipv6
 CONFIGURE_ARGS+=--without-ipv6
 .endif
 
+.if defined(WITH_MAILDROPFLAGS) || !defined(WITHOUT_MAILDROPFLAGS)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-maildrop__maildir.C
+.endif
+
+.if defined(WITH_WEBMAILXFACE) || !defined(WITHOUT_WEBMAILXFACE)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__msg2html.c
+.endif
+
+.if defined(WITH_WEBMAILRSENT) || !defined(WITHOUT_WEBMAILRSENT)
+CONFIGURE_ARGS+=--enable-autorenamesent
+.else
+CONFIGURE_ARGS+=--disable-autorenamesent
+.endif
+
 pre-everything::
 	@${ECHO_MSG} "===> --------------------------------------------------------"
 	@${ECHO_MSG} "===>	Run 'make config' to (re)configure ${PKGNAME}"
diff --git a/mail/courier/Makefile.man b/mail/courier/Makefile.man
index 3b9219e30260..474eba4c81cf 100644
--- a/mail/courier/Makefile.man
+++ b/mail/courier/Makefile.man
@@ -49,6 +49,7 @@ MAN8=	\
 	mkimapdcert.8 \
 	mkpop3dcert.8 \
 	pop3d.8 \
+	pop3d-ssl.8 \
 	submit.8
 
 MLINKS=	dot-forward.1 dotforward.1 \
diff --git a/mail/courier/distinfo b/mail/courier/distinfo
index 09feb669a33b..70038f9fca1e 100644
--- a/mail/courier/distinfo
+++ b/mail/courier/distinfo
@@ -1,3 +1,3 @@
-MD5 (courier-0.60.0.tar.bz2) = 688d4b44c0d7438c5c47c0a65835846d
-SHA256 (courier-0.60.0.tar.bz2) = c13da0a0b76c4a59aa219d037129b8305293d1091143027f2dfd631b9e470e64
-SIZE (courier-0.60.0.tar.bz2) = 7067430
+MD5 (courier-0.61.1.tar.bz2) = a0feca15632f376401d865765ff172e3
+SHA256 (courier-0.61.1.tar.bz2) = 979ff8342f53478c8f14cb79290d1a795433375c8ad18fc5aa950595a9973c90
+SIZE (courier-0.61.1.tar.bz2) = 7229642
diff --git a/mail/courier/files/extra-patch-maildrop__maildir.C b/mail/courier/files/extra-patch-maildrop__maildir.C
new file mode 100644
index 000000000000..ba1d64c18051
--- /dev/null
+++ b/mail/courier/files/extra-patch-maildrop__maildir.C
@@ -0,0 +1,33 @@
+--- maildrop/maildir.C.orig	Thu Jan 15 04:12:13 2004
++++ maildrop/maildir.C	Thu Jul  5 00:09:38 2007
+@@ -137,7 +137,6 @@
+ 			tmpname=createInfo.tmpname;
+ 			newname=createInfo.newname;
+ 			tmpname += '\0';
+-			newname += '\0';
+ 			maildir_tmpcreate_free(&createInfo);
+ 
+ 			file.fd(f);
+@@ -181,6 +180,22 @@
+ {
+ 	if (is_open)
+ 	{
++		Buffer b;
++
++		b="MFLAGS";
++
++		const char *f=GetVarStr(b);
++
++		if (f && strlen(f) > 0)
++		{
++			newname += ':';
++			newname += '2';
++			newname += ',';
++			newname += f;
++		}
++
++		newname += '\0';
++
+ 		Buffer keywords;
+ 
+ 		keywords="KEYWORDS";
diff --git a/mail/courier/files/extra-patch-webmail__msg2html.c b/mail/courier/files/extra-patch-webmail__msg2html.c
new file mode 100644
index 000000000000..00b5445f55f6
--- /dev/null
+++ b/mail/courier/files/extra-patch-webmail__msg2html.c
@@ -0,0 +1,44 @@
+--- webmail/msg2html.c.orig	2007-07-11 03:36:04.000000000 +0200
++++ webmail/msg2html.c	2007-12-21 08:42:02.000000000 +0100
+@@ -451,6 +451,7 @@
+ char	*header, *value;
+ char	*save_subject=0;
+ char	*save_date=0;
++char	*save_xface=0;
+ off_t	start_pos, end_pos, start_body;
+ struct	rfc2045id *p, newpart;
+ off_t	dummy;
+@@ -523,6 +524,13 @@
+ 			free(header);
+ 			continue;
+ 		}
++		if (strcmp(header, "x-face") == 0)
++		{
++			if (save_xface)	free(save_xface);
++			save_xface=strdup(value);
++			free(header);
++			continue;
++		}
+ 		if (isaddressheader(header))
+ 		{
+ 			print_header_uc(info, header);
+@@ -575,7 +583,18 @@
+ 	if (flag && info->message_rfc822_action)
+ 		(*info->message_rfc822_action)(idptr);
+ 
+-	printf("</table>\n<hr width=\"100%%\" />\n");
++	if (save_xface)
++	{
++		char *q=cgiurlencode(save_xface);
++		printf("</table>\n</td><td align=\"right\"><img width=\"48\" heigth=\"48\" src=\"http://www.dairiki.org/xface/xface.php?xface=");
++	        printf("%s", q);
++		printf("&amp;preview=1\"></td></tr><tr><td colspan=\"2\"><hr width=\"100%%\">\n");
++	        free(q);
++	}
++	else
++	{
++		printf("</table>\n<hr width=\"100%%\" />\n");
++	}
+ 
+ 	if (!flag && info->gpgdir && libmail_gpg_has_gpg(info->gpgdir) == 0
+ 	    && libmail_gpgmime_has_mimegpg(rfc)