3 files changed, 26 insertions, 36 deletions

diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index b3c6dfbc0a76..dd93b8f4a040 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	Mail-Tools
-PORTVERSION=	1.77
+PORTVERSION=	2.02
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	MailTools-${PORTVERSION}
 
@@ -22,6 +21,8 @@ MAN3=		Mail::Address.3 \
 		Mail::Cap.3 \
 		Mail::Field.3 \
 		Mail::Field::AddrList.3 \
+		Mail::Field::Date.3 \
+		Mail::Field::Generic.3 \
 		Mail::Filter.3 \
 		Mail::Header.3 \
 		Mail::Internet.3 \
@@ -29,11 +30,4 @@ MAN3=		Mail::Address.3 \
 		Mail::Send.3 \
 		Mail::Util.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS=	${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
-RUN_DEPENDS=	${BUILD_DEPENDS}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Tools/distinfo b/mail/p5-Mail-Tools/distinfo
index 2c7f7a0ebc95..df63de201269 100644
--- a/mail/p5-Mail-Tools/distinfo
+++ b/mail/p5-Mail-Tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (MailTools-1.77.tar.gz) = c1bcd6627cb9bab271b77a8323d62c48
-SHA256 (MailTools-1.77.tar.gz) = 9bc63a8a0dee3c17269e2974cdddab237fafad292e19dd377ae6dcedd2d068d4
-SIZE (MailTools-1.77.tar.gz) = 48574
+MD5 (MailTools-2.02.tar.gz) = 824bdbe6c4084739ac2d005eebb09b0e
+SHA256 (MailTools-2.02.tar.gz) = cc3150db9400e6b269b20c140defecf8e84d8b306ba8541ed4a9a2f15f894c9b
+SIZE (MailTools-2.02.tar.gz) = 52013
diff --git a/mail/p5-Mail-Tools/pkg-plist b/mail/p5-Mail-Tools/pkg-plist
index bdf7de8785ad..57dd5ad74d44 100644
--- a/mail/p5-Mail-Tools/pkg-plist
+++ b/mail/p5-Mail-Tools/pkg-plist
@@ -1,38 +1,34 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/.packlist
 %%SITE_PERL%%/Mail/Address.pm
+%%SITE_PERL%%/Mail/Address.pod
 %%SITE_PERL%%/Mail/Cap.pm
+%%SITE_PERL%%/Mail/Cap.pod
 %%SITE_PERL%%/Mail/Field.pm
+%%SITE_PERL%%/Mail/Field.pod
 %%SITE_PERL%%/Mail/Field/AddrList.pm
+%%SITE_PERL%%/Mail/Field/AddrList.pod
 %%SITE_PERL%%/Mail/Field/Date.pm
+%%SITE_PERL%%/Mail/Field/Date.pod
+%%SITE_PERL%%/Mail/Field/Generic.pm
+%%SITE_PERL%%/Mail/Field/Generic.pod
 %%SITE_PERL%%/Mail/Filter.pm
+%%SITE_PERL%%/Mail/Filter.pod
 %%SITE_PERL%%/Mail/Header.pm
+%%SITE_PERL%%/Mail/Header.pod
 %%SITE_PERL%%/Mail/Internet.pm
+%%SITE_PERL%%/Mail/Internet.pod
 %%SITE_PERL%%/Mail/Mailer.pm
-%%SITE_PERL%%/Mail/Mailer/qmail.pm
+%%SITE_PERL%%/Mail/Mailer.pod
 %%SITE_PERL%%/Mail/Mailer/rfc822.pm
 %%SITE_PERL%%/Mail/Mailer/sendmail.pm
 %%SITE_PERL%%/Mail/Mailer/smtp.pm
 %%SITE_PERL%%/Mail/Mailer/testfile.pm
 %%SITE_PERL%%/Mail/Send.pm
+%%SITE_PERL%%/Mail/Send.pod
 %%SITE_PERL%%/Mail/Util.pm
-%%SITE_PERL%%/auto/Mail/Internet/_prephdr.al
-%%SITE_PERL%%/auto/Mail/Internet/add_signature.al
-%%SITE_PERL%%/auto/Mail/Internet/autosplit.ix
-%%SITE_PERL%%/auto/Mail/Internet/escape_from.al
-%%SITE_PERL%%/auto/Mail/Internet/nntppost.al
-%%SITE_PERL%%/auto/Mail/Internet/reply.al
-%%SITE_PERL%%/auto/Mail/Internet/send.al
-%%SITE_PERL%%/auto/Mail/Internet/sign.al
-%%SITE_PERL%%/auto/Mail/Internet/smtpsend.al
-%%SITE_PERL%%/auto/Mail/Internet/unescape_from.al
-%%SITE_PERL%%/auto/Mail/Util/autosplit.ix
-%%SITE_PERL%%/auto/Mail/Util/mailaddress.al
-%%SITE_PERL%%/auto/Mail/Util/maildomain.al
-%%SITE_PERL%%/auto/Mail/Util/read_mbox.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
-@dirrm %%SITE_PERL%%/auto/Mail/Util
-@dirrm %%SITE_PERL%%/auto/Mail/Internet
-@dirrm %%SITE_PERL%%/auto/Mail
-@dirrm %%SITE_PERL%%/Mail/Mailer
-@dirrm %%SITE_PERL%%/Mail/Field
+%%SITE_PERL%%/Mail/Util.pod
+%%SITE_PERL%%/Mail/Mailer/qmail.pm
+@dirrmtry %%SITE_PERL%%/Mail/Mailer
+@dirrmtry %%SITE_PERL%%/Mail/Field
 @dirrmtry %%SITE_PERL%%/Mail
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail