7 files changed, 337 insertions, 342 deletions

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 0f4ae3957a69..36a0504f980f 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cone
-PORTVERSION=	0.60
-PORTREVISION=	1
+PORTVERSION=	0.62
 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 7533b6ffbe71..c148bcc4b8e7 100644
--- a/mail/cone/distinfo
+++ b/mail/cone/distinfo
@@ -1,2 +1,2 @@
-MD5 (cone-0.60.tar.bz2) = b2ae0cb3808e5485d566474c8bf251f9
-SIZE (cone-0.60.tar.bz2) = 2096318
+MD5 (cone-0.62.tar.bz2) = 96883bf940dded1a135765aec7a9de26
+SIZE (cone-0.62.tar.bz2) = 2160891
diff --git a/mail/cone/files/patch-gcc34 b/mail/cone/files/patch-gcc34
deleted file mode 100644
index 9b84b964edb4..000000000000
--- a/mail/cone/files/patch-gcc34
+++ /dev/null
@@ -1,10 +0,0 @@
---- libmail/addressbookget.C~	Mon Jun  7 20:46:57 2004
-+++ libmail/addressbookget.C	Mon Jun  7 20:45:14 2004
-@@ -260,5 +260,5 @@
- 	addressBookLineMap.insert(make_pair(hdr, text));
- }
- 
--template mail::addressbook::GetAddressList<mail::address>;
--template mail::addressbook::GetAddressList<mail::emailAddress>;
-+template class mail::addressbook::GetAddressList<mail::address>;
-+template class mail::addressbook::GetAddressList<mail::emailAddress>;
diff --git a/mail/cone/pkg-deinstall b/mail/cone/pkg-deinstall
index 9fa9cbcb4fae..f52440161216 100644
--- a/mail/cone/pkg-deinstall
+++ b/mail/cone/pkg-deinstall
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 case "$2" in DEINSTALL)
 	if cmp -s "$PKG_PREFIX/etc/cone" "$PKG_PREFIX/etc/cone.dist" ; then
 		rm -f "$PKG_PREFIX/etc/cone"
diff --git a/mail/cone/pkg-install b/mail/cone/pkg-install
index 4e27f060a716..9061f217a7e3 100644
--- a/mail/cone/pkg-install
+++ b/mail/cone/pkg-install
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 case "$2" in POST-INSTALL)
 	"$PKG_PREFIX/sbin/cone-sysconftool" "$PKG_PREFIX/etc/cone.dist" ;;
 esac
diff --git a/mail/cone/pkg-plist b/mail/cone/pkg-plist
index fc89334c3b6a..311bdf165a1b 100644
--- a/mail/cone/pkg-plist
+++ b/mail/cone/pkg-plist
@@ -4,330 +4,336 @@ bin/mailtool
 sbin/cone-sysconftool
 etc/cone.dist
 libexec/cone
-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-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/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/add.html
-share/cone/address.html
-share/cone/attributes.html
-share/cone/book.html
-share/cone/c2570.html
-share/cone/c2608.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/emailaddress.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-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/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/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-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/r11013.html
-share/cone/r8527.html
-share/cone/r8784.html
-share/cone/readme.html
-share/cone/rootcerts/052e396b.0
-share/cone/rootcerts/0bb21872.0
-share/cone/rootcerts/0c364b2d.0
-share/cone/rootcerts/0e82f83a.0
-share/cone/rootcerts/11f154d6.0
-share/cone/rootcerts/128b9c8d.0
-share/cone/rootcerts/19899da5.0
-share/cone/rootcerts/1a147d5b.0
-share/cone/rootcerts/1bb6c7e0.0
-share/cone/rootcerts/256fd83b.0
-share/cone/rootcerts/2d047263.0
-share/cone/rootcerts/2edf7016.0
-share/cone/rootcerts/31044350.0
-share/cone/rootcerts/3ad48a91.0
-share/cone/rootcerts/3c58f906.0
-share/cone/rootcerts/3e7271e8.0
-share/cone/rootcerts/412bea73.0
-share/cone/rootcerts/418882ac.0
-share/cone/rootcerts/43d4bde2.0
-share/cone/rootcerts/4643210f.0
-share/cone/rootcerts/4d654d1d.0
-share/cone/rootcerts/5480ace1.0
-share/cone/rootcerts/54edfa5d.0
-share/cone/rootcerts/56e607f4.0
-share/cone/rootcerts/594f1775.0
-share/cone/rootcerts/5ee07a24.0
-share/cone/rootcerts/5f5e5caa.0
-share/cone/rootcerts/6166cb50.0
-share/cone/rootcerts/61f6c934.0
-share/cone/rootcerts/66eb5c17.0
-share/cone/rootcerts/66ec64da.0
-share/cone/rootcerts/6981fb07.0
-share/cone/rootcerts/6a15001a.0
-share/cone/rootcerts/6c55cf77.0
-share/cone/rootcerts/6d6ec79c.0
-share/cone/rootcerts/700b8679.0
-share/cone/rootcerts/709afd2b.0
-share/cone/rootcerts/72fa7371.0
-share/cone/rootcerts/73451336.0
-share/cone/rootcerts/739b7930.0
-share/cone/rootcerts/74c26bd0.0
-share/cone/rootcerts/7651b327.0
-share/cone/rootcerts/76d6205a.0
-share/cone/rootcerts/788c9bfc.0
-share/cone/rootcerts/7a9820c1.0
-share/cone/rootcerts/7d3cd826.0
-share/cone/rootcerts/7d453d8f.0
-share/cone/rootcerts/7e74191f.0
-share/cone/rootcerts/81447c6e.0
-share/cone/rootcerts/843b6c51.0
-share/cone/rootcerts/878cf4c6.0
-share/cone/rootcerts/8e6e2991.0
-share/cone/rootcerts/8efac7d4.0
-share/cone/rootcerts/8f7b96c4.0
-share/cone/rootcerts/95750816.0
-share/cone/rootcerts/97b4211c.0
-share/cone/rootcerts/a15b3b6b.0
-share/cone/rootcerts/a2be0f54.0
-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
-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/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/e268a4c5.0
-share/cone/rootcerts/e28f6bbc.0
-share/cone/rootcerts/e7b8d656.0
-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/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/f10dd942.0
-share/cone/rootcerts/f4996e82.0
-share/cone/rootcerts/f73e89fd.0
-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/x11499.html
-share/cone/x11705.html
-share/cone/x12041.html
-share/cone/x12312.html
-share/cone/x12555.html
-share/cone/x12659.html
-share/cone/x12901.html
-share/cone/x13258.html
-share/cone/x13269.html
+%%DATADIR%%/APPLICATION.PDF.filter
+%%DATADIR%%/IMAGE.GIF.filter
+%%DATADIR%%/IMAGE.JPEG.filter
+%%DATADIR%%/IMAGE.PNG.filter
+%%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%%/book.html
+%%DATADIR%%/c2588.html
+%%DATADIR%%/c2626.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%%/cone10encryption.html
+%%DATADIR%%/cone11filters.html
+%%DATADIR%%/conn.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%%/install.html
+%%DATADIR%%/leaf.html
+%%DATADIR%%/libmail-folder.html
+%%DATADIR%%/libmail-misc.html
+%%DATADIR%%/libmail.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%%/mailtool.html
+%%DATADIR%%/manpage.css
+%%DATADIR%%/mimestruct.html
+%%DATADIR%%/misc.html
+%%DATADIR%%/native.html
+%%DATADIR%%/readme.html
+%%DATADIR%%/rootcerts/052e396b.0
+%%DATADIR%%/rootcerts/0bb21872.0
+%%DATADIR%%/rootcerts/0c364b2d.0
+%%DATADIR%%/rootcerts/0e82f83a.0
+%%DATADIR%%/rootcerts/11f154d6.0
+%%DATADIR%%/rootcerts/128b9c8d.0
+%%DATADIR%%/rootcerts/19899da5.0
+%%DATADIR%%/rootcerts/1a147d5b.0
+%%DATADIR%%/rootcerts/1bb6c7e0.0
+%%DATADIR%%/rootcerts/256fd83b.0
+%%DATADIR%%/rootcerts/2d047263.0
+%%DATADIR%%/rootcerts/2edf7016.0
+%%DATADIR%%/rootcerts/31044350.0
+%%DATADIR%%/rootcerts/3ad48a91.0
+%%DATADIR%%/rootcerts/3c58f906.0
+%%DATADIR%%/rootcerts/3e7271e8.0
+%%DATADIR%%/rootcerts/412bea73.0
+%%DATADIR%%/rootcerts/418882ac.0
+%%DATADIR%%/rootcerts/43d4bde2.0
+%%DATADIR%%/rootcerts/4643210f.0
+%%DATADIR%%/rootcerts/4d654d1d.0
+%%DATADIR%%/rootcerts/5480ace1.0
+%%DATADIR%%/rootcerts/54edfa5d.0
+%%DATADIR%%/rootcerts/56e607f4.0
+%%DATADIR%%/rootcerts/594f1775.0
+%%DATADIR%%/rootcerts/5ee07a24.0
+%%DATADIR%%/rootcerts/5f5e5caa.0
+%%DATADIR%%/rootcerts/6166cb50.0
+%%DATADIR%%/rootcerts/61f6c934.0
+%%DATADIR%%/rootcerts/66eb5c17.0
+%%DATADIR%%/rootcerts/66ec64da.0
+%%DATADIR%%/rootcerts/6981fb07.0
+%%DATADIR%%/rootcerts/6a15001a.0
+%%DATADIR%%/rootcerts/6c55cf77.0
+%%DATADIR%%/rootcerts/6d6ec79c.0
+%%DATADIR%%/rootcerts/700b8679.0
+%%DATADIR%%/rootcerts/709afd2b.0
+%%DATADIR%%/rootcerts/72fa7371.0
+%%DATADIR%%/rootcerts/73451336.0
+%%DATADIR%%/rootcerts/739b7930.0
+%%DATADIR%%/rootcerts/74c26bd0.0
+%%DATADIR%%/rootcerts/7651b327.0
+%%DATADIR%%/rootcerts/76d6205a.0
+%%DATADIR%%/rootcerts/788c9bfc.0
+%%DATADIR%%/rootcerts/7a9820c1.0
+%%DATADIR%%/rootcerts/7d3cd826.0
+%%DATADIR%%/rootcerts/7d453d8f.0
+%%DATADIR%%/rootcerts/7e74191f.0
+%%DATADIR%%/rootcerts/81447c6e.0
+%%DATADIR%%/rootcerts/843b6c51.0
+%%DATADIR%%/rootcerts/878cf4c6.0
+%%DATADIR%%/rootcerts/8e6e2991.0
+%%DATADIR%%/rootcerts/8efac7d4.0
+%%DATADIR%%/rootcerts/8f7b96c4.0
+%%DATADIR%%/rootcerts/95750816.0
+%%DATADIR%%/rootcerts/97b4211c.0
+%%DATADIR%%/rootcerts/a15b3b6b.0
+%%DATADIR%%/rootcerts/a2be0f54.0
+%%DATADIR%%/rootcerts/a2df7ad7.0
+%%DATADIR%%/rootcerts/a38484ce.0
+%%DATADIR%%/rootcerts/a3c60019.0
+%%DATADIR%%/rootcerts/aaa45464.0
+%%DATADIR%%/rootcerts/aba-ecom-root-ca.pem
+%%DATADIR%%/rootcerts/addtrust-class-1-ca-root.pem
+%%DATADIR%%/rootcerts/addtrust-external-ca-root.pem
+%%DATADIR%%/rootcerts/addtrust-public-ca-root.pem
+%%DATADIR%%/rootcerts/addtrust-qualified-ca-root.pem
+%%DATADIR%%/rootcerts/american-express-certificate-authority.pem
+%%DATADIR%%/rootcerts/american-express-global-certificate.pem
+%%DATADIR%%/rootcerts/b0f3e76e.0
+%%DATADIR%%/rootcerts/b5f329fa.0
+%%DATADIR%%/rootcerts/ba386118.0
+%%DATADIR%%/rootcerts/baltimore-cybertrust-code-signing.pem
+%%DATADIR%%/rootcerts/baltimore-cybertrust-mobile-root.pem
+%%DATADIR%%/rootcerts/baltimore-cybertrust-root.pem
+%%DATADIR%%/rootcerts/bankengine.pem
+%%DATADIR%%/rootcerts/bb0a889c.0
+%%DATADIR%%/rootcerts/bcdd5959.0
+%%DATADIR%%/rootcerts/belsign-object-publishing-ca.pem
+%%DATADIR%%/rootcerts/belsign-secure-server-ca.pem
+%%DATADIR%%/rootcerts/betrusted-root-ca.pem
+%%DATADIR%%/rootcerts/bffe8b5d.0
+%%DATADIR%%/rootcerts/c19d42c7.0
+%%DATADIR%%/rootcerts/c215bc69.0
+%%DATADIR%%/rootcerts/c33a80d4.0
+%%DATADIR%%/rootcerts/c527e4ab.0
+%%DATADIR%%/rootcerts/c9bc75ba.0
+%%DATADIR%%/rootcerts/ccf7ff0e.0
+%%DATADIR%%/rootcerts/certengine.pem
+%%DATADIR%%/rootcerts/class-1-public-primary-ocsp-responder.pem
+%%DATADIR%%/rootcerts/class-2-public-primary-ocsp-responder.pem
+%%DATADIR%%/rootcerts/class-3-public-primary-ocsp-responder.pem
+%%DATADIR%%/rootcerts/cybertrust-japan-root-ca.pem
+%%DATADIR%%/rootcerts/cybertrust-japan-secure-server.pem
+%%DATADIR%%/rootcerts/d2adc77d.0
+%%DATADIR%%/rootcerts/d593166d.0
+%%DATADIR%%/rootcerts/d78a75c7.0
+%%DATADIR%%/rootcerts/db65db21.0
+%%DATADIR%%/rootcerts/ddc328ff.0
+%%DATADIR%%/rootcerts/deutsche-telekom-root-ca.pem
+%%DATADIR%%/rootcerts/dfd0b044.0
+%%DATADIR%%/rootcerts/digital-signature-trust-co-dstca-00.pem
+%%DATADIR%%/rootcerts/digital-signature-trust-co-dstca-01.pem
+%%DATADIR%%/rootcerts/dst-rootca-x1.pem
+%%DATADIR%%/rootcerts/dst-rootca-x2.pem
+%%DATADIR%%/rootcerts/e-certify-ca.pem
+%%DATADIR%%/rootcerts/e-certify-ra.pem
+%%DATADIR%%/rootcerts/e268a4c5.0
+%%DATADIR%%/rootcerts/e28f6bbc.0
+%%DATADIR%%/rootcerts/e7b8d656.0
+%%DATADIR%%/rootcerts/e9aaa9de.0
+%%DATADIR%%/rootcerts/ed049835.0
+%%DATADIR%%/rootcerts/ed524cf5.0
+%%DATADIR%%/rootcerts/ed62f4e3.0
+%%DATADIR%%/rootcerts/entrust-net-certification-authority.pem
+%%DATADIR%%/rootcerts/entrust-net-client-certification-00.pem
+%%DATADIR%%/rootcerts/entrust-net-client-certification-01.pem
+%%DATADIR%%/rootcerts/entrust-net-secure-server-certification-00.pem
+%%DATADIR%%/rootcerts/entrust-net-secure-server-certification-01.pem
+%%DATADIR%%/rootcerts/equifax-equifax-premium-certificate.pem
+%%DATADIR%%/rootcerts/equifax-equifax-secure-certificate.pem
+%%DATADIR%%/rootcerts/equifax-secure-ebusiness-ca-1.pem
+%%DATADIR%%/rootcerts/equifax-secure-equifax-secure-ebusiness.pem
+%%DATADIR%%/rootcerts/equifax-secure-global-ebusiness.pem
+%%DATADIR%%/rootcerts/f10dd942.0
+%%DATADIR%%/rootcerts/f4996e82.0
+%%DATADIR%%/rootcerts/f73e89fd.0
+%%DATADIR%%/rootcerts/fortengine.pem
+%%DATADIR%%/rootcerts/globalsign-partners-ca.pem
+%%DATADIR%%/rootcerts/globalsign-primary-class-1-ca.pem
+%%DATADIR%%/rootcerts/globalsign-primary-class-2-ca.pem
+%%DATADIR%%/rootcerts/globalsign-primary-class-3-ca.pem
+%%DATADIR%%/rootcerts/globalsign-root-ca.pem
+%%DATADIR%%/rootcerts/gp-root-2.pem
+%%DATADIR%%/rootcerts/gp-root-3.pem
+%%DATADIR%%/rootcerts/gp-root-4.pem
+%%DATADIR%%/rootcerts/gp-root-5.pem
+%%DATADIR%%/rootcerts/gte-cybertrust-global-root.pem
+%%DATADIR%%/rootcerts/gte-cybertrust-root-5.pem
+%%DATADIR%%/rootcerts/gte-cybertrust-root.pem
+%%DATADIR%%/rootcerts/http-www-valicert-com-00.pem
+%%DATADIR%%/rootcerts/http-www-valicert-com-01.pem
+%%DATADIR%%/rootcerts/http-www-valicert-com-02.pem
+%%DATADIR%%/rootcerts/http-www-valicert-net.pem
+%%DATADIR%%/rootcerts/mailengine.pem
+%%DATADIR%%/rootcerts/rsa-data-security-inc-secure-server.pem
+%%DATADIR%%/rootcerts/secure-server-ocsp-responder.pem
+%%DATADIR%%/rootcerts/tc-trustcenter-for-security-in-00.pem
+%%DATADIR%%/rootcerts/tc-trustcenter-for-security-in-01.pem
+%%DATADIR%%/rootcerts/tc-trustcenter-for-security-in-02.pem
+%%DATADIR%%/rootcerts/tc-trustcenter-for-security-in-03.pem
+%%DATADIR%%/rootcerts/tc-trustcenter-for-security-in-04.pem
+%%DATADIR%%/rootcerts/thawte-personal-basic-ca.pem
+%%DATADIR%%/rootcerts/thawte-personal-freemail-ca.pem
+%%DATADIR%%/rootcerts/thawte-personal-premium-ca.pem
+%%DATADIR%%/rootcerts/thawte-premium-server-ca.pem
+%%DATADIR%%/rootcerts/thawte-server-ca.pem
+%%DATADIR%%/rootcerts/thawte-timestamping-ca.pem
+%%DATADIR%%/rootcerts/thawte-universal-ca-root.pem
+%%DATADIR%%/rootcerts/traderengine.pem
+%%DATADIR%%/rootcerts/usps-production-ca-1.pem
+%%DATADIR%%/rootcerts/usps-root-ca.pem
+%%DATADIR%%/rootcerts/verisign-class-1-public-primary.pem
+%%DATADIR%%/rootcerts/verisign-class-2-public-primary.pem
+%%DATADIR%%/rootcerts/verisign-class-3-public-primary.pem
+%%DATADIR%%/rootcerts/verisign-class-4-public-primary.pem
+%%DATADIR%%/rootcerts/verisign-inc-class-1-public-primary.pem
+%%DATADIR%%/rootcerts/verisign-inc-class-2-public-primary.pem
+%%DATADIR%%/rootcerts/verisign-inc-class-3-public-primary.pem
+%%DATADIR%%/rootcerts/verisign-inc-verisign-trust-network-00.pem
+%%DATADIR%%/rootcerts/verisign-inc-verisign-trust-network-01.pem
+%%DATADIR%%/rootcerts/verisign-inc-verisign-trust-network-02.pem
+%%DATADIR%%/rootcerts/verisign-inc-verisign-trust-network-03.pem
+%%DATADIR%%/rootcerts/verisign-time-stamping-authority.pem
+%%DATADIR%%/rootcerts/visa-visa-international-service.pem
+%%DATADIR%%/rootcerts/xcert-ez-by-dst.pem
+%%DATADIR%%/rootcerts/xcert-international-inc-xcert-root-00.pem
+%%DATADIR%%/rootcerts/xcert-international-inc-xcert-root-01.pem
+%%DATADIR%%/rootcerts/xcert-international-inc-xcert-root-02.pem
+%%DATADIR%%/rootcerts/xcert-international-inc-xcert-root-03.pem
+%%DATADIR%%/search.html
+%%DATADIR%%/smap1.html
+%%DATADIR%%/store.html
+%%DATADIR%%/synchronous.html
+%%DATADIR%%/x12223.html
+%%DATADIR%%/x12429.html
+%%DATADIR%%/x12765.html
+%%DATADIR%%/x13036.html
+%%DATADIR%%/x13279.html
+%%DATADIR%%/x13383.html
+%%DATADIR%%/x13625.html
+%%DATADIR%%/x13999.html
+%%DATADIR%%/x14010.html
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/cone/rootcerts
-@dirrm share/cone
+@dirrm %%DATADIR%%/rootcerts
+@dirrm %%DATADIR%%
diff --git a/mail/cone/scripts/c_rehash b/mail/cone/scripts/c_rehash
index e5ef9d224ed7..913d598e754a 100644
--- a/mail/cone/scripts/c_rehash
+++ b/mail/cone/scripts/c_rehash
@@ -21,7 +21,7 @@ if(! -f $openssl) {
 		if(-f "$_/$openssl") {
 			$found = 1;
 			last;
-		}	
+		}
 	}
 	if($found == 0) {
 		print STDERR "c_rehash: rehashing skipped ('openssl' program not available)\n";