Upgrade to v2.4.6

3 files changed, 75 insertions, 40 deletions

diff --git a/www/mhonarc/Makefile b/www/mhonarc/Makefile
index 9337589485ca..e5c1da264d39 100644
--- a/www/mhonarc/Makefile
+++ b/www/mhonarc/Makefile
@@ -6,25 +6,31 @@
 #
 
 PORTNAME=	mhonarc
-PORTVERSION= 	2.3.3
+PORTVERSION= 	2.4.6
 CATEGORIES=	www mail
 MASTER_SITES=	http://www.oac.uci.edu/indiv/ehood/tar/ \
 		ftp://hhobel.phl.univie.ac.at/MHonArc/ \
 		ftp://ftp.redhat.com/contrib/noarch/noarch/ \
 		ftp://ftp.plig.org/pub/CPAN/authors/id/EHOOD/ \
 		http://www.perl.com/CPAN/authors/id/EHOOD/
-DISTNAME=	MHonArc2.3.3
+DISTNAME=	MHonArc2.4.6
 
 MAINTAINER=	jkoshy@freebsd.org
 
 Y2K=		http://www.oac.uci.edu/indiv/ehood/MHonArc/doc/faq/general.html#y2k
 
+USE_BZIP2=	Yes
 USE_PERL5=	Yes
 NO_BUILD=	Yes
 
+MAN1=	mhonarc.1 mha-dbedit.1 mha-dbrecover.1 mha-decode.1
+
 .include <bsd.port.pre.mk>
 
 do-install:
-	cd ${WRKSRC} && ${PERL5} install.me -prefix ${PREFIX} -batch
+	cd ${WRKSRC} && ${PERL5} install.me -binpath ${PREFIX}/bin \
+		-docpath ${PREFIX}/share/doc/MHonArc \
+		-libpath ${PREFIX}/share/MHonArc \
+		-manpath ${PREFIX}/man -batch
 
 .include <bsd.port.post.mk>
diff --git a/www/mhonarc/distinfo b/www/mhonarc/distinfo
index b3e17bb731e0..08fa8b0a641f 100644
--- a/www/mhonarc/distinfo
+++ b/www/mhonarc/distinfo
@@ -1 +1 @@
-MD5 (MHonArc2.3.3.tar.gz) = e2cb627565ae0be7508d37ff987c3fb4
+MD5 (MHonArc2.4.6.tar.bz2) = 9e4eadd3152657e001903b28f90b68f8
diff --git a/www/mhonarc/pkg-plist b/www/mhonarc/pkg-plist
index ebf88e175bb4..3ef66cacb95a 100644
--- a/www/mhonarc/pkg-plist
+++ b/www/mhonarc/pkg-plist
@@ -1,45 +1,53 @@
 bin/mhonarc
 bin/mha-dbedit
 bin/mha-dbrecover
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/base64.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/ewhutil.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/iso8859.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhamain.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhdb.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhdysub.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhexternal.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhfile.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhidxrc.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhindex.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhinit.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhmimetypes.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhmsgfile.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhnote.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhnull.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhopt.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhrcfile.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhrcvars.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhrmm.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhscan.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhsingle.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhthread.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhtime.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhtxttsv.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhtxtenrich.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhtxthtml.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhtxtplain.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhtxtsetext.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhusage.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/mhutil.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/osinit.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/qprint.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/readmail.pl
-lib/perl5/site_perl/%%PERL_VER%%/MHonArc/rfc822.pl
+bin/mha-decode
+share/MHonArc/base64.pl
+share/MHonArc/ewhutil.pl
+share/MHonArc/iso2022jp.pl
+share/MHonArc/iso8859.pl
+share/MHonArc/mhamain.pl
+share/MHonArc/mhdb.pl
+share/MHonArc/mhdysub.pl
+share/MHonArc/mhexternal.pl
+share/MHonArc/mhfile.pl
+share/MHonArc/mhidxrc.pl
+share/MHonArc/mhindex.pl
+share/MHonArc/mhinit.pl
+share/MHonArc/mhlock.pl
+share/MHonArc/mhmimetypes.pl
+share/MHonArc/mhmsgextbody.pl
+share/MHonArc/mhmsgfile.pl
+share/MHonArc/mhnote.pl
+share/MHonArc/mhnull.pl
+share/MHonArc/mhopt.pl
+share/MHonArc/mhrcfile.pl
+share/MHonArc/mhrcvars.pl
+share/MHonArc/mhrmm.pl
+share/MHonArc/mhscan.pl
+share/MHonArc/mhsingle.pl
+share/MHonArc/mhthread.pl
+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
 share/doc/MHonArc/app-bugs.html
 share/doc/MHonArc/app-diagnos.html
+share/doc/MHonArc/app-mimeconf.html
+share/doc/MHonArc/app-rcfileexs.html
+share/doc/MHonArc/app-rcidx.html
 share/doc/MHonArc/app-utilsprg.html
 share/doc/MHonArc/blank.gif
 share/doc/MHonArc/bug.gif
+share/doc/MHonArc/commontasks.html
 share/doc/MHonArc/contacts.html
 share/doc/MHonArc/faq/about.html
 share/doc/MHonArc/faq/envs.html
@@ -56,6 +64,7 @@ share/doc/MHonArc/faq/monsmall_t.gif
 share/doc/MHonArc/faq.gif
 share/doc/MHonArc/home.gif
 share/doc/MHonArc/index.html
+share/doc/MHonArc/install.html
 share/doc/MHonArc/intro.html
 share/doc/MHonArc/layout.html
 share/doc/MHonArc/mhonarc.html
@@ -63,6 +72,11 @@ share/doc/MHonArc/monicon.gif
 share/doc/MHonArc/next.gif
 share/doc/MHonArc/prev.gif
 share/doc/MHonArc/quickstart.html
+share/doc/MHonArc/rcfileexs/date.mrc.html
+share/doc/MHonArc/rcfileexs/icons.mrc.html
+share/doc/MHonArc/rcfileexs/def-mime.mrc.html
+share/doc/MHonArc/rcfileexs/frames.mrc.html
+share/doc/MHonArc/rcfileexs/subject.mrc.html
 share/doc/MHonArc/rcvars.html
 share/doc/MHonArc/resources/mimefilters.html
 share/doc/MHonArc/resources/tprevpglink.html
@@ -239,11 +253,26 @@ share/doc/MHonArc/resources/notetext.html
 share/doc/MHonArc/resources/subjectstripcode.html
 share/doc/MHonArc/resources/msgpgs.html
 share/doc/MHonArc/resources/uselocaltime.html
+share/doc/MHonArc/resources/stderr.html
+share/doc/MHonArc/resources/addressmodifycode.html
+share/doc/MHonArc/resources/lockmethod.html
+share/doc/MHonArc/resources/spammode.html
+share/doc/MHonArc/resources/ssmarkup.html
+share/doc/MHonArc/resources/stdout.html
+share/doc/MHonArc/resources/subjectthreads.html
+share/doc/MHonArc/resources/checknoarchive.html
+share/doc/MHonArc/resources/msgexcfilter.html
+share/doc/MHonArc/resources/saveresources.html
+share/doc/MHonArc/resources/stdin.html
+share/doc/MHonArc/resources/posixstrftime.html
+share/doc/MHonArc/resources/mimedecoders.html
+share/doc/MHonArc/resources/varregex.html
 share/doc/MHonArc/resources.html
 share/doc/MHonArc/ssbg75.jpg
 share/doc/MHonArc/stampwb2.gif
 share/doc/MHonArc/up.gif
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/MHonArc
-@dirrm share/doc/MHonArc/faq
 @dirrm share/doc/MHonArc/resources
+@dirrm share/doc/MHonArc/rcfileexs
+@dirrm share/doc/MHonArc/faq
 @dirrm share/doc/MHonArc
+@dirrm share/MHonArc