summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Teterin <mi@FreeBSD.org>2020-10-29 04:14:38 +0000
committerMikhail Teterin <mi@FreeBSD.org>2020-10-29 04:14:38 +0000
commite50f11688c93b6b997a516d0709b17162614c48e (patch)
tree05c78670dc340fa5d62b39b1aeaa80e6ba618537
parent- Update to 5.75 (diff)
Upgrade from 1.0 to 1.1.
Sponsored by: Association for Advancement of Marsupial Species
-rw-r--r--mail/cone/Makefile3
-rw-r--r--mail/cone/distinfo6
-rw-r--r--mail/cone/files/patch-c++23
-rw-r--r--mail/cone/files/patch-libmail_envelope.H2
4 files changed, 28 insertions, 6 deletions
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 686f3b4bfea8..31d6e88f9ad0 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= cone
-PORTVERSION= 1.0
-PORTREVISION= 3
+PORTVERSION= 1.1
CATEGORIES= mail
# This is for beta versions, leave it in please:
#MASTER_SITES= http://www.courier-mta.org/beta/${PORTNAME}/ \
diff --git a/mail/cone/distinfo b/mail/cone/distinfo
index 893fb0778deb..a37292d6696f 100644
--- a/mail/cone/distinfo
+++ b/mail/cone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537265861
-SHA256 (cone-1.0.tar.bz2) = cffb5ae0292bd461d3a8cdddd09dccf43855f752ea4f4ae8c2aeacf67b69f9e9
-SIZE (cone-1.0.tar.bz2) = 3793288
+TIMESTAMP = 1603844375
+SHA256 (cone-1.1.tar.bz2) = 7ed5f50e65420063621ab4c7127ae9177944655490e98c5b3f202c57e715d3f0
+SIZE (cone-1.1.tar.bz2) = 4017709
diff --git a/mail/cone/files/patch-c++ b/mail/cone/files/patch-c++
new file mode 100644
index 000000000000..392cdd31cc11
--- /dev/null
+++ b/mail/cone/files/patch-c++
@@ -0,0 +1,23 @@
+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;
diff --git a/mail/cone/files/patch-libmail_envelope.H b/mail/cone/files/patch-libmail_envelope.H
index 98cbf2154dac..1f8c755d97a1 100644
--- a/mail/cone/files/patch-libmail_envelope.H
+++ b/mail/cone/files/patch-libmail_envelope.H
@@ -1,4 +1,4 @@
---- libmail/envelope.H.orig 2014-01-06 19:37:10 UTC
+--- libmail/envelope.H 2014-01-06 19:37:10 UTC
+++ libmail/envelope.H
@@ -8,6 +8,7 @@