Attachment #227886 for bug #258132




# Created by: Matthias Andree <matthias.andree@gmx.de>

PORTNAME=	cone
PORTVERSION=	1.2
PORTREVISION=	1
CATEGORIES=	mail
# This is for beta versions, leave it in please:
#MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
#		http://www.lerctr.org/~ler/
# This is for release versions, leave it in please:
MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}

MAINTAINER=	christopher.petrik@usm.edu
COMMENT=	Console based mail client with POP3/IMAP/SMAP support

LICENSE=	GPLv3

Lines 1-3 Link Here

(-)b/mail/cone/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1603844375	1	TIMESTAMP = 1631572186
2	SHA256 (cone-1.1.tar.bz2) = 7ed5f50e65420063621ab4c7127ae9177944655490e98c5b3f202c57e715d3f0	2	SHA256 (cone-1.2.tar.bz2) = 5684ce00890b025bd6abecc5d471509060bdca94f276dc8314770ce1f22ce18f
3	SIZE (cone-1.1.tar.bz2) = 4017709	3	SIZE (cone-1.2.tar.bz2) = 4028890




These aren't a problem for GNU C++, but clang throws an error.
The fix is from upstream (by Sam Varshavchik).

	-mi

--- libmail/mboxadd.H	2017-03-05 20:28:33.000000000 -0500
+++ libmail/mboxadd.H	2020-10-29 00:01:46.241648000 -0400
@@ -29,5 +29,5 @@
 	FILE *fp;
 
-	ptr<mbox> mboxAccount;
+	mail::ptr<mbox> mboxAccount;
 
 	void reportProgress(size_t bytesCompleted,
--- libmail/smtpfolder.H	2017-03-05 20:28:33.000000000 -0500
+++ libmail/smtpfolder.H	2020-10-29 00:09:19.515780000 -0400
@@ -85,5 +85,5 @@
 class smtpAddMessage : public addMessage {
 
-	ptr<smtp> myServer;
+	mail::ptr<smtp> myServer;
 	smtpInfo myInfo;
 	mail::callback &myCallback;

Removed Link Here

(-)a/mail/cone/files/patch-libmail_envelope.H (-10 lines)
1	--- libmail/envelope.H 2014-01-06 19:37:10 UTC
2	+++ libmail/envelope.H
3	@@ -8,6 +8,7 @@
4
5	#include <vector>
6	#include <string>
7	+#include <time.h>
8
9	#include "namespace.H"
10

Return to bug 258132

Lines 1-16 Link Here

(-)b/mail/cone/Makefile (-7 / +2 lines)
1	# Created by: Matthias Andree <matthias.andree@gmx.de>	1	# Created by: Matthias Andree <matthias.andree@gmx.de>
2		2
3	PORTNAME= cone	3	PORTNAME= cone
4	PORTVERSION= 1.1	4	PORTVERSION= 1.2
5	PORTREVISION= 1
6	CATEGORIES= mail	5	CATEGORIES= mail
7	# This is for beta versions, leave it in please:
8	#MASTER_SITES= http://www.courier-mta.org/beta/${PORTNAME}/ \
9	# http://www.lerctr.org/~ler/
10	# This is for release versions, leave it in please:
11	MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION}	6	MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION}
12		7
13	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= christopher.petrik@usm.edu
14	COMMENT= Console based mail client with POP3/IMAP/SMAP support	9	COMMENT= Console based mail client with POP3/IMAP/SMAP support
15		10
16	LICENSE= GPLv3	11	LICENSE= GPLv3

Removed Link Here

(-)a/mail/cone/files/patch-c++ (-23 lines)
1	These aren't a problem for GNU C++, but clang throws an error.
2	The fix is from upstream (by Sam Varshavchik).
3
4	-mi
5
6	--- libmail/mboxadd.H 2017-03-05 20:28:33.000000000 -0500
7	+++ libmail/mboxadd.H 2020-10-29 00:01:46.241648000 -0400
8	@@ -29,5 +29,5 @@
9	FILE *fp;
10
11	- ptr<mbox> mboxAccount;
12	+ mail::ptr<mbox> mboxAccount;
13
14	void reportProgress(size_t bytesCompleted,
15	--- libmail/smtpfolder.H 2017-03-05 20:28:33.000000000 -0500
16	+++ libmail/smtpfolder.H 2020-10-29 00:09:19.515780000 -0400
17	@@ -85,5 +85,5 @@
18	class smtpAddMessage : public addMessage {
19
20	- ptr<smtp> myServer;
21	+ mail::ptr<smtp> myServer;
22	smtpInfo myInfo;
23	mail::callback &myCallback;