44 files changed, 48 insertions, 81 deletions

diff --git a/mail/p5-Email-Address-Loose/Makefile b/mail/p5-Email-Address-Loose/Makefile
index 070bf3559713..97c424e9bd39 100644
--- a/mail/p5-Email-Address-Loose/Makefile
+++ b/mail/p5-Email-Address-Loose/Makefile
@@ -16,7 +16,4 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Email::Address::Loose.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Address-Loose/pkg-plist b/mail/p5-Email-Address-Loose/pkg-plist
index 5453848afe56..54351e9d2f7c 100644
--- a/mail/p5-Email-Address-Loose/pkg-plist
+++ b/mail/p5-Email-Address-Loose/pkg-plist
@@ -2,6 +2,7 @@
 %%SITE_PERL%%/Email/Address/Loose.pm
 %%SITE_PERL%%/Email/Address/Loose/EmailAddress.pm
 %%SITE_PERL%%/Email/Address/Loose/EmailValidLoose.pm
+%%PERL5_MAN3%%/Email::Address::Loose.3.gz
 @dirrm %%SITE_PERL%%/Email/Address/Loose
 @dirrmtry %%SITE_PERL%%/Email/Address
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address/Loose
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 7319a1ee8251..78ca637389d7 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::Find.3 Email::Find::addrspec.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Find/pkg-plist b/mail/p5-Email-Find/pkg-plist
index 777a675f573c..eb4fed1c376d 100644
--- a/mail/p5-Email-Find/pkg-plist
+++ b/mail/p5-Email-Find/pkg-plist
@@ -1,5 +1,7 @@
 %%SITE_PERL%%/Email/Find.pm
 %%SITE_PERL%%/Email/Find/addrspec.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Find/.packlist
+%%PERL5_MAN3%%/Email::Find.3.gz
+%%PERL5_MAN3%%/Email::Find::addrspec.3.gz
 @dirrm %%SITE_PERL%%/Email/Find
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Find
diff --git a/mail/p5-Email-Folder-IMAP/Makefile b/mail/p5-Email-Folder-IMAP/Makefile
index cc3009069e64..8a712eda9032 100644
--- a/mail/p5-Email-Folder-IMAP/Makefile
+++ b/mail/p5-Email-Folder-IMAP/Makefile
@@ -20,7 +20,5 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Email::Folder::IMAP.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Folder-IMAP/pkg-plist b/mail/p5-Email-Folder-IMAP/pkg-plist
index 9965a1a29b89..8fc1f8d73d66 100644
--- a/mail/p5-Email-Folder-IMAP/pkg-plist
+++ b/mail/p5-Email-Folder-IMAP/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Email/Folder/IMAP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAP/.packlist
+%%PERL5_MAN3%%/Email::Folder::IMAP.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-Email-FolderType/Makefile b/mail/p5-Email-FolderType/Makefile
index 568fc14a1b7e..661eaed96955 100644
--- a/mail/p5-Email-FolderType/Makefile
+++ b/mail/p5-Email-FolderType/Makefile
@@ -15,11 +15,4 @@ COMMENT=	Determine the type of a mail folder
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::FolderType.3 \
-		Email::FolderType::Ezmlm.3 \
-		Email::FolderType::MH.3 \
-		Email::FolderType::Maildir.3 \
-		Email::FolderType::Mbox.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-FolderType/pkg-plist b/mail/p5-Email-FolderType/pkg-plist
index a3d32f478cd1..9aafc1c97ab1 100644
--- a/mail/p5-Email-FolderType/pkg-plist
+++ b/mail/p5-Email-FolderType/pkg-plist
@@ -4,6 +4,11 @@
 %%SITE_PERL%%/Email/FolderType/Maildir.pm
 %%SITE_PERL%%/Email/FolderType/Mbox.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/.packlist
+%%PERL5_MAN3%%/Email::FolderType.3.gz
+%%PERL5_MAN3%%/Email::FolderType::Ezmlm.3.gz
+%%PERL5_MAN3%%/Email::FolderType::MH.3.gz
+%%PERL5_MAN3%%/Email::FolderType::Maildir.3.gz
+%%PERL5_MAN3%%/Email::FolderType::Mbox.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
 @dirrmtry %%SITE_PERL%%/Email/FolderType
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
index 7019bb8a90da..718cea24192e 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
@@ -17,9 +17,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::LocalDelivery::Ezmlm.3
-
-NO_STAGE=	yes
 post-patch:
 		@${RM} ${WRKSRC}/lib/Email/LocalDelivery/Ezmlm.pm.orig
 test:
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist b/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
index 2369ee9aad3f..aadab7433141 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Email/LocalDelivery/Ezmlm.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/Ezmlm/.packlist
+%%PERL5_MAN3%%/Email::LocalDelivery::Ezmlm.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/Ezmlm
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile b/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
index f30fc6288615..a44fa44f75dc 100644
--- a/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
+++ b/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
@@ -19,7 +19,4 @@ TEST_DEPENDS=	p5-Test-Classy>=0:${PORTSDIR}/devel/p5-Test-Classy \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Email::MIME::Creator::ISO_2022_JP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist b/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist
index ed5b6c40c3ad..21a9cbec7310 100644
--- a/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist
+++ b/mail/p5-Email-MIME-Creator-ISO_2022_JP/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Creator/ISO_2022_JP/.packlist
 %%SITE_PERL%%/Email/MIME/Creator/ISO_2022_JP.pm
+%%PERL5_MAN3%%/Email::MIME::Creator::ISO_2022_JP.3.gz
 @dirrmtry %%SITE_PERL%%/Email/MIME/Creator
 @dirrmtry %%SITE_PERL%%/Email/MIME
 @dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile b/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
index 0a065ef1b0b0..76cb7cecc9f4 100644
--- a/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
+++ b/mail/p5-Email-Sender-Transport-SMTP-TLS/Makefile
@@ -17,7 +17,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::Sender::Transport::SMTP::TLS.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist b/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist
index 726a10ebd1df..015169648fdd 100644
--- a/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist
+++ b/mail/p5-Email-Sender-Transport-SMTP-TLS/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Email/Sender/Transport/SMTP/TLS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SMTP/TLS/.packlist
+%%PERL5_MAN3%%/Email::Sender::Transport::SMTP::TLS.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SMTP/TLS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SMTP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport
diff --git a/mail/p5-Email-Sender-Transport-SQLite/Makefile b/mail/p5-Email-Sender-Transport-SQLite/Makefile
index 921ce5595043..255b163cda8f 100644
--- a/mail/p5-Email-Sender-Transport-SQLite/Makefile
+++ b/mail/p5-Email-Sender-Transport-SQLite/Makefile
@@ -18,7 +18,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::Sender::Transport::SQLite.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Sender-Transport-SQLite/pkg-plist b/mail/p5-Email-Sender-Transport-SQLite/pkg-plist
index 8338550779b8..6c203ab100c5 100644
--- a/mail/p5-Email-Sender-Transport-SQLite/pkg-plist
+++ b/mail/p5-Email-Sender-Transport-SQLite/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Email/Sender/Transport/SQLite.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SQLite/.packlist
+%%PERL5_MAN3%%/Email::Sender::Transport::SQLite.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport/SQLite
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/Transport
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender
diff --git a/mail/p5-Email-Stuff/Makefile b/mail/p5-Email-Stuff/Makefile
index 65b91420d757..8ebf39f133ca 100644
--- a/mail/p5-Email-Stuff/Makefile
+++ b/mail/p5-Email-Stuff/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chifeng@gmail.com
-COMMENT=	A more casual approach to creating and sending Email
+COMMENT=	More casual approach to creating and sending Email
 
 BUILD_DEPENDS=	p5-prefork>=1.01:${PORTSDIR}/devel/p5-prefork \
 		p5-Params-Util>=0.23:${PORTSDIR}/devel/p5-Params-Util \
@@ -21,7 +21,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::Stuff.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Stuff/pkg-plist b/mail/p5-Email-Stuff/pkg-plist
index 3eff68f82b83..e7f86c13fba3 100644
--- a/mail/p5-Email-Stuff/pkg-plist
+++ b/mail/p5-Email-Stuff/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Email/Stuff.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Stuff/.packlist
+%%PERL5_MAN3%%/Email::Stuff.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Stuff
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
 @dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Stuffer/Makefile b/mail/p5-Email-Stuffer/Makefile
index 7e2c1266bb1d..74229cb552e1 100644
--- a/mail/p5-Email-Stuffer/Makefile
+++ b/mail/p5-Email-Stuffer/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	zi@FreeBSD.org
-COMMENT=	A more casual approach to creating and sending Email
+COMMENT=	More casual approach to creating and sending Email
 
 BUILD_DEPENDS=	p5-Params-Util>=0.23:${PORTSDIR}/devel/p5-Params-Util \
 		p5-File-Type>=0.22:${PORTSDIR}/devel/p5-File-Type \
@@ -19,8 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::Stuffer.3
-
-NO_STAGE=	yes
-
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Stuffer/pkg-plist b/mail/p5-Email-Stuffer/pkg-plist
index dc9a10149f38..9beb7071674b 100644
--- a/mail/p5-Email-Stuffer/pkg-plist
+++ b/mail/p5-Email-Stuffer/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Email/Stuffer.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Stuffer/.packlist
+%%PERL5_MAN3%%/Email::Stuffer.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Stuffer
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
 @dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index 179d7f3132a5..2d769c144476 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -20,10 +20,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::Folder.3 Mail::Folder::Emaul.3 Mail::Folder::Mbox.3 \
-		Mail::Folder::NNTP.3 Mail::Folder::Maildir.3
-
-NO_STAGE=	yes
 post-configure:
 	@${PERL} -pi -e 's/^FULLEXT.*/FULLEXT=Mail\/Folder/' \
 		${WRKSRC}/Makefile
diff --git a/mail/p5-Mail-Folder/pkg-plist b/mail/p5-Mail-Folder/pkg-plist
index 6ac9f5073120..ecd54ace2644 100644
--- a/mail/p5-Mail-Folder/pkg-plist
+++ b/mail/p5-Mail-Folder/pkg-plist
@@ -4,6 +4,11 @@
 %%SITE_PERL%%/Mail/Folder/Mbox.pm
 %%SITE_PERL%%/Mail/Folder/NNTP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Folder/.packlist
+%%PERL5_MAN3%%/Mail::Folder.3.gz
+%%PERL5_MAN3%%/Mail::Folder::Emaul.3.gz
+%%PERL5_MAN3%%/Mail::Folder::Mbox.3.gz
+%%PERL5_MAN3%%/Mail::Folder::NNTP.3.gz
+%%PERL5_MAN3%%/Mail::Folder::Maildir.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Folder
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
 @dirrm %%SITE_PERL%%/Mail/Folder
diff --git a/mail/p5-Mail-OpenRelay-Simple/Makefile b/mail/p5-Mail-OpenRelay-Simple/Makefile
index f42a5a2db4c8..132b2e7b3b48 100644
--- a/mail/p5-Mail-OpenRelay-Simple/Makefile
+++ b/mail/p5-Mail-OpenRelay-Simple/Makefile
@@ -17,7 +17,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Mail::OpenRelay::Simple.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-OpenRelay-Simple/pkg-plist b/mail/p5-Mail-OpenRelay-Simple/pkg-plist
index 96c0d9795383..fcac331db677 100644
--- a/mail/p5-Mail-OpenRelay-Simple/pkg-plist
+++ b/mail/p5-Mail-OpenRelay-Simple/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Mail/OpenRelay/Simple.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenRelay/Simple/.packlist
+%%PERL5_MAN3%%/Mail::OpenRelay::Simple.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenRelay/Simple
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenRelay
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-SendEasy/Makefile b/mail/p5-Mail-SendEasy/Makefile
index cc825d9aa2b4..61f3497cc5f5 100644
--- a/mail/p5-Mail-SendEasy/Makefile
+++ b/mail/p5-Mail-SendEasy/Makefile
@@ -13,8 +13,4 @@ COMMENT=	Send plain/html e-mails through SMTP servers
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::SendEasy.3 Mail::SendEasy::AUTH.3 \
-	       	Mail::SendEasy::SMTP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-SendEasy/pkg-descr b/mail/p5-Mail-SendEasy/pkg-descr
index f8f808493c1e..744ee4456f0a 100644
--- a/mail/p5-Mail-SendEasy/pkg-descr
+++ b/mail/p5-Mail-SendEasy/pkg-descr
@@ -3,4 +3,4 @@ dependencies. Soo, you don't need to install libnet.
 
 It supports SMTP authentication and attachments.
 
-WWW:	http://search.cpan.org/dist/Mail-SendEasy/
+WWW: http://search.cpan.org/dist/Mail-SendEasy/
diff --git a/mail/p5-Mail-SendEasy/pkg-plist b/mail/p5-Mail-SendEasy/pkg-plist
index 49d89e5620f7..ac19881819a6 100644
--- a/mail/p5-Mail-SendEasy/pkg-plist
+++ b/mail/p5-Mail-SendEasy/pkg-plist
@@ -4,6 +4,9 @@
 %%SITE_PERL%%/Mail/SendEasy/Base64.pm
 %%SITE_PERL%%/Mail/SendEasy/IOScalar.pm
 %%SITE_PERL%%/Mail/SendEasy/SMTP.pm
+%%PERL5_MAN3%%/Mail::SendEasy.3.gz
+%%PERL5_MAN3%%/Mail::SendEasy::AUTH.3.gz
+%%PERL5_MAN3%%/Mail::SendEasy::SMTP.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SendEasy
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
 @dirrmtry %%SITE_PERL%%/Mail/SendEasy
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index 8e292952ee31..699017f341c7 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chifeng@gmail.com
-COMMENT=	"Pure Perl" implementation of mail spooling, unspooling, and sending
+COMMENT=	Pure Perl implementation of mail spooling, unspooling, and sending
 
 BUILD_DEPENDS=	p5-File-NFSLock>=0:${PORTSDIR}/devel/p5-File-NFSLock \
 		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::Spool.3 Mail::Spool::Handle.3 Mail::Spool::Node.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Spool/pkg-descr b/mail/p5-Mail-Spool/pkg-descr
index 9fc4069925e7..095b972daf2b 100644
--- a/mail/p5-Mail-Spool/pkg-descr
+++ b/mail/p5-Mail-Spool/pkg-descr
@@ -6,3 +6,5 @@ daemon (based off of Net::Server::Fork) that can be used if necessary.
 It is also intended to be used as a quick spooling mechanism for perl
 scripts. As it can write straight to the queue without opening another
 process.
+
+WWW: http://search.cpan.org/dist/Mail-Spool/
diff --git a/mail/p5-Mail-Spool/pkg-plist b/mail/p5-Mail-Spool/pkg-plist
index 87d022981d17..61644117af09 100644
--- a/mail/p5-Mail-Spool/pkg-plist
+++ b/mail/p5-Mail-Spool/pkg-plist
@@ -2,5 +2,8 @@
 %%SITE_PERL%%/Mail/Spool/Handle.pm
 %%SITE_PERL%%/Mail/Spool/Node.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Spool/.packlist
+%%PERL5_MAN3%%/Mail::Spool.3.gz
+%%PERL5_MAN3%%/Mail::Spool::Handle.3.gz
+%%PERL5_MAN3%%/Mail::Spool::Node.3.gz
 @dirrm %%SITE_PERL%%/Mail/Spool
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Spool
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index 57d31dc29b1c..a45da50fa794 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::Verify.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Verify/pkg-plist b/mail/p5-Mail-Verify/pkg-plist
index 6920f82c4b76..f7420ca4f4de 100644
--- a/mail/p5-Mail-Verify/pkg-plist
+++ b/mail/p5-Mail-Verify/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Mail/Verify.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify/.packlist
+%%PERL5_MAN3%%/Mail::Verify.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
 @dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Net-IMAP-Server/Makefile b/mail/p5-Net-IMAP-Server/Makefile
index 5bb9a886a309..02e3edfc1479 100644
--- a/mail/p5-Net-IMAP-Server/Makefile
+++ b/mail/p5-Net-IMAP-Server/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	chifeng@gmail.com
-COMMENT=	A single-threaded multiplexing IMAP server implementation
+COMMENT=	Single-threaded multiplexing IMAP server implementation
 
 BUILD_DEPENDS=	p5-Net-Server-Coro>=0.6:${PORTSDIR}/net/p5-Net-Server-Coro \
 		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
@@ -25,14 +25,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Net::IMAP::Server.3 \
-	Net::IMAP::Server::Command.3 \
-	Net::IMAP::Server::Connection.3 \
-	Net::IMAP::Server::DefaultAuth.3 \
-	Net::IMAP::Server::DefaultModel.3 \
-	Net::IMAP::Server::Error.3 \
-	Net::IMAP::Server::Mailbox.3 \
-	Net::IMAP::Server::Message.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Net-IMAP-Server/pkg-plist b/mail/p5-Net-IMAP-Server/pkg-plist
index 55707b37e3a9..9be021da830b 100644
--- a/mail/p5-Net-IMAP-Server/pkg-plist
+++ b/mail/p5-Net-IMAP-Server/pkg-plist
@@ -34,6 +34,14 @@
 %%SITE_PERL%%/Net/IMAP/Server/DefaultAuth.pm
 %%SITE_PERL%%/Net/IMAP/Server.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Server/.packlist
+%%PERL5_MAN3%%/Net::IMAP::Server.3.gz
+%%PERL5_MAN3%%/Net::IMAP::Server::Command.3.gz
+%%PERL5_MAN3%%/Net::IMAP::Server::Connection.3.gz
+%%PERL5_MAN3%%/Net::IMAP::Server::DefaultAuth.3.gz
+%%PERL5_MAN3%%/Net::IMAP::Server::DefaultModel.3.gz
+%%PERL5_MAN3%%/Net::IMAP::Server::Error.3.gz
+%%PERL5_MAN3%%/Net::IMAP::Server::Mailbox.3.gz
+%%PERL5_MAN3%%/Net::IMAP::Server::Message.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Server
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/mail/p5-URI-imaps/Makefile b/mail/p5-URI-imaps/Makefile
index cb9aac1a0b86..b67dc798d73e 100644
--- a/mail/p5-URI-imaps/Makefile
+++ b/mail/p5-URI-imaps/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	URI::imaps.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-URI-imaps/pkg-plist b/mail/p5-URI-imaps/pkg-plist
index 78d2079bbd3a..39861afea06f 100644
--- a/mail/p5-URI-imaps/pkg-plist
+++ b/mail/p5-URI-imaps/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/URI/imaps.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imaps/.packlist
+%%PERL5_MAN3%%/URI::imaps.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imaps
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
 @dirrmtry %%SITE_PERL%%/URI
diff --git a/mail/p5-WWW-GMail/Makefile b/mail/p5-WWW-GMail/Makefile
index 47f511c4f827..9b1656e78a54 100644
--- a/mail/p5-WWW-GMail/Makefile
+++ b/mail/p5-WWW-GMail/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		WWW::GMail.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-WWW-GMail/pkg-descr b/mail/p5-WWW-GMail/pkg-descr
index e30a544d965c..1c0815553125 100644
--- a/mail/p5-WWW-GMail/pkg-descr
+++ b/mail/p5-WWW-GMail/pkg-descr
@@ -1,4 +1,3 @@
 WWW::GMail - Perl extension for accessing Google Mail (gmail)
 
-Author:	David Davis <xantus@cpan.org>
-WWW:	http://search.cpan.org/dist/WWW-GMail/
+WWW: http://search.cpan.org/dist/WWW-GMail/
diff --git a/mail/p5-WWW-GMail/pkg-plist b/mail/p5-WWW-GMail/pkg-plist
index 196cfc0f968e..edfdab1890dc 100644
--- a/mail/p5-WWW-GMail/pkg-plist
+++ b/mail/p5-WWW-GMail/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/WWW/GMail.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/GMail/.packlist
+%%PERL5_MAN3%%/WWW::GMail.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/GMail
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
 @dirrmtry %%SITE_PERL%%/WWW
diff --git a/mail/p5-WWW-Hotmail/Makefile b/mail/p5-WWW-Hotmail/Makefile
index 596387ab1614..5ca031d37cf0 100644
--- a/mail/p5-WWW-Hotmail/Makefile
+++ b/mail/p5-WWW-Hotmail/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		WWW::Hotmail.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-WWW-Hotmail/pkg-descr b/mail/p5-WWW-Hotmail/pkg-descr
index a68a62413efd..4592a4bf0078 100644
--- a/mail/p5-WWW-Hotmail/pkg-descr
+++ b/mail/p5-WWW-Hotmail/pkg-descr
@@ -1,4 +1,3 @@
 WWW::Hotmail - Perl extension for connecting to Hotmail
 
-Author: David Davis, <xantus@cpan.org>
 WWW: http://search.cpan.org/dist/WWW-Hotmail/
diff --git a/mail/p5-WWW-Hotmail/pkg-plist b/mail/p5-WWW-Hotmail/pkg-plist
index bb374366b0f3..cd590db8071c 100644
--- a/mail/p5-WWW-Hotmail/pkg-plist
+++ b/mail/p5-WWW-Hotmail/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/WWW/Hotmail.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Hotmail/.packlist
+%%PERL5_MAN3%%/WWW::Hotmail.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Hotmail
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
 @dirrmtry %%SITE_PERL%%/WWW
diff --git a/mail/p5-ZConf-Mail/Makefile b/mail/p5-ZConf-Mail/Makefile
index 1a8c745957fa..a403fecfacda 100644
--- a/mail/p5-ZConf-Mail/Makefile
+++ b/mail/p5-ZConf-Mail/Makefile
@@ -31,7 +31,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		ZConf::Mail.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-ZConf-Mail/pkg-plist b/mail/p5-ZConf-Mail/pkg-plist
index 0ca793790819..d161505d6355 100644
--- a/mail/p5-ZConf-Mail/pkg-plist
+++ b/mail/p5-ZConf-Mail/pkg-plist
@@ -2,6 +2,7 @@ bin/zcgetmail
 bin/zcmailaccount
 %%SITE_PERL%%/ZConf/Mail.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Mail/.packlist
+%%PERL5_MAN3%%/ZConf::Mail.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Mail
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%