4 files changed, 305 insertions, 46 deletions

diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index 76e46bef6e02..484daf266cd3 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -6,47 +6,126 @@
 #
 
 PORTNAME=	Mail-Box
-PORTVERSION=	1.324
+PORTVERSION=	2.038
 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}/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
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 PERL_CONFIGURE=	yes
 
+.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."
+.endif
+
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		Mail::Box.3 \
-		Mail::Box::Index.3 \
+MAN3=		\
+		Mail::Box-Cookbook.3 \
+		Mail::Box-Overview.3 \
+		Mail::Box.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::Box::Threads.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
-
-post-patch:
-	${PERL} -pi -e 's/^our\s+([\$$\@]\w+)/use vars qw($$1);$$1/' \
-		${WRKSRC}/Message.pm
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
+		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::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/distinfo b/mail/p5-Mail-Box/distinfo
index f9e830797c32..4e7c966871dd 100644
--- a/mail/p5-Mail-Box/distinfo
+++ b/mail/p5-Mail-Box/distinfo
@@ -1 +1 @@
-MD5 (Mail-Box-1.324.tar.gz) = aecc24868fb16d97c910d3c59ca787fa
+MD5 (Mail-Box-2.038.tar.gz) = 2a5fb166e60b1b9145c851ed757831e3
diff --git a/mail/p5-Mail-Box/pkg-comment b/mail/p5-Mail-Box/pkg-comment
deleted file mode 100644
index 41f112d42206..000000000000
--- a/mail/p5-Mail-Box/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module implementing a modern mail-folder managerat
diff --git a/mail/p5-Mail-Box/pkg-plist b/mail/p5-Mail-Box/pkg-plist
index 3f30987b987c..9bcec72af323 100644
--- a/mail/p5-Mail-Box/pkg-plist
+++ b/mail/p5-Mail-Box/pkg-plist
@@ -1,26 +1,207 @@
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Index.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker/DotLock.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker/File.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker/NFS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/MH.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/MH/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Manager.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Mbox.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Mbox/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Threads.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie/ARRAY.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie/HASH.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Box
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Locker
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Mbox
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/MH
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box/Tie
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Box
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist
+%%SITE_PERL%%/Mail/Transport.pod
+%%SITE_PERL%%/Mail/Message.pod
+%%SITE_PERL%%/Mail/Box.pm
+%%SITE_PERL%%/Mail/Reporter.pod
+%%SITE_PERL%%/Mail/Transport.pm
+%%SITE_PERL%%/Mail/Reporter.pm
+%%SITE_PERL%%/Mail/Message.pm
+%%SITE_PERL%%/Mail/Box-Cookbook.pod
+%%SITE_PERL%%/Mail/Box-Overview.pod
+%%SITE_PERL%%/Mail/Box.pod
+%%SITE_PERL%%/Mail/Transport/Sendmail.pod
+%%SITE_PERL%%/Mail/Transport/Sendmail.pm
+%%SITE_PERL%%/Mail/Transport/IMAP4.pod
+%%SITE_PERL%%/Mail/Transport/Receive.pm
+%%SITE_PERL%%/Mail/Transport/Send.pm
+%%SITE_PERL%%/Mail/Transport/IMAP4.pm
+%%SITE_PERL%%/Mail/Transport/SMTP.pm
+%%SITE_PERL%%/Mail/Transport/SMTP.pod
+%%SITE_PERL%%/Mail/Transport/Mailx.pod
+%%SITE_PERL%%/Mail/Transport/Exim.pm
+%%SITE_PERL%%/Mail/Transport/POP3.pod
+%%SITE_PERL%%/Mail/Transport/Exim.pod
+%%SITE_PERL%%/Mail/Transport/Qmail.pm
+%%SITE_PERL%%/Mail/Transport/Send.pod
+%%SITE_PERL%%/Mail/Transport/POP3.pm
+%%SITE_PERL%%/Mail/Transport/Receive.pod
+%%SITE_PERL%%/Mail/Transport/Qmail.pod
+%%SITE_PERL%%/Mail/Transport/Mailx.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc.pm
+%%SITE_PERL%%/Mail/Message/Dummy.pm
+%%SITE_PERL%%/Mail/Message/Field.pod
+%%SITE_PERL%%/Mail/Message/Dummy.pod
+%%SITE_PERL%%/Mail/Message/Body.pod
+%%SITE_PERL%%/Mail/Message/Convert.pm
+%%SITE_PERL%%/Mail/Message/Convert.pod
+%%SITE_PERL%%/Mail/Message/Part.pm
+%%SITE_PERL%%/Mail/Message/Head.pod
+%%SITE_PERL%%/Mail/Message/Construct.pm
+%%SITE_PERL%%/Mail/Message/Part.pod
+%%SITE_PERL%%/Mail/Message/Field.pm
+%%SITE_PERL%%/Mail/Message/Body.pm
+%%SITE_PERL%%/Mail/Message/Head.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc.pod
+%%SITE_PERL%%/Mail/Message/Construct.pod
+%%SITE_PERL%%/Mail/Message/Wrapper/SpamAssassin.pm
+%%SITE_PERL%%/Mail/Message/Wrapper/SpamAssassin.pod
+%%SITE_PERL%%/Mail/Message/TransferEnc/EightBit.pod
+%%SITE_PERL%%/Mail/Message/TransferEnc/Base64.pod
+%%SITE_PERL%%/Mail/Message/TransferEnc/Binary.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc/QuotedPrint.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc/QuotedPrint.pod
+%%SITE_PERL%%/Mail/Message/TransferEnc/Binary.pod
+%%SITE_PERL%%/Mail/Message/TransferEnc/SevenBit.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc/SevenBit.pod
+%%SITE_PERL%%/Mail/Message/TransferEnc/Base64.pm
+%%SITE_PERL%%/Mail/Message/TransferEnc/EightBit.pm
+%%SITE_PERL%%/Mail/Message/Convert/Html.pm
+%%SITE_PERL%%/Mail/Message/Convert/Html.pod
+%%SITE_PERL%%/Mail/Message/Convert/MimeEntity.pod
+%%SITE_PERL%%/Mail/Message/Convert/MimeEntity.pm
+%%SITE_PERL%%/Mail/Message/Convert/TextAutoformat.pod
+%%SITE_PERL%%/Mail/Message/Convert/TextAutoformat.pm
+%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatPS.pod
+%%SITE_PERL%%/Mail/Message/Convert/MailInternet.pod
+%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatText.pod
+%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatText.pm
+%%SITE_PERL%%/Mail/Message/Convert/HtmlFormatPS.pm
+%%SITE_PERL%%/Mail/Message/Convert/MailInternet.pm
+%%SITE_PERL%%/Mail/Message/Field/Fast.pm
+%%SITE_PERL%%/Mail/Message/Field/AddrGroup.pod
+%%SITE_PERL%%/Mail/Message/Field/Unstructured.pm
+%%SITE_PERL%%/Mail/Message/Field/Flex.pm
+%%SITE_PERL%%/Mail/Message/Field/Address.pod
+%%SITE_PERL%%/Mail/Message/Field/Attribute.pod
+%%SITE_PERL%%/Mail/Message/Field/AddrGroup.pm
+%%SITE_PERL%%/Mail/Message/Field/Addresses.pm
+%%SITE_PERL%%/Mail/Message/Field/Full.pod
+%%SITE_PERL%%/Mail/Message/Field/Flex.pod
+%%SITE_PERL%%/Mail/Message/Field/Address.pm
+%%SITE_PERL%%/Mail/Message/Field/Addresses.pod
+%%SITE_PERL%%/Mail/Message/Field/Unstructured.pod
+%%SITE_PERL%%/Mail/Message/Field/Fast.pod
+%%SITE_PERL%%/Mail/Message/Field/Attribute.pm
+%%SITE_PERL%%/Mail/Message/Field/Full.pm
+%%SITE_PERL%%/Mail/Message/Body/Multipart.pm
+%%SITE_PERL%%/Mail/Message/Body/Nested.pod
+%%SITE_PERL%%/Mail/Message/Body/Multipart.pod
+%%SITE_PERL%%/Mail/Message/Body/Nested.pm
+%%SITE_PERL%%/Mail/Message/Body/Lines.pod
+%%SITE_PERL%%/Mail/Message/Body/Lines.pm
+%%SITE_PERL%%/Mail/Message/Body/Construct.pm
+%%SITE_PERL%%/Mail/Message/Body/Encode.pod
+%%SITE_PERL%%/Mail/Message/Body/Delayed.pm
+%%SITE_PERL%%/Mail/Message/Body/String.pod
+%%SITE_PERL%%/Mail/Message/Body/File.pm
+%%SITE_PERL%%/Mail/Message/Body/Encode.pm
+%%SITE_PERL%%/Mail/Message/Body/Delayed.pod
+%%SITE_PERL%%/Mail/Message/Body/File.pod
+%%SITE_PERL%%/Mail/Message/Body/String.pm
+%%SITE_PERL%%/Mail/Message/Body/Construct.pod
+%%SITE_PERL%%/Mail/Message/Head/Complete.pm
+%%SITE_PERL%%/Mail/Message/Head/Complete.pod
+%%SITE_PERL%%/Mail/Message/Head/ResentGroup.pod
+%%SITE_PERL%%/Mail/Message/Head/Delayed.pod
+%%SITE_PERL%%/Mail/Message/Head/ResentGroup.pm
+%%SITE_PERL%%/Mail/Message/Head/Delayed.pm
+%%SITE_PERL%%/Mail/Message/Head/Subset.pod
+%%SITE_PERL%%/Mail/Message/Head/Subset.pm
+%%SITE_PERL%%/Mail/Box/Mbox.pod
+%%SITE_PERL%%/Mail/Box/File.pod
+%%SITE_PERL%%/Mail/Box/Manager.pm
+%%SITE_PERL%%/Mail/Box/Message.pod
+%%SITE_PERL%%/Mail/Box/File.pm
+%%SITE_PERL%%/Mail/Box/Net.pod
+%%SITE_PERL%%/Mail/Box/IMAP4.pod
+%%SITE_PERL%%/Mail/Box/Locker.pm
+%%SITE_PERL%%/Mail/Box/IMAP4.pm
+%%SITE_PERL%%/Mail/Box/POP3.pm
+%%SITE_PERL%%/Mail/Box/Search.pm
+%%SITE_PERL%%/Mail/Box/Dir.pm
+%%SITE_PERL%%/Mail/Box/Locker.pod
+%%SITE_PERL%%/Mail/Box/Tie.pod
+%%SITE_PERL%%/Mail/Box/Maildir.pod
+%%SITE_PERL%%/Mail/Box/Dir.pod
+%%SITE_PERL%%/Mail/Box/Mbox.pm
+%%SITE_PERL%%/Mail/Box/POP3.pod
+%%SITE_PERL%%/Mail/Box/Message.pm
+%%SITE_PERL%%/Mail/Box/Manager.pod
+%%SITE_PERL%%/Mail/Box/MH.pm
+%%SITE_PERL%%/Mail/Box/Search.pod
+%%SITE_PERL%%/Mail/Box/Parser.pod
+%%SITE_PERL%%/Mail/Box/Tie.pm
+%%SITE_PERL%%/Mail/Box/Parser.pm
+%%SITE_PERL%%/Mail/Box/Net.pm
+%%SITE_PERL%%/Mail/Box/Maildir.pm
+%%SITE_PERL%%/Mail/Box/MH.pod
+%%SITE_PERL%%/Mail/Box/Mbox/Message.pod
+%%SITE_PERL%%/Mail/Box/Mbox/Message.pm
+%%SITE_PERL%%/Mail/Box/Tie/HASH.pod
+%%SITE_PERL%%/Mail/Box/Tie/HASH.pm
+%%SITE_PERL%%/Mail/Box/Tie/ARRAY.pm
+%%SITE_PERL%%/Mail/Box/Tie/ARRAY.pod
+%%SITE_PERL%%/Mail/Box/Maildir/Message.pm
+%%SITE_PERL%%/Mail/Box/Maildir/Message.pod
+%%SITE_PERL%%/Mail/Box/Parser/Perl.pod
+%%SITE_PERL%%/Mail/Box/Parser/Perl.pm
+%%SITE_PERL%%/Mail/Box/Dir/Message.pod
+%%SITE_PERL%%/Mail/Box/Dir/Message.pm
+%%SITE_PERL%%/Mail/Box/Search/IMAP.pod
+%%SITE_PERL%%/Mail/Box/Search/Grep.pod
+%%SITE_PERL%%/Mail/Box/Search/IMAP.pm
+%%SITE_PERL%%/Mail/Box/Search/Grep.pm
+%%SITE_PERL%%/Mail/Box/Search/SpamAssassin.pod
+%%SITE_PERL%%/Mail/Box/Search/SpamAssassin.pm
+%%SITE_PERL%%/Mail/Box/File/Message.pod
+%%SITE_PERL%%/Mail/Box/File/Message.pm
+%%SITE_PERL%%/Mail/Box/IMAP4/Message.pm
+%%SITE_PERL%%/Mail/Box/IMAP4/Message.pod
+%%SITE_PERL%%/Mail/Box/MH/Labels.pm
+%%SITE_PERL%%/Mail/Box/MH/Index.pm
+%%SITE_PERL%%/Mail/Box/MH/Message.pod
+%%SITE_PERL%%/Mail/Box/MH/Index.pod
+%%SITE_PERL%%/Mail/Box/MH/Message.pm
+%%SITE_PERL%%/Mail/Box/MH/Labels.pod
+%%SITE_PERL%%/Mail/Box/Locker/DotLock.pod
+%%SITE_PERL%%/Mail/Box/Locker/Flock.pod
+%%SITE_PERL%%/Mail/Box/Locker/NFS.pm
+%%SITE_PERL%%/Mail/Box/Locker/DotLock.pm
+%%SITE_PERL%%/Mail/Box/Locker/POSIX.pod
+%%SITE_PERL%%/Mail/Box/Locker/POSIX.pm
+%%SITE_PERL%%/Mail/Box/Locker/Multi.pod
+%%SITE_PERL%%/Mail/Box/Locker/NFS.pod
+%%SITE_PERL%%/Mail/Box/Locker/Multi.pm
+%%SITE_PERL%%/Mail/Box/Locker/Flock.pm
+%%SITE_PERL%%/Mail/Box/Net/Message.pod
+%%SITE_PERL%%/Mail/Box/Net/Message.pm
+%%SITE_PERL%%/Mail/Box/POP3/Message.pm
+%%SITE_PERL%%/Mail/Box/POP3/Message.pod
+%%SITE_PERL%%/Mail/Box/Thread/Node.pod
+%%SITE_PERL%%/Mail/Box/Thread/Node.pm
+%%SITE_PERL%%/Mail/Box/Thread/Manager.pod
+%%SITE_PERL%%/Mail/Box/Thread/Manager.pm
+@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/Convert
+@dirrm %%SITE_PERL%%/Mail/Message/Field
+@dirrm %%SITE_PERL%%/Mail/Message/Body
+@dirrm %%SITE_PERL%%/Mail/Message/Head
+@unexec rmdir %D/%%SITE_PERL%%/Mail/Message 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Mail/Box/Mbox
+@dirrm %%SITE_PERL%%/Mail/Box/Tie
+@dirrm %%SITE_PERL%%/Mail/Box/Maildir
+@dirrm %%SITE_PERL%%/Mail/Box/Parser
+@dirrm %%SITE_PERL%%/Mail/Box/Dir
+@dirrm %%SITE_PERL%%/Mail/Box/Search
+@dirrm %%SITE_PERL%%/Mail/Box/File
+@dirrm %%SITE_PERL%%/Mail/Box/IMAP4
+@dirrm %%SITE_PERL%%/Mail/Box/MH
+@dirrm %%SITE_PERL%%/Mail/Box/Locker
+@dirrm %%SITE_PERL%%/Mail/Box/Net
+@dirrm %%SITE_PERL%%/Mail/Box/POP3
+@dirrm %%SITE_PERL%%/Mail/Box/Thread
+@unexec rmdir %D/%%SITE_PERL%%/Mail/Box 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true