- stage support

Approved by:	portmgr (blanket infrastructure)

38 files changed, 45 insertions, 77 deletions

diff --git a/mail/p5-Email-Abstract/Makefile b/mail/p5-Email-Abstract/Makefile
index 90abba47d628..35982d63c9b1 100644
--- a/mail/p5-Email-Abstract/Makefile
+++ b/mail/p5-Email-Abstract/Makefile
@@ -17,13 +17,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::Abstract.3 \
-		Email::Abstract::EmailMIME.3 \
-		Email::Abstract::EmailSimple.3 \
-		Email::Abstract::MIMEEntity.3 \
-		Email::Abstract::MailInternet.3 \
-		Email::Abstract::MailMessage.3 \
-		Email::Abstract::Plugin.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Abstract/pkg-plist b/mail/p5-Email-Abstract/pkg-plist
index 847210a46bbf..c4ef8bb5ae5b 100644
--- a/mail/p5-Email-Abstract/pkg-plist
+++ b/mail/p5-Email-Abstract/pkg-plist
@@ -6,6 +6,13 @@
 %%SITE_PERL%%/Email/Abstract/MailMessage.pm
 %%SITE_PERL%%/Email/Abstract/Plugin.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Abstract/.packlist
+%%PERL5_MAN3%%/Email::Abstract.3.gz
+%%PERL5_MAN3%%/Email::Abstract::EmailMIME.3.gz
+%%PERL5_MAN3%%/Email::Abstract::EmailSimple.3.gz
+%%PERL5_MAN3%%/Email::Abstract::MIMEEntity.3.gz
+%%PERL5_MAN3%%/Email::Abstract::MailInternet.3.gz
+%%PERL5_MAN3%%/Email::Abstract::MailMessage.3.gz
+%%PERL5_MAN3%%/Email::Abstract::Plugin.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Abstract
 @dirrmtry %%SITE_PERL%%/Email/Abstract
 @dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Delete/Makefile b/mail/p5-Email-Delete/Makefile
index 05636b33c4b2..1171fc3a762c 100644
--- a/mail/p5-Email-Delete/Makefile
+++ b/mail/p5-Email-Delete/Makefile
@@ -22,9 +22,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Email::Delete.3 \
-	Email::Delete::Maildir.3 \
-	Email::Delete::Mbox.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Delete/pkg-plist b/mail/p5-Email-Delete/pkg-plist
index 2e54613ea3ef..7116ef9263ab 100644
--- a/mail/p5-Email-Delete/pkg-plist
+++ b/mail/p5-Email-Delete/pkg-plist
@@ -2,6 +2,9 @@
 %%SITE_PERL%%/Email/Delete/Maildir.pm
 %%SITE_PERL%%/Email/Delete/Mbox.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete/.packlist
+%%PERL5_MAN3%%/Email::Delete.3.gz
+%%PERL5_MAN3%%/Email::Delete::Maildir.3.gz
+%%PERL5_MAN3%%/Email::Delete::Mbox.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
 @dirrmtry %%SITE_PERL%%/Email/Delete
diff --git a/mail/p5-Email-Folder/Makefile b/mail/p5-Email-Folder/Makefile
index 6fff5175ec74..dcf9b8b99734 100644
--- a/mail/p5-Email-Folder/Makefile
+++ b/mail/p5-Email-Folder/Makefile
@@ -18,11 +18,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::Folder.3 \
-		Email::Folder::MH.3 \
-		Email::Folder::Maildir.3 \
-		Email::Folder::Mbox.3 \
-		Email::Folder::Reader.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Folder/pkg-plist b/mail/p5-Email-Folder/pkg-plist
index 3a74fb3c3bcd..a39461f67200 100644
--- a/mail/p5-Email-Folder/pkg-plist
+++ b/mail/p5-Email-Folder/pkg-plist
@@ -5,6 +5,11 @@
 %%SITE_PERL%%/Email/Folder/Mbox.pm
 %%SITE_PERL%%/Email/Folder/Reader.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/.packlist
+%%PERL5_MAN3%%/Email::Folder.3.gz
+%%PERL5_MAN3%%/Email::Folder::MH.3.gz
+%%PERL5_MAN3%%/Email::Folder::Maildir.3.gz
+%%PERL5_MAN3%%/Email::Folder::Mbox.3.gz
+%%PERL5_MAN3%%/Email::Folder::Reader.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
 @dirrmtry %%SITE_PERL%%/Email/Folder
diff --git a/mail/p5-Email-FolderType-Net/Makefile b/mail/p5-Email-FolderType-Net/Makefile
index d200d51b2c47..f1d24d978d09 100644
--- a/mail/p5-Email-FolderType-Net/Makefile
+++ b/mail/p5-Email-FolderType-Net/Makefile
@@ -19,7 +19,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Email::FolderType::Net.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-FolderType-Net/pkg-plist b/mail/p5-Email-FolderType-Net/pkg-plist
index 058df05e5fd9..79c83d0b996d 100644
--- a/mail/p5-Email-FolderType-Net/pkg-plist
+++ b/mail/p5-Email-FolderType-Net/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Email/FolderType/Net.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/Net/.packlist
+%%PERL5_MAN3%%/Email::FolderType::Net.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/Net
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/Makefile b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
index 63e4bcbf5af2..fc0e1d89252b 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/Makefile
+++ b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
@@ -19,7 +19,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::MIME::Attachment::Stripper.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist b/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
index 9b27aecec4ac..10f619a35aa0 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
+++ b/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Email/MIME/Attachment/Stripper.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper/.packlist
+%%PERL5_MAN3%%/Email::MIME::Attachment::Stripper.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
diff --git a/mail/p5-Email-MIME-Encodings/Makefile b/mail/p5-Email-MIME-Encodings/Makefile
index 83cd2d45fefb..1a3a30631d00 100644
--- a/mail/p5-Email-MIME-Encodings/Makefile
+++ b/mail/p5-Email-MIME-Encodings/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
-COMMENT=	A unified interface to MIME encoding and decoding
+COMMENT=	Unified interface to MIME encoding and decoding
 
 RUN_DEPENDS=	p5-MIME-Base64>3.05:${PORTSDIR}/converters/p5-MIME-Base64
 BUILD_DEPENDS:=	${RUN_DEPENDS}
@@ -15,7 +15,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Email::MIME::Encodings.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-MIME-Encodings/pkg-plist b/mail/p5-Email-MIME-Encodings/pkg-plist
index a7f753965bbd..dd82cc26942e 100644
--- a/mail/p5-Email-MIME-Encodings/pkg-plist
+++ b/mail/p5-Email-MIME-Encodings/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Email/MIME/Encodings.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Encodings/.packlist
+%%PERL5_MAN3%%/Email::MIME::Encodings.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Encodings
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-MIME-AltWords/Makefile b/mail/p5-MIME-AltWords/Makefile
index 82bfd6b1c645..49c7f6f18cde 100644
--- a/mail/p5-MIME-AltWords/Makefile
+++ b/mail/p5-MIME-AltWords/Makefile
@@ -13,10 +13,6 @@ COMMENT=	Perl module for encoding and decoding MIME words
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		MIME::AltWords.3 \
-		MIME::AltWords0.3
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e '/NAME/ s|MIME-AltWords|MIME::AltWords|' ${WRKSRC}/Makefile.PL
 
diff --git a/mail/p5-MIME-AltWords/pkg-plist b/mail/p5-MIME-AltWords/pkg-plist
index dc4f2cbbfa61..497d30d01d96 100644
--- a/mail/p5-MIME-AltWords/pkg-plist
+++ b/mail/p5-MIME-AltWords/pkg-plist
@@ -1,6 +1,8 @@
 %%SITE_PERL%%/MIME/AltWords.pm
 %%SITE_PERL%%/MIME/AltWords0.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/AltWords/.packlist
+%%PERL5_MAN3%%/MIME::AltWords.3.gz
+%%PERL5_MAN3%%/MIME::AltWords0.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/AltWords
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
 @dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Lite-HTML/Makefile b/mail/p5-MIME-Lite-HTML/Makefile
index 1fb9590d3032..076d92f77464 100644
--- a/mail/p5-MIME-Lite-HTML/Makefile
+++ b/mail/p5-MIME-Lite-HTML/Makefile
@@ -22,7 +22,4 @@ RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		MIME::Lite::HTML.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-MIME-Lite-HTML/pkg-plist b/mail/p5-MIME-Lite-HTML/pkg-plist
index 89da77011ea6..330242735982 100644
--- a/mail/p5-MIME-Lite-HTML/pkg-plist
+++ b/mail/p5-MIME-Lite-HTML/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/MIME/Lite/HTML.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/HTML/.packlist
+%%PERL5_MAN3%%/MIME::Lite::HTML.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/HTML
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
diff --git a/mail/p5-Mail-Cache/Makefile b/mail/p5-Mail-Cache/Makefile
index 13d04d255bab..455a6577260a 100644
--- a/mail/p5-Mail-Cache/Makefile
+++ b/mail/p5-Mail-Cache/Makefile
@@ -17,7 +17,4 @@ BUILD_DEPENDS=	p5-File-BaseDir>=0:${PORTSDIR}/devel/p5-File-BaseDir \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::Cache.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Cache/pkg-descr b/mail/p5-Mail-Cache/pkg-descr
index f73f64a73b4b..308fdde24d57 100644
--- a/mail/p5-Mail-Cache/pkg-descr
+++ b/mail/p5-Mail-Cache/pkg-descr
@@ -1,3 +1,3 @@
 This provides methods for caching mail information.
 
-WWW: http://search.cpan.org/dist/Mail-Cache
+WWW: http://search.cpan.org/dist/Mail-Cache/
diff --git a/mail/p5-Mail-Cache/pkg-plist b/mail/p5-Mail-Cache/pkg-plist
index 0cf2c719050f..6eb9a05cebc3 100644
--- a/mail/p5-Mail-Cache/pkg-plist
+++ b/mail/p5-Mail-Cache/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Mail/Cache.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cache/.packlist
+%%PERL5_MAN3%%/Mail::Cache.3.gz
 @dirrmtry %%SITE_PERL%%/Mail
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cache
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index 7cc1a490589f..9221349239bf 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -25,7 +25,4 @@ USE_PERL5=	configure
 CONFIGURE_ENV=	BSD_BATCH_INSTALL=yes
 .endif
 
-MAN3=		Mail::Ezmlm.3 Mail::Ezmlm::GpgKeyRing.3 Mail::Ezmlm::GpgEzmlm.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Ezmlm/pkg-plist b/mail/p5-Mail-Ezmlm/pkg-plist
index d68308ba1bd7..8dc087741c75 100644
--- a/mail/p5-Mail-Ezmlm/pkg-plist
+++ b/mail/p5-Mail-Ezmlm/pkg-plist
@@ -2,6 +2,9 @@
 %%SITE_PERL%%/Mail/Ezmlm/GpgEzmlm.pm
 %%SITE_PERL%%/Mail/Ezmlm/GpgKeyRing.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Ezmlm/.packlist
+%%PERL5_MAN3%%/Mail::Ezmlm.3.gz
+%%PERL5_MAN3%%/Mail::Ezmlm::GpgKeyRing.3.gz
+%%PERL5_MAN3%%/Mail::Ezmlm::GpgEzmlm.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Ezmlm
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
 @dirrmtry %%SITE_PERL%%/Mail/Ezmlm
diff --git a/mail/p5-Mail-IMAPTalk-MailCache/Makefile b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
index bd40471c17a6..28799d50d569 100644
--- a/mail/p5-Mail-IMAPTalk-MailCache/Makefile
+++ b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
@@ -17,7 +17,4 @@ BUILD_DEPENDS=	p5-Mail-Cache>=0:${PORTSDIR}/mail/p5-Mail-Cache \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Mail::IMAPTalk::MailCache.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-IMAPTalk-MailCache/pkg-descr b/mail/p5-Mail-IMAPTalk-MailCache/pkg-descr
index 520a138dcdda..663a0e01d252 100644
--- a/mail/p5-Mail-IMAPTalk-MailCache/pkg-descr
+++ b/mail/p5-Mail-IMAPTalk-MailCache/pkg-descr
@@ -1,4 +1,4 @@
 This provides methods for caching mail information for
 Mail::IMAPTalk using Mail::Cache.
 
-WWW: http://search.cpan.org/dist/Mail-IMAPTalk-MailCache
+WWW: http://search.cpan.org/dist/Mail-IMAPTalk-MailCache/
diff --git a/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist b/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist
index 418ff38443d8..edad6cac19fe 100644
--- a/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist
+++ b/mail/p5-Mail-IMAPTalk-MailCache/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Mail/IMAPTalk/MailCache.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk/MailCache/.packlist
+%%PERL5_MAN3%%/Mail::IMAPTalk::MailCache.3.gz
 @dirrmtry %%SITE_PERL%%/Mail/IMAPTalk
 @dirrmtry %%SITE_PERL%%/Mail
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPTalk/MailCache
diff --git a/mail/p5-Mail-Transport-Dbx/Makefile b/mail/p5-Mail-Transport-Dbx/Makefile
index 8aeb5d835a76..f8cb2bdfbe70 100644
--- a/mail/p5-Mail-Transport-Dbx/Makefile
+++ b/mail/p5-Mail-Transport-Dbx/Makefile
@@ -16,7 +16,4 @@ COMMENT=	Mail::Transport::Dbx - Parse Outlook Express mailboxes
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Mail::Transport::Dbx.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Transport-Dbx/pkg-plist b/mail/p5-Mail-Transport-Dbx/pkg-plist
index 8e3a709993ba..61af40a380f2 100644
--- a/mail/p5-Mail-Transport-Dbx/pkg-plist
+++ b/mail/p5-Mail-Transport-Dbx/pkg-plist
@@ -3,6 +3,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx/Dbx.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx/Dbx.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx/autosplit.ix
+%%PERL5_MAN3%%/Mail::Transport::Dbx.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport/Dbx
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Transport
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail/Transport
diff --git a/mail/p5-Mail-Verp/Makefile b/mail/p5-Mail-Verp/Makefile
index 9f2113299cba..eb6fc9b1b842 100644
--- a/mail/p5-Mail-Verp/Makefile
+++ b/mail/p5-Mail-Verp/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Encodes and decodes Variable Envelope Return Paths (VERP) addresses
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Mail::Verp.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Verp/pkg-descr b/mail/p5-Mail-Verp/pkg-descr
index d843905b67db..146336984440 100644
--- a/mail/p5-Mail-Verp/pkg-descr
+++ b/mail/p5-Mail-Verp/pkg-descr
@@ -4,4 +4,4 @@ recipient is forwarding their mail to another address and the remote Mail
 Transport Agents send back unhelpful bounce messages. The module must also be
 used to decode bounce recipient addresses.
 
-WWW:	http://search.cpan.org/dist/Mail-Verp/
+WWW: http://search.cpan.org/dist/Mail-Verp/
diff --git a/mail/p5-Mail-Verp/pkg-plist b/mail/p5-Mail-Verp/pkg-plist
index 71e68815190c..d38b598a61a4 100644
--- a/mail/p5-Mail-Verp/pkg-plist
+++ b/mail/p5-Mail-Verp/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Mail/Verp.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verp/.packlist
+%%PERL5_MAN3%%/Mail::Verp.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verp
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
 @dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Net-QMTP/Makefile b/mail/p5-Net-QMTP/Makefile
index 4f622f5421d3..f9576c882116 100644
--- a/mail/p5-Net-QMTP/Makefile
+++ b/mail/p5-Net-QMTP/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS=	p5-Text-Netstring>=0:${PORTSDIR}/textproc/p5-Text-Netstring
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::QMTP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Net-QMTP/pkg-plist b/mail/p5-Net-QMTP/pkg-plist
index e6be8c02dd26..24b1ef3513b7 100644
--- a/mail/p5-Net-QMTP/pkg-plist
+++ b/mail/p5-Net-QMTP/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Net/QMTP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/QMTP/.packlist
+%%PERL5_MAN3%%/Net::QMTP.3.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/QMTP
-@unexec rmdir %%PREFIX%%/%%SITE_PERL%%/Net 2>/dev/null || true
-@unexec rmdir %%PREFIX%%/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/mail/p5-Net-SMTP-TLS/Makefile b/mail/p5-Net-SMTP-TLS/Makefile
index aac269cddc5b..ac153ab01e4e 100644
--- a/mail/p5-Net-SMTP-TLS/Makefile
+++ b/mail/p5-Net-SMTP-TLS/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gslin@gslin.org
-COMMENT=	An SMTP client supporting TLS and AUTH
+COMMENT=	SMTP client supporting TLS and AUTH
 
 RUN_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
 		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
@@ -18,7 +18,4 @@ RUN_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::SMTP::TLS.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Net-SMTP-TLS/pkg-descr b/mail/p5-Net-SMTP-TLS/pkg-descr
index 54eb94394be9..c3072f6a4a0a 100644
--- a/mail/p5-Net-SMTP-TLS/pkg-descr
+++ b/mail/p5-Net-SMTP-TLS/pkg-descr
@@ -3,4 +3,4 @@ interface that users will find familiar from Net::SMTP. Net::SMTP::TLS
 implements a subset of the methods provided by that module, but
 certainly not (yet) a complete mirror image of that API.
 
-WWW:	http://search.cpan.org/dist/Net-SMTP-TLS/
+WWW: http://search.cpan.org/dist/Net-SMTP-TLS/
diff --git a/mail/p5-Net-SMTP-TLS/pkg-plist b/mail/p5-Net-SMTP-TLS/pkg-plist
index e312c8e2c41d..fbb0bee59ee6 100644
--- a/mail/p5-Net-SMTP-TLS/pkg-plist
+++ b/mail/p5-Net-SMTP-TLS/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS/.packlist
 %%SITE_PERL%%/Net/SMTP/TLS.pm
+%%PERL5_MAN3%%/Net::SMTP::TLS.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/TLS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/mail/p5-Net-Server-Mail/Makefile b/mail/p5-Net-Server-Mail/Makefile
index ddf2b5fd0a93..8eac8e590f32 100644
--- a/mail/p5-Net-Server-Mail/Makefile
+++ b/mail/p5-Net-Server-Mail/Makefile
@@ -14,12 +14,4 @@ COMMENT=	Implementation of SMTP, ESMTP, and LMTP protocols
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::Server::Mail.3 \
-		Net::Server::Mail::ESMTP.3 \
-		Net::Server::Mail::ESMTP::Extension.3 \
-		Net::Server::Mail::ESMTP::XFORWARD.3 \
-		Net::Server::Mail::LMTP.3 \
-		Net::Server::Mail::SMTP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Net-Server-Mail/pkg-plist b/mail/p5-Net-Server-Mail/pkg-plist
index 303a1e4d1b6c..a894dc0d68de 100644
--- a/mail/p5-Net-Server-Mail/pkg-plist
+++ b/mail/p5-Net-Server-Mail/pkg-plist
@@ -7,6 +7,12 @@
 %%SITE_PERL%%/Net/Server/Mail/ESMTP/XFORWARD.pm
 %%SITE_PERL%%/Net/Server/Mail/LMTP.pm
 %%SITE_PERL%%/Net/Server/Mail/SMTP.pm
+%%PERL5_MAN3%%/Net::Server::Mail.3.gz
+%%PERL5_MAN3%%/Net::Server::Mail::ESMTP.3.gz
+%%PERL5_MAN3%%/Net::Server::Mail::ESMTP::Extension.3.gz
+%%PERL5_MAN3%%/Net::Server::Mail::ESMTP::XFORWARD.3.gz
+%%PERL5_MAN3%%/Net::Server::Mail::LMTP.3.gz
+%%PERL5_MAN3%%/Net::Server::Mail::SMTP.3.gz
 @dirrm %%SITE_PERL%%/Net/Server/Mail/ESMTP
 @dirrm %%SITE_PERL%%/Net/Server/Mail
 @dirrmtry %%SITE_PERL%%/Net/Server
diff --git a/mail/p5-Parse-Syslog-Mail/Makefile b/mail/p5-Parse-Syslog-Mail/Makefile
index 0a10d35a5bda..bd4629ee403d 100644
--- a/mail/p5-Parse-Syslog-Mail/Makefile
+++ b/mail/p5-Parse-Syslog-Mail/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Parse::Syslog::Mail.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Parse-Syslog-Mail/pkg-plist b/mail/p5-Parse-Syslog-Mail/pkg-plist
index bc98e73b2da5..3eb9d20509ef 100644
--- a/mail/p5-Parse-Syslog-Mail/pkg-plist
+++ b/mail/p5-Parse-Syslog-Mail/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/Parse/Syslog/Mail.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog/Mail/.packlist
+%%PERL5_MAN3%%/Parse::Syslog::Mail.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog/Mail
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse