Update to 2.063.

5 files changed, 231 insertions, 153 deletions

diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index 1eb7e442a1ce..5010ca08121c 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -6,135 +6,45 @@
 #
 
 PORTNAME=	Mail-Box
-PORTVERSION=	2.042
+PORTVERSION=	2.063
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
-COMMENT=	Perl module implementing a modern mail-folder managerat
-
-BUILD_DEPENDS=	${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
-		${SITE_PERL}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
-		${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils \
-		${SITE_PERL}/Object/Realize/Later.pm:${PORTSDIR}/devel/p5-Object-Realize-Later \
-		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+COMMENT=	Perl module implementing a modern mail folder management
+
+BUILD_DEPENDS=	\
+	${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+	${SITE_PERL}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
+	${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
+	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
+	p5-File-Remove>=0.20:${PORTSDIR}/devel/p5-File-Remove \
+	p5-HTML-Format>=2.01:${PORTSDIR}/textproc/p5-HTML-Format \
+	p5-HTML-Tree>=3.13:${PORTSDIR}/www/p5-HTML-Tree \
+	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
+	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
+	p5-Mail-IMAPClient>=2.2.8:${PORTSDIR}/mail/p5-Mail-IMAPClient \
+	p5-Mail-Transport-Dbx>=0.04:${PORTSDIR}/mail/p5-Mail-Transport-Dbx \
+	p5-Object-Realize-Later>=0.14:${PORTSDIR}/devel/p5-Object-Realize-Later \
+	p5-Scalar-List-Utils>=1.13:${PORTSDIR}/lang/p5-Scalar-List-Utils \
+	p5-Time-HiRes>=1.51:${PORTSDIR}/devel/p5-Time-HiRes \
+	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
+	p5-URI>=1.23:${PORTSDIR}/net/p5-URI \
+	p5-User-Identity>=0.90:${PORTSDIR}/devel/p5-User-Identity
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
+CONFIGURE_ARGS=	</dev/null
+CONFIGURE_ENV+=	MAILBOX_INSTALL_OPTIONALS=n
 
+.include "Makefile.man"
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-IGNORE=	"This port requires perl 5.6 or newer.  Install lang/perl5 or lang/perl5.8 and try again."
+.if ${PERL_LEVEL} < 500601
+IGNORE=	requires perl 5.6.1 or newer. Install lang/perl5.8 and try again
 .endif
 
-MAN3=		\
-		Mail::Box-Cookbook.3 \
-		Mail::Box-Overview.3 \
-		Mail::Box.3 \
-		Mail::Box::Dbx.3 \
-		Mail::Box::Dbx::Message.3 \
-		Mail::Box::Dir.3 \
-		Mail::Box::Dir::Message.3 \
-		Mail::Box::File.3 \
-		Mail::Box::File::Message.3 \
-		Mail::Box::IMAP4.3 \
-		Mail::Box::IMAP4::Message.3 \
-		Mail::Box::Locker.3 \
-		Mail::Box::Locker::DotLock.3 \
-		Mail::Box::Locker::Flock.3 \
-		Mail::Box::Locker::Multi.3 \
-		Mail::Box::Locker::NFS.3 \
-		Mail::Box::Locker::POSIX.3 \
-		Mail::Box::MH.3 \
-		Mail::Box::MH::Index.3 \
-		Mail::Box::MH::Labels.3 \
-		Mail::Box::MH::Message.3 \
-		Mail::Box::Maildir.3 \
-		Mail::Box::Maildir::Message.3 \
-		Mail::Box::Manager.3 \
-		Mail::Box::Mbox.3 \
-		Mail::Box::Mbox::Message.3 \
-		Mail::Box::Message.3 \
-		Mail::Message::Head::Partial.3 \
-		Mail::Box::Net.3 \
-		Mail::Box::Net::Message.3 \
-		Mail::Box::POP3.3 \
-		Mail::Box::POP3::Message.3 \
-		Mail::Box::Parser.3 \
-		Mail::Box::Parser::Perl.3 \
-		Mail::Box::Search.3 \
-		Mail::Box::Search::Grep.3 \
-		Mail::Box::Search::IMAP.3 \
-		Mail::Box::Search::SpamAssassin.3 \
-		Mail::Box::Thread::Manager.3 \
-		Mail::Box::Thread::Node.3 \
-		Mail::Box::Tie.3 \
-		Mail::Box::Tie::ARRAY.3 \
-		Mail::Box::Tie::HASH.3 \
-		Mail::Message.3 \
-		Mail::Message::Body.3 \
-		Mail::Message::Body::Construct.3 \
-		Mail::Message::Body::Delayed.3 \
-		Mail::Message::Body::Encode.3 \
-		Mail::Message::Body::File.3 \
-		Mail::Message::Body::Lines.3 \
-		Mail::Message::Body::Multipart.3 \
-		Mail::Message::Body::Nested.3 \
-		Mail::Message::Body::String.3 \
-		Mail::Message::Construct.3 \
-		Mail::Message::Construct::Bounce.3 \
-		Mail::Message::Construct::Build.3 \
-		Mail::Message::Construct::Forward.3 \
-		Mail::Message::Construct::Read.3 \
-		Mail::Message::Construct::Rebuild.3 \
-		Mail::Message::Construct::Reply.3 \
-		Mail::Message::Construct::Text.3 \
-		Mail::Message::Convert.3 \
-		Mail::Message::Convert::Html.3 \
-		Mail::Message::Convert::HtmlFormatPS.3 \
-		Mail::Message::Convert::HtmlFormatText.3 \
-		Mail::Message::Convert::MailInternet.3 \
-		Mail::Message::Convert::MimeEntity.3 \
-		Mail::Message::Convert::TextAutoformat.3 \
-		Mail::Message::Dummy.3 \
-		Mail::Message::Field.3 \
-		Mail::Message::Field::AddrGroup.3 \
-		Mail::Message::Field::Address.3 \
-		Mail::Message::Field::Addresses.3 \
-		Mail::Message::Field::Attribute.3 \
-		Mail::Message::Field::Fast.3 \
-		Mail::Message::Field::Flex.3 \
-		Mail::Message::Field::Full.3 \
-		Mail::Message::Field::Unstructured.3 \
-		Mail::Message::Head.3 \
-		Mail::Message::Head::Complete.3 \
-		Mail::Message::Head::Delayed.3 \
-		Mail::Message::Head::ResentGroup.3 \
-		Mail::Message::Head::Subset.3 \
-		Mail::Message::Part.3 \
-		Mail::Message::TransferEnc.3 \
-		Mail::Message::TransferEnc::Base64.3 \
-		Mail::Message::TransferEnc::Binary.3 \
-		Mail::Message::TransferEnc::EightBit.3 \
-		Mail::Message::TransferEnc::QuotedPrint.3 \
-		Mail::Message::TransferEnc::SevenBit.3 \
-		Mail::Message::Wrapper::SpamAssassin.3 \
-		Mail::Reporter.3 \
-		Mail::Transport.3 \
-		Mail::Transport::Exim.3 \
-		Mail::Transport::IMAP4.3 \
-		Mail::Transport::Mailx.3 \
-		Mail::Transport::POP3.3 \
-		Mail::Transport::Qmail.3 \
-		Mail::Transport::Receive.3 \
-		Mail::Transport::SMTP.3 \
-		Mail::Transport::Send.3 \
-		Mail::Transport::Sendmail.3
-
 .include <bsd.port.post.mk>
diff --git a/mail/p5-Mail-Box/Makefile.man b/mail/p5-Mail-Box/Makefile.man
new file mode 100644
index 000000000000..cba6dffbbe0a
--- /dev/null
+++ b/mail/p5-Mail-Box/Makefile.man
@@ -0,0 +1,122 @@
+# $FreeBSD$
+
+MAN3+=	Mail::Box-Cookbook.3
+MAN3+=	Mail::Box-Index.3
+MAN3+=	Mail::Box-Overview.3
+MAN3+=	Mail::Box.3
+MAN3+=	Mail::Box::Collection.3
+MAN3+=	Mail::Box::Dbx.3
+MAN3+=	Mail::Box::Dbx::Message.3
+MAN3+=	Mail::Box::Dir.3
+MAN3+=	Mail::Box::Dir::Message.3
+MAN3+=	Mail::Box::FastScalar.3
+MAN3+=	Mail::Box::File.3
+MAN3+=	Mail::Box::File::Message.3
+MAN3+=	Mail::Box::IMAP4.3
+MAN3+=	Mail::Box::IMAP4::Head.3
+MAN3+=	Mail::Box::IMAP4::Message.3
+MAN3+=	Mail::Box::Identity.3
+MAN3+=	Mail::Box::Locker.3
+MAN3+=	Mail::Box::Locker::DotLock.3
+MAN3+=	Mail::Box::Locker::Flock.3
+MAN3+=	Mail::Box::Locker::Multi.3
+MAN3+=	Mail::Box::Locker::NFS.3
+MAN3+=	Mail::Box::Locker::POSIX.3
+MAN3+=	Mail::Box::MH.3
+MAN3+=	Mail::Box::MH::Index.3
+MAN3+=	Mail::Box::MH::Labels.3
+MAN3+=	Mail::Box::MH::Message.3
+MAN3+=	Mail::Box::Maildir.3
+MAN3+=	Mail::Box::Maildir::Message.3
+MAN3+=	Mail::Box::Manage::User.3
+MAN3+=	Mail::Box::Manager.3
+MAN3+=	Mail::Box::Mbox.3
+MAN3+=	Mail::Box::Mbox::Message.3
+MAN3+=	Mail::Box::Message.3
+MAN3+=	Mail::Box::Message::Destructed.3
+MAN3+=	Mail::Box::Net.3
+MAN3+=	Mail::Box::Net::Message.3
+MAN3+=	Mail::Box::POP3.3
+MAN3+=	Mail::Box::POP3::Message.3
+MAN3+=	Mail::Box::Parser.3
+MAN3+=	Mail::Box::Parser::Perl.3
+MAN3+=	Mail::Box::Search.3
+MAN3+=	Mail::Box::Search::Grep.3
+MAN3+=	Mail::Box::Search::SpamAssassin.3
+MAN3+=	Mail::Box::Thread::Manager.3
+MAN3+=	Mail::Box::Thread::Node.3
+MAN3+=	Mail::Box::Tie.3
+MAN3+=	Mail::Box::Tie::ARRAY.3
+MAN3+=	Mail::Box::Tie::HASH.3
+MAN3+=	Mail::Message.3
+MAN3+=	Mail::Message::Body.3
+MAN3+=	Mail::Message::Body::Construct.3
+MAN3+=	Mail::Message::Body::Delayed.3
+MAN3+=	Mail::Message::Body::Encode.3
+MAN3+=	Mail::Message::Body::File.3
+MAN3+=	Mail::Message::Body::Lines.3
+MAN3+=	Mail::Message::Body::Multipart.3
+MAN3+=	Mail::Message::Body::Nested.3
+MAN3+=	Mail::Message::Body::String.3
+MAN3+=	Mail::Message::Construct.3
+MAN3+=	Mail::Message::Construct::Bounce.3
+MAN3+=	Mail::Message::Construct::Build.3
+MAN3+=	Mail::Message::Construct::Forward.3
+MAN3+=	Mail::Message::Construct::Read.3
+MAN3+=	Mail::Message::Construct::Rebuild.3
+MAN3+=	Mail::Message::Construct::Reply.3
+MAN3+=	Mail::Message::Construct::Text.3
+MAN3+=	Mail::Message::Convert.3
+MAN3+=	Mail::Message::Convert::Html.3
+MAN3+=	Mail::Message::Convert::HtmlFormatPS.3
+MAN3+=	Mail::Message::Convert::HtmlFormatText.3
+MAN3+=	Mail::Message::Convert::MailInternet.3
+MAN3+=	Mail::Message::Convert::MimeEntity.3
+MAN3+=	Mail::Message::Convert::TextAutoformat.3
+MAN3+=	Mail::Message::Dummy.3
+MAN3+=	Mail::Message::Field.3
+MAN3+=	Mail::Message::Field::AddrGroup.3
+MAN3+=	Mail::Message::Field::Address.3
+MAN3+=	Mail::Message::Field::Addresses.3
+MAN3+=	Mail::Message::Field::Attribute.3
+MAN3+=	Mail::Message::Field::Fast.3
+MAN3+=	Mail::Message::Field::Flex.3
+MAN3+=	Mail::Message::Field::Full.3
+MAN3+=	Mail::Message::Field::Structured.3
+MAN3+=	Mail::Message::Field::URIs.3
+MAN3+=	Mail::Message::Field::Unstructured.3
+MAN3+=	Mail::Message::Head.3
+MAN3+=	Mail::Message::Head::Complete.3
+MAN3+=	Mail::Message::Head::Delayed.3
+MAN3+=	Mail::Message::Head::FieldGroup.3
+MAN3+=	Mail::Message::Head::ListGroup.3
+MAN3+=	Mail::Message::Head::Partial.3
+MAN3+=	Mail::Message::Head::ResentGroup.3
+MAN3+=	Mail::Message::Head::SpamGroup.3
+MAN3+=	Mail::Message::Head::Subset.3
+MAN3+=	Mail::Message::Part.3
+MAN3+=	Mail::Message::Replace::MailHeader.3
+MAN3+=	Mail::Message::Replace::MailInternet.3
+MAN3+=	Mail::Message::TransferEnc.3
+MAN3+=	Mail::Message::TransferEnc::Base64.3
+MAN3+=	Mail::Message::TransferEnc::Binary.3
+MAN3+=	Mail::Message::TransferEnc::EightBit.3
+MAN3+=	Mail::Message::TransferEnc::QuotedPrint.3
+MAN3+=	Mail::Message::TransferEnc::SevenBit.3
+MAN3+=	Mail::Message::Wrapper::SpamAssassin.3
+MAN3+=	Mail::Reporter.3
+MAN3+=	Mail::Server.3
+MAN3+=	Mail::Server::IMAP4.3
+MAN3+=	Mail::Server::IMAP4::Fetch.3
+MAN3+=	Mail::Server::IMAP4::List.3
+MAN3+=	Mail::Server::IMAP4::Search.3
+MAN3+=	Mail::Transport.3
+MAN3+=	Mail::Transport::Exim.3
+MAN3+=	Mail::Transport::IMAP4.3
+MAN3+=	Mail::Transport::Mailx.3
+MAN3+=	Mail::Transport::POP3.3
+MAN3+=	Mail::Transport::Qmail.3
+MAN3+=	Mail::Transport::Receive.3
+MAN3+=	Mail::Transport::SMTP.3
+MAN3+=	Mail::Transport::Send.3
+MAN3+=	Mail::Transport::Sendmail.3
diff --git a/mail/p5-Mail-Box/distinfo b/mail/p5-Mail-Box/distinfo
index b48aa051bf03..3001abb5ba67 100644
--- a/mail/p5-Mail-Box/distinfo
+++ b/mail/p5-Mail-Box/distinfo
@@ -1,3 +1,3 @@
-MD5 (Mail-Box-2.042.tar.gz) = 5381a9f4414529bd481ad15e223263a2
-SHA256 (Mail-Box-2.042.tar.gz) = 1d88b09e0eb9583e68ea14b3d5cbe1c1f63fd0b22be11db5a7639209f560aec3
-SIZE (Mail-Box-2.042.tar.gz) = 433359
+MD5 (Mail-Box-2.063.tar.gz) = c181b1a72698a5a2fdfd5a6e750427f3
+SHA256 (Mail-Box-2.063.tar.gz) = daa4a0acbfce3134949731b98739a838b96e6d741108253365b5b293a8fb229b
+SIZE (Mail-Box-2.063.tar.gz) = 589139
diff --git a/mail/p5-Mail-Box/pkg-descr b/mail/p5-Mail-Box/pkg-descr
index 77e4e104ccc9..82c7eb9e5f0a 100644
--- a/mail/p5-Mail-Box/pkg-descr
+++ b/mail/p5-Mail-Box/pkg-descr
@@ -1,6 +1,6 @@
 The Mail::Box folder is a modern mail-folder manager (at least on the
 moment of this writing).  It is written to replace Mail::Folder,
-although it interface is different.
+although its interface is different.
 
 Author: Mark Overmeer <mark@overmeer.net>
 WWW: http://search.cpan.org/dist/Mail-Box/
diff --git a/mail/p5-Mail-Box/pkg-plist b/mail/p5-Mail-Box/pkg-plist
index 126fd7ee4c51..6dbbabb6b7c9 100644
--- a/mail/p5-Mail-Box/pkg-plist
+++ b/mail/p5-Mail-Box/pkg-plist
@@ -1,23 +1,33 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist
 %%SITE_PERL%%/Mail/Box-Cookbook.pod
+%%SITE_PERL%%/Mail/Box-Index.pod
 %%SITE_PERL%%/Mail/Box-Overview.pod
 %%SITE_PERL%%/Mail/Box.pm
 %%SITE_PERL%%/Mail/Box.pod
-%%SITE_PERL%%/Mail/Box/Dbx.pod
+%%SITE_PERL%%/Mail/Box/Collection.pm
+%%SITE_PERL%%/Mail/Box/Collection.pod
 %%SITE_PERL%%/Mail/Box/Dbx.pm
-%%SITE_PERL%%/Mail/Box/Dbx/Message.pod
+%%SITE_PERL%%/Mail/Box/Dbx.pod
 %%SITE_PERL%%/Mail/Box/Dbx/Message.pm
+%%SITE_PERL%%/Mail/Box/Dbx/Message.pod
 %%SITE_PERL%%/Mail/Box/Dir.pm
 %%SITE_PERL%%/Mail/Box/Dir.pod
 %%SITE_PERL%%/Mail/Box/Dir/Message.pm
 %%SITE_PERL%%/Mail/Box/Dir/Message.pod
+%%SITE_PERL%%/Mail/Box/FastScalar.pm
+%%SITE_PERL%%/Mail/Box/FastScalar.pod
 %%SITE_PERL%%/Mail/Box/File.pm
 %%SITE_PERL%%/Mail/Box/File.pod
 %%SITE_PERL%%/Mail/Box/File/Message.pm
 %%SITE_PERL%%/Mail/Box/File/Message.pod
 %%SITE_PERL%%/Mail/Box/IMAP4.pm
 %%SITE_PERL%%/Mail/Box/IMAP4.pod
+%%SITE_PERL%%/Mail/Box/IMAP4/Head.pm
+%%SITE_PERL%%/Mail/Box/IMAP4/Head.pod
 %%SITE_PERL%%/Mail/Box/IMAP4/Message.pm
 %%SITE_PERL%%/Mail/Box/IMAP4/Message.pod
+%%SITE_PERL%%/Mail/Box/Identity.pm
+%%SITE_PERL%%/Mail/Box/Identity.pod
 %%SITE_PERL%%/Mail/Box/Locker.pm
 %%SITE_PERL%%/Mail/Box/Locker.pod
 %%SITE_PERL%%/Mail/Box/Locker/DotLock.pm
@@ -42,6 +52,8 @@
 %%SITE_PERL%%/Mail/Box/Maildir.pod
 %%SITE_PERL%%/Mail/Box/Maildir/Message.pm
 %%SITE_PERL%%/Mail/Box/Maildir/Message.pod
+%%SITE_PERL%%/Mail/Box/Manage/User.pm
+%%SITE_PERL%%/Mail/Box/Manage/User.pod
 %%SITE_PERL%%/Mail/Box/Manager.pm
 %%SITE_PERL%%/Mail/Box/Manager.pod
 %%SITE_PERL%%/Mail/Box/Mbox.pm
@@ -50,8 +62,8 @@
 %%SITE_PERL%%/Mail/Box/Mbox/Message.pod
 %%SITE_PERL%%/Mail/Box/Message.pm
 %%SITE_PERL%%/Mail/Box/Message.pod
-%%SITE_PERL%%/Mail/Message/Head/Partial.pm
-%%SITE_PERL%%/Mail/Message/Head/Partial.pod
+%%SITE_PERL%%/Mail/Box/Message/Destructed.pm
+%%SITE_PERL%%/Mail/Box/Message/Destructed.pod
 %%SITE_PERL%%/Mail/Box/Net.pm
 %%SITE_PERL%%/Mail/Box/Net.pod
 %%SITE_PERL%%/Mail/Box/Net/Message.pm
@@ -68,8 +80,6 @@
 %%SITE_PERL%%/Mail/Box/Search.pod
 %%SITE_PERL%%/Mail/Box/Search/Grep.pm
 %%SITE_PERL%%/Mail/Box/Search/Grep.pod
-%%SITE_PERL%%/Mail/Box/Search/IMAP.pm
-%%SITE_PERL%%/Mail/Box/Search/IMAP.pod
 %%SITE_PERL%%/Mail/Box/Search/SpamAssassin.pm
 %%SITE_PERL%%/Mail/Box/Search/SpamAssassin.pod
 %%SITE_PERL%%/Mail/Box/Thread/Manager.pm
@@ -82,6 +92,7 @@
 %%SITE_PERL%%/Mail/Box/Tie/ARRAY.pod
 %%SITE_PERL%%/Mail/Box/Tie/HASH.pm
 %%SITE_PERL%%/Mail/Box/Tie/HASH.pod
+%%SITE_PERL%%/Mail/Makefile.PL
 %%SITE_PERL%%/Mail/Message.pm
 %%SITE_PERL%%/Mail/Message.pod
 %%SITE_PERL%%/Mail/Message/Body.pm
@@ -150,6 +161,10 @@
 %%SITE_PERL%%/Mail/Message/Field/Flex.pod
 %%SITE_PERL%%/Mail/Message/Field/Full.pm
 %%SITE_PERL%%/Mail/Message/Field/Full.pod
+%%SITE_PERL%%/Mail/Message/Field/Structured.pm
+%%SITE_PERL%%/Mail/Message/Field/Structured.pod
+%%SITE_PERL%%/Mail/Message/Field/URIs.pm
+%%SITE_PERL%%/Mail/Message/Field/URIs.pod
 %%SITE_PERL%%/Mail/Message/Field/Unstructured.pm
 %%SITE_PERL%%/Mail/Message/Field/Unstructured.pod
 %%SITE_PERL%%/Mail/Message/Head.pm
@@ -158,12 +173,24 @@
 %%SITE_PERL%%/Mail/Message/Head/Complete.pod
 %%SITE_PERL%%/Mail/Message/Head/Delayed.pm
 %%SITE_PERL%%/Mail/Message/Head/Delayed.pod
+%%SITE_PERL%%/Mail/Message/Head/FieldGroup.pm
+%%SITE_PERL%%/Mail/Message/Head/FieldGroup.pod
+%%SITE_PERL%%/Mail/Message/Head/ListGroup.pm
+%%SITE_PERL%%/Mail/Message/Head/ListGroup.pod
+%%SITE_PERL%%/Mail/Message/Head/Partial.pm
+%%SITE_PERL%%/Mail/Message/Head/Partial.pod
 %%SITE_PERL%%/Mail/Message/Head/ResentGroup.pm
 %%SITE_PERL%%/Mail/Message/Head/ResentGroup.pod
+%%SITE_PERL%%/Mail/Message/Head/SpamGroup.pm
+%%SITE_PERL%%/Mail/Message/Head/SpamGroup.pod
 %%SITE_PERL%%/Mail/Message/Head/Subset.pm
 %%SITE_PERL%%/Mail/Message/Head/Subset.pod
 %%SITE_PERL%%/Mail/Message/Part.pm
 %%SITE_PERL%%/Mail/Message/Part.pod
+%%SITE_PERL%%/Mail/Message/Replace/MailHeader.pm
+%%SITE_PERL%%/Mail/Message/Replace/MailHeader.pod
+%%SITE_PERL%%/Mail/Message/Replace/MailInternet.pm
+%%SITE_PERL%%/Mail/Message/Replace/MailInternet.pod
 %%SITE_PERL%%/Mail/Message/TransferEnc.pm
 %%SITE_PERL%%/Mail/Message/TransferEnc.pod
 %%SITE_PERL%%/Mail/Message/TransferEnc/Base64.pm
@@ -180,6 +207,16 @@
 %%SITE_PERL%%/Mail/Message/Wrapper/SpamAssassin.pod
 %%SITE_PERL%%/Mail/Reporter.pm
 %%SITE_PERL%%/Mail/Reporter.pod
+%%SITE_PERL%%/Mail/Server.pm
+%%SITE_PERL%%/Mail/Server.pod
+%%SITE_PERL%%/Mail/Server/IMAP4.pm
+%%SITE_PERL%%/Mail/Server/IMAP4.pod
+%%SITE_PERL%%/Mail/Server/IMAP4/Fetch.pm
+%%SITE_PERL%%/Mail/Server/IMAP4/Fetch.pod
+%%SITE_PERL%%/Mail/Server/IMAP4/List.pm
+%%SITE_PERL%%/Mail/Server/IMAP4/List.pod
+%%SITE_PERL%%/Mail/Server/IMAP4/Search.pm
+%%SITE_PERL%%/Mail/Server/IMAP4/Search.pod
 %%SITE_PERL%%/Mail/Transport.pm
 %%SITE_PERL%%/Mail/Transport.pod
 %%SITE_PERL%%/Mail/Transport/Exim.pm
@@ -200,31 +237,40 @@
 %%SITE_PERL%%/Mail/Transport/Send.pod
 %%SITE_PERL%%/Mail/Transport/Sendmail.pm
 %%SITE_PERL%%/Mail/Transport/Sendmail.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box
-@dirrm %%SITE_PERL%%/Mail/Transport
-@dirrm %%SITE_PERL%%/Mail/Message/Wrapper
-@dirrm %%SITE_PERL%%/Mail/Message/TransferEnc
-@dirrm %%SITE_PERL%%/Mail/Message/Head
-@dirrm %%SITE_PERL%%/Mail/Message/Field
-@dirrm %%SITE_PERL%%/Mail/Message/Convert
-@dirrm %%SITE_PERL%%/Mail/Message/Construct
-@dirrm %%SITE_PERL%%/Mail/Message/Body
-@dirrm %%SITE_PERL%%/Mail/Box/Tie
-@dirrm %%SITE_PERL%%/Mail/Box/Thread
-@dirrm %%SITE_PERL%%/Mail/Box/Search
-@dirrm %%SITE_PERL%%/Mail/Box/Parser
-@dirrm %%SITE_PERL%%/Mail/Box/POP3
-@dirrm %%SITE_PERL%%/Mail/Box/Net
-@dirrm %%SITE_PERL%%/Mail/Box/Mbox
-@dirrm %%SITE_PERL%%/Mail/Box/Maildir
-@dirrm %%SITE_PERL%%/Mail/Box/MH
-@dirrm %%SITE_PERL%%/Mail/Box/Locker
-@dirrm %%SITE_PERL%%/Mail/Box/IMAP4
-@dirrm %%SITE_PERL%%/Mail/Box/File
-@dirrm %%SITE_PERL%%/Mail/Box/Dir
-@dirrm %%SITE_PERL%%/Mail/Box/Dbx
-@dirrm %%SITE_PERL%%/Mail/Box
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail/Transport
+@dirrmtry %%SITE_PERL%%/Mail/Server/IMAP4
+@dirrmtry %%SITE_PERL%%/Mail/Server
+@dirrmtry %%SITE_PERL%%/Mail/Message/Wrapper
+@dirrmtry %%SITE_PERL%%/Mail/Message/TransferEnc
+@dirrmtry %%SITE_PERL%%/Mail/Message/Replace
+@dirrmtry %%SITE_PERL%%/Mail/Message/Head
+@dirrmtry %%SITE_PERL%%/Mail/Message/Head
+@dirrmtry %%SITE_PERL%%/Mail/Message/Field
+@dirrmtry %%SITE_PERL%%/Mail/Message/Field
+@dirrmtry %%SITE_PERL%%/Mail/Message/Convert
+@dirrmtry %%SITE_PERL%%/Mail/Message/Construct
+@dirrmtry %%SITE_PERL%%/Mail/Message/Body
+@dirrmtry %%SITE_PERL%%/Mail/Message
 @dirrmtry %%SITE_PERL%%/Mail/Message
+@dirrmtry %%SITE_PERL%%/Mail/Box/Tie
+@dirrmtry %%SITE_PERL%%/Mail/Box/Thread
+@dirrmtry %%SITE_PERL%%/Mail/Box/Search
+@dirrmtry %%SITE_PERL%%/Mail/Box/Parser
+@dirrmtry %%SITE_PERL%%/Mail/Box/POP3
+@dirrmtry %%SITE_PERL%%/Mail/Box/Net
+@dirrmtry %%SITE_PERL%%/Mail/Box/Message
+@dirrmtry %%SITE_PERL%%/Mail/Box/Mbox
+@dirrmtry %%SITE_PERL%%/Mail/Box/Manage
+@dirrmtry %%SITE_PERL%%/Mail/Box/Maildir
+@dirrmtry %%SITE_PERL%%/Mail/Box/MH
+@dirrmtry %%SITE_PERL%%/Mail/Box/Locker
+@dirrmtry %%SITE_PERL%%/Mail/Box/IMAP4
+@dirrmtry %%SITE_PERL%%/Mail/Box/IMAP4
+@dirrmtry %%SITE_PERL%%/Mail/Box/File
+@dirrmtry %%SITE_PERL%%/Mail/Box/Dir
+@dirrmtry %%SITE_PERL%%/Mail/Box/Dbx
+@dirrmtry %%SITE_PERL%%/Mail/Box
+@dirrmtry %%SITE_PERL%%/Mail/Box
 @dirrmtry %%SITE_PERL%%/Mail
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail