diff options
author | joerg <joerg@pkgsrc.org> | 2020-03-22 21:24:56 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2020-03-22 21:24:56 +0000 |
commit | c5828dfe37fcde86534877d40e775c6ab54aa984 (patch) | |
tree | 9602cbab47f90eb2f61e69378681b11fd2a49ba7 /mail | |
parent | 09f0c8bb0fa5d990c22b2465b317bb3945fc5205 (diff) | |
download | pkgsrc-c5828dfe37fcde86534877d40e775c6ab54aa984.tar.gz |
Fix iconv use and other C++ issues. Still doesn't build due to both
outdated OpenSSL and GNU TLS code.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/cone/distinfo | 6 | ||||
-rw-r--r-- | mail/cone/patches/patch-cone_myserverremoteconfig.C | 13 | ||||
-rw-r--r-- | mail/cone/patches/patch-curses-cursesscreen.C | 21 | ||||
-rw-r--r-- | mail/cone/patches/patch-libmail_addmessage.H | 13 |
4 files changed, 48 insertions, 5 deletions
diff --git a/mail/cone/distinfo b/mail/cone/distinfo index e1ba5830bd5..3296fd6bd26 100644 --- a/mail/cone/distinfo +++ b/mail/cone/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 23:27:02 agc Exp $ +$NetBSD: distinfo,v 1.11 2020/03/22 21:24:56 joerg Exp $ SHA1 (cone-0.90.tar.bz2) = 51614269ed0b8c091de4573bacefe5f394a08311 RMD160 (cone-0.90.tar.bz2) = 2b2a924d8726535654c74c9d98d7e444aff9fd5e @@ -6,7 +6,8 @@ SHA512 (cone-0.90.tar.bz2) = 6446f868e07a54bda074e403ce48d590a55e97cf25b7e6172ba Size (cone-0.90.tar.bz2) = 3906323 bytes SHA1 (patch-af) = f2018ee08526ee9e0c9c93e6ff5f83b948fd7067 SHA1 (patch-cone_cursesmessage.C) = df0d016ffaf546614fb3292368cdcf4b1d895416 -SHA1 (patch-curses-cursesscreen.C) = 55aae19747367036d859c0e1835f2af96ea58a77 +SHA1 (patch-cone_myserverremoteconfig.C) = 7d5449288f4e94806181a5a4fb2bb547ab4174e1 +SHA1 (patch-curses-cursesscreen.C) = 5f825ff97aa7788ea89e1e2fb71d20d62d4281c5 SHA1 (patch-curses_cursescontainer.C) = 3168e56fd5f26b59c22fa4823cd55ef98e8fd7c8 SHA1 (patch-curses_cursescontainer.H) = 7a81ff321c72d002da8381412da474fbaecb07cb SHA1 (patch-libmail-maildir.C) = 724c16cb897667792cbfb769b7c7e81b803a1bd5 @@ -16,3 +17,4 @@ SHA1 (patch-libmail-mboxfolder.C) = c2c6d87bb76ab8805549c7cd72a5670633079725 SHA1 (patch-libmail-mboxgetmessage.C) = a46d7ee0962e89721ff75b43adcf5316aa5bda28 SHA1 (patch-libmail-mboxread.C) = 940eab3b9040d9362f816d9af4d9bcc305701ae6 SHA1 (patch-libmail-tmpaccount.C) = dbd3d7bde51e9c94b3258fcb2fca6b9077f9ad12 +SHA1 (patch-libmail_addmessage.H) = 27a07ef263bd351938e658c7f8c7faed44376479 diff --git a/mail/cone/patches/patch-cone_myserverremoteconfig.C b/mail/cone/patches/patch-cone_myserverremoteconfig.C new file mode 100644 index 00000000000..9402ed23a67 --- /dev/null +++ b/mail/cone/patches/patch-cone_myserverremoteconfig.C @@ -0,0 +1,13 @@ +$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; + } diff --git a/mail/cone/patches/patch-curses-cursesscreen.C b/mail/cone/patches/patch-curses-cursesscreen.C index 3cb0a046563..c187ec0d43d 100644 --- a/mail/cone/patches/patch-curses-cursesscreen.C +++ b/mail/cone/patches/patch-curses-cursesscreen.C @@ -1,15 +1,30 @@ -$NetBSD: patch-curses-cursesscreen.C,v 1.1 2012/09/16 00:49:41 dholland Exp $ +$NetBSD: patch-curses-cursesscreen.C,v 1.2 2020/03/22 21:24:56 joerg Exp $ Fix C++ type error. ---- curses/cursesscreen.C~ 2011-08-22 11:36:27.000000000 +0000 +--- curses/cursesscreen.C.orig 2011-08-22 11:36:27.000000000 +0000 +++ curses/cursesscreen.C -@@ -73,7 +73,8 @@ void CursesScreen::KeyReader::operator<< +@@ -28,6 +28,10 @@ + #include "cursesscreen.H" + #include "cursesfield.H" + ++#ifdef __NetBSD__ ++#include <sys/param.h> ++#endif ++ + static unsigned char termStopKey= 'Z' & 31; + + static RETSIGTYPE bye(int dummy) +@@ -73,7 +77,12 @@ void CursesScreen::KeyReader::operator<< while (input_buf.size() > 0) { - char *inbuf=&input_buf[0], *outbuf=&winput_buf[winput_cnt]; ++#if defined(__NetBSD__) && (__NetBSD_Version__-0 < 999001700) + const char *inbuf=&input_buf[0]; ++#else ++ char *inbuf=&input_buf[0]; ++#endif + char *outbuf=&winput_buf[winput_cnt]; size_t inbytesleft=input_buf.size(), outbytesleft=winput_buf.size()-winput_cnt; diff --git a/mail/cone/patches/patch-libmail_addmessage.H b/mail/cone/patches/patch-libmail_addmessage.H new file mode 100644 index 00000000000..832566b2f5b --- /dev/null +++ b/mail/cone/patches/patch-libmail_addmessage.H @@ -0,0 +1,13 @@ +$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(); |