3 files changed, 129 insertions, 20 deletions

diff --git a/www/mhonarc/Makefile b/www/mhonarc/Makefile
index 66d067f80814..bd0bce476947 100644
--- a/www/mhonarc/Makefile
+++ b/www/mhonarc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mhonarc
-PORTVERSION=	2.5.14
+PORTVERSION=	2.6.0
 CATEGORIES=	www mail
 MASTER_SITES=	http://www.mhonarc.org/tar/ \
 		http://www.oac.uci.edu/indiv/ehood/tar/ \
diff --git a/www/mhonarc/distinfo b/www/mhonarc/distinfo
index 95a7b87040ca..ec2bb6f811d9 100644
--- a/www/mhonarc/distinfo
+++ b/www/mhonarc/distinfo
@@ -1 +1 @@
-MD5 (MHonArc2.5.14.tar.bz2) = ce7fc8bf96a8d16050f9af80084eb710
+MD5 (MHonArc2.6.0.tar.bz2) = 93ec225d4e99fe4b8ab8d0fce598020e
diff --git a/www/mhonarc/pkg-plist b/www/mhonarc/pkg-plist
index c11c55d78dc5..526008479e7f 100644
--- a/www/mhonarc/pkg-plist
+++ b/www/mhonarc/pkg-plist
@@ -2,30 +2,128 @@ bin/mha-dbedit
 bin/mha-dbrecover
 bin/mha-decode
 bin/mhonarc
+share/MHonArc/MHonArc/Char.pm
+share/MHonArc/MHonArc/Char/JP.pm
+share/MHonArc/MHonArc/Char/KR.pm
 share/MHonArc/MHonArc/CharEnt.pm
+share/MHonArc/MHonArc/CharEnt/AppleArabic.pm
+share/MHonArc/MHonArc/CharEnt/AppleCenteuro.pm
+share/MHonArc/MHonArc/CharEnt/AppleCroatian.pm
+share/MHonArc/MHonArc/CharEnt/AppleCyrillic.pm
+share/MHonArc/MHonArc/CharEnt/AppleGreek.pm
+share/MHonArc/MHonArc/CharEnt/AppleHebrew.pm
+share/MHonArc/MHonArc/CharEnt/AppleIceland.pm
+share/MHonArc/MHonArc/CharEnt/AppleRoman.pm
+share/MHonArc/MHonArc/CharEnt/AppleRomanian.pm
+share/MHonArc/MHonArc/CharEnt/AppleThai.pm
+share/MHonArc/MHonArc/CharEnt/AppleTurkish.pm
+share/MHonArc/MHonArc/CharEnt/BIG5_ETEN.pm
+share/MHonArc/MHonArc/CharEnt/BIG5_HKSCS.pm
 share/MHonArc/MHonArc/CharEnt/CP1250.pm
+share/MHonArc/MHonArc/CharEnt/CP1251.pm
 share/MHonArc/MHonArc/CharEnt/CP1252.pm
+share/MHonArc/MHonArc/CharEnt/CP1253.pm
+share/MHonArc/MHonArc/CharEnt/CP1254.pm
+share/MHonArc/MHonArc/CharEnt/CP1255.pm
+share/MHonArc/MHonArc/CharEnt/CP1256.pm
+share/MHonArc/MHonArc/CharEnt/CP1257.pm
+share/MHonArc/MHonArc/CharEnt/CP1258.pm
+share/MHonArc/MHonArc/CharEnt/CP866.pm
+share/MHonArc/MHonArc/CharEnt/CP932.pm
+share/MHonArc/MHonArc/CharEnt/CP936.pm
+share/MHonArc/MHonArc/CharEnt/CP949.pm
+share/MHonArc/MHonArc/CharEnt/CP950.pm
+share/MHonArc/MHonArc/CharEnt/EUC_JP.pm
+share/MHonArc/MHonArc/CharEnt/GB2312.pm
+share/MHonArc/MHonArc/CharEnt/GOST19768_87.pm
+share/MHonArc/MHonArc/CharEnt/HP_ROMAN8.pm
 share/MHonArc/MHonArc/CharEnt/ISO8859_1.pm
 share/MHonArc/MHonArc/CharEnt/ISO8859_10.pm
-share/MHonArc/MHonArc/CharEnt/ISO8859_10R.pm
+share/MHonArc/MHonArc/CharEnt/ISO8859_11.pm
+share/MHonArc/MHonArc/CharEnt/ISO8859_13.pm
+share/MHonArc/MHonArc/CharEnt/ISO8859_14.pm
 share/MHonArc/MHonArc/CharEnt/ISO8859_15.pm
-share/MHonArc/MHonArc/CharEnt/ISO8859_15R.pm
-share/MHonArc/MHonArc/CharEnt/ISO8859_1R.pm
+share/MHonArc/MHonArc/CharEnt/ISO8859_16.pm
 share/MHonArc/MHonArc/CharEnt/ISO8859_2.pm
 share/MHonArc/MHonArc/CharEnt/ISO8859_3.pm
-share/MHonArc/MHonArc/CharEnt/ISO8859_3R.pm
 share/MHonArc/MHonArc/CharEnt/ISO8859_4.pm
 share/MHonArc/MHonArc/CharEnt/ISO8859_5.pm
 share/MHonArc/MHonArc/CharEnt/ISO8859_6.pm
 share/MHonArc/MHonArc/CharEnt/ISO8859_7.pm
-share/MHonArc/MHonArc/CharEnt/ISO8859_7R.pm
 share/MHonArc/MHonArc/CharEnt/ISO8859_8.pm
-share/MHonArc/MHonArc/CharEnt/ISO8859_8R.pm
 share/MHonArc/MHonArc/CharEnt/ISO8859_9.pm
-share/MHonArc/MHonArc/CharEnt/ISO8859_9R.pm
-share/MHonArc/MHonArc/CharEnt/Makefile
-share/MHonArc/MHonArc/Makefile
+share/MHonArc/MHonArc/CharEnt/KOI8_A.pm
+share/MHonArc/MHonArc/CharEnt/KOI8_B.pm
+share/MHonArc/MHonArc/CharEnt/KOI8_E.pm
+share/MHonArc/MHonArc/CharEnt/KOI8_F.pm
+share/MHonArc/MHonArc/CharEnt/KOI8_R.pm
+share/MHonArc/MHonArc/CharEnt/KOI8_U.pm
+share/MHonArc/MHonArc/CharEnt/KOI_0.pm
+share/MHonArc/MHonArc/CharEnt/KOI_7.pm
+share/MHonArc/MHonArc/CharEnt/VISCII.pm
+share/MHonArc/MHonArc/CharEnt/cmp.pl
+share/MHonArc/MHonArc/CharMaps.pm
+share/MHonArc/MHonArc/Encode.pm
+share/MHonArc/MHonArc/RFC822.pm
 share/MHonArc/MHonArc/UTF8.pm
+share/MHonArc/MHonArc/UTF8/AppleArabic.pm
+share/MHonArc/MHonArc/UTF8/AppleCenteuro.pm
+share/MHonArc/MHonArc/UTF8/AppleCroatian.pm
+share/MHonArc/MHonArc/UTF8/AppleCyrillic.pm
+share/MHonArc/MHonArc/UTF8/AppleGreek.pm
+share/MHonArc/MHonArc/UTF8/AppleHebrew.pm
+share/MHonArc/MHonArc/UTF8/AppleIceland.pm
+share/MHonArc/MHonArc/UTF8/AppleRoman.pm
+share/MHonArc/MHonArc/UTF8/AppleRomanian.pm
+share/MHonArc/MHonArc/UTF8/AppleThai.pm
+share/MHonArc/MHonArc/UTF8/AppleTurkish.pm
+share/MHonArc/MHonArc/UTF8/BIG5_ETEN.pm
+share/MHonArc/MHonArc/UTF8/BIG5_HKSCS.pm
+share/MHonArc/MHonArc/UTF8/CP1250.pm
+share/MHonArc/MHonArc/UTF8/CP1251.pm
+share/MHonArc/MHonArc/UTF8/CP1252.pm
+share/MHonArc/MHonArc/UTF8/CP1253.pm
+share/MHonArc/MHonArc/UTF8/CP1254.pm
+share/MHonArc/MHonArc/UTF8/CP1255.pm
+share/MHonArc/MHonArc/UTF8/CP1256.pm
+share/MHonArc/MHonArc/UTF8/CP1257.pm
+share/MHonArc/MHonArc/UTF8/CP1258.pm
+share/MHonArc/MHonArc/UTF8/CP866.pm
+share/MHonArc/MHonArc/UTF8/CP932.pm
+share/MHonArc/MHonArc/UTF8/CP936.pm
+share/MHonArc/MHonArc/UTF8/CP949.pm
+share/MHonArc/MHonArc/UTF8/CP950.pm
+share/MHonArc/MHonArc/UTF8/EUC_JP.pm
+share/MHonArc/MHonArc/UTF8/Encode.pm
+share/MHonArc/MHonArc/UTF8/GB2312.pm
+share/MHonArc/MHonArc/UTF8/GOST19768_87.pm
+share/MHonArc/MHonArc/UTF8/HP_ROMAN8.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_1.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_10.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_11.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_13.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_14.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_15.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_16.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_2.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_3.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_4.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_5.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_6.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_7.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_8.pm
+share/MHonArc/MHonArc/UTF8/ISO8859_9.pm
+share/MHonArc/MHonArc/UTF8/KOI8_A.pm
+share/MHonArc/MHonArc/UTF8/KOI8_B.pm
+share/MHonArc/MHonArc/UTF8/KOI8_E.pm
+share/MHonArc/MHonArc/UTF8/KOI8_F.pm
+share/MHonArc/MHonArc/UTF8/KOI8_R.pm
+share/MHonArc/MHonArc/UTF8/KOI8_U.pm
+share/MHonArc/MHonArc/UTF8/KOI_0.pm
+share/MHonArc/MHonArc/UTF8/KOI_7.pm
+share/MHonArc/MHonArc/UTF8/MapUTF8.pm
+share/MHonArc/MHonArc/UTF8/MhaEncode.pm
+share/MHonArc/MHonArc/UTF8/VISCII.pm
 share/MHonArc/base64.pl
 share/MHonArc/ewhutil.pl
 share/MHonArc/iso2022jp.pl
@@ -55,14 +153,12 @@ share/MHonArc/mhtime.pl
 share/MHonArc/mhtxtenrich.pl
 share/MHonArc/mhtxthtml.pl
 share/MHonArc/mhtxtplain.pl
-share/MHonArc/mhtxtsetext.pl
 share/MHonArc/mhtxttsv.pl
 share/MHonArc/mhusage.pl
 share/MHonArc/mhutil.pl
 share/MHonArc/osinit.pl
 share/MHonArc/qprint.pl
 share/MHonArc/readmail.pl
-share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/app-api.html
 %%PORTDOCS%%share/doc/MHonArc/app-bugs.html
 %%PORTDOCS%%share/doc/MHonArc/app-diagnos.html
@@ -75,11 +171,6 @@ share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/commontasks.html
 %%PORTDOCS%%share/doc/MHonArc/contacts.html
 %%PORTDOCS%%share/doc/MHonArc/faq.png
-%%PORTDOCS%%share/doc/MHonArc/faq/Makefile
-%%PORTDOCS%%share/doc/MHonArc/faq/_helper/Makefile
-%%PORTDOCS%%share/doc/MHonArc/faq/_helper/addbuttons.pl
-%%PORTDOCS%%share/doc/MHonArc/faq/_helper/addtoc-i.pl
-%%PORTDOCS%%share/doc/MHonArc/faq/_helper/addtoc.pl
 %%PORTDOCS%%share/doc/MHonArc/faq/about.html
 %%PORTDOCS%%share/doc/MHonArc/faq/archives.html
 %%PORTDOCS%%share/doc/MHonArc/faq/envs.html
@@ -109,11 +200,11 @@ share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/rcfileexs/frames.mrc.html
 %%PORTDOCS%%share/doc/MHonArc/rcfileexs/icons.mrc.html
 %%PORTDOCS%%share/doc/MHonArc/rcfileexs/subject.mrc.html
+%%PORTDOCS%%share/doc/MHonArc/rcfileexs/utf-8-encode.mrc.html
 %%PORTDOCS%%share/doc/MHonArc/rcfileexs/utf-8.mrc.html
 %%PORTDOCS%%share/doc/MHonArc/rcvars.html
 %%PORTDOCS%%share/doc/MHonArc/relnotes.html
 %%PORTDOCS%%share/doc/MHonArc/resources.html
-%%PORTDOCS%%share/doc/MHonArc/resources/Makefile
 %%PORTDOCS%%share/doc/MHonArc/resources/add.html
 %%PORTDOCS%%share/doc/MHonArc/resources/addressmodifycode.html
 %%PORTDOCS%%share/doc/MHonArc/resources/afs.html
@@ -123,6 +214,7 @@ share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/resources/authorend.html
 %%PORTDOCS%%share/doc/MHonArc/resources/authsort.html
 %%PORTDOCS%%share/doc/MHonArc/resources/botlinks.html
+%%PORTDOCS%%share/doc/MHonArc/resources/charsetaliases.html
 %%PORTDOCS%%share/doc/MHonArc/resources/charsetconverters.html
 %%PORTDOCS%%share/doc/MHonArc/resources/checknoarchive.html
 %%PORTDOCS%%share/doc/MHonArc/resources/conlen.html
@@ -130,7 +222,9 @@ share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/resources/daybegin.html
 %%PORTDOCS%%share/doc/MHonArc/resources/dayend.html
 %%PORTDOCS%%share/doc/MHonArc/resources/dbfile.html
+%%PORTDOCS%%share/doc/MHonArc/resources/dbfileperms.html
 %%PORTDOCS%%share/doc/MHonArc/resources/decodeheads.html
+%%PORTDOCS%%share/doc/MHonArc/resources/defcharset.html
 %%PORTDOCS%%share/doc/MHonArc/resources/definederived.html
 %%PORTDOCS%%share/doc/MHonArc/resources/definevar.html
 %%PORTDOCS%%share/doc/MHonArc/resources/defrcfile.html
@@ -144,7 +238,9 @@ share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/resources/fieldorder.html
 %%PORTDOCS%%share/doc/MHonArc/resources/fieldsbeg.html
 %%PORTDOCS%%share/doc/MHonArc/resources/fieldsend.html
+%%PORTDOCS%%share/doc/MHonArc/resources/fieldstore.html
 %%PORTDOCS%%share/doc/MHonArc/resources/fieldstyles.html
+%%PORTDOCS%%share/doc/MHonArc/resources/fileperms.html
 %%PORTDOCS%%share/doc/MHonArc/resources/firstpglink.html
 %%PORTDOCS%%share/doc/MHonArc/resources/fldbeg.html
 %%PORTDOCS%%share/doc/MHonArc/resources/fldend.html
@@ -162,6 +258,7 @@ share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/resources/headbodysep.html
 %%PORTDOCS%%share/doc/MHonArc/resources/htmlext.html
 %%PORTDOCS%%share/doc/MHonArc/resources/icons.html
+%%PORTDOCS%%share/doc/MHonArc/resources/iconurlprefix.html
 %%PORTDOCS%%share/doc/MHonArc/resources/idxfname.html
 %%PORTDOCS%%share/doc/MHonArc/resources/idxlabel.html
 %%PORTDOCS%%share/doc/MHonArc/resources/idxpgbegin.html
@@ -194,6 +291,7 @@ share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/resources/mimedecoders.html
 %%PORTDOCS%%share/doc/MHonArc/resources/mimeexcs.html
 %%PORTDOCS%%share/doc/MHonArc/resources/mimefilters.html
+%%PORTDOCS%%share/doc/MHonArc/resources/modifybodyaddresses.html
 %%PORTDOCS%%share/doc/MHonArc/resources/modtime.html
 %%PORTDOCS%%share/doc/MHonArc/resources/months.html
 %%PORTDOCS%%share/doc/MHonArc/resources/monthsabr.html
@@ -235,6 +333,7 @@ share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/resources/prevpglinkia.html
 %%PORTDOCS%%share/doc/MHonArc/resources/quiet.html
 %%PORTDOCS%%share/doc/MHonArc/resources/rcfile.html
+%%PORTDOCS%%share/doc/MHonArc/resources/reconvert.html
 %%PORTDOCS%%share/doc/MHonArc/resources/refsbegin.html
 %%PORTDOCS%%share/doc/MHonArc/resources/refsend.html
 %%PORTDOCS%%share/doc/MHonArc/resources/refslitxt.html
@@ -259,7 +358,12 @@ share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/resources/subsort.html
 %%PORTDOCS%%share/doc/MHonArc/resources/tcontbegin.html
 %%PORTDOCS%%share/doc/MHonArc/resources/tcontend.html
+%%PORTDOCS%%share/doc/MHonArc/resources/tendbuttonia.html
+%%PORTDOCS%%share/doc/MHonArc/resources/tendlink.html
+%%PORTDOCS%%share/doc/MHonArc/resources/tendlinkia.html
+%%PORTDOCS%%share/doc/MHonArc/resources/tendbutton.html
 %%PORTDOCS%%share/doc/MHonArc/resources/textclipfunc.html
+%%PORTDOCS%%share/doc/MHonArc/resources/textencode.html
 %%PORTDOCS%%share/doc/MHonArc/resources/tfirstpglink.html
 %%PORTDOCS%%share/doc/MHonArc/resources/tfoot.html
 %%PORTDOCS%%share/doc/MHonArc/resources/thead.html
@@ -343,7 +447,11 @@ share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/resources/tsubsort.html
 %%PORTDOCS%%share/doc/MHonArc/resources/ttitle.html
 %%PORTDOCS%%share/doc/MHonArc/resources/ttopbegin.html
+%%PORTDOCS%%share/doc/MHonArc/resources/ttopbutton.html
+%%PORTDOCS%%share/doc/MHonArc/resources/ttopbuttonia.html
 %%PORTDOCS%%share/doc/MHonArc/resources/ttopend.html
+%%PORTDOCS%%share/doc/MHonArc/resources/ttoplink.html
+%%PORTDOCS%%share/doc/MHonArc/resources/ttoplinkia.html
 %%PORTDOCS%%share/doc/MHonArc/resources/umask.html
 %%PORTDOCS%%share/doc/MHonArc/resources/uselocaltime.html
 %%PORTDOCS%%share/doc/MHonArc/resources/usinglastpg.html
@@ -355,9 +463,10 @@ share/MHonArc/rfc822.pl
 %%PORTDOCS%%share/doc/MHonArc/up.png
 %%PORTDOCS%%@dirrm share/doc/MHonArc/resources
 %%PORTDOCS%%@dirrm share/doc/MHonArc/rcfileexs
-%%PORTDOCS%%@dirrm share/doc/MHonArc/faq/_helper
 %%PORTDOCS%%@dirrm share/doc/MHonArc/faq
 %%PORTDOCS%%@dirrm share/doc/MHonArc
+@dirrm share/MHonArc/MHonArc/UTF8
 @dirrm share/MHonArc/MHonArc/CharEnt
+@dirrm share/MHonArc/MHonArc/Char
 @dirrm share/MHonArc/MHonArc
 @dirrm share/MHonArc