4 files changed, 32 insertions, 13 deletions

diff --git a/mail/courier/files/patch-courier__cdmsgq.C b/mail/courier/files/patch-courier__cdmsgq.C
new file mode 100644
index 000000000000..b1f0f7a08038
--- /dev/null
+++ b/mail/courier/files/patch-courier__cdmsgq.C
@@ -0,0 +1,10 @@
+--- courier/cdmsgq.C.orig	2009-05-02 15:11:56 UTC
++++ courier/cdmsgq.C
+@@ -38,6 +38,7 @@
+ #include	<utime.h>
+ #include	"numlib/numlib.h"
+ 
++#include	<functional>
+ #include	<vector>
+ #include	<list>
+ #include	<algorithm>
diff --git a/mail/courier/files/patch-courier__cmlmfetch.C b/mail/courier/files/patch-courier__cmlmfetch.C
new file mode 100644
index 000000000000..80a27c2f0156
--- /dev/null
+++ b/mail/courier/files/patch-courier__cmlmfetch.C
@@ -0,0 +1,11 @@
+--- courier/cmlmfetch.C.orig	2009-11-08 18:14:47 UTC
++++ courier/cmlmfetch.C
+@@ -334,7 +334,7 @@ int doindex(const char *n)
+ 			ack << std::setiosflags(std::ios::right)
+ 			    << std::setw(10)
+ 			    << msgs[i]
+-			    << resetiosflags(std::ios::right) << " "
++			    << std::resetiosflags(std::ios::right) << " "
+ 			    << std::setw(0) << msginfo[i].msgsubj << std::endl;
+ 			ack << std::setiosflags(std::ios::right)
+ 			    << std::setw(10)
diff --git a/mail/courier/files/patch-courier__configure.in b/mail/courier/files/patch-courier__configure.in
deleted file mode 100644
index 972abe3b7a7b..000000000000
--- a/mail/courier/files/patch-courier__configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- courier/configure.in.orig	2009-09-05 13:59:26.000000000 +0200
-+++ courier/configure.in	2010-02-15 19:44:35.000000000 +0100
-@@ -77,6 +77,10 @@
- esac
- AC_SUBST(testmode)
- 
-+AC_ARG_WITH(piddir, [  --with-piddir         Directory where imapd.pid is created ], piddir="$withval", piddir=$localstatedir/run)
-+
-+AC_SUBST(piddir)
-+
- version=`cat ../version`
- 
- COPYRIGHT="Courier $version Copyright 1999-2008 Double Precision, Inc."
diff --git a/mail/courier/files/patch-courier__webmlmd.H b/mail/courier/files/patch-courier__webmlmd.H
new file mode 100644
index 000000000000..0af669fecaf4
--- /dev/null
+++ b/mail/courier/files/patch-courier__webmlmd.H
@@ -0,0 +1,11 @@
+--- courier/webmlmd.H.orig	2007-12-17 12:09:18 UTC
++++ courier/webmlmd.H
+@@ -49,7 +49,7 @@ namespace webmlmd {
+ 		T t;
+ 
+ 		t.reserve(s.size() * 6 / 5);
+-		class T::iterator b=s.begin(), e=s.end(), p=b;
++		typename T::iterator b=s.begin(), e=s.end(), p=b;
+ 
+ 		while (b != e)
+ 		{