3 files changed, 126 insertions, 114 deletions

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index ddf01a1252ed..4f340089d2b7 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	cone
-PORTVERSION=	0.52
+PORTVERSION=	0.54.20030915
 CATEGORIES=	mail
 # This is for beta versions, leave it in please:
-#MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/
+MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/
 # This is for release versions, leave it in please:
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	courier
+#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+#MASTER_SITE_SUBDIR=	courier
 
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	"Console based mail client with POP3/IMAP/SMAP support"
@@ -36,6 +36,8 @@ MAN1=		cone.1 leaf.1 mailtool.1
 
 do-install:
 		cd ${WRKSRC} && make install-strip
+		${MKDIR} ${DOCSDIR}
+		${INSTALL_MAN} ${WRKSRC}/ChangeLog ${DOCSDIR}
 
 post-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${PREFIX}/sbin/cone-sysconftool
diff --git a/mail/cone/distinfo b/mail/cone/distinfo
index 95c1e6dcc38a..943dd493394d 100644
--- a/mail/cone/distinfo
+++ b/mail/cone/distinfo
@@ -1 +1 @@
-MD5 (cone-0.52.tar.bz2) = 7bdbea4ea8dbb8a1874224c552822bb5
+MD5 (cone-0.54.20030915.tar.bz2) = 40a08952975fa52c1f935fc7e1d6b22c
diff --git a/mail/cone/pkg-plist b/mail/cone/pkg-plist
index 128d4f5ed90d..4cf346f0a29f 100644
--- a/mail/cone/pkg-plist
+++ b/mail/cone/pkg-plist
@@ -4,6 +4,7 @@ bin/mailtool
 sbin/cone-sysconftool
 etc/cone.dist
 libexec/cone
+%%DOCSDIR%%/ChangeLog
 share/cone/APPLICATION.PDF.filter
 share/cone/IMAGE.GIF.filter
 share/cone/IMAGE.JPEG.filter
@@ -16,6 +17,7 @@ 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
@@ -26,6 +28,8 @@ 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
@@ -36,12 +40,13 @@ 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/c1844.html
-share/cone/c1882.html
+share/cone/c2382.html
+share/cone/c2420.html
 share/cone/cone.hlp
 share/cone/cone.html
 share/cone/cone00index.html
@@ -55,6 +60,8 @@ 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
@@ -83,6 +90,7 @@ 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
@@ -91,6 +99,7 @@ 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
@@ -105,106 +114,30 @@ 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/r6325.html
-share/cone/r6545.html
-share/cone/r7951.html
+share/cone/r7497.html
+share/cone/r7717.html
+share/cone/r9123.html
 share/cone/readme.html
-share/cone/rootcerts/aba-ecom-root-ca.pem
-share/cone/rootcerts/addtrust-class-1-ca-root.pem
-share/cone/rootcerts/addtrust-external-ca-root.pem
-share/cone/rootcerts/addtrust-public-ca-root.pem
-share/cone/rootcerts/addtrust-qualified-ca-root.pem
-share/cone/rootcerts/american-express-certificate-authority.pem
-share/cone/rootcerts/american-express-global-certificate.pem
-share/cone/rootcerts/baltimore-cybertrust-code-signing.pem
-share/cone/rootcerts/baltimore-cybertrust-mobile-root.pem
-share/cone/rootcerts/baltimore-cybertrust-root.pem
-share/cone/rootcerts/bankengine.pem
-share/cone/rootcerts/belsign-object-publishing-ca.pem
-share/cone/rootcerts/belsign-secure-server-ca.pem
-share/cone/rootcerts/betrusted-root-ca.pem
-share/cone/rootcerts/certengine.pem
-share/cone/rootcerts/class-1-public-primary-ocsp-responder.pem
-share/cone/rootcerts/class-2-public-primary-ocsp-responder.pem
-share/cone/rootcerts/class-3-public-primary-ocsp-responder.pem
-share/cone/rootcerts/cybertrust-japan-root-ca.pem
-share/cone/rootcerts/cybertrust-japan-secure-server.pem
-share/cone/rootcerts/deutsche-telekom-root-ca.pem
-share/cone/rootcerts/digital-signature-trust-co-dstca-00.pem
-share/cone/rootcerts/digital-signature-trust-co-dstca-01.pem
-share/cone/rootcerts/dst-rootca-x1.pem
-share/cone/rootcerts/dst-rootca-x2.pem
-share/cone/rootcerts/e-certify-ca.pem
-share/cone/rootcerts/e-certify-ra.pem
-share/cone/rootcerts/entrust-net-certification-authority.pem
-share/cone/rootcerts/entrust-net-client-certification-00.pem
-share/cone/rootcerts/entrust-net-client-certification-01.pem
-share/cone/rootcerts/entrust-net-secure-server-certification-00.pem
-share/cone/rootcerts/entrust-net-secure-server-certification-01.pem
-share/cone/rootcerts/equifax-equifax-premium-certificate.pem
-share/cone/rootcerts/equifax-equifax-secure-certificate.pem
-share/cone/rootcerts/equifax-secure-ebusiness-ca-1.pem
-share/cone/rootcerts/equifax-secure-equifax-secure-ebusiness.pem
-share/cone/rootcerts/equifax-secure-global-ebusiness.pem
-share/cone/rootcerts/fortengine.pem
-share/cone/rootcerts/globalsign-partners-ca.pem
-share/cone/rootcerts/globalsign-primary-class-1-ca.pem
-share/cone/rootcerts/globalsign-primary-class-2-ca.pem
-share/cone/rootcerts/globalsign-primary-class-3-ca.pem
-share/cone/rootcerts/globalsign-root-ca.pem
-share/cone/rootcerts/gp-root-2.pem
-share/cone/rootcerts/gp-root-3.pem
-share/cone/rootcerts/gp-root-4.pem
-share/cone/rootcerts/gp-root-5.pem
-share/cone/rootcerts/gte-cybertrust-global-root.pem
-share/cone/rootcerts/gte-cybertrust-root-5.pem
-share/cone/rootcerts/gte-cybertrust-root.pem
-share/cone/rootcerts/http-www-valicert-com-00.pem
-share/cone/rootcerts/http-www-valicert-com-01.pem
-share/cone/rootcerts/http-www-valicert-com-02.pem
-share/cone/rootcerts/http-www-valicert-net.pem
-share/cone/rootcerts/mailengine.pem
-share/cone/rootcerts/rsa-data-security-inc-secure-server.pem
-share/cone/rootcerts/secure-server-ocsp-responder.pem
-share/cone/rootcerts/tc-trustcenter-for-security-in-00.pem
-share/cone/rootcerts/tc-trustcenter-for-security-in-01.pem
-share/cone/rootcerts/tc-trustcenter-for-security-in-02.pem
-share/cone/rootcerts/tc-trustcenter-for-security-in-03.pem
-share/cone/rootcerts/tc-trustcenter-for-security-in-04.pem
-share/cone/rootcerts/thawte-personal-basic-ca.pem
-share/cone/rootcerts/thawte-personal-freemail-ca.pem
-share/cone/rootcerts/thawte-personal-premium-ca.pem
-share/cone/rootcerts/thawte-premium-server-ca.pem
-share/cone/rootcerts/thawte-server-ca.pem
-share/cone/rootcerts/thawte-timestamping-ca.pem
-share/cone/rootcerts/thawte-universal-ca-root.pem
-share/cone/rootcerts/traderengine.pem
-share/cone/rootcerts/usps-production-ca-1.pem
-share/cone/rootcerts/usps-root-ca.pem
-share/cone/rootcerts/verisign-class-1-public-primary.pem
-share/cone/rootcerts/verisign-class-2-public-primary.pem
-share/cone/rootcerts/verisign-class-3-public-primary.pem
-share/cone/rootcerts/verisign-class-4-public-primary.pem
-share/cone/rootcerts/verisign-inc-class-1-public-primary.pem
-share/cone/rootcerts/verisign-inc-class-2-public-primary.pem
-share/cone/rootcerts/verisign-inc-class-3-public-primary.pem
-share/cone/rootcerts/verisign-inc-verisign-trust-network-00.pem
-share/cone/rootcerts/verisign-inc-verisign-trust-network-01.pem
-share/cone/rootcerts/verisign-inc-verisign-trust-network-02.pem
-share/cone/rootcerts/verisign-inc-verisign-trust-network-03.pem
-share/cone/rootcerts/verisign-time-stamping-authority.pem
-share/cone/rootcerts/visa-visa-international-service.pem
-share/cone/rootcerts/xcert-ez-by-dst.pem
-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/search.html
+share/cone/smap1.html
+share/cone/store.html
+share/cone/synchronous.html
+share/cone/x10137.html
+share/cone/x10380.html
+share/cone/x10484.html
+share/cone/x10726.html
+share/cone/x11061.html
+share/cone/x11072.html
+share/cone/x9524.html
+share/cone/x9730.html
+share/cone/x9866.html
 share/cone/rootcerts/052e396b.0
 share/cone/rootcerts/0bb21872.0
 share/cone/rootcerts/0c364b2d.0
@@ -267,11 +200,25 @@ share/cone/rootcerts/a2df7ad7.0
 share/cone/rootcerts/a38484ce.0
 share/cone/rootcerts/a3c60019.0
 share/cone/rootcerts/aaa45464.0
+share/cone/rootcerts/aba-ecom-root-ca.pem
+share/cone/rootcerts/addtrust-class-1-ca-root.pem
+share/cone/rootcerts/addtrust-external-ca-root.pem
+share/cone/rootcerts/addtrust-public-ca-root.pem
+share/cone/rootcerts/addtrust-qualified-ca-root.pem
+share/cone/rootcerts/american-express-certificate-authority.pem
+share/cone/rootcerts/american-express-global-certificate.pem
 share/cone/rootcerts/b0f3e76e.0
 share/cone/rootcerts/b5f329fa.0
 share/cone/rootcerts/ba386118.0
+share/cone/rootcerts/baltimore-cybertrust-code-signing.pem
+share/cone/rootcerts/baltimore-cybertrust-mobile-root.pem
+share/cone/rootcerts/baltimore-cybertrust-root.pem
+share/cone/rootcerts/bankengine.pem
 share/cone/rootcerts/bb0a889c.0
 share/cone/rootcerts/bcdd5959.0
+share/cone/rootcerts/belsign-object-publishing-ca.pem
+share/cone/rootcerts/belsign-secure-server-ca.pem
+share/cone/rootcerts/betrusted-root-ca.pem
 share/cone/rootcerts/bffe8b5d.0
 share/cone/rootcerts/c19d42c7.0
 share/cone/rootcerts/c215bc69.0
@@ -279,12 +226,25 @@ share/cone/rootcerts/c33a80d4.0
 share/cone/rootcerts/c527e4ab.0
 share/cone/rootcerts/c9bc75ba.0
 share/cone/rootcerts/ccf7ff0e.0
+share/cone/rootcerts/certengine.pem
+share/cone/rootcerts/class-1-public-primary-ocsp-responder.pem
+share/cone/rootcerts/class-2-public-primary-ocsp-responder.pem
+share/cone/rootcerts/class-3-public-primary-ocsp-responder.pem
+share/cone/rootcerts/cybertrust-japan-root-ca.pem
+share/cone/rootcerts/cybertrust-japan-secure-server.pem
 share/cone/rootcerts/d2adc77d.0
 share/cone/rootcerts/d593166d.0
 share/cone/rootcerts/d78a75c7.0
 share/cone/rootcerts/db65db21.0
 share/cone/rootcerts/ddc328ff.0
+share/cone/rootcerts/deutsche-telekom-root-ca.pem
 share/cone/rootcerts/dfd0b044.0
+share/cone/rootcerts/dst-rootca-x1.pem
+share/cone/rootcerts/digital-signature-trust-co-dstca-00.pem
+share/cone/rootcerts/digital-signature-trust-co-dstca-01.pem
+share/cone/rootcerts/dst-rootca-x2.pem
+share/cone/rootcerts/e-certify-ca.pem
+share/cone/rootcerts/e-certify-ra.pem
 share/cone/rootcerts/e268a4c5.0
 share/cone/rootcerts/e28f6bbc.0
 share/cone/rootcerts/e7b8d656.0
@@ -292,22 +252,72 @@ share/cone/rootcerts/e9aaa9de.0
 share/cone/rootcerts/ed049835.0
 share/cone/rootcerts/ed524cf5.0
 share/cone/rootcerts/ed62f4e3.0
+share/cone/rootcerts/entrust-net-certification-authority.pem
+share/cone/rootcerts/entrust-net-client-certification-00.pem
+share/cone/rootcerts/entrust-net-client-certification-01.pem
+share/cone/rootcerts/equifax-equifax-premium-certificate.pem
+share/cone/rootcerts/entrust-net-secure-server-certification-00.pem
+share/cone/rootcerts/entrust-net-secure-server-certification-01.pem
+share/cone/rootcerts/equifax-equifax-secure-certificate.pem
+share/cone/rootcerts/equifax-secure-ebusiness-ca-1.pem
+share/cone/rootcerts/equifax-secure-equifax-secure-ebusiness.pem
+share/cone/rootcerts/equifax-secure-global-ebusiness.pem
 share/cone/rootcerts/f10dd942.0
 share/cone/rootcerts/f4996e82.0
 share/cone/rootcerts/f73e89fd.0
-share/cone/search.html
-share/cone/smap1.html
-share/cone/store.html
-share/cone/synchronous.html
-share/cone/x8356.html
-share/cone/x8441.html
-share/cone/x8553.html
-share/cone/x8689.html
-share/cone/x8944.html
-share/cone/x9164.html
-share/cone/x9267.html
-share/cone/x9490.html
-share/cone/x9814.html
-share/cone/x9825.html
+share/cone/rootcerts/fortengine.pem
+share/cone/rootcerts/globalsign-partners-ca.pem
+share/cone/rootcerts/globalsign-primary-class-1-ca.pem
+share/cone/rootcerts/globalsign-primary-class-2-ca.pem
+share/cone/rootcerts/globalsign-primary-class-3-ca.pem
+share/cone/rootcerts/globalsign-root-ca.pem
+share/cone/rootcerts/gp-root-2.pem
+share/cone/rootcerts/gp-root-3.pem
+share/cone/rootcerts/gp-root-4.pem
+share/cone/rootcerts/gp-root-5.pem
+share/cone/rootcerts/gte-cybertrust-global-root.pem
+share/cone/rootcerts/gte-cybertrust-root-5.pem
+share/cone/rootcerts/gte-cybertrust-root.pem
+share/cone/rootcerts/http-www-valicert-com-00.pem
+share/cone/rootcerts/http-www-valicert-com-01.pem
+share/cone/rootcerts/http-www-valicert-com-02.pem
+share/cone/rootcerts/http-www-valicert-net.pem
+share/cone/rootcerts/mailengine.pem
+share/cone/rootcerts/rsa-data-security-inc-secure-server.pem
+share/cone/rootcerts/secure-server-ocsp-responder.pem
+share/cone/rootcerts/tc-trustcenter-for-security-in-00.pem
+share/cone/rootcerts/tc-trustcenter-for-security-in-01.pem
+share/cone/rootcerts/tc-trustcenter-for-security-in-02.pem
+share/cone/rootcerts/tc-trustcenter-for-security-in-03.pem
+share/cone/rootcerts/tc-trustcenter-for-security-in-04.pem
+share/cone/rootcerts/thawte-personal-basic-ca.pem
+share/cone/rootcerts/thawte-personal-freemail-ca.pem
+share/cone/rootcerts/thawte-personal-premium-ca.pem
+share/cone/rootcerts/thawte-premium-server-ca.pem
+share/cone/rootcerts/thawte-server-ca.pem
+share/cone/rootcerts/thawte-timestamping-ca.pem
+share/cone/rootcerts/thawte-universal-ca-root.pem
+share/cone/rootcerts/traderengine.pem
+share/cone/rootcerts/usps-production-ca-1.pem
+share/cone/rootcerts/usps-root-ca.pem
+share/cone/rootcerts/verisign-class-1-public-primary.pem
+share/cone/rootcerts/verisign-class-2-public-primary.pem
+share/cone/rootcerts/verisign-class-3-public-primary.pem
+share/cone/rootcerts/verisign-class-4-public-primary.pem
+share/cone/rootcerts/verisign-inc-class-1-public-primary.pem
+share/cone/rootcerts/verisign-inc-class-2-public-primary.pem
+share/cone/rootcerts/verisign-inc-class-3-public-primary.pem
+share/cone/rootcerts/verisign-inc-verisign-trust-network-00.pem
+share/cone/rootcerts/verisign-inc-verisign-trust-network-01.pem
+share/cone/rootcerts/verisign-inc-verisign-trust-network-02.pem
+share/cone/rootcerts/verisign-inc-verisign-trust-network-03.pem
+share/cone/rootcerts/verisign-time-stamping-authority.pem
+share/cone/rootcerts/visa-visa-international-service.pem
+share/cone/rootcerts/xcert-ez-by-dst.pem
+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
+@dirrm %%DOCSDIR%%
 @dirrm share/cone/rootcerts
 @dirrm share/cone