- support stage

Approved by:	portmgr (blanket infrastructure)

45 files changed, 54 insertions, 106 deletions

diff --git a/mail/p5-CGP-CLI/Makefile b/mail/p5-CGP-CLI/Makefile
index 4460dc43bacc..aedb24d091e2 100644
--- a/mail/p5-CGP-CLI/Makefile
+++ b/mail/p5-CGP-CLI/Makefile
@@ -14,7 +14,4 @@ COMMENT=	CommunigatePro Command Line Interface perl module
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	CGP::CLI.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-CGP-CLI/pkg-descr b/mail/p5-CGP-CLI/pkg-descr
index 6d98225b33b1..1cade77f9b0e 100644
--- a/mail/p5-CGP-CLI/pkg-descr
+++ b/mail/p5-CGP-CLI/pkg-descr
@@ -1 +1,3 @@
 CommunigatePro Command Line Interface perl module.
+
+WWW: http://search.cpan.org/dist/CGP-CLI/
diff --git a/mail/p5-CGP-CLI/pkg-plist b/mail/p5-CGP-CLI/pkg-plist
index 06d38a7b6e99..0e18750ac2a4 100644
--- a/mail/p5-CGP-CLI/pkg-plist
+++ b/mail/p5-CGP-CLI/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGP/CLI/.packlist
 %%SITE_PERL%%/CGP/CLI.pm
+%%PERL5_MAN3%%/CGP::CLI.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGP/CLI
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGP
 @dirrmtry %%SITE_PERL%%/CGP
diff --git a/mail/p5-Data-Validate-Email/Makefile b/mail/p5-Data-Validate-Email/Makefile
index 322252344ff2..0a3037ab4515 100644
--- a/mail/p5-Data-Validate-Email/Makefile
+++ b/mail/p5-Data-Validate-Email/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mopsfelder@gmail.com
-COMMENT=	A common email validation written in Perl
+COMMENT=	Common email validation written in Perl
 
 RUN_DEPENDS=	p5-Data-Validate-Domain>=0:${PORTSDIR}/dns/p5-Data-Validate-Domain \
 		p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
@@ -17,7 +17,4 @@ RUN_DEPENDS=	p5-Data-Validate-Domain>=0:${PORTSDIR}/dns/p5-Data-Validate-Domain
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Data::Validate::Email.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Data-Validate-Email/pkg-descr b/mail/p5-Data-Validate-Email/pkg-descr
index 9e230c3661c8..74935081c9ad 100644
--- a/mail/p5-Data-Validate-Email/pkg-descr
+++ b/mail/p5-Data-Validate-Email/pkg-descr
@@ -1,4 +1,4 @@
 This module collects common email validation routines to
 make input validation, and untainting easier and more readable.
 
-WWW:	http://search.cpan.org/dist/Data-Validate-Email/
+WWW: http://search.cpan.org/dist/Data-Validate-Email/
diff --git a/mail/p5-Data-Validate-Email/pkg-plist b/mail/p5-Data-Validate-Email/pkg-plist
index b2f376e429ce..2e4b85ada8a1 100644
--- a/mail/p5-Data-Validate-Email/pkg-plist
+++ b/mail/p5-Data-Validate-Email/pkg-plist
@@ -6,6 +6,7 @@
 %%SITE_PERL%%/auto/Data/Validate/Email/is_domain.al
 %%SITE_PERL%%/auto/Data/Validate/Email/is_username.al
 %%SITE_PERL%%/auto/Data/Validate/Email/autosplit.ix
+%%PERL5_MAN3%%/Data::Validate::Email.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate/Email
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Validate
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
diff --git a/mail/p5-Email-AddressParser/Makefile b/mail/p5-Email-AddressParser/Makefile
index a35e9c6d7089..01089afa25ed 100644
--- a/mail/p5-Email-AddressParser/Makefile
+++ b/mail/p5-Email-AddressParser/Makefile
@@ -13,7 +13,4 @@ COMMENT=	RFC 2822 Address Parsing and Creation
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Email::AddressParser.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-AddressParser/pkg-plist b/mail/p5-Email-AddressParser/pkg-plist
index 6784ff57f32c..4f344d997b98 100644
--- a/mail/p5-Email-AddressParser/pkg-plist
+++ b/mail/p5-Email-AddressParser/pkg-plist
@@ -2,6 +2,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/AddressParser/AddressParser.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/AddressParser/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/Email/AddressParser.pm
+%%PERL5_MAN3%%/Email::AddressParser.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/AddressParser
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Email
diff --git a/mail/p5-Email-Folder-IMAPS/Makefile b/mail/p5-Email-Folder-IMAPS/Makefile
index fd3fe3aefcd0..f171f0292efe 100644
--- a/mail/p5-Email-Folder-IMAPS/Makefile
+++ b/mail/p5-Email-Folder-IMAPS/Makefile
@@ -20,7 +20,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Email::Folder::IMAPS.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Folder-IMAPS/pkg-plist b/mail/p5-Email-Folder-IMAPS/pkg-plist
index 538accefbc01..8d55ffb72e28 100644
--- a/mail/p5-Email-Folder-IMAPS/pkg-plist
+++ b/mail/p5-Email-Folder-IMAPS/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Email/Folder/IMAPS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAPS/.packlist
+%%PERL5_MAN3%%/Email::Folder::IMAPS.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAPS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-Email-MIME-ContentType/Makefile b/mail/p5-Email-MIME-ContentType/Makefile
index 1ac52f24c618..0998799c840b 100644
--- a/mail/p5-Email-MIME-ContentType/Makefile
+++ b/mail/p5-Email-MIME-ContentType/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Parse a MIME Content-Type Header
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::MIME::ContentType.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-MIME-ContentType/pkg-plist b/mail/p5-Email-MIME-ContentType/pkg-plist
index 771d10698423..8b81d3cae57b 100644
--- a/mail/p5-Email-MIME-ContentType/pkg-plist
+++ b/mail/p5-Email-MIME-ContentType/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Email/MIME/ContentType.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType/.packlist
+%%PERL5_MAN3%%/Email::MIME::ContentType.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-Email-Send/Makefile b/mail/p5-Email-Send/Makefile
index a8b9ec149233..2fefcd5e0d4d 100644
--- a/mail/p5-Email-Send/Makefile
+++ b/mail/p5-Email-Send/Makefile
@@ -20,12 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Email::Send.3 \
-	Email::Send::NNTP.3 \
-	Email::Send::Qmail.3 \
-	Email::Send::SMTP.3 \
-	Email::Send::Sendmail.3 \
-	Email::Send::Test.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Send/pkg-plist b/mail/p5-Email-Send/pkg-plist
index 3bf9a3d86e22..f8578751e59e 100644
--- a/mail/p5-Email-Send/pkg-plist
+++ b/mail/p5-Email-Send/pkg-plist
@@ -5,6 +5,12 @@
 %%SITE_PERL%%/Email/Send/Sendmail.pm
 %%SITE_PERL%%/Email/Send/Test.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send/.packlist
+%%PERL5_MAN3%%/Email::Send.3.gz
+%%PERL5_MAN3%%/Email::Send::NNTP.3.gz
+%%PERL5_MAN3%%/Email::Send::Qmail.3.gz
+%%PERL5_MAN3%%/Email::Send::SMTP.3.gz
+%%PERL5_MAN3%%/Email::Send::Sendmail.3.gz
+%%PERL5_MAN3%%/Email::Send::Test.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
 @dirrmtry %%SITE_PERL%%/Email/Send
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index df2e75bd1196..e8e6f79a7fab 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS=	${COMMON_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::Valid.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Valid/pkg-plist b/mail/p5-Email-Valid/pkg-plist
index c0ad0954ee1d..1060781de992 100644
--- a/mail/p5-Email-Valid/pkg-plist
+++ b/mail/p5-Email-Valid/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Valid/.packlist
 %%SITE_PERL%%/Email/Valid.pm
+%%PERL5_MAN3%%/Email::Valid.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Valid
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
 @dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-GMail-IMAPD/Makefile b/mail/p5-GMail-IMAPD/Makefile
index 41d78c7b0566..056a1e02bc88 100644
--- a/mail/p5-GMail-IMAPD/Makefile
+++ b/mail/p5-GMail-IMAPD/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		GMail::IMAPD.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-GMail-IMAPD/pkg-plist b/mail/p5-GMail-IMAPD/pkg-plist
index c50b460be0bc..158589efb383 100644
--- a/mail/p5-GMail-IMAPD/pkg-plist
+++ b/mail/p5-GMail-IMAPD/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/GMail/IMAPD.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/GMail/IMAPD/.packlist
+%%PERL5_MAN3%%/GMail::IMAPD.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GMail/IMAPD
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GMail
 @dirrm %%SITE_PERL%%/GMail
diff --git a/mail/p5-MIME-EncWords/Makefile b/mail/p5-MIME-EncWords/Makefile
index ce4a9175741a..0b0939eef425 100644
--- a/mail/p5-MIME-EncWords/Makefile
+++ b/mail/p5-MIME-EncWords/Makefile
@@ -15,7 +15,4 @@ RUN_DEPENDS=	p5-MIME-Charset>=1.006.2:${PORTSDIR}/mail/p5-MIME-Charset
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		MIME::EncWords.3 MIME::EncWords::JA_JP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-MIME-EncWords/pkg-descr b/mail/p5-MIME-EncWords/pkg-descr
index 1f3b4f666b87..66fc02811430 100644
--- a/mail/p5-MIME-EncWords/pkg-descr
+++ b/mail/p5-MIME-EncWords/pkg-descr
@@ -1,8 +1,6 @@
-MIME::EncWords is aimed to be another implimentation of MIME::Words so
-    that it will achive more exact conformance with MIME specifications.
-    Additionally, it contains some improvements. Following synopsis and
-    descriptions are inherited from its inspirer, with description of
-    improvements and clarifications added.*
+MIME::EncWords is aimed to be another implimentation of MIME::Words so that it
+will achive more exact conformance with MIME specifications.  Additionally, it
+contains some improvements. Following synopsis and descriptions are inherited
+from its inspirer, with description of improvements and clarifications added.
 
-Author: <hatuka@nezumi.nu>
 WWW: http://search.cpan.org/dist/MIME-EncWords/
diff --git a/mail/p5-MIME-EncWords/pkg-plist b/mail/p5-MIME-EncWords/pkg-plist
index 3b01ff908e56..3f2389de8860 100644
--- a/mail/p5-MIME-EncWords/pkg-plist
+++ b/mail/p5-MIME-EncWords/pkg-plist
@@ -2,6 +2,8 @@
 %%SITE_PERL%%/MIME/EncWords/Defaults.pm.sample
 %%SITE_PERL%%/MIME/EncWords/JA_JP.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/EncWords/.packlist
+%%PERL5_MAN3%%/MIME::EncWords.3.gz
+%%PERL5_MAN3%%/MIME::EncWords::JA_JP.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/EncWords
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
 @dirrmtry %%SITE_PERL%%/MIME/EncWords
diff --git a/mail/p5-Mail-Alias/Makefile b/mail/p5-Mail-Alias/Makefile
index 9f3df88aa885..2b9fbaa18dde 100644
--- a/mail/p5-Mail-Alias/Makefile
+++ b/mail/p5-Mail-Alias/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Mail::Alias
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::Alias.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Alias/pkg-plist b/mail/p5-Mail-Alias/pkg-plist
index e473ff55a817..e36a99f7e505 100644
--- a/mail/p5-Mail-Alias/pkg-plist
+++ b/mail/p5-Mail-Alias/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Mail/Alias.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Alias/.packlist
+%%PERL5_MAN3%%/Mail::Alias.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Alias
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
 @dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
index 3644f39fc15d..600772c4a0b7 100644
--- a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
+++ b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
@@ -18,7 +18,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::DeliveryStatus::BounceParser.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
index b95a59537dac..c641e811191e 100644
--- a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
+++ b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
@@ -1,6 +1,7 @@
 %%SITE_PERL%%/Mail/DeliveryStatus/BounceParser.pm
 %%SITE_PERL%%/Mail/DeliveryStatus/Report.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus/BounceParser/.packlist
+%%PERL5_MAN3%%/Mail::DeliveryStatus::BounceParser.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus/BounceParser
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index 46c3dfaba435..1714396d3200 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::Stats::Record.3 Mail::Stats.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-MailStats/pkg-plist b/mail/p5-Mail-MailStats/pkg-plist
index 84d5f6a12ccf..07420862e9c1 100644
--- a/mail/p5-Mail-MailStats/pkg-plist
+++ b/mail/p5-Mail-MailStats/pkg-plist
@@ -4,6 +4,8 @@ bin/countmail
 %%SITE_PERL%%/Mail/Stats/Parser.pm
 %%SITE_PERL%%/Mail/Stats/Record.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats/.packlist
+%%PERL5_MAN3%%/Mail::Stats::Record.3.gz
+%%PERL5_MAN3%%/Mail::Stats.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats
 @dirrm %%SITE_PERL%%/Mail/Stats
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-MboxParser/Makefile b/mail/p5-Mail-MboxParser/Makefile
index 17eb4d515dc1..d42f69b585dc 100644
--- a/mail/p5-Mail-MboxParser/Makefile
+++ b/mail/p5-Mail-MboxParser/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	demon@FreeBSD.org
-COMMENT=	A module for working with UNIX-flavoured mailboxes
+COMMENT=	Module for working with UNIX-flavoured mailboxes
 
 BUILD_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
 		p5-Mail-Mbox-MessageParser>=0:${PORTSDIR}/mail/p5-Mail-Mbox-MessageParser
@@ -18,10 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::MboxParser.3 Mail::MboxParser::Base.3 \
-		Mail::MboxParser::Mail.3 \
-		Mail::MboxParser::Mail::Body.3 \
-		Mail::MboxParser::Mail::Convertable.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-MboxParser/pkg-plist b/mail/p5-Mail-MboxParser/pkg-plist
index ea890e5ee681..c470f92b3949 100644
--- a/mail/p5-Mail-MboxParser/pkg-plist
+++ b/mail/p5-Mail-MboxParser/pkg-plist
@@ -4,6 +4,11 @@
 %%SITE_PERL%%/Mail/MboxParser/Mail/Convertable.pm
 %%SITE_PERL%%/Mail/MboxParser/Mail/Body.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/MboxParser/.packlist
+%%PERL5_MAN3%%/Mail::MboxParser.3.gz
+%%PERL5_MAN3%%/Mail::MboxParser::Base.3.gz
+%%PERL5_MAN3%%/Mail::MboxParser::Mail.3.gz
+%%PERL5_MAN3%%/Mail::MboxParser::Mail::Body.3.gz
+%%PERL5_MAN3%%/Mail::MboxParser::Mail::Convertable.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/MboxParser
 @dirrm %%SITE_PERL%%/Mail/MboxParser/Mail
 @dirrm %%SITE_PERL%%/Mail/MboxParser
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index 888a119dacd1..a6f3e2d84d30 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl5 module to talk to a POP3 (RFC1939) server
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::POP3Client.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-POP3Client/pkg-descr b/mail/p5-Mail-POP3Client/pkg-descr
index 76646836f8de..7fbfadf10f89 100644
--- a/mail/p5-Mail-POP3Client/pkg-descr
+++ b/mail/p5-Mail-POP3Client/pkg-descr
@@ -1,18 +1,4 @@
-DESCRIPTION
-
-This module implements an Object-Oriented interface to a POP3 server.  It is
+This module implements an Object-Oriented interface to a POP3 server. It is
 based on RFC1939.
 
-USAGE
-
-Here is a simple example to list out the headers in your remote mailbox:
-
-#!/usr/bin/perl
-
-use Mail::POP3Client;
-$pop = new Mail::POP3Client("me", "mypassword", "pop3.do.main");
-for ($i = 1; $i <= $pop->Count; $i++) {
-	print $pop->Head($i), "\n";
-}
-
 WWW: http://search.cpan.org/dist/Mail-POP3Client/
diff --git a/mail/p5-Mail-POP3Client/pkg-plist b/mail/p5-Mail-POP3Client/pkg-plist
index 82845503e756..a89dcb3c84c1 100644
--- a/mail/p5-Mail-POP3Client/pkg-plist
+++ b/mail/p5-Mail-POP3Client/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Mail/POP3Client.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/POP3Client/.packlist
+%%PERL5_MAN3%%/Mail::POP3Client.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/POP3Client
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
 @dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Sender/Makefile b/mail/p5-Mail-Sender/Makefile
index cbd103937d23..f4a3c1a89107 100644
--- a/mail/p5-Mail-Sender/Makefile
+++ b/mail/p5-Mail-Sender/Makefile
@@ -13,9 +13,6 @@ COMMENT=	Module for sending mails with attachments through an SMTP server
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::Sender.3
-
-NO_STAGE=	yes
 post-patch:
 .if defined(BATCH)
 	@${REINPLACE_CMD}  -e 's/res = <STDIN>;/res = "N";/' ${WRKSRC}/Config.PL
diff --git a/mail/p5-Mail-Sender/pkg-plist b/mail/p5-Mail-Sender/pkg-plist
index 3f07b9a97f21..91370e50d5c8 100644
--- a/mail/p5-Mail-Sender/pkg-plist
+++ b/mail/p5-Mail-Sender/pkg-plist
@@ -2,6 +2,7 @@
 %%SITE_PERL%%/Mail/Sender/CType/Ext.pm
 %%SITE_PERL%%/Mail/Sender/CType/Win32.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sender/.packlist
+%%PERL5_MAN3%%/Mail::Sender.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sender
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
 @dirrm %%SITE_PERL%%/Mail/Sender/CType
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index 388eb2458b1c..7f6aa01d51be 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -17,18 +17,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-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 \
-		Mail::Mailer.3 \
-		Mail::Send.3 \
-		Mail::Util.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Tools/pkg-plist b/mail/p5-Mail-Tools/pkg-plist
index c4b04fed6835..3372e155a594 100644
--- a/mail/p5-Mail-Tools/pkg-plist
+++ b/mail/p5-Mail-Tools/pkg-plist
@@ -29,6 +29,18 @@
 %%SITE_PERL%%/Mail/Util.pm
 %%SITE_PERL%%/Mail/Util.pod
 %%SITE_PERL%%/Mail/Mailer/qmail.pm
+%%PERL5_MAN3%%/Mail::Address.3.gz
+%%PERL5_MAN3%%/Mail::Cap.3.gz
+%%PERL5_MAN3%%/Mail::Field.3.gz
+%%PERL5_MAN3%%/Mail::Field::AddrList.3.gz
+%%PERL5_MAN3%%/Mail::Field::Date.3.gz
+%%PERL5_MAN3%%/Mail::Field::Generic.3.gz
+%%PERL5_MAN3%%/Mail::Filter.3.gz
+%%PERL5_MAN3%%/Mail::Header.3.gz
+%%PERL5_MAN3%%/Mail::Internet.3.gz
+%%PERL5_MAN3%%/Mail::Mailer.3.gz
+%%PERL5_MAN3%%/Mail::Send.3.gz
+%%PERL5_MAN3%%/Mail::Util.3.gz
 @dirrmtry %%SITE_PERL%%/Mail/Mailer
 @dirrmtry %%SITE_PERL%%/Mail/Field
 @dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Net-IMAP-Simple-SSL/Makefile b/mail/p5-Net-IMAP-Simple-SSL/Makefile
index c89e02a820fd..0a686df88b93 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/Makefile
+++ b/mail/p5-Net-IMAP-Simple-SSL/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Net::IMAP::Simple::SSL.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Net-IMAP-Simple-SSL/pkg-plist b/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
index f9d3986032f2..c4f1c1e3343c 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
+++ b/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Net/IMAP/Simple/SSL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/SSL/.packlist
+%%PERL5_MAN3%%/Net::IMAP::Simple::SSL.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/SSL
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
diff --git a/mail/p5-Net-POP3-SSLWrapper/Makefile b/mail/p5-Net-POP3-SSLWrapper/Makefile
index 8fde9d0b0848..dfdfe185dbf6 100644
--- a/mail/p5-Net-POP3-SSLWrapper/Makefile
+++ b/mail/p5-Net-POP3-SSLWrapper/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS=	p5-IO-Socket-SSL>=1.34:${PORTSDIR}/security/p5-IO-Socket-SSL
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::POP3::SSLWrapper.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Net-POP3-SSLWrapper/pkg-descr b/mail/p5-Net-POP3-SSLWrapper/pkg-descr
index f7692b66a4c7..a6d679b1b40b 100644
--- a/mail/p5-Net-POP3-SSLWrapper/pkg-descr
+++ b/mail/p5-Net-POP3-SSLWrapper/pkg-descr
@@ -1,5 +1,4 @@
 Net::POP3::SSLWrapper is simple POP3S wrapper for Net::POP3.
-
 You can easy to support POP3S, with very small code change.
 
 WWW: http://search.cpan.org/dist/Net-POP3-SSLWrapper/
diff --git a/mail/p5-Net-POP3-SSLWrapper/pkg-plist b/mail/p5-Net-POP3-SSLWrapper/pkg-plist
index 51dd4ded48a2..61dfe2e3f578 100644
--- a/mail/p5-Net-POP3-SSLWrapper/pkg-plist
+++ b/mail/p5-Net-POP3-SSLWrapper/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Net/POP3/SSLWrapper.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/POP3/SSLWrapper/.packlist
+%%PERL5_MAN3%%/Net::POP3::SSLWrapper.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/POP3/SSLWrapper
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/POP3
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/mail/p5-Net-SenderBase/Makefile b/mail/p5-Net-SenderBase/Makefile
index 65d594148850..34310120dfae 100644
--- a/mail/p5-Net-SenderBase/Makefile
+++ b/mail/p5-Net-SenderBase/Makefile
@@ -16,9 +16,4 @@ RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::SenderBase.3 \
-		Net::SenderBase::Query.3 \
-		Net::SenderBase::Results.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Net-SenderBase/pkg-plist b/mail/p5-Net-SenderBase/pkg-plist
index 6376a2133466..c3a6617f00ea 100644
--- a/mail/p5-Net-SenderBase/pkg-plist
+++ b/mail/p5-Net-SenderBase/pkg-plist
@@ -3,6 +3,9 @@
 %%SITE_PERL%%/Net/SenderBase/Query.pm
 %%SITE_PERL%%/Net/SenderBase/Results.pm
 %%SITE_PERL%%/Net/SenderBase/Query/DNS.pm
+%%PERL5_MAN3%%/Net::SenderBase.3.gz
+%%PERL5_MAN3%%/Net::SenderBase::Query.3.gz
+%%PERL5_MAN3%%/Net::SenderBase::Results.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SenderBase
 @dirrm %%SITE_PERL%%/Net/SenderBase/Query
 @dirrm %%SITE_PERL%%/Net/SenderBase
diff --git a/mail/p5-URI-imap/Makefile b/mail/p5-URI-imap/Makefile
index 7331c3ddd407..0c0805355de4 100644
--- a/mail/p5-URI-imap/Makefile
+++ b/mail/p5-URI-imap/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	URI::imap.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-URI-imap/pkg-plist b/mail/p5-URI-imap/pkg-plist
index ee98b783e21f..dcff72a25334 100644
--- a/mail/p5-URI-imap/pkg-plist
+++ b/mail/p5-URI-imap/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/URI/imap.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imap/.packlist
+%%PERL5_MAN3%%/URI::imap.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imap
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
 @dirrmtry %%SITE_PERL%%/URI