Sun Mar 22 21:24:56 2020 UTC ()
Fix iconv use and other C++ issues. Still doesn't build due to both
outdated OpenSSL and GNU TLS code.


(joerg)
diff -r1.10 -r1.11 pkgsrc/mail/cone/distinfo
diff -r0 -r1.1 pkgsrc/mail/cone/patches/patch-cone_myserverremoteconfig.C
diff -r0 -r1.1 pkgsrc/mail/cone/patches/patch-libmail_addmessage.H
diff -r1.1 -r1.2 pkgsrc/mail/cone/patches/patch-curses-cursesscreen.C
cvs diff -r1.10 -r1.11 pkgsrc/mail/cone/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/cone/distinfo 2015/11/03 23:27:02 1.10
+++ pkgsrc/mail/cone/distinfo 2020/03/22 21:24:56 1.11
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1$NetBSD: distinfo,v 1.10 2015/11/03 23:27:02 agc Exp $ 1$NetBSD: distinfo,v 1.11 2020/03/22 21:24:56 joerg Exp $
2 2
3SHA1 (cone-0.90.tar.bz2) = 51614269ed0b8c091de4573bacefe5f394a08311 3SHA1 (cone-0.90.tar.bz2) = 51614269ed0b8c091de4573bacefe5f394a08311
4RMD160 (cone-0.90.tar.bz2) = 2b2a924d8726535654c74c9d98d7e444aff9fd5e 4RMD160 (cone-0.90.tar.bz2) = 2b2a924d8726535654c74c9d98d7e444aff9fd5e
5SHA512 (cone-0.90.tar.bz2) = 6446f868e07a54bda074e403ce48d590a55e97cf25b7e6172ba02df1242a232ade52840a837dd92e70253159cc637c17876876db01445c60374152262329ae27 5SHA512 (cone-0.90.tar.bz2) = 6446f868e07a54bda074e403ce48d590a55e97cf25b7e6172ba02df1242a232ade52840a837dd92e70253159cc637c17876876db01445c60374152262329ae27
6Size (cone-0.90.tar.bz2) = 3906323 bytes 6Size (cone-0.90.tar.bz2) = 3906323 bytes
7SHA1 (patch-af) = f2018ee08526ee9e0c9c93e6ff5f83b948fd7067 7SHA1 (patch-af) = f2018ee08526ee9e0c9c93e6ff5f83b948fd7067
8SHA1 (patch-cone_cursesmessage.C) = df0d016ffaf546614fb3292368cdcf4b1d895416 8SHA1 (patch-cone_cursesmessage.C) = df0d016ffaf546614fb3292368cdcf4b1d895416
9SHA1 (patch-curses-cursesscreen.C) = 55aae19747367036d859c0e1835f2af96ea58a77 9SHA1 (patch-cone_myserverremoteconfig.C) = 7d5449288f4e94806181a5a4fb2bb547ab4174e1
 10SHA1 (patch-curses-cursesscreen.C) = 5f825ff97aa7788ea89e1e2fb71d20d62d4281c5
10SHA1 (patch-curses_cursescontainer.C) = 3168e56fd5f26b59c22fa4823cd55ef98e8fd7c8 11SHA1 (patch-curses_cursescontainer.C) = 3168e56fd5f26b59c22fa4823cd55ef98e8fd7c8
11SHA1 (patch-curses_cursescontainer.H) = 7a81ff321c72d002da8381412da474fbaecb07cb 12SHA1 (patch-curses_cursescontainer.H) = 7a81ff321c72d002da8381412da474fbaecb07cb
12SHA1 (patch-libmail-maildir.C) = 724c16cb897667792cbfb769b7c7e81b803a1bd5 13SHA1 (patch-libmail-maildir.C) = 724c16cb897667792cbfb769b7c7e81b803a1bd5
13SHA1 (patch-libmail-mbox.C) = 02cb2a96fe1915f61126436439ae7842f882b512 14SHA1 (patch-libmail-mbox.C) = 02cb2a96fe1915f61126436439ae7842f882b512
14SHA1 (patch-libmail-mboxadd.C) = 8731fb947d48256a061d68d2630573323d5ec797 15SHA1 (patch-libmail-mboxadd.C) = 8731fb947d48256a061d68d2630573323d5ec797
15SHA1 (patch-libmail-mboxfolder.C) = c2c6d87bb76ab8805549c7cd72a5670633079725 16SHA1 (patch-libmail-mboxfolder.C) = c2c6d87bb76ab8805549c7cd72a5670633079725
16SHA1 (patch-libmail-mboxgetmessage.C) = a46d7ee0962e89721ff75b43adcf5316aa5bda28 17SHA1 (patch-libmail-mboxgetmessage.C) = a46d7ee0962e89721ff75b43adcf5316aa5bda28
17SHA1 (patch-libmail-mboxread.C) = 940eab3b9040d9362f816d9af4d9bcc305701ae6 18SHA1 (patch-libmail-mboxread.C) = 940eab3b9040d9362f816d9af4d9bcc305701ae6
18SHA1 (patch-libmail-tmpaccount.C) = dbd3d7bde51e9c94b3258fcb2fca6b9077f9ad12 19SHA1 (patch-libmail-tmpaccount.C) = dbd3d7bde51e9c94b3258fcb2fca6b9077f9ad12
 20SHA1 (patch-libmail_addmessage.H) = 27a07ef263bd351938e658c7f8c7faed44376479
File Added: pkgsrc/mail/cone/patches/patch-cone_myserverremoteconfig.C
$NetBSD: patch-cone_myserverremoteconfig.C,v 1.1 2020/03/22 21:24:56 joerg Exp $

--- cone/myserverremoteconfig.C.orig	2020-03-22 20:25:04.977804903 +0000
+++ cone/myserverremoteconfig.C
@@ -142,7 +142,7 @@ mail::account *myServer::remoteConfig::l
 			if (a)
 				delete a;
 			errmsg=callback.msg;
-			return false;
+			return NULL;
 		}
 		break;
 	}
File Added: pkgsrc/mail/cone/patches/patch-libmail_addmessage.H
$NetBSD: patch-libmail_addmessage.H,v 1.1 2020/03/22 21:24:56 joerg Exp $

--- libmail/addmessage.H.orig	2020-03-22 20:23:21.658486107 +0000
+++ libmail/addmessage.H
@@ -39,7 +39,7 @@ class Attachment;
 // notification).
 
 
-class addMessage : private ptr<mail::account> {
+class addMessage : public ptr<mail::account> {
 
 protected:
 	bool checkServer();
cvs diff -r1.1 -r1.2 pkgsrc/mail/cone/patches/patch-curses-cursesscreen.C (expand / switch to unified diff)

--- pkgsrc/mail/cone/patches/patch-curses-cursesscreen.C 2012/09/16 00:49:41 1.1
+++ pkgsrc/mail/cone/patches/patch-curses-cursesscreen.C 2020/03/22 21:24:56 1.2
@@ -1,16 +1,31 @@ @@ -1,16 +1,31 @@
1$NetBSD: patch-curses-cursesscreen.C,v 1.1 2012/09/16 00:49:41 dholland Exp $ 1$NetBSD: patch-curses-cursesscreen.C,v 1.2 2020/03/22 21:24:56 joerg Exp $
2 2
3Fix C++ type error. 3Fix C++ type error.
4 4
5--- curses/cursesscreen.C~ 2011-08-22 11:36:27.000000000 +0000 5--- curses/cursesscreen.C.orig 2011-08-22 11:36:27.000000000 +0000
6+++ curses/cursesscreen.C 6+++ curses/cursesscreen.C
7@@ -73,7 +73,8 @@ void CursesScreen::KeyReader::operator<< 7@@ -28,6 +28,10 @@
 8 #include "cursesscreen.H"
 9 #include "cursesfield.H"
 10
 11+#ifdef __NetBSD__
 12+#include <sys/param.h>
 13+#endif
 14+
 15 static unsigned char termStopKey= 'Z' & 31;
 16
 17 static RETSIGTYPE bye(int dummy)
 18@@ -73,7 +77,12 @@ void CursesScreen::KeyReader::operator<<
8 while (input_buf.size() > 0) 19 while (input_buf.size() > 0)
9 { 20 {
10  21
11- char *inbuf=&input_buf[0], *outbuf=&winput_buf[winput_cnt]; 22- char *inbuf=&input_buf[0], *outbuf=&winput_buf[winput_cnt];
 23+#if defined(__NetBSD__) && (__NetBSD_Version__-0 < 999001700)
12+ const char *inbuf=&input_buf[0]; 24+ const char *inbuf=&input_buf[0];
 25+#else
 26+ char *inbuf=&input_buf[0];
 27+#endif
13+ char *outbuf=&winput_buf[winput_cnt]; 28+ char *outbuf=&winput_buf[winput_cnt];
14 size_t inbytesleft=input_buf.size(), 29 size_t inbytesleft=input_buf.size(),
15 outbytesleft=winput_buf.size()-winput_cnt; 30 outbytesleft=winput_buf.size()-winput_cnt;
16  31