Index: head/mail/cone/Makefile
===================================================================
--- head/mail/cone/Makefile	(revision 400397)
+++ head/mail/cone/Makefile	(revision 400398)
@@ -1,51 +1,46 @@
 # Created by: Matthias Andree <matthias.andree@gmx.de>
 # $FreeBSD$
 
 PORTNAME=	cone
-PORTVERSION=	0.90
-PORTREVISION=	4
+PORTVERSION=	0.92
 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=	uffe@uffe.org
 COMMENT=	Console based mail client with POP3/IMAP/SMAP support
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell \
+				libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
 BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		fam gettext gmake iconv ncurses perl5 shebangfix tar:bzip2
 USE_GNOME=	libxml2
-USE_GCC=	yes
 
 SHEBANG_FILES=	sysconftool
 
 CPPFLAGS+=	-I${LOCALBASE}/include \
-		-D_XOPEN_SOURCE_EXTENDED \
-		-I${WRKDIR} -D_XOPEN_SOURCE_EXTENDED
+		-D_XOPEN_SOURCE_EXTENDED
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	-C --without-db --with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}
-CONFIGURE_ENV=	REHASH="${PERL} ${SCRIPTDIR}/c_rehash"
-
+CONFIGURE_ARGS+=	--with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
-post-extract:
-		@${MKDIR} ${WRKDIR}/ncursesw
-		${LN} -s ${LOCALBASE}/include/ncurses/ncurses.h ${WRKDIR}/ncursesw/curses.h
-
 post-install:
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/leaf
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mailtool
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/cone
 		${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${STAGEDIR}${PREFIX}/sbin/cone-sysconftool
 		${RM} -f ${STAGEDIR}${PREFIX}/share/cone/rootcerts/.0
 		@${MKDIR} ${STAGEDIR}${DOCSDIR}
 		${INSTALL_MAN} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/mail/cone/distinfo
===================================================================
--- head/mail/cone/distinfo	(revision 400397)
+++ head/mail/cone/distinfo	(revision 400398)
@@ -1,2 +1,2 @@
-SHA256 (cone-0.90.tar.bz2) = b03edfbf3392fb7b8d93574dad2bc4c7cbfca8890afabac8b99b21a9f46d8733
-SIZE (cone-0.90.tar.bz2) = 3906323
+SHA256 (cone-0.92.tar.bz2) = bfc1170565d931ac9b8a674410f44cb2472c7b755b5bb97e9915d37fdfe9d631
+SIZE (cone-0.92.tar.bz2) = 3774451
Index: head/mail/cone/files/patch-libmail-envelope-h.diff
===================================================================
--- head/mail/cone/files/patch-libmail-envelope-h.diff	(revision 400397)
+++ head/mail/cone/files/patch-libmail-envelope-h.diff	(nonexistent)
@@ -1,10 +0,0 @@
---- libmail/envelope.H.orig	2014-06-24 00:28:56.000000000 +0200
-+++ libmail/envelope.H	2014-06-24 00:29:36.000000000 +0200
-@@ -8,6 +8,7 @@
- 
- #include <vector>
- #include <string>
-+#include <ctime>
- 
- #include "namespace.H"
- 

Property changes on: head/mail/cone/files/patch-libmail-envelope-h.diff
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/mail/cone/files/patch-curses-cursescontainer-C.diff
===================================================================
--- head/mail/cone/files/patch-curses-cursescontainer-C.diff	(revision 400397)
+++ head/mail/cone/files/patch-curses-cursescontainer-C.diff	(nonexistent)
@@ -1,11 +0,0 @@
---- curses/cursescontainer.C.orig	2014-06-24 00:25:29.000000000 +0200
-+++ curses/cursescontainer.C	2014-06-24 00:25:42.000000000 +0200
-@@ -10,7 +10,7 @@
- using namespace std;
- 
- CursesContainer::CursesContainer(CursesContainer *parent)
--	: Curses(parent), drawIndex(0)
-+	: Curses(parent), drawIndex()
- {
- }
- 

Property changes on: head/mail/cone/files/patch-curses-cursescontainer-C.diff
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/mail/cone/files/patch-cone_cursesmessage.C
===================================================================
--- head/mail/cone/files/patch-cone_cursesmessage.C	(nonexistent)
+++ head/mail/cone/files/patch-cone_cursesmessage.C	(revision 400398)
@@ -0,0 +1,15 @@
+--- cone/cursesmessage.C.orig	2014-01-06 19:51:56 UTC
++++ cone/cursesmessage.C
+@@ -3761,10 +3761,10 @@ bool CursesMessage::decrypt(std::string 
+ 			gi.passphrase_fd=passphrase_fd.c_str();
+ 		}
+ 
+-		gi.input_func= &tempSaveText.input_func;
++		gi.input_func= &CursesMessage::DecryptSaveText::input_func;
+ 		gi.input_func_arg= &tempSaveText;
+ 
+-		gi.output_func= &tempSaveText.output_func;
++		gi.output_func= &CursesMessage::DecryptSaveText::output_func; 
+ 		gi.output_func_arg= &tempSaveText;
+ 
+ 		gi.errhandler_func= &tempSaveText.err_func;

Property changes on: head/mail/cone/files/patch-cone_cursesmessage.C
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cone/files/patch-libmail_envelope.H
===================================================================
--- head/mail/cone/files/patch-libmail_envelope.H	(nonexistent)
+++ head/mail/cone/files/patch-libmail_envelope.H	(revision 400398)
@@ -0,0 +1,10 @@
+--- libmail/envelope.H.orig	2014-01-06 19:37:10 UTC
++++ libmail/envelope.H
+@@ -8,6 +8,7 @@
+ 
+ #include <vector>
+ #include <string>
++#include <time.h>
+ 
+ #include "namespace.H"
+ 

Property changes on: head/mail/cone/files/patch-libmail_envelope.H
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cone/files/patch-libs_tcpd_libcouriertls.c
===================================================================
--- head/mail/cone/files/patch-libs_tcpd_libcouriertls.c	(nonexistent)
+++ head/mail/cone/files/patch-libs_tcpd_libcouriertls.c	(revision 400398)
@@ -0,0 +1,18 @@
+--- libs/tcpd/libcouriertls.c.orig	2014-10-22 08:00:04 UTC
++++ libs/tcpd/libcouriertls.c
+@@ -74,7 +74,15 @@ struct proto_ops op_list[] =
+     { "TLSv1",     &TLSv1_method,   SSL_OP_ALL },
+     { "TLS1",      &TLSv1_method,   SSL_OP_ALL },
+     { "SSL3+",     &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2 },
++#ifndef OPENSSL_NO_SSL3
+     { "SSL3",      &SSLv3_method,   SSL_OP_ALL },
++#else
++    { "SSL3",      &SSLv23_method,   SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_TLSv1 
++#ifdef HAVE_TLSV1_1_METHOD
++      |SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2
++#endif /* SSL_OP_NO_TLSv1 */
++    },
++#endif /* OPENSSL_NO_SSL3 */
+     { "SSL23",     &SSLv23_method,  SSL_OP_ALL },
+     { "",          &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },
+     { NULL,        &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },

Property changes on: head/mail/cone/files/patch-libs_tcpd_libcouriertls.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/cone/pkg-plist
===================================================================
--- head/mail/cone/pkg-plist	(revision 400397)
+++ head/mail/cone/pkg-plist	(revision 400398)
@@ -1,165 +1,165 @@
 bin/cone
 bin/leaf
 bin/mailtool
-sbin/cone-sysconftool
-etc/cone.dist
+@sample etc/cone.dist etc/cone
 libexec/cone
 man/man1/cone.1.gz
-man/man1/mailtool.1.gz
 man/man1/leaf.1.gz
+man/man1/mailtool.1.gz
+sbin/cone-sysconftool
 %%DATADIR%%/APPLICATION.PDF.filter
+%%DATADIR%%/FAQ.html
 %%DATADIR%%/IMAGE.GIF.filter
 %%DATADIR%%/IMAGE.JPEG.filter
 %%DATADIR%%/IMAGE.PNG.filter
+%%DATADIR%%/INSTALL.html
+%%DATADIR%%/README.html
 %%DATADIR%%/account-checknewmail.html
 %%DATADIR%%/account-copymessagesto.html
 %%DATADIR%%/account-createfolder.html
 %%DATADIR%%/account-deletefolder.html
 %%DATADIR%%/account-delrights.html
 %%DATADIR%%/account-getfolderfrompath.html
 %%DATADIR%%/account-getfolderfromstring.html
 %%DATADIR%%/account-getfolderindexinfo.html
 %%DATADIR%%/account-getfolderindexsize.html
 %%DATADIR%%/account-getfolderkeywordinfo.html
 %%DATADIR%%/account-getmessagecontent.html
 %%DATADIR%%/account-getmessagecontentdecoded.html
 %%DATADIR%%/account-getmessageenvelope.html
 %%DATADIR%%/account-getmessagestructure.html
 %%DATADIR%%/account-getmyrights.html
 %%DATADIR%%/account-getparentfolder.html
 %%DATADIR%%/account-getrights.html
 %%DATADIR%%/account-getsubfolders.html
 %%DATADIR%%/account-gettoplevelfolders.html
 %%DATADIR%%/account-libmail-addmessage.html
 %%DATADIR%%/account-login.html
 %%DATADIR%%/account-logout.html
 %%DATADIR%%/account-movemessagesto.html
 %%DATADIR%%/account-openfolder.html
 %%DATADIR%%/account-readfolderinfo.html
 %%DATADIR%%/account-removemessages.html
 %%DATADIR%%/account-renamefolder.html
 %%DATADIR%%/account-savefolderindexinfo.html
 %%DATADIR%%/account-searchmessages.html
 %%DATADIR%%/account-send.html
 %%DATADIR%%/account-setrights.html
 %%DATADIR%%/account-translatepath.html
 %%DATADIR%%/account-updatefolderindexflags.html
 %%DATADIR%%/account-updatefolderindexinfo.html
 %%DATADIR%%/account-updatekeywords.html
 %%DATADIR%%/add.html
 %%DATADIR%%/address.html
 %%DATADIR%%/attributes.html
 %%DATADIR%%/bk01-toc.html
 %%DATADIR%%/cone.hlp
 %%DATADIR%%/cone.html
 %%DATADIR%%/cone00index.html
 %%DATADIR%%/cone01folderlist.html
 %%DATADIR%%/cone02folderindex.html
 %%DATADIR%%/cone03messageview.html
 %%DATADIR%%/cone04writemessage.html
 %%DATADIR%%/cone05setup.html
 %%DATADIR%%/cone06newaccount.html
 %%DATADIR%%/cone07remoteconfig.html
 %%DATADIR%%/cone08gpg.html
 %%DATADIR%%/cone09masterpassword.html
 %%DATADIR%%/cone10certificates.html
 %%DATADIR%%/cone11encryption.html
 %%DATADIR%%/cone12filters.html
 %%DATADIR%%/cone13addressbook.html
 %%DATADIR%%/cone14ldapaddressbook.html
 %%DATADIR%%/conn.html
 %%DATADIR%%/cppnamespace.html
 %%DATADIR%%/emailaddress.html
 %%DATADIR%%/envelope.html
-%%DATADIR%%/FAQ.html
 %%DATADIR%%/folder-addmessage.html
 %%DATADIR%%/folder-clone.html
 %%DATADIR%%/folder-create.html
 %%DATADIR%%/folder-createsubfolder.html
 %%DATADIR%%/folder-delrights.html
 %%DATADIR%%/folder-destroy.html
 %%DATADIR%%/folder-getmyrights.html
 %%DATADIR%%/folder-getname.html
 %%DATADIR%%/folder-getparentfolder.html
 %%DATADIR%%/folder-getpath.html
 %%DATADIR%%/folder-getrights.html
 %%DATADIR%%/folder-hasmessages.html
 %%DATADIR%%/folder-hassubfolders.html
 %%DATADIR%%/folder-isparentof.html
 %%DATADIR%%/folder-open.html
 %%DATADIR%%/folder-readfolderinfo.html
 %%DATADIR%%/folder-readsubfolders.html
 %%DATADIR%%/folder-renamefolder.html
 %%DATADIR%%/folder-setrights.html
 %%DATADIR%%/folder-tostring.html
 %%DATADIR%%/header-addresslist.html
 %%DATADIR%%/header-encoded.html
 %%DATADIR%%/header-list.html
 %%DATADIR%%/header-mime.html
 %%DATADIR%%/header-plain.html
-%%DATADIR%%/index.html
+%%DATADIR%%/http.handler
+%%DATADIR%%/https.handler
 %%DATADIR%%/icon.gif
-%%DATADIR%%/INSTALL.html
+%%DATADIR%%/index.html
 %%DATADIR%%/leaf.html
 %%DATADIR%%/libmail-folder.html
 %%DATADIR%%/libmail-misc.html
 %%DATADIR%%/libmail.html
 %%DATADIR%%/libmailapi.html
 %%DATADIR%%/mail-attachments.html
 %%DATADIR%%/mail-checknewmail.html
 %%DATADIR%%/mail-copymessagesto.html
 %%DATADIR%%/mail-findfolder.html
 %%DATADIR%%/mail-folderfromstring.html
 %%DATADIR%%/mail-getfolderindexinfo.html
 %%DATADIR%%/mail-getfolderindexsize.html
 %%DATADIR%%/mail-getfolderkeywordinfo.html
 %%DATADIR%%/mail-getsendfolder.html
 %%DATADIR%%/mail-hascapability.html
 %%DATADIR%%/mail-headers.html
 %%DATADIR%%/mail-homedir.html
 %%DATADIR%%/mail-hostname.html
 %%DATADIR%%/mail-isremoteurl.html
 %%DATADIR%%/mail-loginurldecode.html
 %%DATADIR%%/mail-loginurlencode.html
 %%DATADIR%%/mail-logout.html
 %%DATADIR%%/mail-movemessagesto.html
 %%DATADIR%%/mail-open.html
 %%DATADIR%%/mail-poll.html
 %%DATADIR%%/mail-process.html
 %%DATADIR%%/mail-readmsgattr.html
 %%DATADIR%%/mail-readmsgcontent.html
 %%DATADIR%%/mail-readmsgcontentdecoded.html
 %%DATADIR%%/mail-readtoplevel.html
 %%DATADIR%%/mail-removemessages.html
 %%DATADIR%%/mail-resume.html
 %%DATADIR%%/mail-savefolderindexinfo.html
 %%DATADIR%%/mail-searchmessages.html
 %%DATADIR%%/mail-setappcharset.html
 %%DATADIR%%/mail-translatepath.html
 %%DATADIR%%/mail-updatefolderindexflags.html
 %%DATADIR%%/mail-updatefolderindexinfo.html
 %%DATADIR%%/mail-updatekeywords.html
 %%DATADIR%%/mail-updatenotify.html
 %%DATADIR%%/mail-upper.html
 %%DATADIR%%/maillist.html
 %%DATADIR%%/mailtool.html
 %%DATADIR%%/manpage.css
 %%DATADIR%%/mimestruct.html
 %%DATADIR%%/misc.html
 %%DATADIR%%/moredocs.html
 %%DATADIR%%/native.html
-%%DATADIR%%/README.html
 %%DATADIR%%/search.html
 %%DATADIR%%/smap1.html
 %%DATADIR%%/smapconcurrency.html
-%%DATADIR%%/smapfolders.html
 %%DATADIR%%/smapcopymovemessages.html
+%%DATADIR%%/smapfolders.html
 %%DATADIR%%/smaplogout.html
 %%DATADIR%%/smapmessagecontents.html
 %%DATADIR%%/smapsyntax.html
 %%DATADIR%%/smapusingfolders.html
 %%DATADIR%%/store.html
 %%DATADIR%%/synchronous.html
-%%DATADIR%%/http.handler
-%%DATADIR%%/https.handler
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog