54 files changed, 227 insertions, 272 deletions

diff --git a/devel/p5-AnyEvent/Makefile b/devel/p5-AnyEvent/Makefile
index 037f87491496..509815a14202 100644
--- a/devel/p5-AnyEvent/Makefile
+++ b/devel/p5-AnyEvent/Makefile
@@ -18,34 +18,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		AE.3 \
-		AnyEvent.3 \
-		AnyEvent::DNS.3 \
-		AnyEvent::Debug.3 \
-		AnyEvent::FAQ.3 \
-		AnyEvent::Handle.3 \
-		AnyEvent::IO.3 \
-		AnyEvent::IO::IOAIO.3 \
-		AnyEvent::IO::Perl.3 \
-		AnyEvent::Impl::Cocoa.3 \
-		AnyEvent::Impl::EV.3 \
-		AnyEvent::Impl::Event.3 \
-		AnyEvent::Impl::EventLib.3 \
-		AnyEvent::Impl::FLTK.3 \
-		AnyEvent::Impl::Glib.3 \
-		AnyEvent::Impl::IOAsync.3 \
-		AnyEvent::Impl::Irssi.3 \
-		AnyEvent::Impl::POE.3 \
-		AnyEvent::Impl::Perl.3 \
-		AnyEvent::Impl::Qt.3 \
-		AnyEvent::Impl::Tk.3 \
-		AnyEvent::Intro.3 \
-		AnyEvent::Log.3 \
-		AnyEvent::Loop.3 \
-		AnyEvent::Socket.3 \
-		AnyEvent::Strict.3 \
-		AnyEvent::TLS.3 \
-		AnyEvent::Util.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-AnyEvent/pkg-plist b/devel/p5-AnyEvent/pkg-plist
index 287e59693ecb..ddc2656b6642 100644
--- a/devel/p5-AnyEvent/pkg-plist
+++ b/devel/p5-AnyEvent/pkg-plist
@@ -1,3 +1,31 @@
+%%PERL5_MAN3%%/AE.3.gz
+%%PERL5_MAN3%%/AnyEvent.3.gz
+%%PERL5_MAN3%%/AnyEvent::DNS.3.gz
+%%PERL5_MAN3%%/AnyEvent::Debug.3.gz
+%%PERL5_MAN3%%/AnyEvent::FAQ.3.gz
+%%PERL5_MAN3%%/AnyEvent::Handle.3.gz
+%%PERL5_MAN3%%/AnyEvent::IO.3.gz
+%%PERL5_MAN3%%/AnyEvent::IO::IOAIO.3.gz
+%%PERL5_MAN3%%/AnyEvent::IO::Perl.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::Cocoa.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::EV.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::Event.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::EventLib.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::FLTK.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::Glib.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::IOAsync.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::Irssi.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::POE.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::Perl.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::Qt.3.gz
+%%PERL5_MAN3%%/AnyEvent::Impl::Tk.3.gz
+%%PERL5_MAN3%%/AnyEvent::Intro.3.gz
+%%PERL5_MAN3%%/AnyEvent::Log.3.gz
+%%PERL5_MAN3%%/AnyEvent::Loop.3.gz
+%%PERL5_MAN3%%/AnyEvent::Socket.3.gz
+%%PERL5_MAN3%%/AnyEvent::Strict.3.gz
+%%PERL5_MAN3%%/AnyEvent::TLS.3.gz
+%%PERL5_MAN3%%/AnyEvent::Util.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/AE.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/AnyEvent/DNS.pm
diff --git a/devel/p5-App-CLI-Extension/Makefile b/devel/p5-App-CLI-Extension/Makefile
index a4b874d5c44e..e8f5b596a61c 100644
--- a/devel/p5-App-CLI-Extension/Makefile
+++ b/devel/p5-App-CLI-Extension/Makefile
@@ -22,15 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		App::CLI::Extension.3 \
-		App::CLI::Extension::Component::Config.3 \
-		App::CLI::Extension::Component::ErrorHandler.3 \
-		App::CLI::Extension::Component::InstallCallback.3 \
-		App::CLI::Extension::Component::OriginalArgv.3 \
-		App::CLI::Extension::Component::RunCommand.3 \
-		App::CLI::Extension::Component::Stash.3 \
-		App::CLI::Extension::Exception.3 \
-		App::CLI::README.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-App-CLI-Extension/pkg-plist b/devel/p5-App-CLI-Extension/pkg-plist
index 814dd7c502a3..bcb7597973b4 100644
--- a/devel/p5-App-CLI-Extension/pkg-plist
+++ b/devel/p5-App-CLI-Extension/pkg-plist
@@ -1,3 +1,12 @@
+%%PERL5_MAN3%%/App::CLI::Extension.3.gz
+%%PERL5_MAN3%%/App::CLI::Extension::Component::Config.3.gz
+%%PERL5_MAN3%%/App::CLI::Extension::Component::ErrorHandler.3.gz
+%%PERL5_MAN3%%/App::CLI::Extension::Component::InstallCallback.3.gz
+%%PERL5_MAN3%%/App::CLI::Extension::Component::OriginalArgv.3.gz
+%%PERL5_MAN3%%/App::CLI::Extension::Component::RunCommand.3.gz
+%%PERL5_MAN3%%/App::CLI::Extension::Component::Stash.3.gz
+%%PERL5_MAN3%%/App::CLI::Extension::Exception.3.gz
+%%PERL5_MAN3%%/App::CLI::README.3.gz
 %%SITE_PERL%%/App/CLI/Extension.pm
 %%SITE_PERL%%/App/CLI/Extension/Component/Config.pm
 %%SITE_PERL%%/App/CLI/Extension/Component/ErrorHandler.pm
diff --git a/devel/p5-App-Cache/Makefile b/devel/p5-App-Cache/Makefile
index f975c976be6d..dae22eb1f7a9 100644
--- a/devel/p5-App-Cache/Makefile
+++ b/devel/p5-App-Cache/Makefile
@@ -20,7 +20,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		App::Cache.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-App-Cache/pkg-plist b/devel/p5-App-Cache/pkg-plist
index acd6ae5ca318..93cec9055fe6 100644
--- a/devel/p5-App-Cache/pkg-plist
+++ b/devel/p5-App-Cache/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Cache/.packlist
+%%PERL5_MAN3%%/App::Cache.3.gz
 %%SITE_PERL%%/App/Cache.pm
-@dirrmtry %%SITE_PERL%%/App
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Cache
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Cache/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Cache
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
+@dirrmtry %%SITE_PERL%%/App
diff --git a/devel/p5-App-Cmd/Makefile b/devel/p5-App-Cmd/Makefile
index 2a6ac02808e0..2acf1697c556 100644
--- a/devel/p5-App-Cmd/Makefile
+++ b/devel/p5-App-Cmd/Makefile
@@ -23,19 +23,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		App::Cmd.3 \
-		App::Cmd::ArgProcessor.3 \
-		App::Cmd::Command.3 \
-		App::Cmd::Command::commands.3 \
-		App::Cmd::Command::help.3 \
-		App::Cmd::Plugin.3 \
-		App::Cmd::Setup.3 \
-		App::Cmd::Simple.3 \
-		App::Cmd::Subdispatch.3 \
-		App::Cmd::Subdispatch::DashedStyle.3 \
-		App::Cmd::Tester.3 \
-		App::Cmd::Tester::CaptureExternal.3 \
-		App::Cmd::Tutorial.3 \
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-App-Cmd/pkg-plist b/devel/p5-App-Cmd/pkg-plist
index 582a633759dc..1974240e316d 100644
--- a/devel/p5-App-Cmd/pkg-plist
+++ b/devel/p5-App-Cmd/pkg-plist
@@ -1,3 +1,16 @@
+%%PERL5_MAN3%%/App::Cmd.3.gz
+%%PERL5_MAN3%%/App::Cmd::ArgProcessor.3.gz
+%%PERL5_MAN3%%/App::Cmd::Command.3.gz
+%%PERL5_MAN3%%/App::Cmd::Command::commands.3.gz
+%%PERL5_MAN3%%/App::Cmd::Command::help.3.gz
+%%PERL5_MAN3%%/App::Cmd::Plugin.3.gz
+%%PERL5_MAN3%%/App::Cmd::Setup.3.gz
+%%PERL5_MAN3%%/App::Cmd::Simple.3.gz
+%%PERL5_MAN3%%/App::Cmd::Subdispatch.3.gz
+%%PERL5_MAN3%%/App::Cmd::Subdispatch::DashedStyle.3.gz
+%%PERL5_MAN3%%/App::Cmd::Tester.3.gz
+%%PERL5_MAN3%%/App::Cmd::Tester::CaptureExternal.3.gz
+%%PERL5_MAN3%%/App::Cmd::Tutorial.3.gz
 %%SITE_PERL%%/App/Cmd.pm
 %%SITE_PERL%%/App/Cmd/ArgProcessor.pm
 %%SITE_PERL%%/App/Cmd/Command.pm
diff --git a/devel/p5-App-GitHub/Makefile b/devel/p5-App-GitHub/Makefile
index dcad3e6030e5..a4ba4147d021 100644
--- a/devel/p5-App-GitHub/Makefile
+++ b/devel/p5-App-GitHub/Makefile
@@ -22,8 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		github.pl.1
-MAN3=		App::GitHub.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-App-GitHub/pkg-plist b/devel/p5-App-GitHub/pkg-plist
index ebe9d631c324..bb502ad883ce 100644
--- a/devel/p5-App-GitHub/pkg-plist
+++ b/devel/p5-App-GitHub/pkg-plist
@@ -1,6 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/GitHub/.packlist
-%%SITE_PERL%%/App/GitHub.pm
 bin/github.pl
-@dirrmtry %%SITE_PERL%%/App
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/GitHub
+%%PERL5_MAN3%%/App::GitHub.3.gz
+%%SITE_PERL%%/App/GitHub.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/GitHub/.packlist
+man/man1/github.pl.1.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/GitHub
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
+@dirrmtry %%SITE_PERL%%/App
diff --git a/devel/p5-App-Options/Makefile b/devel/p5-App-Options/Makefile
index 518d6e4c9315..f9451b391d3a 100644
--- a/devel/p5-App-Options/Makefile
+++ b/devel/p5-App-Options/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Combine command line options, environment vars, and option file values
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		App::Options.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-App-Options/pkg-plist b/devel/p5-App-Options/pkg-plist
index 976ee1af23ca..3945aa8fab6e 100644
--- a/devel/p5-App-Options/pkg-plist
+++ b/devel/p5-App-Options/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App-Options/.packlist
-%%SITE_PERL%%/App/Options.pm
 bin/prefix
 bin/prefixadmin
+%%PERL5_MAN3%%/App::Options.3.gz
+%%SITE_PERL%%/App/Options.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/App-Options/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/App-Options
 @dirrmtry %%SITE_PERL%%/App
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App-Options
diff --git a/devel/p5-App-SD/Makefile b/devel/p5-App-SD/Makefile
index c4552cd3d7e6..45426ec389c8 100644
--- a/devel/p5-App-SD/Makefile
+++ b/devel/p5-App-SD/Makefile
@@ -30,31 +30,6 @@ RT_DESC=		Enable rt sync
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	App::SD::ForeignReplica::PullEncoder.3 \
-	App::SD::Server.3 \
-	App::SD::Replica::debbugs.3 \
-	App::SD::Replica::rt.3 \
-	App::SD::Replica::lighthouse::PullEncoder.3 \
-	App::SD::Replica::hm.3 \
-	App::SD::Model::Ticket.3 \
-	App::SD::Replica::gcode::PullEncoder.3 \
-	App::SD::Replica::rt::PullEncoder.3 \
-	App::SD::Test.3 \
-	App::SD::Replica::trac.3 \
-	App::SD::Replica::github.3 \
-	App::SD::Replica::github::PullEncoder.3 \
-	App::SD::Replica::debbugs::PushEncoder.3 \
-	App::SD::Replica::trac::PullEncoder.3 \
-	App::SD::CLI::Command.3 \
-	App::SD::CLI::Model::Ticket.3 \
-	App::SD::Replica::debbugs::PullEncoder.3 \
-	App::SD::ForeignReplica.3 \
-	App::SD::Util.3 \
-	App::SD.3
-
-MAN1=	sd.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGITHUB}
diff --git a/devel/p5-App-SD/pkg-plist b/devel/p5-App-SD/pkg-plist
index 509f3dfe5c01..453abe1b525f 100644
--- a/devel/p5-App-SD/pkg-plist
+++ b/devel/p5-App-SD/pkg-plist
@@ -1,105 +1,129 @@
 bin/darcs-sd
 bin/git-sd
 bin/sd
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/SD/.packlist
+%%PERL5_MAN3%%/App::SD.3.gz
+%%PERL5_MAN3%%/App::SD::CLI::Command.3.gz
+%%PERL5_MAN3%%/App::SD::CLI::Model::Ticket.3.gz
+%%PERL5_MAN3%%/App::SD::ForeignReplica.3.gz
+%%PERL5_MAN3%%/App::SD::ForeignReplica::PullEncoder.3.gz
+%%PERL5_MAN3%%/App::SD::Model::Ticket.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::debbugs.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::debbugs::PullEncoder.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::debbugs::PushEncoder.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::gcode::PullEncoder.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::github.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::github::PullEncoder.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::hm.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::lighthouse::PullEncoder.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::rt.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::rt::PullEncoder.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::trac.3.gz
+%%PERL5_MAN3%%/App::SD::Replica::trac::PullEncoder.3.gz
+%%PERL5_MAN3%%/App::SD::Server.3.gz
+%%PERL5_MAN3%%/App::SD::Test.3.gz
+%%PERL5_MAN3%%/App::SD::Util.3.gz
 %%SITE_PERL%%/App/SD.pm
-%%SITE_PERL%%/App/SD/ForeignReplica.pm
-%%SITE_PERL%%/App/SD/Model/Comment.pm
-%%SITE_PERL%%/App/SD/Model/Ticket.pm
-%%SITE_PERL%%/App/SD/Model/Attachment.pm
+%%SITE_PERL%%/App/SD/CLI.pm
 %%SITE_PERL%%/App/SD/CLI/Command.pm
-%%SITE_PERL%%/App/SD/CLI/Model/Ticket.pm
-%%SITE_PERL%%/App/SD/CLI/Model/TicketComment.pm
-%%SITE_PERL%%/App/SD/CLI/Model/Attachment.pm
-%%SITE_PERL%%/App/SD/CLI/Dispatcher.pm
-%%SITE_PERL%%/App/SD/CLI/NewReplicaCommand.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Clone.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Attachment/Content.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Attachment/Create.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Browser.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Publish.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Shell.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Clone.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Help.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Log.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Help/Authors.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Help/Commands.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Help/Settings.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Help/Search.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Help/Tickets.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Help/Sync.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Help/Intro.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Help/Copying.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Help/History.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Help/About.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Help/Environment.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Help/Aliases.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Help/Attachments.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Help/Authors.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Help/Commands.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Help/Comments.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Help/Config.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Help/Copying.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Help/Environment.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Help/History.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Help/Intro.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Help/Search.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Help/Settings.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Help/Sync.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Help/Tickets.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Help/ticket_summary_format.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Attachment/Create.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Attachment/Content.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Init.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Log.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Publish.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Server.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Comment.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Update.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Basics.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Create.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Comments.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Search.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Show.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Shell.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Ticket/Attachment/Create.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Ticket/Attachment/Search.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Details.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Review.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Basics.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Comment.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Ticket/Comment/Create.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Ticket/Comment/Update.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Comments.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Create.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Details.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Review.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Search.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Show.pm
+%%SITE_PERL%%/App/SD/CLI/Command/Ticket/Update.pm
 %%SITE_PERL%%/App/SD/CLI/Command/Version.pm
-%%SITE_PERL%%/App/SD/CLI/Command/Init.pm
-%%SITE_PERL%%/App/SD/Util.pm
-%%SITE_PERL%%/App/SD/Record.pm
-%%SITE_PERL%%/App/SD/Server.pm
+%%SITE_PERL%%/App/SD/CLI/Dispatcher.pm
+%%SITE_PERL%%/App/SD/CLI/Model/Attachment.pm
+%%SITE_PERL%%/App/SD/CLI/Model/Ticket.pm
+%%SITE_PERL%%/App/SD/CLI/Model/TicketComment.pm
+%%SITE_PERL%%/App/SD/CLI/NewReplicaCommand.pm
+%%SITE_PERL%%/App/SD/Collection/Attachment.pm
+%%SITE_PERL%%/App/SD/Collection/Comment.pm
+%%SITE_PERL%%/App/SD/Collection/Ticket.pm
 %%SITE_PERL%%/App/SD/Config.pm
+%%SITE_PERL%%/App/SD/ForeignReplica.pm
 %%SITE_PERL%%/App/SD/ForeignReplica/PullEncoder.pm
 %%SITE_PERL%%/App/SD/ForeignReplica/PushEncoder.pm
-%%SITE_PERL%%/App/SD/CLI.pm
-%%SITE_PERL%%/App/SD/Server/Dispatcher.pm
-%%SITE_PERL%%/App/SD/Server/View.pm
-%%SITE_PERL%%/App/SD/Test.pm
-%%SITE_PERL%%/App/SD/Replica/lighthouse.pm
+%%SITE_PERL%%/App/SD/Model/Attachment.pm
+%%SITE_PERL%%/App/SD/Model/Comment.pm
+%%SITE_PERL%%/App/SD/Model/Ticket.pm
+%%SITE_PERL%%/App/SD/Record.pm
+%%SITE_PERL%%/App/SD/Replica/debbugs.pm
+%%SITE_PERL%%/App/SD/Replica/debbugs/PullEncoder.pm
+%%SITE_PERL%%/App/SD/Replica/debbugs/PushEncoder.pm
+%%SITE_PERL%%/App/SD/Replica/gcode.pm
 %%SITE_PERL%%/App/SD/Replica/gcode/PullEncoder.pm
 %%SITE_PERL%%/App/SD/Replica/gcode/PushEncoder.pm
+%%SITE_PERL%%/App/SD/Replica/github.pm
 %%SITE_PERL%%/App/SD/Replica/github/PullEncoder.pm
 %%SITE_PERL%%/App/SD/Replica/github/PushEncoder.pm
-%%SITE_PERL%%/App/SD/Replica/trac.pm
-%%SITE_PERL%%/App/SD/Replica/debbugs/PushEncoder.pm
-%%SITE_PERL%%/App/SD/Replica/debbugs/PullEncoder.pm
-%%SITE_PERL%%/App/SD/Replica/trac/PullEncoder.pm
-%%SITE_PERL%%/App/SD/Replica/trac/PushEncoder.pm
-%%SITE_PERL%%/App/SD/Replica/gcode.pm
-%%SITE_PERL%%/App/SD/Replica/rt.pm
-%%SITE_PERL%%/App/SD/Replica/hm/PushEncoder.pm
+%%SITE_PERL%%/App/SD/Replica/hm.pm
 %%SITE_PERL%%/App/SD/Replica/hm/PullEncoder.pm
+%%SITE_PERL%%/App/SD/Replica/hm/PushEncoder.pm
+%%SITE_PERL%%/App/SD/Replica/lighthouse.pm
+%%SITE_PERL%%/App/SD/Replica/lighthouse/PullEncoder.pm
+%%SITE_PERL%%/App/SD/Replica/lighthouse/PushEncoder.pm
+%%SITE_PERL%%/App/SD/Replica/redmine.pm
 %%SITE_PERL%%/App/SD/Replica/redmine/PullEncoder.pm
 %%SITE_PERL%%/App/SD/Replica/redmine/PushEncoder.pm
-%%SITE_PERL%%/App/SD/Replica/redmine.pm
-%%SITE_PERL%%/App/SD/Replica/hm.pm
-%%SITE_PERL%%/App/SD/Replica/github.pm
-%%SITE_PERL%%/App/SD/Replica/lighthouse/PushEncoder.pm
-%%SITE_PERL%%/App/SD/Replica/lighthouse/PullEncoder.pm
-%%SITE_PERL%%/App/SD/Replica/debbugs.pm
+%%SITE_PERL%%/App/SD/Replica/rt.pm
 %%SITE_PERL%%/App/SD/Replica/rt/PullEncoder.pm
 %%SITE_PERL%%/App/SD/Replica/rt/PushEncoder.pm
-%%SITE_PERL%%/App/SD/Collection/Attachment.pm
-%%SITE_PERL%%/App/SD/Collection/Comment.pm
-%%SITE_PERL%%/App/SD/Collection/Ticket.pm
+%%SITE_PERL%%/App/SD/Replica/trac.pm
+%%SITE_PERL%%/App/SD/Replica/trac/PullEncoder.pm
+%%SITE_PERL%%/App/SD/Replica/trac/PushEncoder.pm
+%%SITE_PERL%%/App/SD/Server.pm
+%%SITE_PERL%%/App/SD/Server/Dispatcher.pm
+%%SITE_PERL%%/App/SD/Server/View.pm
+%%SITE_PERL%%/App/SD/Test.pm
+%%SITE_PERL%%/App/SD/Util.pm
+%%SITE_PERL%%/auto/share/dist/App-SD/web/static/css/main.css
 %%SITE_PERL%%/auto/share/dist/App-SD/web/static/images/gradient.png
 %%SITE_PERL%%/auto/share/dist/App-SD/web/static/images/sd.png
-%%SITE_PERL%%/auto/share/dist/App-SD/web/static/css/main.css
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/SD/.packlist
+man/man1/sd.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/SD
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
 @dirrm %%SITE_PERL%%/auto/share/dist/App-SD/web/static/images
 @dirrm %%SITE_PERL%%/auto/share/dist/App-SD/web/static/css
 @dirrm %%SITE_PERL%%/auto/share/dist/App-SD/web/static
 @dirrm %%SITE_PERL%%/auto/share/dist/App-SD/web
 @dirrm %%SITE_PERL%%/auto/share/dist/App-SD
+@dirrmtry %%SITE_PERL%%/auto/share/dist
+@dirrmtry %%SITE_PERL%%/auto/share
 @dirrm %%SITE_PERL%%/App/SD/Server
 @dirrm %%SITE_PERL%%/App/SD/Replica/trac
 @dirrm %%SITE_PERL%%/App/SD/Replica/rt
@@ -122,4 +146,4 @@ bin/sd
 @dirrm %%SITE_PERL%%/App/SD/CLI/Command
 @dirrm %%SITE_PERL%%/App/SD/CLI
 @dirrm %%SITE_PERL%%/App/SD
-@dirrm %%SITE_PERL%%/App
+@dirrmtry %%SITE_PERL%%/App
diff --git a/devel/p5-App-SVN-Bisect/Makefile b/devel/p5-App-SVN-Bisect/Makefile
index 75f10fb40802..562f30d6c4aa 100644
--- a/devel/p5-App-SVN-Bisect/Makefile
+++ b/devel/p5-App-SVN-Bisect/Makefile
@@ -20,8 +20,4 @@ TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=	svn-bisect.1
-MAN3=	App::SVN::Bisect.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-App-SVN-Bisect/pkg-plist b/devel/p5-App-SVN-Bisect/pkg-plist
index b9d641aff81a..7654b2d3f712 100644
--- a/devel/p5-App-SVN-Bisect/pkg-plist
+++ b/devel/p5-App-SVN-Bisect/pkg-plist
@@ -1,8 +1,10 @@
 bin/svn-bisect
+%%PERL5_MAN3%%/App::SVN::Bisect.3.gz
 %%SITE_PERL%%/App/SVN/Bisect.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/SVN/Bisect/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/SVN/Bisect
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/SVN
+man/man1/svn-bisect.1.gz
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/SVN/Bisect
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/SVN
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
-@dirrmtry %%SITE_PERL%%/App/SVN
+@dirrm %%SITE_PERL%%/App/SVN
 @dirrmtry %%SITE_PERL%%/App
diff --git a/devel/p5-Array-Group/Makefile b/devel/p5-Array-Group/Makefile
index 957380140af3..2982286d76cb 100644
--- a/devel/p5-Array-Group/Makefile
+++ b/devel/p5-Array-Group/Makefile
@@ -12,11 +12,7 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert an array into array of arrayrefs of uniform size N
 
 USE_ZIP=	yes
-
-MAN3=		Array::Group.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Array-Group/pkg-plist b/devel/p5-Array-Group/pkg-plist
index 711cf26e6b86..e140faeac56f 100644
--- a/devel/p5-Array-Group/pkg-plist
+++ b/devel/p5-Array-Group/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Group/.packlist
+%%PERL5_MAN3%%/Array::Group.3.gz
 %%SITE_PERL%%/Array/Group.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Group
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Group/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Group
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
 @dirrmtry %%SITE_PERL%%/Array
diff --git a/devel/p5-Array-Window/Makefile b/devel/p5-Array-Window/Makefile
index 32f33cca07c1..3f91b381317e 100644
--- a/devel/p5-Array-Window/Makefile
+++ b/devel/p5-Array-Window/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Array::Window.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Array-Window/pkg-plist b/devel/p5-Array-Window/pkg-plist
index 8a58c8257208..7909eecc6203 100644
--- a/devel/p5-Array-Window/pkg-plist
+++ b/devel/p5-Array-Window/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Window/.packlist
+%%PERL5_MAN3%%/Array::Window.3.gz
 %%SITE_PERL%%/Array/Window.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Window/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Window
-@dirrmtry %%SITE_PERL%%/Array
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
+@dirrmtry %%SITE_PERL%%/Array
diff --git a/devel/p5-Async-Interrupt/Makefile b/devel/p5-Async-Interrupt/Makefile
index 25ad2330e698..aa98b30d3d4b 100644
--- a/devel/p5-Async-Interrupt/Makefile
+++ b/devel/p5-Async-Interrupt/Makefile
@@ -20,7 +20,4 @@ RUN_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Async::Interrupt.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Async-Interrupt/pkg-plist b/devel/p5-Async-Interrupt/pkg-plist
index 6ba5c3310c1a..23490247dc8a 100644
--- a/devel/p5-Async-Interrupt/pkg-plist
+++ b/devel/p5-Async-Interrupt/pkg-plist
@@ -1,8 +1,8 @@
+%%PERL5_MAN3%%/Async::Interrupt.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Async/Interrupt.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Async/Interrupt/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Async/Interrupt/Interrupt.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Async/Interrupt/Interrupt.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Async/Interrupt
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Async/Interrupt
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Async
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Async
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 1692ea2865b7..b9d34ae7c01e 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -13,7 +13,4 @@ COMMENT=	AtExit - Perform exit processing for a program or object
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		AtExit.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-AtExit/pkg-plist b/devel/p5-AtExit/pkg-plist
index 71868c9eb447..ff428379ba99 100644
--- a/devel/p5-AtExit/pkg-plist
+++ b/devel/p5-AtExit/pkg-plist
@@ -1,3 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AtExit/.packlist
+%%PERL5_MAN3%%/AtExit.3.gz
 %%SITE_PERL%%/AtExit.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AtExit/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AtExit
diff --git a/devel/p5-Attribute-Handlers-Prospective/Makefile b/devel/p5-Attribute-Handlers-Prospective/Makefile
index 3494cfce01e5..890a9b6303f3 100644
--- a/devel/p5-Attribute-Handlers-Prospective/Makefile
+++ b/devel/p5-Attribute-Handlers-Prospective/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Richer semantics for attribute handlers
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Attribute::Handlers::Prospective.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Attribute-Handlers-Prospective/pkg-plist b/devel/p5-Attribute-Handlers-Prospective/pkg-plist
index 0ca48f7c4c87..a3ef00856b10 100644
--- a/devel/p5-Attribute-Handlers-Prospective/pkg-plist
+++ b/devel/p5-Attribute-Handlers-Prospective/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Attribute::Handlers::Prospective.3.gz
 %%SITE_PERL%%/Attribute/Handlers/Prospective.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers/Prospective/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers/Prospective
diff --git a/devel/p5-Attribute-Handlers/Makefile b/devel/p5-Attribute-Handlers/Makefile
index bc8daf8a4e26..5dfa52fc7f65 100644
--- a/devel/p5-Attribute-Handlers/Makefile
+++ b/devel/p5-Attribute-Handlers/Makefile
@@ -16,7 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Attribute::Handlers.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Attribute-Handlers/pkg-plist b/devel/p5-Attribute-Handlers/pkg-plist
index 24e337b44224..7fce584f7952 100644
--- a/devel/p5-Attribute-Handlers/pkg-plist
+++ b/devel/p5-Attribute-Handlers/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers/.packlist
+%%PERL5_MAN3%%/Attribute::Handlers.3.gz
 %%SITE_PERL%%/Attribute/Handlers.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute
-@dirrm %%SITE_PERL%%/Attribute
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute
+@dirrmtry %%SITE_PERL%%/Attribute
diff --git a/devel/p5-Attribute-Persistent/Makefile b/devel/p5-Attribute-Persistent/Makefile
index 01bfe34f6301..65499d335ea1 100644
--- a/devel/p5-Attribute-Persistent/Makefile
+++ b/devel/p5-Attribute-Persistent/Makefile
@@ -1,22 +1,19 @@
 # Created by: Mathieu Arnold <mat@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=		Attribute-Persistent
-PORTVERSION=		1.1
-CATEGORIES=		devel perl5
-MASTER_SITES=		CPAN
-PKGNAMEPREFIX=		p5-
+PORTNAME=	Attribute-Persistent
+PORTVERSION=	1.1
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
 
-MAINTAINER=		perl@FreeBSD.org
-COMMENT=		Attribute::Persistent - Really lazy persistence
+MAINTAINER=	perl@FreeBSD.org
+COMMENT=	Attribute::Persistent - Really lazy persistence
 
-BUILD_DEPENDS=		p5-Attribute-Handlers-Prospective>=0:${PORTSDIR}/devel/p5-Attribute-Handlers-Prospective \
-			p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
+BUILD_DEPENDS=	p5-Attribute-Handlers-Prospective>=0:${PORTSDIR}/devel/p5-Attribute-Handlers-Prospective \
+		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=			Attribute::Persistent.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Attribute-Persistent/pkg-plist b/devel/p5-Attribute-Persistent/pkg-plist
index eb06263c4d24..df79fc4bfccd 100644
--- a/devel/p5-Attribute-Persistent/pkg-plist
+++ b/devel/p5-Attribute-Persistent/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Attribute::Persistent.3.gz
 %%SITE_PERL%%/Attribute/Persistent.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Persistent/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Persistent
diff --git a/devel/p5-AutoLoader/Makefile b/devel/p5-AutoLoader/Makefile
index 83702c8adc9a..ce060fcc5c8e 100644
--- a/devel/p5-AutoLoader/Makefile
+++ b/devel/p5-AutoLoader/Makefile
@@ -13,9 +13,6 @@ COMMENT=	Load subroutines only on demand
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		AutoLoader.3 AutoSplit.3
-
-NO_STAGE=	yes
 regression-test:
 	cd ${WRKSRC} && ${MAKE} test
 
diff --git a/devel/p5-AutoLoader/pkg-plist b/devel/p5-AutoLoader/pkg-plist
index 25e7781b5d95..8adb3c3e68e9 100644
--- a/devel/p5-AutoLoader/pkg-plist
+++ b/devel/p5-AutoLoader/pkg-plist
@@ -1,3 +1,5 @@
+%%PERL5_MAN3%%/AutoLoader.3.gz
+%%PERL5_MAN3%%/AutoSplit.3.gz
 %%SITE_PERL%%/AutoLoader.pm
 %%SITE_PERL%%/AutoSplit.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/AutoLoader/.packlist
diff --git a/devel/p5-AutoXS-Header/Makefile b/devel/p5-AutoXS-Header/Makefile
index 92f43c54118f..edf73bc23aa9 100644
--- a/devel/p5-AutoXS-Header/Makefile
+++ b/devel/p5-AutoXS-Header/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Container for the AutoXS header files
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		AutoXS::Header.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-AutoXS-Header/pkg-plist b/devel/p5-AutoXS-Header/pkg-plist
index fa68ccbe8779..062b2309a5d6 100644
--- a/devel/p5-AutoXS-Header/pkg-plist
+++ b/devel/p5-AutoXS-Header/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/AutoXS/Header/.packlist
+%%PERL5_MAN3%%/AutoXS::Header.3.gz
 %%SITE_PERL%%/AutoXS/Header.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AutoXS/Header
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/AutoXS/Header/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AutoXS/Header
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AutoXS
 @dirrmtry %%SITE_PERL%%/AutoXS
diff --git a/devel/p5-B-Deobfuscate/Makefile b/devel/p5-B-Deobfuscate/Makefile
index 341dc6c3cd41..c5f342ba850b 100644
--- a/devel/p5-B-Deobfuscate/Makefile
+++ b/devel/p5-B-Deobfuscate/Makefile
@@ -17,7 +17,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		B::Deobfuscate.3 B::Deobfuscate::Dict::Flowers.3 B::Deobfuscate::Dict::PGPHashWords.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-B-Deobfuscate/pkg-plist b/devel/p5-B-Deobfuscate/pkg-plist
index 6cfabb3eeac2..c888aeb96a7d 100644
--- a/devel/p5-B-Deobfuscate/pkg-plist
+++ b/devel/p5-B-Deobfuscate/pkg-plist
@@ -1,3 +1,6 @@
+%%PERL5_MAN3%%/B::Deobfuscate.3.gz
+%%PERL5_MAN3%%/B::Deobfuscate::Dict::Flowers.3.gz
+%%PERL5_MAN3%%/B::Deobfuscate::Dict::PGPHashWords.3.gz
 %%SITE_PERL%%/B/Deobfuscate.pm
 %%SITE_PERL%%/B/Deobfuscate.pod
 %%SITE_PERL%%/B/Deobfuscate/Dict/Flowers.pm
diff --git a/devel/p5-B-Graph/Makefile b/devel/p5-B-Graph/Makefile
index 89b60a21b6f7..f277b38e60b8 100644
--- a/devel/p5-B-Graph/Makefile
+++ b/devel/p5-B-Graph/Makefile
@@ -12,7 +12,5 @@ COMMENT=	Perl Compiler backend to diagram OP trees
 
 USES=		perl5
 USE_PERL5=	configure
-MAN3=		B::Graph.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-B-Graph/pkg-plist b/devel/p5-B-Graph/pkg-plist
index 52156fba0dfa..0a444330133f 100644
--- a/devel/p5-B-Graph/pkg-plist
+++ b/devel/p5-B-Graph/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/B::Graph.3.gz
 %%SITE_PERL%%/B/Graph.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Graph/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Graph
diff --git a/devel/p5-B-Hooks-EndOfScope/Makefile b/devel/p5-B-Hooks-EndOfScope/Makefile
index b245bc1ff794..51351deaf3f6 100644
--- a/devel/p5-B-Hooks-EndOfScope/Makefile
+++ b/devel/p5-B-Hooks-EndOfScope/Makefile
@@ -21,11 +21,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		B::Hooks::EndOfScope.3 \
-		B::Hooks::EndOfScope::PP.3 \
-		B::Hooks::EndOfScope::PP::FieldHash.3 \
-		B::Hooks::EndOfScope::PP::HintHash.3 \
-		B::Hooks::EndOfScope::XS.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-B-Hooks-EndOfScope/pkg-plist b/devel/p5-B-Hooks-EndOfScope/pkg-plist
index f5496bbb9a8c..288de5e604a3 100644
--- a/devel/p5-B-Hooks-EndOfScope/pkg-plist
+++ b/devel/p5-B-Hooks-EndOfScope/pkg-plist
@@ -1,3 +1,8 @@
+%%PERL5_MAN3%%/B::Hooks::EndOfScope.3.gz
+%%PERL5_MAN3%%/B::Hooks::EndOfScope::PP.3.gz
+%%PERL5_MAN3%%/B::Hooks::EndOfScope::PP::FieldHash.3.gz
+%%PERL5_MAN3%%/B::Hooks::EndOfScope::PP::HintHash.3.gz
+%%PERL5_MAN3%%/B::Hooks::EndOfScope::XS.3.gz
 %%SITE_PERL%%/B/Hooks/EndOfScope.pm
 %%SITE_PERL%%/B/Hooks/EndOfScope/PP.pm
 %%SITE_PERL%%/B/Hooks/EndOfScope/PP/FieldHash.pm
diff --git a/devel/p5-B-Hooks-Parser/Makefile b/devel/p5-B-Hooks-Parser/Makefile
index 7c3bdf4e6fc6..d1f66635d61e 100644
--- a/devel/p5-B-Hooks-Parser/Makefile
+++ b/devel/p5-B-Hooks-Parser/Makefile
@@ -19,7 +19,4 @@ TEST_DEPENDS=	p5-B-Hooks-EndOfScope>=0.05:${PORTSDIR}/devel/p5-B-Hooks-EndOfScop
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		B::Hooks::Parser.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-B-Hooks-Parser/pkg-plist b/devel/p5-B-Hooks-Parser/pkg-plist
index 516ee2d96619..292570096b07 100644
--- a/devel/p5-B-Hooks-Parser/pkg-plist
+++ b/devel/p5-B-Hooks-Parser/pkg-plist
@@ -1,13 +1,14 @@
+%%PERL5_MAN3%%/B::Hooks::Parser.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/Parser.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/Parser/Install/Files.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/Parser/Install/hook_parser.h
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/Parser/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/Parser/Parser.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/Parser/Parser.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/Parser
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks/Parser
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Hooks
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/Parser/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/Parser
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/Parser/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks/Parser
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B/Hooks
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B
diff --git a/devel/p5-B-Keywords/Makefile b/devel/p5-B-Keywords/Makefile
index bc0628d6031f..f376c22fb001 100644
--- a/devel/p5-B-Keywords/Makefile
+++ b/devel/p5-B-Keywords/Makefile
@@ -16,7 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		B::Keywords.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-B-Keywords/pkg-plist b/devel/p5-B-Keywords/pkg-plist
index fab2334cf45d..70fc846ac95b 100644
--- a/devel/p5-B-Keywords/pkg-plist
+++ b/devel/p5-B-Keywords/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/B::Keywords.3.gz
 %%SITE_PERL%%/B/Keywords.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Keywords/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Keywords
diff --git a/devel/p5-B-OPCheck/Makefile b/devel/p5-B-OPCheck/Makefile
index 5d5eade75217..0bc81beb389b 100644
--- a/devel/p5-B-OPCheck/Makefile
+++ b/devel/p5-B-OPCheck/Makefile
@@ -20,7 +20,4 @@ BUILD_DEPENDS:=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		B::OPCheck.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-B-OPCheck/pkg-plist b/devel/p5-B-OPCheck/pkg-plist
index 318f1c01cfdd..ee53d2673af0 100644
--- a/devel/p5-B-OPCheck/pkg-plist
+++ b/devel/p5-B-OPCheck/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/B::OPCheck.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/B/OPCheck.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/OPCheck/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/OPCheck/OPCheck.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/OPCheck/OPCheck.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/OPCheck
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/OPCheck
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B
diff --git a/devel/p5-B-Utils/Makefile b/devel/p5-B-Utils/Makefile
index b748bec3e822..41b04acc4e81 100644
--- a/devel/p5-B-Utils/Makefile
+++ b/devel/p5-B-Utils/Makefile
@@ -19,7 +19,4 @@ BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.301:${PORTSDIR}/devel/p5-ExtUtils-Depends
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		B::Utils.3 B::Utils::OP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-B-Utils/pkg-plist b/devel/p5-B-Utils/pkg-plist
index b32940d04594..d9087252b271 100644
--- a/devel/p5-B-Utils/pkg-plist
+++ b/devel/p5-B-Utils/pkg-plist
@@ -1,13 +1,15 @@
+%%PERL5_MAN3%%/B::Utils.3.gz
+%%PERL5_MAN3%%/B::Utils::OP.3.gz
+%%SITE_PERL%%/%%PERL_ARCH%%/B/Utils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/B/Utils/Install/BUtils.h
 %%SITE_PERL%%/%%PERL_ARCH%%/B/Utils/Install/Files.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/B/Utils/Install/typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Utils/Install/BUtils.h
 %%SITE_PERL%%/%%PERL_ARCH%%/B/Utils/OP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/B/Utils.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Utils/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Utils/Utils.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Utils/Utils.bs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Utils
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Utils/Utils.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Utils
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B/Utils/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B/Utils
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/B/Utils/Install
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/B/Utils
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B
diff --git a/devel/p5-BFD/Makefile b/devel/p5-BFD/Makefile
index 91a232fe5e11..5f7e331dd5e5 100644
--- a/devel/p5-BFD/Makefile
+++ b/devel/p5-BFD/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Impromptu dumping of data structures for debugging purposes
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		BFD.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-BFD/pkg-plist b/devel/p5-BFD/pkg-plist
index ba9a6b449e8e..43410614021a 100644
--- a/devel/p5-BFD/pkg-plist
+++ b/devel/p5-BFD/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/BFD.3.gz
 %%SITE_PERL%%/BFD.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/BFD/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BFD
diff --git a/devel/p5-BSD-stat/Makefile b/devel/p5-BSD-stat/Makefile
index 071a2987828c..eeafb8016b5e 100644
--- a/devel/p5-BSD-stat/Makefile
+++ b/devel/p5-BSD-stat/Makefile
@@ -16,7 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		BSD::stat.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-BSD-stat/pkg-plist b/devel/p5-BSD-stat/pkg-plist
index c8d6efd9daef..24e6b6dbd609 100644
--- a/devel/p5-BSD-stat/pkg-plist
+++ b/devel/p5-BSD-stat/pkg-plist
@@ -1,8 +1,9 @@
+%%PERL5_MAN3%%/BSD::stat.3.gz
+%%SITE_PERL%%/%%PERL_ARCH%%/BSD/stat.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/stat.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/stat.so
-%%SITE_PERL%%/%%PERL_ARCH%%/BSD/stat.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/BSD
diff --git a/devel/p5-BZ-Client/Makefile b/devel/p5-BZ-Client/Makefile
index 9a16632280d5..01eb8334ff93 100644
--- a/devel/p5-BZ-Client/Makefile
+++ b/devel/p5-BZ-Client/Makefile
@@ -21,9 +21,4 @@ TEST_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		BZ::Client.3 BZ::Client::API.3 BZ::Client::Bug.3 \
-		BZ::Client::Bugzilla.3 BZ::Client::Exception.3 \
-		BZ::Client::Product.3 BZ::Client::Test.3 BZ::Client::XMLRPC.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-BZ-Client/pkg-plist b/devel/p5-BZ-Client/pkg-plist
index b70943c2d69b..660a5a22b55e 100644
--- a/devel/p5-BZ-Client/pkg-plist
+++ b/devel/p5-BZ-Client/pkg-plist
@@ -1,4 +1,11 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/BZ/Client/.packlist
+%%PERL5_MAN3%%/BZ::Client.3.gz
+%%PERL5_MAN3%%/BZ::Client::API.3.gz
+%%PERL5_MAN3%%/BZ::Client::Bug.3.gz
+%%PERL5_MAN3%%/BZ::Client::Bugzilla.3.gz
+%%PERL5_MAN3%%/BZ::Client::Exception.3.gz
+%%PERL5_MAN3%%/BZ::Client::Product.3.gz
+%%PERL5_MAN3%%/BZ::Client::Test.3.gz
+%%PERL5_MAN3%%/BZ::Client::XMLRPC.3.gz
 %%SITE_PERL%%/BZ/Client.pm
 %%SITE_PERL%%/BZ/Client/API.pm
 %%SITE_PERL%%/BZ/Client/Bug.pm
@@ -13,8 +20,9 @@
 %%SITE_PERL%%/BZ/Client/XMLRPC/Response.pm
 %%SITE_PERL%%/BZ/Client/XMLRPC/Struct.pm
 %%SITE_PERL%%/BZ/Client/XMLRPC/Value.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/BZ/Client/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BZ/Client
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BZ
 @dirrm %%SITE_PERL%%/BZ/Client/XMLRPC
 @dirrm %%SITE_PERL%%/BZ/Client
-@dirrm %%SITE_PERL%%/BZ
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BZ/Client
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BZ
+@dirrmtry %%SITE_PERL%%/BZ