- Update to 0.58

PR:		ports/65684
Submitted by:	Matthias Andree <matthias.andree@gmx.de>

5 files changed, 205 insertions, 157 deletions

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 92a1b9675592..d1c2d2f8456e 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cone
-PORTVERSION=	0.56
-PORTREVISION=	1
+PORTVERSION=	0.58
 CATEGORIES=	mail
 # This is for beta versions, leave it in please:
 #MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/
@@ -20,10 +19,14 @@ COMMENT=	Console based mail client with POP3/IMAP/SMAP support
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		aspell.15:${PORTSDIR}/textproc/aspell \
-		ncurses.5:${PORTSDIR}/devel/ncurses
+		ncurses.5:${PORTSDIR}/devel/ncurses \
+		fam.0:${PORTSDIR}/devel/fam
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_GETTEXT=	yes
+USE_ICONV=	yes
+
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
@@ -34,18 +37,16 @@ CONFIGURE_ENV=	REHASH="${PERL} ${SCRIPTDIR}/c_rehash" LDFLAGS=-L${LOCALBASE}/lib
 		CPPFLAGS=-I${LOCALBASE}/include
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAN1=		cone.1 leaf.1 mailtool.1
-
-do-install:
-		cd ${WRKSRC} && make install-strip
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}
-		${INSTALL_MAN} ${WRKSRC}/ChangeLog ${DOCSDIR}
-.endif
+INSTALL_TARGET=	install-strip
 
 post-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${PREFIX}/sbin/cone-sysconftool
 		PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PORTNAME} POST-INSTALL
 		${RM} -f ${PREFIX}/share/cone/rootcerts/.0
+.if !defined(NOPORTDOCS)
+		${MKDIR} ${DOCSDIR}
+		${INSTALL_MAN} ${WRKSRC}/ChangeLog ${DOCSDIR}
+.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/cone/distinfo b/mail/cone/distinfo
index 3f80fb76395a..29a275de8748 100644
--- a/mail/cone/distinfo
+++ b/mail/cone/distinfo
@@ -1,2 +1,2 @@
-MD5 (cone-0.56.tar.bz2) = 6edd669b5c83eba3a1c3aedf25e4b395
-SIZE (cone-0.56.tar.bz2) = 1836189
+MD5 (cone-0.58.tar.bz2) = de586b61c484178859a382429f92df7d
+SIZE (cone-0.58.tar.bz2) = 2086903
diff --git a/mail/cone/files/patch-fileno-casts b/mail/cone/files/patch-fileno-casts
new file mode 100644
index 000000000000..489efd0a3a1a
--- /dev/null
+++ b/mail/cone/files/patch-fileno-casts
@@ -0,0 +1,49 @@
+--- libmail/mbox.C~	Tue Apr  6 04:06:36 2004
++++ libmail/mbox.C	Sat Apr 17 22:05:27 2004
+@@ -1243,7 +1243,7 @@
+ 				// Remember how big the saveFile was,
+ 				// originally.
+ 
+-				if (fstat(fileno(*saveFile), &stat_buf) < 0)
++				if (fstat(fileno(static_cast<FILE *>(*saveFile)), &stat_buf) < 0)
+ 				{
+ 					return false;
+ 				}
+@@ -1280,7 +1280,7 @@
+ 			{
+ 				// Potential short cut.
+ 
+-				if (fstat(fileno(scanFile), &stat_buf) < 0)
++				if (fstat(fileno(static_cast<FILE *>(scanFile)), &stat_buf) < 0)
+ 				{
+ 					return false;
+ 				}
+--- libmail/mboxadd.C~	Wed Aug 27 04:37:22 2003
++++ libmail/mboxadd.C	Sat Apr 17 22:06:10 2004
+@@ -99,13 +99,13 @@
+ {
+ 	struct stat st;
+ 
+-	mail::mbox::sighandler updating(fileno(file));
++	mail::mbox::sighandler updating(fileno(static_cast<FILE *>(file)));
+ 
+ 	try {
+ 
+ 		// Make sure the mboxAccount file ends with a trailing newline
+ 
+-		if (fstat(fileno(file), &st) < 0)
++		if (fstat(fileno(static_cast<FILE *>(file)), &st) < 0)
+ 		{
+ 			fail(strerror(errno));
+ 			return;
+--- libmail/mboxgetmessage.C~	Wed Aug 27 04:37:22 2003
++++ libmail/mboxgetmessage.C	Sat Apr 17 22:06:42 2004
+@@ -81,7 +81,7 @@
+ 	{
+ 		struct stat stat_buf;
+ 
+-		if (fstat(fileno(file), &stat_buf) < 0)
++		if (fstat(fileno(static_cast<FILE *>(file)), &stat_buf) < 0)
+ 			endingPos=stat_buf.st_size;
+ 	}
+ 	else
diff --git a/mail/cone/files/patch-libmail::pop3maildrop.C b/mail/cone/files/patch-libmail::pop3maildrop.C
deleted file mode 100644
index 7dbe5f3de313..000000000000
--- a/mail/cone/files/patch-libmail::pop3maildrop.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmail/pop3maildrop.C.orig	Sun Nov 16 03:43:14 2003
-+++ libmail/pop3maildrop.C	Sat Nov 29 04:29:03 2003
-@@ -13,6 +13,8 @@
- #include <errno.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- using namespace std;
- 
diff --git a/mail/cone/pkg-plist b/mail/cone/pkg-plist
index c6cd5c60c232..ddb24c2cbfea 100644
--- a/mail/cone/pkg-plist
+++ b/mail/cone/pkg-plist
@@ -4,126 +4,6 @@ bin/mailtool
 sbin/cone-sysconftool
 etc/cone.dist
 libexec/cone
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-share/cone/APPLICATION.PDF.filter
-share/cone/IMAGE.GIF.filter
-share/cone/IMAGE.JPEG.filter
-share/cone/IMAGE.PNG.filter
-share/cone/account-checknewmail.html
-share/cone/account-copymessagesto.html
-share/cone/account-createfolder.html
-share/cone/account-deletefolder.html
-share/cone/account-getfolderfrompath.html
-share/cone/account-getfolderfromstring.html
-share/cone/account-getfolderindexinfo.html
-share/cone/account-getfolderindexsize.html
-share/cone/account-getfolderkeywordinfo.html
-share/cone/account-getmessagecontent.html
-share/cone/account-getmessagecontentdecoded.html
-share/cone/account-getmessageenvelope.html
-share/cone/account-getmessagestructure.html
-share/cone/account-getparentfolder.html
-share/cone/account-getsubfolders.html
-share/cone/account-gettoplevelfolders.html
-share/cone/account-libmail-addmessage.html
-share/cone/account-login.html
-share/cone/account-logout.html
-share/cone/account-movemessagesto.html
-share/cone/account-movemessagesto.sgml
-share/cone/account-openfolder.html
-share/cone/account-readfolderinfo.html
-share/cone/account-removemessages.html
-share/cone/account-renamefolder.html
-share/cone/account-savefolderindexinfo.html
-share/cone/account-searchmessages.html
-share/cone/account-send.html
-share/cone/account-translatepath.html
-share/cone/account-updatefolderindexflags.html
-share/cone/account-updatefolderindexinfo.html
-share/cone/account-updatekeywords.html
-share/cone/add.html
-share/cone/address.html
-share/cone/attributes.html
-share/cone/book.html
-share/cone/cone.hlp
-share/cone/cone.html
-share/cone/cone00index.html
-share/cone/cone01folderlist.html
-share/cone/cone02folderindex.html
-share/cone/cone03messageview.html
-share/cone/cone04writemessage.html
-share/cone/cone05setup.html
-share/cone/cone06newaccount.html
-share/cone/cone07remoteconfig.html
-share/cone/cone08gpg.html
-share/cone/cone09masterpassword.html
-share/cone/cone10encryption.html
-share/cone/cone11filters.html
-share/cone/conn.html
-share/cone/envelope.html
-share/cone/faq.html
-share/cone/folder-addmessage.html
-share/cone/folder-clone.html
-share/cone/folder-create.html
-share/cone/folder-createsubfolder.html
-share/cone/folder-destroy.html
-share/cone/folder-getname.html
-share/cone/folder-getparentfolder.html
-share/cone/folder-getpath.html
-share/cone/folder-hasmessages.html
-share/cone/folder-hassubfolders.html
-share/cone/folder-isparentof.html
-share/cone/folder-open.html
-share/cone/folder-readfolderinfo.html
-share/cone/folder-readsubfolders.html
-share/cone/folder-renamefolder.html
-share/cone/folder-tostring.html
-share/cone/index.html
-share/cone/install.html
-share/cone/leaf.html
-share/cone/libmail.html
-share/cone/mail-checknewmail.html
-share/cone/mail-copymessagesto.html
-share/cone/mail-findfolder.html
-share/cone/mail-folderfromstring.html
-share/cone/mail-getfolderindexinfo.html
-share/cone/mail-getfolderindexsize.html
-share/cone/mail-getfolderkeywordinfo.html
-share/cone/mail-getsendfolder.html
-share/cone/mail-hascapability.html
-share/cone/mail-homedir.html
-share/cone/mail-hostname.html
-share/cone/mail-isremoteurl.html
-share/cone/mail-loginurldecode.html
-share/cone/mail-loginurlencode.html
-share/cone/mail-logout.html
-share/cone/mail-movemessagesto.html
-share/cone/mail-open.html
-share/cone/mail-process.html
-share/cone/mail-readmsgattr.html
-share/cone/mail-readmsgcontent.html
-share/cone/mail-readmsgcontentdecoded.html
-share/cone/mail-readtoplevel.html
-share/cone/mail-removemessages.html
-share/cone/mail-resume.html
-share/cone/mail-savefolderindexinfo.html
-share/cone/mail-searchmessages.html
-share/cone/mail-setappcharset.html
-share/cone/mail-translatepath.html
-share/cone/mail-updatefolderindexflags.html
-share/cone/mail-updatefolderindexinfo.html
-share/cone/mail-updatekeywords.html
-share/cone/mail-updatenotify.html
-share/cone/mail-upper.html
-share/cone/mailtool.html
-share/cone/manpage.css
-share/cone/mimestruct.html
-share/cone/native.html
-share/cone/readme.html
-share/cone/search.html
-share/cone/smap1.html
-share/cone/store.html
-share/cone/synchronous.html
 share/cone/rootcerts/052e396b.0
 share/cone/rootcerts/0bb21872.0
 share/cone/rootcerts/0c364b2d.0
@@ -304,20 +184,149 @@ share/cone/rootcerts/xcert-international-inc-xcert-root-00.pem
 share/cone/rootcerts/xcert-international-inc-xcert-root-01.pem
 share/cone/rootcerts/xcert-international-inc-xcert-root-02.pem
 share/cone/rootcerts/xcert-international-inc-xcert-root-03.pem
-share/cone/c2428.html
-share/cone/c2466.html
-share/cone/r7571.html
-share/cone/r7791.html
-share/cone/r9197.html
-share/cone/x10211.html
-share/cone/x10454.html
-share/cone/x10558.html
-share/cone/x10800.html
-share/cone/x11135.html
-share/cone/x11146.html
-share/cone/x9598.html
-share/cone/x9804.html
-share/cone/x9940.html
+share/cone/IMAGE.GIF.filter
+share/cone/IMAGE.JPEG.filter
+share/cone/IMAGE.PNG.filter
+share/cone/account-checknewmail.html
+share/cone/account-copymessagesto.html
+share/cone/account-createfolder.html
+share/cone/account-deletefolder.html
+share/cone/account-delrights.html
+share/cone/account-getfolderfrompath.html
+share/cone/account-getfolderfromstring.html
+share/cone/account-getfolderindexinfo.html
+share/cone/account-getfolderindexsize.html
+share/cone/account-getfolderkeywordinfo.html
+share/cone/account-getmessagecontent.html
+share/cone/account-getmessagecontentdecoded.html
+share/cone/account-getmessageenvelope.html
+share/cone/account-getmessagestructure.html
+share/cone/account-getmyrights.html
+share/cone/account-getparentfolder.html
+share/cone/account-getrights.html
+share/cone/account-getsubfolders.html
+share/cone/account-gettoplevelfolders.html
+share/cone/account-libmail-addmessage.html
+share/cone/account-login.html
+share/cone/account-logout.html
+share/cone/account-movemessagesto.html
+share/cone/add.html
+share/cone/account-movemessagesto.sgml
+share/cone/account-openfolder.html
+share/cone/account-readfolderinfo.html
+share/cone/account-removemessages.html
+share/cone/account-renamefolder.html
+share/cone/account-savefolderindexinfo.html
+share/cone/account-searchmessages.html
+share/cone/account-send.html
+share/cone/account-setrights.html
+share/cone/account-translatepath.html
+share/cone/account-updatefolderindexflags.html
+share/cone/account-updatefolderindexinfo.html
+share/cone/account-updatekeywords.html
+share/cone/address.html
+share/cone/attributes.html
+share/cone/book.html
+share/cone/c2534.html
+share/cone/c2572.html
+share/cone/cone.html
+share/cone/cone00index.html
+share/cone/cone01folderlist.html
+share/cone/cone02folderindex.html
+share/cone/cone03messageview.html
+share/cone/cone04writemessage.html
+share/cone/cone05setup.html
+share/cone/cone06newaccount.html
+share/cone/cone07remoteconfig.html
+share/cone/cone08gpg.html
+share/cone/cone09masterpassword.html
+share/cone/cone10encryption.html
+share/cone/cone11filters.html
+share/cone/conn.html
+share/cone/faq.html
+share/cone/envelope.html
+share/cone/folder-addmessage.html
+share/cone/folder-clone.html
+share/cone/folder-create.html
+share/cone/folder-createsubfolder.html
+share/cone/folder-delrights.html
+share/cone/folder-destroy.html
+share/cone/folder-getmyrights.html
+share/cone/folder-getname.html
+share/cone/folder-getparentfolder.html
+share/cone/folder-getpath.html
+share/cone/folder-getrights.html
+share/cone/folder-hasmessages.html
+share/cone/folder-hassubfolders.html
+share/cone/folder-isparentof.html
+share/cone/folder-open.html
+share/cone/index.html
+share/cone/folder-readfolderinfo.html
+share/cone/folder-readsubfolders.html
+share/cone/folder-renamefolder.html
+share/cone/folder-setrights.html
+share/cone/folder-tostring.html
+share/cone/install.html
+share/cone/leaf.html
+share/cone/libmail.html
+share/cone/mail-checknewmail.html
+share/cone/mail-copymessagesto.html
+share/cone/mail-findfolder.html
+share/cone/mail-folderfromstring.html
+share/cone/mail-getfolderindexinfo.html
+share/cone/mail-getfolderindexsize.html
+share/cone/mail-getfolderkeywordinfo.html
+share/cone/mail-getsendfolder.html
+share/cone/mail-hascapability.html
+share/cone/mail-homedir.html
+share/cone/mail-hostname.html
+share/cone/mail-isremoteurl.html
+share/cone/mail-loginurldecode.html
+share/cone/mail-loginurlencode.html
+share/cone/mail-logout.html
+share/cone/mail-movemessagesto.html
+share/cone/mail-open.html
+share/cone/mail-poll.html
+share/cone/mail-process.html
+share/cone/mail-readmsgattr.html
+share/cone/mail-readmsgcontent.html
+share/cone/mail-readmsgcontentdecoded.html
+share/cone/mail-readtoplevel.html
+share/cone/mail-removemessages.html
+share/cone/mail-resume.html
+share/cone/mail-savefolderindexinfo.html
+share/cone/mail-searchmessages.html
+share/cone/mail-setappcharset.html
+share/cone/mail-translatepath.html
+share/cone/mail-updatefolderindexflags.html
+share/cone/mail-updatefolderindexinfo.html
+share/cone/mail-updatekeywords.html
+share/cone/mail-updatenotify.html
+share/cone/mail-upper.html
+share/cone/mailtool.html
+share/cone/manpage.css
+share/cone/mimestruct.html
+share/cone/native.html
+share/cone/r10978.html
+share/cone/r8529.html
+share/cone/r8749.html
+share/cone/readme.html
+share/cone/search.html
+share/cone/smap1.html
+share/cone/store.html
+share/cone/synchronous.html
+share/cone/x11379.html
+share/cone/x11585.html
+share/cone/x11921.html
+share/cone/x12192.html
+share/cone/x12435.html
+share/cone/x12539.html
+share/cone/x12781.html
+share/cone/x13128.html
+share/cone/x13139.html
+share/cone/APPLICATION.PDF.filter
+share/cone/cone.hlp
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/cone/rootcerts
 @dirrm share/cone