From 7f4d851fca6ebd544921f9964be6f32b002e9641 Mon Sep 17 00:00:00 2001 From: margarida Date: Sun, 16 Feb 2003 20:21:12 +0000 Subject: [PATCH] Update to version 2.6.0 -- This version includes much improved character encoding support, including support for Japanese, Chinese, UTF-8, and other encodings. The flowed text conversion was improved. There are security enhancements, mail address rewriting in message bodies, and other new features and bugfixes. Changelog: http://www.mhonarc.org/MHonArc/CHANGES --- www/mhonarc/Makefile | 9 +- www/mhonarc/distinfo | 6 +- www/mhonarc/patches/patch-Makefile_PL | 22 +-- www/mhonarc/patches/patch-extras_HtmlMail | 8 - www/mhonarc/patches/patch-extras_MosaicMail | 9 -- www/mhonarc/pkg/PLIST | 155 +++++++++++++++++--- 6 files changed, 149 insertions(+), 60 deletions(-) delete mode 100644 www/mhonarc/patches/patch-extras_HtmlMail delete mode 100644 www/mhonarc/patches/patch-extras_MosaicMail diff --git a/www/mhonarc/Makefile b/www/mhonarc/Makefile index 7f67cbdddbb..3ac6ed0ff29 100644 --- a/www/mhonarc/Makefile +++ b/www/mhonarc/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.16 2002/12/29 22:01:49 margarida Exp $ +# $OpenBSD: Makefile,v 1.17 2003/02/16 20:21:12 margarida Exp $ COMMENT= "highly customizable e-mail to HTML converter" -VERSION= 2.5.14 +VERSION= 2.6.0 DISTNAME= MHonArc${VERSION} PKGNAME= mhonarc-${VERSION} CATEGORIES= www mail @@ -28,6 +28,7 @@ CONFIGURE_STYLE= perl ALL_TARGET= default EXAMPLES= mha-preview mhasiteinit.pl mhonarc.vim *.mrc +EXTRAS= mha-mhedit/* post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mhonarc @@ -35,7 +36,7 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mhonarc/extras cd ${WRKSRC}/examples && ${INSTALL_DATA} ${EXAMPLES} \ ${PREFIX}/share/examples/mhonarc/examples - cd ${WRKSRC}/extras && ${INSTALL_DATA} HtmlMail MosaicMail \ + cd ${WRKSRC}/extras && ${INSTALL_DATA} ${EXTRAS} \ ${PREFIX}/share/examples/mhonarc/extras - + .include diff --git a/www/mhonarc/distinfo b/www/mhonarc/distinfo index 39e02dac083..61c3bab5533 100644 --- a/www/mhonarc/distinfo +++ b/www/mhonarc/distinfo @@ -1,3 +1,3 @@ -MD5 (MHonArc2.5.14.tar.gz) = 72a94fd1b93d940f617cbfdb3989328c -RMD160 (MHonArc2.5.14.tar.gz) = a046b8e5ed13d66484748efb4c02f9f76709ae6d -SHA1 (MHonArc2.5.14.tar.gz) = 147307012fc0541c2a4806bf50bd5c30c62e46c8 +MD5 (MHonArc2.6.0.tar.gz) = 206d20256aae9fe59e5d203dcce6fdec +RMD160 (MHonArc2.6.0.tar.gz) = 98f54d6a138ef6eea11ac19c84eba924d1a4c18b +SHA1 (MHonArc2.6.0.tar.gz) = 1f96a0aca1efdf53b6c2b658dd332e0ec67a2cbc diff --git a/www/mhonarc/patches/patch-Makefile_PL b/www/mhonarc/patches/patch-Makefile_PL index ccc42f7b6a7..6ad97ddf5f2 100644 --- a/www/mhonarc/patches/patch-Makefile_PL +++ b/www/mhonarc/patches/patch-Makefile_PL @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_PL,v 1.1 2002/09/15 01:09:47 pvalchev Exp $ ---- Makefile.PL.orig Thu Apr 4 08:07:48 2002 -+++ Makefile.PL Tue Sep 10 21:31:06 2002 +$OpenBSD: patch-Makefile_PL,v 1.2 2003/02/16 20:21:12 margarida Exp $ +--- Makefile.PL.orig Sat Jan 4 04:44:21 2003 ++++ Makefile.PL Sun Feb 16 19:40:24 2003 @@ -21,8 +21,8 @@ foreach (@ARGV) { } my $opt_prefix = defined($vars{'PREFIX'}) ? @@ -21,20 +21,12 @@ $OpenBSD: patch-Makefile_PL,v 1.1 2002/09/15 01:09:47 pvalchev Exp $ $opt_manpath =~ s/man1$//; my $instme_args = "$opt_prefix $opt_binpath $opt_libpath $opt_manpath"; -@@ -70,7 +70,7 @@ default: pod2man - release-prep: autodoc relnotes bugs install-doc +@@ -64,7 +64,7 @@ default: _FORCE + \$(CHMOD) -R a+r,a+X . - install: + install: _FORCE - \$(PERL) \$(INSTALLPRG) -batch $instme_args + \$(PERL) \$(INSTALLPRG) -batch $instme_args -docpath $vars{'PREFIX'}/share/doc/mhonarc - install-ask: + install-ask: _FORCE \$(PERL) \$(INSTALLPRG) $instme_args -@@ -79,7 +79,6 @@ install-doc: - w3m doc/install.html -cols 76 > INSTALL - - pod2man: -- -\@\$(MKDIR) man - \@for i in \$(PRGS) ; \\ - do( \\ - echo "Manifying \$\$i ..."; \\ diff --git a/www/mhonarc/patches/patch-extras_HtmlMail b/www/mhonarc/patches/patch-extras_HtmlMail deleted file mode 100644 index de85194365f..00000000000 --- a/www/mhonarc/patches/patch-extras_HtmlMail +++ /dev/null @@ -1,8 +0,0 @@ -$OpenBSD: patch-extras_HtmlMail,v 1.1 2002/09/15 01:09:47 pvalchev Exp $ ---- extras/HtmlMail.orig Tue Sep 10 04:58:35 2002 -+++ extras/HtmlMail Tue Sep 10 05:00:06 2002 -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/perl - - ##---------------------------------------------------------------------------## diff --git a/www/mhonarc/patches/patch-extras_MosaicMail b/www/mhonarc/patches/patch-extras_MosaicMail deleted file mode 100644 index b12fe8fc102..00000000000 --- a/www/mhonarc/patches/patch-extras_MosaicMail +++ /dev/null @@ -1,9 +0,0 @@ -$OpenBSD: patch-extras_MosaicMail,v 1.1 2002/09/15 01:09:47 pvalchev Exp $ ---- extras/MosaicMail.orig Tue Sep 10 04:59:23 2002 -+++ extras/MosaicMail Tue Sep 10 04:59:52 2002 -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/perl - - ##---------------------------------------------------------------------------## - diff --git a/www/mhonarc/pkg/PLIST b/www/mhonarc/pkg/PLIST index 30951ed24bc..16f2b6f7a8d 100644 --- a/www/mhonarc/pkg/PLIST +++ b/www/mhonarc/pkg/PLIST @@ -1,32 +1,130 @@ -@comment $OpenBSD: PLIST,v 1.4 2002/09/15 01:09:47 pvalchev Exp $ +@comment $OpenBSD: PLIST,v 1.5 2003/02/16 20:21:12 margarida Exp $ bin/mha-dbedit bin/mha-dbrecover bin/mha-decode bin/mhonarc +${P5SITE}/MHonArc/Char.pm +${P5SITE}/MHonArc/Char/JP.pm +${P5SITE}/MHonArc/Char/KR.pm ${P5SITE}/MHonArc/CharEnt.pm +${P5SITE}/MHonArc/CharEnt/AppleArabic.pm +${P5SITE}/MHonArc/CharEnt/AppleCenteuro.pm +${P5SITE}/MHonArc/CharEnt/AppleCroatian.pm +${P5SITE}/MHonArc/CharEnt/AppleCyrillic.pm +${P5SITE}/MHonArc/CharEnt/AppleGreek.pm +${P5SITE}/MHonArc/CharEnt/AppleHebrew.pm +${P5SITE}/MHonArc/CharEnt/AppleIceland.pm +${P5SITE}/MHonArc/CharEnt/AppleRoman.pm +${P5SITE}/MHonArc/CharEnt/AppleRomanian.pm +${P5SITE}/MHonArc/CharEnt/AppleThai.pm +${P5SITE}/MHonArc/CharEnt/AppleTurkish.pm +${P5SITE}/MHonArc/CharEnt/BIG5_ETEN.pm +${P5SITE}/MHonArc/CharEnt/BIG5_HKSCS.pm ${P5SITE}/MHonArc/CharEnt/CP1250.pm +${P5SITE}/MHonArc/CharEnt/CP1251.pm ${P5SITE}/MHonArc/CharEnt/CP1252.pm +${P5SITE}/MHonArc/CharEnt/CP1253.pm +${P5SITE}/MHonArc/CharEnt/CP1254.pm +${P5SITE}/MHonArc/CharEnt/CP1255.pm +${P5SITE}/MHonArc/CharEnt/CP1256.pm +${P5SITE}/MHonArc/CharEnt/CP1257.pm +${P5SITE}/MHonArc/CharEnt/CP1258.pm +${P5SITE}/MHonArc/CharEnt/CP866.pm +${P5SITE}/MHonArc/CharEnt/CP932.pm +${P5SITE}/MHonArc/CharEnt/CP936.pm +${P5SITE}/MHonArc/CharEnt/CP949.pm +${P5SITE}/MHonArc/CharEnt/CP950.pm +${P5SITE}/MHonArc/CharEnt/EUC_JP.pm +${P5SITE}/MHonArc/CharEnt/GB2312.pm +${P5SITE}/MHonArc/CharEnt/GOST19768_87.pm +${P5SITE}/MHonArc/CharEnt/HP_ROMAN8.pm ${P5SITE}/MHonArc/CharEnt/ISO8859_1.pm ${P5SITE}/MHonArc/CharEnt/ISO8859_10.pm -${P5SITE}/MHonArc/CharEnt/ISO8859_10R.pm +${P5SITE}/MHonArc/CharEnt/ISO8859_11.pm +${P5SITE}/MHonArc/CharEnt/ISO8859_13.pm +${P5SITE}/MHonArc/CharEnt/ISO8859_14.pm ${P5SITE}/MHonArc/CharEnt/ISO8859_15.pm -${P5SITE}/MHonArc/CharEnt/ISO8859_15R.pm -${P5SITE}/MHonArc/CharEnt/ISO8859_1R.pm +${P5SITE}/MHonArc/CharEnt/ISO8859_16.pm ${P5SITE}/MHonArc/CharEnt/ISO8859_2.pm ${P5SITE}/MHonArc/CharEnt/ISO8859_3.pm -${P5SITE}/MHonArc/CharEnt/ISO8859_3R.pm ${P5SITE}/MHonArc/CharEnt/ISO8859_4.pm ${P5SITE}/MHonArc/CharEnt/ISO8859_5.pm ${P5SITE}/MHonArc/CharEnt/ISO8859_6.pm ${P5SITE}/MHonArc/CharEnt/ISO8859_7.pm -${P5SITE}/MHonArc/CharEnt/ISO8859_7R.pm ${P5SITE}/MHonArc/CharEnt/ISO8859_8.pm -${P5SITE}/MHonArc/CharEnt/ISO8859_8R.pm ${P5SITE}/MHonArc/CharEnt/ISO8859_9.pm -${P5SITE}/MHonArc/CharEnt/ISO8859_9R.pm -${P5SITE}/MHonArc/CharEnt/Makefile -${P5SITE}/MHonArc/Makefile +${P5SITE}/MHonArc/CharEnt/KOI8_A.pm +${P5SITE}/MHonArc/CharEnt/KOI8_B.pm +${P5SITE}/MHonArc/CharEnt/KOI8_E.pm +${P5SITE}/MHonArc/CharEnt/KOI8_F.pm +${P5SITE}/MHonArc/CharEnt/KOI8_R.pm +${P5SITE}/MHonArc/CharEnt/KOI8_U.pm +${P5SITE}/MHonArc/CharEnt/KOI_0.pm +${P5SITE}/MHonArc/CharEnt/KOI_7.pm +${P5SITE}/MHonArc/CharEnt/VISCII.pm +${P5SITE}/MHonArc/CharEnt/cmp.pl +${P5SITE}/MHonArc/CharMaps.pm +${P5SITE}/MHonArc/Encode.pm +${P5SITE}/MHonArc/RFC822.pm ${P5SITE}/MHonArc/UTF8.pm +${P5SITE}/MHonArc/UTF8/AppleArabic.pm +${P5SITE}/MHonArc/UTF8/AppleCenteuro.pm +${P5SITE}/MHonArc/UTF8/AppleCroatian.pm +${P5SITE}/MHonArc/UTF8/AppleCyrillic.pm +${P5SITE}/MHonArc/UTF8/AppleGreek.pm +${P5SITE}/MHonArc/UTF8/AppleHebrew.pm +${P5SITE}/MHonArc/UTF8/AppleIceland.pm +${P5SITE}/MHonArc/UTF8/AppleRoman.pm +${P5SITE}/MHonArc/UTF8/AppleRomanian.pm +${P5SITE}/MHonArc/UTF8/AppleThai.pm +${P5SITE}/MHonArc/UTF8/AppleTurkish.pm +${P5SITE}/MHonArc/UTF8/BIG5_ETEN.pm +${P5SITE}/MHonArc/UTF8/BIG5_HKSCS.pm +${P5SITE}/MHonArc/UTF8/CP1250.pm +${P5SITE}/MHonArc/UTF8/CP1251.pm +${P5SITE}/MHonArc/UTF8/CP1252.pm +${P5SITE}/MHonArc/UTF8/CP1253.pm +${P5SITE}/MHonArc/UTF8/CP1254.pm +${P5SITE}/MHonArc/UTF8/CP1255.pm +${P5SITE}/MHonArc/UTF8/CP1256.pm +${P5SITE}/MHonArc/UTF8/CP1257.pm +${P5SITE}/MHonArc/UTF8/CP1258.pm +${P5SITE}/MHonArc/UTF8/CP866.pm +${P5SITE}/MHonArc/UTF8/CP932.pm +${P5SITE}/MHonArc/UTF8/CP936.pm +${P5SITE}/MHonArc/UTF8/CP949.pm +${P5SITE}/MHonArc/UTF8/CP950.pm +${P5SITE}/MHonArc/UTF8/EUC_JP.pm +${P5SITE}/MHonArc/UTF8/Encode.pm +${P5SITE}/MHonArc/UTF8/GB2312.pm +${P5SITE}/MHonArc/UTF8/GOST19768_87.pm +${P5SITE}/MHonArc/UTF8/HP_ROMAN8.pm +${P5SITE}/MHonArc/UTF8/ISO8859_1.pm +${P5SITE}/MHonArc/UTF8/ISO8859_10.pm +${P5SITE}/MHonArc/UTF8/ISO8859_11.pm +${P5SITE}/MHonArc/UTF8/ISO8859_13.pm +${P5SITE}/MHonArc/UTF8/ISO8859_14.pm +${P5SITE}/MHonArc/UTF8/ISO8859_15.pm +${P5SITE}/MHonArc/UTF8/ISO8859_16.pm +${P5SITE}/MHonArc/UTF8/ISO8859_2.pm +${P5SITE}/MHonArc/UTF8/ISO8859_3.pm +${P5SITE}/MHonArc/UTF8/ISO8859_4.pm +${P5SITE}/MHonArc/UTF8/ISO8859_5.pm +${P5SITE}/MHonArc/UTF8/ISO8859_6.pm +${P5SITE}/MHonArc/UTF8/ISO8859_7.pm +${P5SITE}/MHonArc/UTF8/ISO8859_8.pm +${P5SITE}/MHonArc/UTF8/ISO8859_9.pm +${P5SITE}/MHonArc/UTF8/KOI8_A.pm +${P5SITE}/MHonArc/UTF8/KOI8_B.pm +${P5SITE}/MHonArc/UTF8/KOI8_E.pm +${P5SITE}/MHonArc/UTF8/KOI8_F.pm +${P5SITE}/MHonArc/UTF8/KOI8_R.pm +${P5SITE}/MHonArc/UTF8/KOI8_U.pm +${P5SITE}/MHonArc/UTF8/KOI_0.pm +${P5SITE}/MHonArc/UTF8/KOI_7.pm +${P5SITE}/MHonArc/UTF8/MapUTF8.pm +${P5SITE}/MHonArc/UTF8/MhaEncode.pm +${P5SITE}/MHonArc/UTF8/VISCII.pm ${P5SITE}/base64.pl ${P5SITE}/ewhutil.pl ${P5SITE}/iso2022jp.pl @@ -56,14 +154,12 @@ ${P5SITE}/mhtime.pl ${P5SITE}/mhtxtenrich.pl ${P5SITE}/mhtxthtml.pl ${P5SITE}/mhtxtplain.pl -${P5SITE}/mhtxtsetext.pl ${P5SITE}/mhtxttsv.pl ${P5SITE}/mhusage.pl ${P5SITE}/mhutil.pl ${P5SITE}/osinit.pl ${P5SITE}/qprint.pl ${P5SITE}/readmail.pl -${P5SITE}/rfc822.pl man/man1/mha-dbedit.1 man/man1/mha-dbrecover.1 man/man1/mha-decode.1 @@ -80,11 +176,6 @@ share/doc/mhonarc/bug.png share/doc/mhonarc/commontasks.html share/doc/mhonarc/contacts.html share/doc/mhonarc/faq.png -share/doc/mhonarc/faq/Makefile -share/doc/mhonarc/faq/_helper/Makefile -share/doc/mhonarc/faq/_helper/addbuttons.pl -share/doc/mhonarc/faq/_helper/addtoc-i.pl -share/doc/mhonarc/faq/_helper/addtoc.pl share/doc/mhonarc/faq/about.html share/doc/mhonarc/faq/archives.html share/doc/mhonarc/faq/envs.html @@ -114,11 +205,11 @@ share/doc/mhonarc/rcfileexs/def-mime.mrc.html share/doc/mhonarc/rcfileexs/frames.mrc.html share/doc/mhonarc/rcfileexs/icons.mrc.html share/doc/mhonarc/rcfileexs/subject.mrc.html +share/doc/mhonarc/rcfileexs/utf-8-encode.mrc.html share/doc/mhonarc/rcfileexs/utf-8.mrc.html share/doc/mhonarc/rcvars.html share/doc/mhonarc/relnotes.html share/doc/mhonarc/resources.html -share/doc/mhonarc/resources/Makefile share/doc/mhonarc/resources/add.html share/doc/mhonarc/resources/addressmodifycode.html share/doc/mhonarc/resources/afs.html @@ -128,6 +219,7 @@ share/doc/mhonarc/resources/authorbegin.html share/doc/mhonarc/resources/authorend.html share/doc/mhonarc/resources/authsort.html share/doc/mhonarc/resources/botlinks.html +share/doc/mhonarc/resources/charsetaliases.html share/doc/mhonarc/resources/charsetconverters.html share/doc/mhonarc/resources/checknoarchive.html share/doc/mhonarc/resources/conlen.html @@ -135,7 +227,9 @@ share/doc/mhonarc/resources/datefields.html share/doc/mhonarc/resources/daybegin.html share/doc/mhonarc/resources/dayend.html share/doc/mhonarc/resources/dbfile.html +share/doc/mhonarc/resources/dbfileperms.html share/doc/mhonarc/resources/decodeheads.html +share/doc/mhonarc/resources/defcharset.html share/doc/mhonarc/resources/definederived.html share/doc/mhonarc/resources/definevar.html share/doc/mhonarc/resources/defrcfile.html @@ -149,7 +243,9 @@ share/doc/mhonarc/resources/expiredate.html share/doc/mhonarc/resources/fieldorder.html share/doc/mhonarc/resources/fieldsbeg.html share/doc/mhonarc/resources/fieldsend.html +share/doc/mhonarc/resources/fieldstore.html share/doc/mhonarc/resources/fieldstyles.html +share/doc/mhonarc/resources/fileperms.html share/doc/mhonarc/resources/firstpglink.html share/doc/mhonarc/resources/fldbeg.html share/doc/mhonarc/resources/fldend.html @@ -167,6 +263,7 @@ share/doc/mhonarc/resources/gziplinks.html share/doc/mhonarc/resources/headbodysep.html share/doc/mhonarc/resources/htmlext.html share/doc/mhonarc/resources/icons.html +share/doc/mhonarc/resources/iconurlprefix.html share/doc/mhonarc/resources/idxfname.html share/doc/mhonarc/resources/idxlabel.html share/doc/mhonarc/resources/idxpgbegin.html @@ -199,6 +296,7 @@ share/doc/mhonarc/resources/mimeargs.html share/doc/mhonarc/resources/mimedecoders.html share/doc/mhonarc/resources/mimeexcs.html share/doc/mhonarc/resources/mimefilters.html +share/doc/mhonarc/resources/modifybodyaddresses.html share/doc/mhonarc/resources/modtime.html share/doc/mhonarc/resources/months.html share/doc/mhonarc/resources/monthsabr.html @@ -240,6 +338,7 @@ share/doc/mhonarc/resources/prevpglink.html share/doc/mhonarc/resources/prevpglinkia.html share/doc/mhonarc/resources/quiet.html share/doc/mhonarc/resources/rcfile.html +share/doc/mhonarc/resources/reconvert.html share/doc/mhonarc/resources/refsbegin.html share/doc/mhonarc/resources/refsend.html share/doc/mhonarc/resources/refslitxt.html @@ -264,7 +363,12 @@ share/doc/mhonarc/resources/subjectthreads.html share/doc/mhonarc/resources/subsort.html share/doc/mhonarc/resources/tcontbegin.html share/doc/mhonarc/resources/tcontend.html +share/doc/mhonarc/resources/tendbutton.html +share/doc/mhonarc/resources/tendbuttonia.html +share/doc/mhonarc/resources/tendlink.html +share/doc/mhonarc/resources/tendlinkia.html share/doc/mhonarc/resources/textclipfunc.html +share/doc/mhonarc/resources/textencode.html share/doc/mhonarc/resources/tfirstpglink.html share/doc/mhonarc/resources/tfoot.html share/doc/mhonarc/resources/thead.html @@ -348,7 +452,11 @@ share/doc/mhonarc/resources/tsublistend.html share/doc/mhonarc/resources/tsubsort.html share/doc/mhonarc/resources/ttitle.html share/doc/mhonarc/resources/ttopbegin.html +share/doc/mhonarc/resources/ttopbutton.html +share/doc/mhonarc/resources/ttopbuttonia.html share/doc/mhonarc/resources/ttopend.html +share/doc/mhonarc/resources/ttoplink.html +share/doc/mhonarc/resources/ttoplinkia.html share/doc/mhonarc/resources/umask.html share/doc/mhonarc/resources/uselocaltime.html share/doc/mhonarc/resources/usinglastpg.html @@ -367,16 +475,21 @@ share/examples/mhonarc/examples/mha-preview share/examples/mhonarc/examples/mhasiteinit.pl share/examples/mhonarc/examples/mhonarc.vim share/examples/mhonarc/examples/subject.mrc +share/examples/mhonarc/examples/utf-8-encode.mrc share/examples/mhonarc/examples/utf-8.mrc -share/examples/mhonarc/extras/HtmlMail -share/examples/mhonarc/extras/MosaicMail +share/examples/mhonarc/extras/INSTALL +share/examples/mhonarc/extras/README +share/examples/mhonarc/extras/mha-mhedit +share/examples/mhonarc/extras/mha-mhedit.html +share/examples/mhonarc/extras/mha-repl.mrc @dirrm share/examples/mhonarc/extras @dirrm share/examples/mhonarc/examples @dirrm share/examples/mhonarc @dirrm share/doc/mhonarc/resources @dirrm share/doc/mhonarc/rcfileexs -@dirrm share/doc/mhonarc/faq/_helper @dirrm share/doc/mhonarc/faq @dirrm share/doc/mhonarc +@dirrm ${P5SITE}/MHonArc/UTF8 @dirrm ${P5SITE}/MHonArc/CharEnt +@dirrm ${P5SITE}/MHonArc/Char @dirrm ${P5SITE}/MHonArc