Mon Apr 29 21:22:17 2013 UTC ()

Don't depend on namespace pollution to find resetiosflags. Add missing
<functional> include.


(joerg)

diff -r1.18 -r1.19 pkgsrc/mail/courier-mta/distinfo
diff -r0 -r1.1 pkgsrc/mail/courier-mta/patches/patch-courier_cdmsgq.C
diff -r0 -r1.1 pkgsrc/mail/courier-mta/patches/patch-courier_cmlmfetch.C

--- pkgsrc/mail/courier-mta/distinfo 2012/10/26 20:25:18 1.18
+++ pkgsrc/mail/courier-mta/distinfo 2013/04/29 21:22:17 1.19

 @@ -1,21 +1,23 @@
-$NetBSD: distinfo,v 1.18 2012/10/26 20:25:18 joerg Exp $
+$NetBSD: distinfo,v 1.19 2013/04/29 21:22:17 joerg Exp $
 SHA1 (courier-0.68.1.tar.bz2) = fbd7cd0bc88876dc12d02b9404cea95877805ebe
 RMD160 (courier-0.68.1.tar.bz2) = 3f062aae0d34a71055a5ff5ad172ca191ab3f0e4
 Size (courier-0.68.1.tar.bz2) = 7024234 bytes
 SHA1 (patch-aa) = 26af5d3ffd188fb7ab6ce18ef3241305e3c2363a
 SHA1 (patch-ab) = b65ceddc722962592af713c20fcf99da76b6af50
 SHA1 (patch-ac) = 225b0c418758e38e4f144100b1b2a34362008c33
 SHA1 (patch-ad) = 4a086c2d72106913989aa248d4d70b932a67eb90
 SHA1 (patch-ae) = 25cf54b4764da79d7c2a4ee40189b93542a2d1ff
 SHA1 (patch-af) = d5222c55039eb1060d1486d1d776e9f7afe9a991
 SHA1 (patch-ag) = fc9bfb34ce7a93647076c2305d206fd36ce54d9a
 SHA1 (patch-ah) = ef516d4da2acaffe72dd32a859ef03c2593a7b1e
 SHA1 (patch-ai) = ee3ae11ec6342afcd2284f4607b6f15412c1ac15
 SHA1 (patch-aj) = 9c4e9525f05ca73cb7358e4e0b341ef3e9aa08a5
 SHA1 (patch-al) = 1c7935b46b7affafa86e4a858ba6a79b7fbebbc5
 SHA1 (patch-an) = 2b78be9a0e8a9daf528da83007ba865f9b8cc402
 SHA1 (patch-ax) = 8978eacb3aa13559905849e9a7038441c0dfef22
 SHA1 (patch-ay) = d4b391e76167cd27012f928587d5feb57ea1b4ff
 SHA1 (patch-courier_cdfilters.C) = 1f9169de45355cd9a4ecb7e8ddac30df05d368d0
 SHA1 (patch-courier_cdmsgq.C) = 467479ded922cfff97c4e5876a5234eef3f82b50
 SHA1 (patch-courier_cmlmfetch.C) = 7426b5642271a8bcd4ed442eb6571d191a454d1f
 SHA1 (patch-courier_webmlmd.H) = 3a66894c376bf84ae5a43f4c6f3dfbb687f9436e

$NetBSD: patch-courier_cdmsgq.C,v 1.1 2013/04/29 21:22:17 joerg Exp $

--- courier/cdmsgq.C.orig	2013-04-28 14:54:36.000000000 +0000
+++ courier/cdmsgq.C
@@ -41,6 +41,7 @@
 #include	<vector>
 #include	<list>
 #include	<algorithm>
+#include	<functional>
 
 std::vector<msgq> msgq::queue;
 std::vector<msgq *> msgq::queuehashfirst, msgq::queuehashlast;

$NetBSD: patch-courier_cmlmfetch.C,v 1.1 2013/04/29 21:22:17 joerg Exp $

--- courier/cmlmfetch.C.orig	2013-04-28 14:52:46.000000000 +0000
+++ courier/cmlmfetch.C
@@ -333,7 +333,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)