Changes 0.90:

* cone/gettext.C: gettext can't deal with literal ^Ds, so provide a
  workaround: "\\D" literal.
* cone/cursesindexdisplay.C (drawLine): Misformatting of the date
  column in some locales.

10 files changed, 34 insertions, 40 deletions

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 7582c679982..07851a33fdb 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2012/06/01 00:09:50 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2012/06/09 11:51:36 adam Exp $
 
-DISTNAME=	cone-0.84
-PKGREVISION=	2
+DISTNAME=	cone-0.90
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -9,6 +8,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.courier-mta.org/cone/
 COMMENT=	Console newsreader and emailer
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -27,7 +27,6 @@ CONFIGURE_ARGS+=	--with-certdb=${SSLCERTS}
 # variables that were meant for the builder to use.  Fix that by
 # overriding the special ac_cv_* configure cache variables as a last
 # resort.
-#
 CONFIGURE_ENV+=		ac_cv_path_OPENSSL=${TOOLS_TRUE}
 CONFIGURE_ENV+=		ac_cv_path_REHASH=${TOOLS_TRUE}
 
diff --git a/mail/cone/distinfo b/mail/cone/distinfo
index cd7ea5692e5..fdeb53060cb 100644
--- a/mail/cone/distinfo
+++ b/mail/cone/distinfo
@@ -1,18 +1,13 @@
-$NetBSD: distinfo,v 1.5 2011/11/22 18:12:35 joerg Exp $
+$NetBSD: distinfo,v 1.6 2012/06/09 11:51:36 adam Exp $
 
-SHA1 (cone-0.84.tar.bz2) = 507962bd666c4435e66f7653670c9aee360fd771
-RMD160 (cone-0.84.tar.bz2) = 88a76c71807269daa7094206a39ce566726c0b23
-Size (cone-0.84.tar.bz2) = 4077181 bytes
-SHA1 (patch-aa) = 379e4875619bda6d7094f906e2cba34f19d879fe
-SHA1 (patch-ab) = 2475c6644d894d1bdbf60977cdc5f96f36e72dde
-SHA1 (patch-ac) = 2a6a8ad9c8cc6773b219bfbefabc11eac31f6cb3
-SHA1 (patch-ad) = 578dde2e725ca4e1b332ad2e9135446534aa3184
-SHA1 (patch-ae) = f11842f29aadd91aaab74dff8583d6b62c06673d
-SHA1 (patch-af) = e78186b709c4eae63b5b05e5bf57dcc6a2967613
-SHA1 (patch-libmail-maildir.C) = 82962f71d9cfc4e6e124504bf2bbacde8487baf4
-SHA1 (patch-libmail-mbox.C) = 964e0901341d2ebdd1ac1fef2349d0565f5df188
-SHA1 (patch-libmail-mboxadd.C) = 614c95af75eba90c29868dc78f220df0fe9cdc77
-SHA1 (patch-libmail-mboxfolder.C) = 1ad0bc2ecfde93b941204501afa241f56e572dd0
-SHA1 (patch-libmail-mboxgetmessage.C) = fde73c28f91efbd9ca86e17f0980edd3d7994178
-SHA1 (patch-libmail-mboxread.C) = dea06e218ccbf683102d4c05a8ec8a4c64d96f4b
-SHA1 (patch-libmail-tmpaccount.C) = 5333f86f4ee37fb1b146048d37d70c7647b127ba
+SHA1 (cone-0.90.tar.bz2) = 51614269ed0b8c091de4573bacefe5f394a08311
+RMD160 (cone-0.90.tar.bz2) = 2b2a924d8726535654c74c9d98d7e444aff9fd5e
+Size (cone-0.90.tar.bz2) = 3906323 bytes
+SHA1 (patch-af) = f2018ee08526ee9e0c9c93e6ff5f83b948fd7067
+SHA1 (patch-libmail-maildir.C) = 724c16cb897667792cbfb769b7c7e81b803a1bd5
+SHA1 (patch-libmail-mbox.C) = 02cb2a96fe1915f61126436439ae7842f882b512
+SHA1 (patch-libmail-mboxadd.C) = 8731fb947d48256a061d68d2630573323d5ec797
+SHA1 (patch-libmail-mboxfolder.C) = c2c6d87bb76ab8805549c7cd72a5670633079725
+SHA1 (patch-libmail-mboxgetmessage.C) = a46d7ee0962e89721ff75b43adcf5316aa5bda28
+SHA1 (patch-libmail-mboxread.C) = 940eab3b9040d9362f816d9af4d9bcc305701ae6
+SHA1 (patch-libmail-tmpaccount.C) = dbd3d7bde51e9c94b3258fcb2fca6b9077f9ad12
diff --git a/mail/cone/patches/patch-af b/mail/cone/patches/patch-af
index e2bce8f9c73..c09450aa5b0 100644
--- a/mail/cone/patches/patch-af
+++ b/mail/cone/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2007/11/13 18:02:15 jlam Exp $
+$NetBSD: patch-af,v 1.2 2012/06/09 11:51:36 adam Exp $
 
---- libmail/mail.H.orig	Wed Jun 23 00:55:25 2004
+--- libmail/mail.H.orig	2011-04-04 11:58:20.000000000 +0000
 +++ libmail/mail.H
-@@ -11,10 +11,10 @@
+@@ -10,10 +10,10 @@
  #include <time.h>
  #include <string>
  
diff --git a/mail/cone/patches/patch-libmail-maildir.C b/mail/cone/patches/patch-libmail-maildir.C
index 11d8bc0de55..29832a7e14c 100644
--- a/mail/cone/patches/patch-libmail-maildir.C
+++ b/mail/cone/patches/patch-libmail-maildir.C
@@ -1,10 +1,10 @@
-$NetBSD: patch-libmail-maildir.C,v 1.1 2011/11/22 18:12:35 joerg Exp $
+$NetBSD: patch-libmail-maildir.C,v 1.2 2012/06/09 11:51:36 adam Exp $
 
 Use stdio functions to ensure that the mail::file cast to FILE * happens.
 
 --- libmail/maildir.C.orig	2011-11-22 16:26:47.000000000 +0000
 +++ libmail/maildir.C
-@@ -31,6 +31,8 @@
+@@ -30,6 +30,8 @@
  #include <list>
  #include <map>
  
diff --git a/mail/cone/patches/patch-libmail-mbox.C b/mail/cone/patches/patch-libmail-mbox.C
index fde22e9c65b..35c441d5b8c 100644
--- a/mail/cone/patches/patch-libmail-mbox.C
+++ b/mail/cone/patches/patch-libmail-mbox.C
@@ -1,10 +1,10 @@
-$NetBSD: patch-libmail-mbox.C,v 1.1 2011/11/22 18:12:35 joerg Exp $
+$NetBSD: patch-libmail-mbox.C,v 1.2 2012/06/09 11:51:36 adam Exp $
 
 Use stdio functions to ensure that the mail::file cast to FILE * happens.
 
 --- libmail/mbox.C.orig	2011-11-22 16:27:37.000000000 +0000
 +++ libmail/mbox.C
-@@ -32,6 +32,10 @@
+@@ -31,6 +31,10 @@
  #include <signal.h>
  #include <ctype.h>
  
diff --git a/mail/cone/patches/patch-libmail-mboxadd.C b/mail/cone/patches/patch-libmail-mboxadd.C
index c2946cbe605..5147e113644 100644
--- a/mail/cone/patches/patch-libmail-mboxadd.C
+++ b/mail/cone/patches/patch-libmail-mboxadd.C
@@ -1,10 +1,10 @@
-$NetBSD: patch-libmail-mboxadd.C,v 1.1 2011/11/22 18:12:35 joerg Exp $
+$NetBSD: patch-libmail-mboxadd.C,v 1.2 2012/06/09 11:51:36 adam Exp $
 
 Use stdio functions to ensure that the mail::file cast to FILE * happens.
 
 --- libmail/mboxadd.C.orig	2011-11-22 16:29:21.000000000 +0000
 +++ libmail/mboxadd.C
-@@ -16,6 +16,10 @@
+@@ -15,6 +15,10 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  
diff --git a/mail/cone/patches/patch-libmail-mboxfolder.C b/mail/cone/patches/patch-libmail-mboxfolder.C
index 359a3b7cb12..b6774abb3b6 100644
--- a/mail/cone/patches/patch-libmail-mboxfolder.C
+++ b/mail/cone/patches/patch-libmail-mboxfolder.C
@@ -1,10 +1,10 @@
-$NetBSD: patch-libmail-mboxfolder.C,v 1.1 2011/11/22 18:12:35 joerg Exp $
+$NetBSD: patch-libmail-mboxfolder.C,v 1.2 2012/06/09 11:51:36 adam Exp $
 
 Use stdio functions to ensure that the mail::file cast to FILE * happens.
 
 --- libmail/mboxfolder.C.orig	2011-11-22 16:30:20.000000000 +0000
 +++ libmail/mboxfolder.C
-@@ -40,6 +40,8 @@
+@@ -39,6 +39,8 @@
  
  #include <vector>
  
diff --git a/mail/cone/patches/patch-libmail-mboxgetmessage.C b/mail/cone/patches/patch-libmail-mboxgetmessage.C
index 07c895ab1cc..5022e65c403 100644
--- a/mail/cone/patches/patch-libmail-mboxgetmessage.C
+++ b/mail/cone/patches/patch-libmail-mboxgetmessage.C
@@ -1,10 +1,10 @@
-$NetBSD: patch-libmail-mboxgetmessage.C,v 1.1 2011/11/22 18:12:35 joerg Exp $
+$NetBSD: patch-libmail-mboxgetmessage.C,v 1.2 2012/06/09 11:51:36 adam Exp $
 
 Use stdio functions to ensure that the mail::file cast to FILE * happens.
 
 --- libmail/mboxgetmessage.C.orig	2011-11-22 16:30:48.000000000 +0000
 +++ libmail/mboxgetmessage.C
-@@ -16,6 +16,8 @@
+@@ -15,6 +15,8 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  
diff --git a/mail/cone/patches/patch-libmail-mboxread.C b/mail/cone/patches/patch-libmail-mboxread.C
index 6aacbe8cf4e..2cbcf69ad06 100644
--- a/mail/cone/patches/patch-libmail-mboxread.C
+++ b/mail/cone/patches/patch-libmail-mboxread.C
@@ -1,10 +1,10 @@
-$NetBSD: patch-libmail-mboxread.C,v 1.1 2011/11/22 18:12:35 joerg Exp $
+$NetBSD: patch-libmail-mboxread.C,v 1.2 2012/06/09 11:51:36 adam Exp $
 
 Use stdio functions to ensure that the mail::file cast to FILE * happens.
 
 --- libmail/mboxread.C.orig	2011-11-22 16:32:57.000000000 +0000
 +++ libmail/mboxread.C
-@@ -12,6 +12,8 @@
+@@ -11,6 +11,8 @@
  #include <ctype.h>
  #include <errno.h>
  
diff --git a/mail/cone/patches/patch-libmail-tmpaccount.C b/mail/cone/patches/patch-libmail-tmpaccount.C
index 063ac51cd26..292f8f430a0 100644
--- a/mail/cone/patches/patch-libmail-tmpaccount.C
+++ b/mail/cone/patches/patch-libmail-tmpaccount.C
@@ -1,12 +1,12 @@
-$NetBSD: patch-libmail-tmpaccount.C,v 1.1 2011/11/22 18:12:35 joerg Exp $
+$NetBSD: patch-libmail-tmpaccount.C,v 1.2 2012/06/09 11:51:36 adam Exp $
 
 Use stdio functions to ensure that the mail::file cast to FILE * happens.
 
---- libmail/tmpaccount.C.orig	2011-11-22 16:37:21.000000000 +0000
+--- libmail/tmpaccount.C.orig	2011-04-04 11:58:20.000000000 +0000
 +++ libmail/tmpaccount.C
-@@ -14,6 +14,8 @@
- #include <errno.h>
+@@ -12,6 +12,8 @@
  #include <sys/stat.h>
+ #include <cstring>
  
 +#undef ferror
 +