Support STAGEDIR.

76 files changed, 174 insertions, 222 deletions

diff --git a/devel/p5-IO-AIO/Makefile b/devel/p5-IO-AIO/Makefile
index fb92a4fa80a7..d8456d908a7b 100644
--- a/devel/p5-IO-AIO/Makefile
+++ b/devel/p5-IO-AIO/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IO::AIO.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-AIO/pkg-plist b/devel/p5-IO-AIO/pkg-plist
index 1daa02dca730..96ebceb55007 100644
--- a/devel/p5-IO-AIO/pkg-plist
+++ b/devel/p5-IO-AIO/pkg-plist
@@ -1,8 +1,9 @@
 bin/treescan
+%%PERL5_MAN3%%/IO::AIO.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/IO/AIO.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/AIO/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/AIO/AIO.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/AIO/AIO.so
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/AIO
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/AIO
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
diff --git a/devel/p5-IO-BufferedSelect/Makefile b/devel/p5-IO-BufferedSelect/Makefile
index 065133a91961..1cbafaddf0d7 100644
--- a/devel/p5-IO-BufferedSelect/Makefile
+++ b/devel/p5-IO-BufferedSelect/Makefile
@@ -12,10 +12,6 @@ COMMENT=	Line-buffered select interface
 
 USES=		perl5
 USE_PERL5=	configure
-
-MAN3=		IO::BufferedSelect.3
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-BufferedSelect/pkg-plist b/devel/p5-IO-BufferedSelect/pkg-plist
index 42acb33185f0..82106d2b20e5 100644
--- a/devel/p5-IO-BufferedSelect/pkg-plist
+++ b/devel/p5-IO-BufferedSelect/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/BufferedSelect/.packlist
+%%PERL5_MAN3%%/IO::BufferedSelect.3.gz
 %%SITE_PERL%%/IO/BufferedSelect.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/BufferedSelect/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/BufferedSelect
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
 @dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-Interactive/Makefile b/devel/p5-IO-Interactive/Makefile
index 4d0a7172bc96..93fb345d8ad9 100644
--- a/devel/p5-IO-Interactive/Makefile
+++ b/devel/p5-IO-Interactive/Makefile
@@ -18,9 +18,6 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IO::Interactive.3
-
 PORTSCOUT=	skipv:0.01
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-Interactive/pkg-plist b/devel/p5-IO-Interactive/pkg-plist
index 752657e538af..8444e383958c 100644
--- a/devel/p5-IO-Interactive/pkg-plist
+++ b/devel/p5-IO-Interactive/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/IO::Interactive.3.gz
 %%SITE_PERL%%/IO/Interactive.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interactive/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interactive
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interactive
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
 @dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-NestedCapture/Makefile b/devel/p5-IO-NestedCapture/Makefile
index 8e2f08b3d65d..2243256d1282 100644
--- a/devel/p5-IO-NestedCapture/Makefile
+++ b/devel/p5-IO-NestedCapture/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Perl module for performing nested STD\* handle captures
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		IO::NestedCapture.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-NestedCapture/pkg-plist b/devel/p5-IO-NestedCapture/pkg-plist
index f48e6257f357..64f83f3a6731 100644
--- a/devel/p5-IO-NestedCapture/pkg-plist
+++ b/devel/p5-IO-NestedCapture/pkg-plist
@@ -1,2 +1,3 @@
+%%PERL5_MAN3%%/IO::NestedCapture.3.gz
 %%SITE_PERL%%/IO/NestedCapture.pm
 @dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-Pipely/Makefile b/devel/p5-IO-Pipely/Makefile
index 5036833142c1..829ea5c7252d 100644
--- a/devel/p5-IO-Pipely/Makefile
+++ b/devel/p5-IO-Pipely/Makefile
@@ -21,9 +21,6 @@ TEST_DEPENDS=	p5-Scalar-List-Utils>=1.29:${PORTSDIR}/lang/p5-Scalar-List-Utils
 USE_PERL5=	configure
 USES=		perl5
 
-MAN3=		IO::Pipely.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501400
diff --git a/devel/p5-IO-Pipely/pkg-plist b/devel/p5-IO-Pipely/pkg-plist
index 7d011d5a5886..e6f0c3bb4645 100644
--- a/devel/p5-IO-Pipely/pkg-plist
+++ b/devel/p5-IO-Pipely/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/IO::Pipely.3.gz
 %%SITE_PERL%%/IO/Pipely.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Pipely/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Pipely
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Pipely
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
 @dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-String/Makefile b/devel/p5-IO-String/Makefile
index fe07c089933b..fba2a5276a72 100644
--- a/devel/p5-IO-String/Makefile
+++ b/devel/p5-IO-String/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Simplified Perl5 module to handle I/O on in-core strings
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IO::String.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-String/pkg-plist b/devel/p5-IO-String/pkg-plist
index d0a0a9d891bd..e5de11365e49 100644
--- a/devel/p5-IO-String/pkg-plist
+++ b/devel/p5-IO-String/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/IO::String.3.gz
 %%SITE_PERL%%/IO/String.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/String/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/String
diff --git a/devel/p5-IO-Stty/Makefile b/devel/p5-IO-Stty/Makefile
index 5c00bbb3ebb4..4108df7e4bd2 100644
--- a/devel/p5-IO-Stty/Makefile
+++ b/devel/p5-IO-Stty/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Change and print terminal line settings
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		IO::Stty.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-Stty/pkg-plist b/devel/p5-IO-Stty/pkg-plist
index ba5d9ed902fa..17bb1c6c8edd 100644
--- a/devel/p5-IO-Stty/pkg-plist
+++ b/devel/p5-IO-Stty/pkg-plist
@@ -1,3 +1,4 @@
 bin/stty.pl
+%%PERL5_MAN3%%/IO::Stty.3.gz
 %%SITE_PERL%%/IO/Stty.pm
 @dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-Tee/Makefile b/devel/p5-IO-Tee/Makefile
index 4a3498c7df69..24777f0f73d7 100644
--- a/devel/p5-IO-Tee/Makefile
+++ b/devel/p5-IO-Tee/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Multiplex output to multiple output handles
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IO::Tee.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-Tee/pkg-plist b/devel/p5-IO-Tee/pkg-plist
index c0f288eb3929..7754494df3c7 100644
--- a/devel/p5-IO-Tee/pkg-plist
+++ b/devel/p5-IO-Tee/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/IO::Tee.3.gz
 %%SITE_PERL%%/IO/Tee.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tee/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tee
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tee
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
 @dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index a6df4c223f5d..ac41134645a4 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -13,9 +13,4 @@ COMMENT=	Flexible I/O Perl5 module that allows manipulation of pseudo-TTYs
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IO::Pty.3 \
-		IO::Tty.3 \
-		IO::Tty::Constant.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-Tty/pkg-plist b/devel/p5-IO-Tty/pkg-plist
index 5f5747ef9ca9..4d89dadd327d 100644
--- a/devel/p5-IO-Tty/pkg-plist
+++ b/devel/p5-IO-Tty/pkg-plist
@@ -1,10 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty/Tty.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty/Tty.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty/.packlist
+%%PERL5_MAN3%%/IO::Pty.3.gz
+%%PERL5_MAN3%%/IO::Tty.3.gz
+%%PERL5_MAN3%%/IO::Tty::Constant.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/IO/Pty.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty/Constant.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty/Tty.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty/Tty.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
diff --git a/devel/p5-IO-Util/Makefile b/devel/p5-IO-Util/Makefile
index 7030e181b3ca..1d2a29e29fbf 100644
--- a/devel/p5-IO-Util/Makefile
+++ b/devel/p5-IO-Util/Makefile
@@ -17,7 +17,4 @@ PORTSCOUT=	skipv:1.48
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IO::Util.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-Util/pkg-plist b/devel/p5-IO-Util/pkg-plist
index 95a7bac4c34c..eb314c9759bb 100644
--- a/devel/p5-IO-Util/pkg-plist
+++ b/devel/p5-IO-Util/pkg-plist
@@ -1,5 +1,6 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Util/.packlist
+%%PERL5_MAN3%%/IO::Util.3.gz
 %%SITE_PERL%%/IO/Util.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Util/
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Util/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Util
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
 @dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-YAML/Makefile b/devel/p5-IO-YAML/Makefile
index 9ee912829e2b..ffef7e687472 100644
--- a/devel/p5-IO-YAML/Makefile
+++ b/devel/p5-IO-YAML/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		IO::YAML.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-YAML/pkg-plist b/devel/p5-IO-YAML/pkg-plist
index 615fa66ae93c..9004d137d9b9 100644
--- a/devel/p5-IO-YAML/pkg-plist
+++ b/devel/p5-IO-YAML/pkg-plist
@@ -1,2 +1,3 @@
+%%PERL5_MAN3%%/IO::YAML.3.gz
 %%SITE_PERL%%/IO/YAML.pm
 @dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index 42dc168a2216..9cda37a0d0b2 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -13,8 +13,4 @@ COMMENT=	Perl5 module for using IO handles with non-file objects
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IO::AtomicFile.3 IO::InnerFile.3 IO::Lines.3 IO::Scalar.3 \
-		IO::ScalarArray.3 IO::Stringy.3 IO::Wrap.3 IO::WrapTie.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-stringy/pkg-plist b/devel/p5-IO-stringy/pkg-plist
index 26266fea7781..adca3192610c 100644
--- a/devel/p5-IO-stringy/pkg-plist
+++ b/devel/p5-IO-stringy/pkg-plist
@@ -1,3 +1,11 @@
+%%PERL5_MAN3%%/IO::AtomicFile.3.gz
+%%PERL5_MAN3%%/IO::InnerFile.3.gz
+%%PERL5_MAN3%%/IO::Lines.3.gz
+%%PERL5_MAN3%%/IO::Scalar.3.gz
+%%PERL5_MAN3%%/IO::ScalarArray.3.gz
+%%PERL5_MAN3%%/IO::Stringy.3.gz
+%%PERL5_MAN3%%/IO::Wrap.3.gz
+%%PERL5_MAN3%%/IO::WrapTie.3.gz
 %%SITE_PERL%%/IO/AtomicFile.pm
 %%SITE_PERL%%/IO/InnerFile.pm
 %%SITE_PERL%%/IO/Lines.pm
@@ -7,6 +15,6 @@
 %%SITE_PERL%%/IO/Wrap.pm
 %%SITE_PERL%%/IO/WrapTie.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Stringy/.packlist
-@dirrmtry %%SITE_PERL%%/IO
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Stringy
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO/Makefile b/devel/p5-IO/Makefile
index ee76dbf3feff..9db1cd9b9142 100644
--- a/devel/p5-IO/Makefile
+++ b/devel/p5-IO/Makefile
@@ -15,9 +15,4 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	INSTALLDIRS=site POLLUTE=1
 
-MAN3=		IO.3 IO::Dir.3 IO::File.3 IO::Handle.3 IO::Pipe.3 IO::Poll.3 \
-		IO::Seekable.3 IO::Select.3 IO::Socket.3 IO::Socket::INET.3 \
-		IO::Socket::UNIX.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IO/pkg-plist b/devel/p5-IO/pkg-plist
index c0e143c35e02..fed6732ff05e 100644
--- a/devel/p5-IO/pkg-plist
+++ b/devel/p5-IO/pkg-plist
@@ -1,6 +1,14 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/IO.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/IO.so
+%%PERL5_MAN3%%/IO.3.gz
+%%PERL5_MAN3%%/IO::Dir.3.gz
+%%PERL5_MAN3%%/IO::File.3.gz
+%%PERL5_MAN3%%/IO::Handle.3.gz
+%%PERL5_MAN3%%/IO::Pipe.3.gz
+%%PERL5_MAN3%%/IO::Poll.3.gz
+%%PERL5_MAN3%%/IO::Seekable.3.gz
+%%PERL5_MAN3%%/IO::Select.3.gz
+%%PERL5_MAN3%%/IO::Socket.3.gz
+%%PERL5_MAN3%%/IO::Socket::INET.3.gz
+%%PERL5_MAN3%%/IO::Socket::UNIX.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/IO.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/IO/Dir.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/IO/File.pm
@@ -12,6 +20,9 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket/INET.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket/UNIX.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/IO.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/IO.so
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
diff --git a/devel/p5-IOC/Makefile b/devel/p5-IOC/Makefile
index a8f578b42c5f..81baeb674dca 100644
--- a/devel/p5-IOC/Makefile
+++ b/devel/p5-IOC/Makefile
@@ -22,18 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IOC.3 IOC::Config::XML.3 IOC::Config::XML::SAX::Handler.3 \
-		IOC::Container.3 IOC::Container::MethodResolution.3 \
-		IOC::Exceptions.3 IOC::Interfaces.3 IOC::Proxy.3 \
-		IOC::Proxy::Interfaces.3 IOC::Registry.3 IOC::Service.3 \
-		IOC::Service::ConstructorInjection.3 IOC::Service::Literal.3 \
-		IOC::Service::Parameterized.3 IOC::Service::Prototype.3 \
-		IOC::Service::Prototype::ConstructorInjection.3 \
-		IOC::Service::Prototype::SetterInjection.3 \
-		IOC::Service::SetterInjection.3 \
-		IOC::Visitor::SearchForContainer.3 \
-		IOC::Visitor::SearchForService.3 IOC::Visitor::ServiceLocator.3 \
-		Test::IOC.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IOC/pkg-plist b/devel/p5-IOC/pkg-plist
index 7f677aeb1cad..edd24e17abcf 100644
--- a/devel/p5-IOC/pkg-plist
+++ b/devel/p5-IOC/pkg-plist
@@ -1,4 +1,25 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IOC/.packlist
+%%PERL5_MAN3%%/IOC.3.gz
+%%PERL5_MAN3%%/IOC::Config::XML.3.gz
+%%PERL5_MAN3%%/IOC::Config::XML::SAX::Handler.3.gz
+%%PERL5_MAN3%%/IOC::Container.3.gz
+%%PERL5_MAN3%%/IOC::Container::MethodResolution.3.gz
+%%PERL5_MAN3%%/IOC::Exceptions.3.gz
+%%PERL5_MAN3%%/IOC::Interfaces.3.gz
+%%PERL5_MAN3%%/IOC::Proxy.3.gz
+%%PERL5_MAN3%%/IOC::Proxy::Interfaces.3.gz
+%%PERL5_MAN3%%/IOC::Registry.3.gz
+%%PERL5_MAN3%%/IOC::Service.3.gz
+%%PERL5_MAN3%%/IOC::Service::ConstructorInjection.3.gz
+%%PERL5_MAN3%%/IOC::Service::Literal.3.gz
+%%PERL5_MAN3%%/IOC::Service::Parameterized.3.gz
+%%PERL5_MAN3%%/IOC::Service::Prototype.3.gz
+%%PERL5_MAN3%%/IOC::Service::Prototype::ConstructorInjection.3.gz
+%%PERL5_MAN3%%/IOC::Service::Prototype::SetterInjection.3.gz
+%%PERL5_MAN3%%/IOC::Service::SetterInjection.3.gz
+%%PERL5_MAN3%%/IOC::Visitor::SearchForContainer.3.gz
+%%PERL5_MAN3%%/IOC::Visitor::SearchForService.3.gz
+%%PERL5_MAN3%%/IOC::Visitor::ServiceLocator.3.gz
+%%PERL5_MAN3%%/Test::IOC.3.gz
 %%SITE_PERL%%/IOC.pm
 %%SITE_PERL%%/IOC/Config/XML.pm
 %%SITE_PERL%%/IOC/Config/XML/SAX/Handler.pm
@@ -21,6 +42,9 @@
 %%SITE_PERL%%/IOC/Visitor/SearchForService.pm
 %%SITE_PERL%%/IOC/Visitor/ServiceLocator.pm
 %%SITE_PERL%%/Test/IOC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IOC/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IOC
+@dirrmtry %%SITE_PERL%%/Test
 @dirrm %%SITE_PERL%%/IOC/Visitor
 @dirrm %%SITE_PERL%%/IOC/Service/Prototype
 @dirrm %%SITE_PERL%%/IOC/Service
@@ -30,6 +54,3 @@
 @dirrm %%SITE_PERL%%/IOC/Config/XML
 @dirrm %%SITE_PERL%%/IOC/Config
 @dirrm %%SITE_PERL%%/IOC
-@dirrmtry %%SITE_PERL%%/Test
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IOC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IOC
diff --git a/devel/p5-IPC-Cache/Makefile b/devel/p5-IPC-Cache/Makefile
index ed996fae9dfa..e5b1350f775a 100644
--- a/devel/p5-IPC-Cache/Makefile
+++ b/devel/p5-IPC-Cache/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IPC::Cache.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IPC-Cache/pkg-plist b/devel/p5-IPC-Cache/pkg-plist
index bd9408b9ecb2..29c2a21641bf 100644
--- a/devel/p5-IPC-Cache/pkg-plist
+++ b/devel/p5-IPC-Cache/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/IPC::Cache.3.gz
 %%SITE_PERL%%/IPC/Cache.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cache/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cache
diff --git a/devel/p5-IPC-Locker/Makefile b/devel/p5-IPC-Locker/Makefile
index c7f5a9f4d8f7..8b2045edfb70 100644
--- a/devel/p5-IPC-Locker/Makefile
+++ b/devel/p5-IPC-Locker/Makefile
@@ -16,10 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=	lockerd.1 lockersh.1 pidstat.1 pidstatd.1 pidwatch.1 \
-	uriexec.1
-MAN3=	IPC::Locker.3 IPC::Locker::Server.3 \
-	IPC::PidStat.3 IPC::PidStat::PidServer.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IPC-Locker/pkg-plist b/devel/p5-IPC-Locker/pkg-plist
index aa82085faa44..531ee8e71ce9 100644
--- a/devel/p5-IPC-Locker/pkg-plist
+++ b/devel/p5-IPC-Locker/pkg-plist
@@ -1,16 +1,26 @@
-bin/lockersh
-bin/pidwatch
 bin/lockerd
+bin/lockersh
 bin/pidstat
 bin/pidstatd
+bin/pidwatch
 bin/uriexec
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Locker/.packlist
-%%SITE_PERL%%/IPC/Locker/Server.pm
+%%PERL5_MAN3%%/IPC::Locker.3.gz
+%%PERL5_MAN3%%/IPC::Locker::Server.3.gz
+%%PERL5_MAN3%%/IPC::PidStat.3.gz
+%%PERL5_MAN3%%/IPC::PidStat::PidServer.3.gz
 %%SITE_PERL%%/IPC/Locker.pm
+%%SITE_PERL%%/IPC/Locker/Server.pm
 %%SITE_PERL%%/IPC/PidStat.pm
 %%SITE_PERL%%/IPC/PidStat/PidServer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Locker/.packlist
+man/man1/lockerd.1.gz
+man/man1/lockersh.1.gz
+man/man1/pidstat.1.gz
+man/man1/pidstatd.1.gz
+man/man1/pidwatch.1.gz
+man/man1/uriexec.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Locker
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
-@dirrm %%SITE_PERL%%/IPC/Locker
 @dirrm %%SITE_PERL%%/IPC/PidStat
+@dirrm %%SITE_PERL%%/IPC/Locker
 @dirrmtry %%SITE_PERL%%/IPC
diff --git a/devel/p5-IPC-MM/Makefile b/devel/p5-IPC-MM/Makefile
index af757832fc78..c0d1242034ed 100644
--- a/devel/p5-IPC-MM/Makefile
+++ b/devel/p5-IPC-MM/Makefile
@@ -15,7 +15,4 @@ LIB_DEPENDS=	mm.14:${PORTSDIR}/devel/mm
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IPC::MM.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IPC-MM/pkg-plist b/devel/p5-IPC-MM/pkg-plist
index d4168c43975c..1210a3ceb736 100644
--- a/devel/p5-IPC-MM/pkg-plist
+++ b/devel/p5-IPC-MM/pkg-plist
@@ -1,8 +1,9 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/.packlist
+%%PERL5_MAN3%%/IPC::MM.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/IPC/MM.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/MM.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/MM.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/autosplit.ix
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IPC
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IPC
diff --git a/devel/p5-IPC-Mmap/Makefile b/devel/p5-IPC-Mmap/Makefile
index aed6000eb6ea..e3c03520cd3d 100644
--- a/devel/p5-IPC-Mmap/Makefile
+++ b/devel/p5-IPC-Mmap/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Provides a minimal mmap() interface for both POSIX and Win32
 USES=		perl5
 USE_PERL5=	configure
 
-#MAN3=		IPC::Mmap.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IPC-Mmap/pkg-plist b/devel/p5-IPC-Mmap/pkg-plist
index 4b21703f10f6..c4c596c3d955 100644
--- a/devel/p5-IPC-Mmap/pkg-plist
+++ b/devel/p5-IPC-Mmap/pkg-plist
@@ -1,10 +1,10 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Mmap/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Mmap/Mmap.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Mmap/Mmap.so
 %%SITE_PERL%%/%%PERL_ARCH%%/IPC/Mmap.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/IPC/Mmap/POSIX.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/IPC/Mmap/Win32.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Mmap
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Mmap/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Mmap/Mmap.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Mmap/Mmap.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Mmap
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IPC/Mmap
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/IPC/Mmap
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IPC
diff --git a/devel/p5-IPC-Run-SafeHandles/Makefile b/devel/p5-IPC-Run-SafeHandles/Makefile
index e2a9c5747b99..a318202097d5 100644
--- a/devel/p5-IPC-Run-SafeHandles/Makefile
+++ b/devel/p5-IPC-Run-SafeHandles/Makefile
@@ -15,16 +15,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	IPC::Run::SafeHandles.3
-
-PLIST_DIRS=	%%SITE_PERL%%/IPC/Run \
-			%%SITE_PERL%%/IPC \
-			%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run/SafeHandles \
-			%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run \
-			%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
-
-PLIST_FILES=	%%SITE_PERL%%/IPC/Run/SafeHandles.pm \
-				%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run/SafeHandles/.packlist
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IPC-Run-SafeHandles/pkg-plist b/devel/p5-IPC-Run-SafeHandles/pkg-plist
new file mode 100644
index 000000000000..fb378471b386
--- /dev/null
+++ b/devel/p5-IPC-Run-SafeHandles/pkg-plist
@@ -0,0 +1,8 @@
+%%PERL5_MAN3%%/IPC::Run::SafeHandles.3.gz
+%%SITE_PERL%%/IPC/Run/SafeHandles.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run/SafeHandles/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run/SafeHandles
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry %%SITE_PERL%%/IPC/Run
+@dirrmtry %%SITE_PERL%%/IPC
diff --git a/devel/p5-IPC-Run/Makefile b/devel/p5-IPC-Run/Makefile
index 3209c02abdf9..7fe2a5fc442c 100644
--- a/devel/p5-IPC-Run/Makefile
+++ b/devel/p5-IPC-Run/Makefile
@@ -19,13 +19,4 @@ RUN_DEPENDS=	p5-IO-Tty>=1.08:${PORTSDIR}/devel/p5-IO-Tty
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IPC::Run.3 \
-		IPC::Run::Debug.3 \
-		IPC::Run::IO.3 \
-		IPC::Run::Timer.3 \
-		IPC::Run::Win32Helper.3 \
-		IPC::Run::Win32IO.3 \
-		IPC::Run::Win32Pump.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IPC-Run/pkg-plist b/devel/p5-IPC-Run/pkg-plist
index e2d23c8c1ba1..7ac2e3c94966 100644
--- a/devel/p5-IPC-Run/pkg-plist
+++ b/devel/p5-IPC-Run/pkg-plist
@@ -1,3 +1,10 @@
+%%PERL5_MAN3%%/IPC::Run.3.gz
+%%PERL5_MAN3%%/IPC::Run::Debug.3.gz
+%%PERL5_MAN3%%/IPC::Run::IO.3.gz
+%%PERL5_MAN3%%/IPC::Run::Timer.3.gz
+%%PERL5_MAN3%%/IPC::Run::Win32Helper.3.gz
+%%PERL5_MAN3%%/IPC::Run::Win32IO.3.gz
+%%PERL5_MAN3%%/IPC::Run::Win32Pump.3.gz
 %%SITE_PERL%%/IPC/Run.pm
 %%SITE_PERL%%/IPC/Run/Debug.pm
 %%SITE_PERL%%/IPC/Run/IO.pm
@@ -6,7 +13,7 @@
 %%SITE_PERL%%/IPC/Run/Win32IO.pm
 %%SITE_PERL%%/IPC/Run/Win32Pump.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
-@dirrm %%SITE_PERL%%/IPC/Run
+@dirrmtry %%SITE_PERL%%/IPC/Run
 @dirrmtry %%SITE_PERL%%/IPC
diff --git a/devel/p5-IPC-Run3/Makefile b/devel/p5-IPC-Run3/Makefile
index 965db3010d90..e27e87ee76a6 100644
--- a/devel/p5-IPC-Run3/Makefile
+++ b/devel/p5-IPC-Run3/Makefile
@@ -13,12 +13,4 @@ COMMENT=	Run a subprocess in batch mode
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IPC::Run3.3 \
-		IPC::Run3::ProfArrayBuffer.3 \
-		IPC::Run3::ProfLogger.3 \
-		IPC::Run3::ProfLogReader.3 \
-		IPC::Run3::ProfPP.3 \
-		IPC::Run3::ProfReporter.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IPC-Run3/pkg-plist b/devel/p5-IPC-Run3/pkg-plist
index dd69c4d367ae..77d237f8b2e9 100644
--- a/devel/p5-IPC-Run3/pkg-plist
+++ b/devel/p5-IPC-Run3/pkg-plist
@@ -1,3 +1,9 @@
+%%PERL5_MAN3%%/IPC::Run3.3.gz
+%%PERL5_MAN3%%/IPC::Run3::ProfArrayBuffer.3.gz
+%%PERL5_MAN3%%/IPC::Run3::ProfLogReader.3.gz
+%%PERL5_MAN3%%/IPC::Run3::ProfLogger.3.gz
+%%PERL5_MAN3%%/IPC::Run3::ProfPP.3.gz
+%%PERL5_MAN3%%/IPC::Run3::ProfReporter.3.gz
 %%SITE_PERL%%/IPC/Run3.pm
 %%SITE_PERL%%/IPC/Run3/ProfArrayBuffer.pm
 %%SITE_PERL%%/IPC/Run3/ProfLogReader.pm
@@ -5,7 +11,7 @@
 %%SITE_PERL%%/IPC/Run3/ProfPP.pm
 %%SITE_PERL%%/IPC/Run3/ProfReporter.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run3/.packlist
-@dirrm %%SITE_PERL%%/IPC/Run3
-@dirrmtry %%SITE_PERL%%/IPC
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run3
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
+@dirrm %%SITE_PERL%%/IPC/Run3
+@dirrmtry %%SITE_PERL%%/IPC
diff --git a/devel/p5-IPC-ShareLite/Makefile b/devel/p5-IPC-ShareLite/Makefile
index 4852d6f27f43..0594e044ffc4 100644
--- a/devel/p5-IPC-ShareLite/Makefile
+++ b/devel/p5-IPC-ShareLite/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Simple interface to access shared memory
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IPC::ShareLite.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IPC-ShareLite/pkg-plist b/devel/p5-IPC-ShareLite/pkg-plist
index 66745c599572..83179a68d7e6 100644
--- a/devel/p5-IPC-ShareLite/pkg-plist
+++ b/devel/p5-IPC-ShareLite/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/IPC::ShareLite.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/IPC/ShareLite.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/ShareLite/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/ShareLite/ShareLite.bs
diff --git a/devel/p5-IPC-SharedCache/Makefile b/devel/p5-IPC-SharedCache/Makefile
index d2c3a93127d2..25bafb8fe133 100644
--- a/devel/p5-IPC-SharedCache/Makefile
+++ b/devel/p5-IPC-SharedCache/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		IPC::SharedCache.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-IPC-SharedCache/pkg-plist b/devel/p5-IPC-SharedCache/pkg-plist
index 3c953d378765..bc878cda7fc6 100644
--- a/devel/p5-IPC-SharedCache/pkg-plist
+++ b/devel/p5-IPC-SharedCache/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/IPC::SharedCache.3.gz
 %%SITE_PERL%%/IPC/SharedCache.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/SharedCache/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/SharedCache
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/SharedCache
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
 @dirrmtry %%SITE_PERL%%/IPC
diff --git a/devel/p5-Inline-ASM/Makefile b/devel/p5-Inline-ASM/Makefile
index e32d2ea09b01..8ae584a2e624 100644
--- a/devel/p5-Inline-ASM/Makefile
+++ b/devel/p5-Inline-ASM/Makefile
@@ -17,7 +17,4 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	</dev/null
 
-MAN3=		Inline::ASM.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Inline-ASM/pkg-plist b/devel/p5-Inline-ASM/pkg-plist
index 65c7906f167a..a3265c7b1d9f 100644
--- a/devel/p5-Inline-ASM/pkg-plist
+++ b/devel/p5-Inline-ASM/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/ASM/.packlist
+%%PERL5_MAN3%%/Inline::ASM.3.gz
 %%SITE_PERL%%/Inline/ASM.pm
 %%SITE_PERL%%/Inline/ASM.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/ASM/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/ASM
-@dirrmtry %%SITE_PERL%%/Inline
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
+@dirrmtry %%SITE_PERL%%/Inline
diff --git a/devel/p5-Inline-CPP/Makefile b/devel/p5-Inline-CPP/Makefile
index c8d9340dc63d..f0377f16f416 100644
--- a/devel/p5-Inline-CPP/Makefile
+++ b/devel/p5-Inline-CPP/Makefile
@@ -19,11 +19,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Inline::CPP.3 \
-		Inline::CPP::Config.3 \
-		Inline::CPP::grammar.3
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/Makefile.PL
 
diff --git a/devel/p5-Inline-CPP/pkg-plist b/devel/p5-Inline-CPP/pkg-plist
index 2452c46360f9..5663b65eb6e1 100644
--- a/devel/p5-Inline-CPP/pkg-plist
+++ b/devel/p5-Inline-CPP/pkg-plist
@@ -1,3 +1,6 @@
+%%PERL5_MAN3%%/Inline::CPP.3.gz
+%%PERL5_MAN3%%/Inline::CPP::Config.3.gz
+%%PERL5_MAN3%%/Inline::CPP::grammar.3.gz
 %%SITE_PERL%%/Inline/CPP.pm
 %%SITE_PERL%%/Inline/CPP.pod
 %%SITE_PERL%%/Inline/CPP/Config.pm
diff --git a/devel/p5-Inline-Files/Makefile b/devel/p5-Inline-Files/Makefile
index 548bd111ade5..eb420d0054b3 100644
--- a/devel/p5-Inline-Files/Makefile
+++ b/devel/p5-Inline-Files/Makefile
@@ -13,8 +13,4 @@ COMMENT=	Multiple virtual files at the end of your code
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Inline::Files.3 \
-		Inline::Files::Virtual.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Inline-Files/pkg-plist b/devel/p5-Inline-Files/pkg-plist
index 3fb29603d600..eebace768de5 100644
--- a/devel/p5-Inline-Files/pkg-plist
+++ b/devel/p5-Inline-Files/pkg-plist
@@ -1,6 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Files/.packlist
+%%PERL5_MAN3%%/Inline::Files.3.gz
+%%PERL5_MAN3%%/Inline::Files::Virtual.3.gz
 %%SITE_PERL%%/Inline/Files.pm
 %%SITE_PERL%%/Inline/Files/Virtual.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Files/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Files
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
 @dirrm %%SITE_PERL%%/Inline/Files
diff --git a/devel/p5-Inline-Filters/Makefile b/devel/p5-Inline-Filters/Makefile
index d55acdd1bb82..2863e3943299 100644
--- a/devel/p5-Inline-Filters/Makefile
+++ b/devel/p5-Inline-Filters/Makefile
@@ -16,7 +16,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Inline::Filters.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Inline-Filters/pkg-plist b/devel/p5-Inline-Filters/pkg-plist
index 106bf144e75c..440c290f1c88 100644
--- a/devel/p5-Inline-Filters/pkg-plist
+++ b/devel/p5-Inline-Filters/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Filters/.packlist
+%%PERL5_MAN3%%/Inline::Filters.3.gz
 %%SITE_PERL%%/Inline/Filters.pm
 %%SITE_PERL%%/Inline/Filters.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Filters/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Filters
-@dirrmtry %%SITE_PERL%%/Inline
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
+@dirrmtry %%SITE_PERL%%/Inline
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index 25b3c0fd2f35..b479321fdbc5 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -24,8 +24,4 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	J2SDK=${JAVA_HOME} </dev/null
 
-MAN3=		Inline::Java.3 \
-		Inline::Java::Callback.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Inline-Java/pkg-plist b/devel/p5-Inline-Java/pkg-plist
index b06b1c5bb0c7..52061e7af424 100644
--- a/devel/p5-Inline-Java/pkg-plist
+++ b/devel/p5-Inline-Java/pkg-plist
@@ -1,6 +1,5 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/JNI/JNI.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/JNI/JNI.so
+%%PERL5_MAN3%%/Inline::Java.3.gz
+%%PERL5_MAN3%%/Inline::Java::Callback.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Array.pm
@@ -37,6 +36,12 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUserClassLink.java
 %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUserClassLoader.java
 %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUtils.java
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/JNI/JNI.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/JNI/JNI.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/JNI
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl
@@ -44,6 +49,3 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Inline
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/JNI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
diff --git a/devel/p5-Inline-Tcl/Makefile b/devel/p5-Inline-Tcl/Makefile
index ef978b70bcea..643fa8d2b545 100644
--- a/devel/p5-Inline-Tcl/Makefile
+++ b/devel/p5-Inline-Tcl/Makefile
@@ -11,17 +11,14 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Write Perl subroutines in Tcl
 
 BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline
-LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84
+#LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		perl5
+USES=		perl5 tcl
 USE_PERL5=	configure
-CONFIGURE_ARGS=	INC="-I${PREFIX}/include/tcl8.4" \
-		LIBS="-L${PREFIX}/lib -R${PREFIX}/lib -ltcl84"
+CONFIGURE_ARGS=	INC="-I${TCL_INCLUDEDIR}" \
+		LIBS="-L${TCL_LIBDIR} -R${TCL_LIBDIR} -ltcl${TCL_SHLIB_VER}"
 
-MAN3=		Inline::Tcl.3
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -i.bak '2,99d' ${WRKSRC}/Makefile.PL
 
diff --git a/devel/p5-Inline-Tcl/pkg-plist b/devel/p5-Inline-Tcl/pkg-plist
index b24daa401e3a..cd3c50f498a3 100644
--- a/devel/p5-Inline-Tcl/pkg-plist
+++ b/devel/p5-Inline-Tcl/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Tcl/.packlist
+%%PERL5_MAN3%%/Inline::Tcl.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Tcl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Tcl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Tcl/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Tcl/Tcl.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Tcl/Tcl.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Tcl
diff --git a/devel/p5-Inline/Makefile b/devel/p5-Inline/Makefile
index 1d5fe279ec37..cdf6b6425131 100644
--- a/devel/p5-Inline/Makefile
+++ b/devel/p5-Inline/Makefile
@@ -21,16 +21,6 @@ TEST_DEPENDS=	p5-Inline-Files>=0:${PORTSDIR}/devel/p5-Inline-Files
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Inline.3 \
-		Inline-API.3 \
-		Inline-FAQ.3 \
-		Inline-Support.3 \
-		Inline::C.3 \
-		Inline::C-Cookbook.3 \
-		Inline::C::ParseRecDescent.3 \
-		Inline::C::ParseRegExp.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 501400
diff --git a/devel/p5-Inline/pkg-plist b/devel/p5-Inline/pkg-plist
index cf9355d8e799..d664554fbd11 100644
--- a/devel/p5-Inline/pkg-plist
+++ b/devel/p5-Inline/pkg-plist
@@ -1,3 +1,11 @@
+%%PERL5_MAN3%%/Inline-API.3.gz
+%%PERL5_MAN3%%/Inline-FAQ.3.gz
+%%PERL5_MAN3%%/Inline-Support.3.gz
+%%PERL5_MAN3%%/Inline.3.gz
+%%PERL5_MAN3%%/Inline::C-Cookbook.3.gz
+%%PERL5_MAN3%%/Inline::C.3.gz
+%%PERL5_MAN3%%/Inline::C::ParseRecDescent.3.gz
+%%PERL5_MAN3%%/Inline::C::ParseRegExp.3.gz
 %%SITE_PERL%%/Inline-API.pod
 %%SITE_PERL%%/Inline-FAQ.pod
 %%SITE_PERL%%/Inline-Support.pod
@@ -114,9 +122,9 @@
 %%SITE_PERL%%/auto/Inline/with_configs.al
 %%SITE_PERL%%/auto/Inline/write_inl_file.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
 @dirrm %%SITE_PERL%%/auto/Inline/denter
+@dirrmtry %%SITE_PERL%%/auto/Inline
 @dirrm %%SITE_PERL%%/Inline/MakeMaker
 @dirrm %%SITE_PERL%%/Inline/C
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
-@dirrmtry %%SITE_PERL%%/auto/Inline
 @dirrmtry %%SITE_PERL%%/Inline
diff --git a/devel/p5-InlineX-C2XS/Makefile b/devel/p5-InlineX-C2XS/Makefile
index ea741dcecffd..f41be63d67ca 100644
--- a/devel/p5-InlineX-C2XS/Makefile
+++ b/devel/p5-InlineX-C2XS/Makefile
@@ -18,7 +18,4 @@ TEST_DEPENDS=	p5-Test-Warn>=0.23:${PORTSDIR}/devel/p5-Test-Warn
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		InlineX::C2XS.3 InlineX::C2XS-Cookbook.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-InlineX-C2XS/pkg-plist b/devel/p5-InlineX-C2XS/pkg-plist
index 97f42f0a5b78..83d71882baad 100644
--- a/devel/p5-InlineX-C2XS/pkg-plist
+++ b/devel/p5-InlineX-C2XS/pkg-plist
@@ -1,6 +1,8 @@
 bin/c2xs
-%%SITE_PERL%%/InlineX/C2XS.pm
+%%PERL5_MAN3%%/InlineX::C2XS-Cookbook.3.gz
+%%PERL5_MAN3%%/InlineX::C2XS.3.gz
 %%SITE_PERL%%/InlineX/C2XS-Cookbook.pod
+%%SITE_PERL%%/InlineX/C2XS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/InlineX/C2XS/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/InlineX/C2XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/InlineX
diff --git a/devel/p5-InlineX-CPP2XS/Makefile b/devel/p5-InlineX-CPP2XS/Makefile
index 48dd805b6d26..7be252458b67 100644
--- a/devel/p5-InlineX-CPP2XS/Makefile
+++ b/devel/p5-InlineX-CPP2XS/Makefile
@@ -22,7 +22,4 @@ TEST_DEPENDS=	p5-Test-Warn>=0.24:${PORTSDIR}/devel/p5-Test-Warn
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		InlineX::CPP2XS.3 InlineX::CPP2XS-Cookbook.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-InlineX-CPP2XS/pkg-plist b/devel/p5-InlineX-CPP2XS/pkg-plist
index 5f6f3daae9d9..61d0e105495b 100644
--- a/devel/p5-InlineX-CPP2XS/pkg-plist
+++ b/devel/p5-InlineX-CPP2XS/pkg-plist
@@ -1,6 +1,8 @@
 bin/cpp2xs
-%%SITE_PERL%%/InlineX/CPP2XS.pm
+%%PERL5_MAN3%%/InlineX::CPP2XS-Cookbook.3.gz
+%%PERL5_MAN3%%/InlineX::CPP2XS.3.gz
 %%SITE_PERL%%/InlineX/CPP2XS-Cookbook.pod
+%%SITE_PERL%%/InlineX/CPP2XS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/InlineX/CPP2XS/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/InlineX/CPP2XS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/InlineX
diff --git a/devel/p5-Ioctl/Makefile b/devel/p5-Ioctl/Makefile
index a7d77b23ed61..38dea4243112 100644
--- a/devel/p5-Ioctl/Makefile
+++ b/devel/p5-Ioctl/Makefile
@@ -14,5 +14,4 @@ COMMENT=	Perl module that provides a way to get the value of C ioctl constants
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Ioctl/pkg-plist b/devel/p5-Ioctl/pkg-plist
index 8f5440fa59eb..87915a02b6fa 100644
--- a/devel/p5-Ioctl/pkg-plist
+++ b/devel/p5-Ioctl/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl/Ioctl.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl/Ioctl.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ioctl
diff --git a/devel/p5-Iterator-IO/Makefile b/devel/p5-Iterator-IO/Makefile
index c1aacb5aab92..cb2ecbce558e 100644
--- a/devel/p5-Iterator-IO/Makefile
+++ b/devel/p5-Iterator-IO/Makefile
@@ -13,10 +13,7 @@ COMMENT=	Filesystem and stream iterators
 BUILD_DEPENDS=	p5-Iterator>=0:${PORTSDIR}/devel/p5-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=	Iterator::IO.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Iterator-IO/pkg-plist b/devel/p5-Iterator-IO/pkg-plist
index 7622dd2e5d5d..dfb342026b28 100644
--- a/devel/p5-Iterator-IO/pkg-plist
+++ b/devel/p5-Iterator-IO/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Iterator::IO.3.gz
 %%SITE_PERL%%/Iterator/IO.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/IO/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/IO
diff --git a/devel/p5-Iterator-Misc/Makefile b/devel/p5-Iterator-Misc/Makefile
index 7f4171ce4653..d740c499234a 100644
--- a/devel/p5-Iterator-Misc/Makefile
+++ b/devel/p5-Iterator-Misc/Makefile
@@ -13,10 +13,7 @@ COMMENT=	Miscellaneous iterator functions
 BUILD_DEPENDS=	p5-Iterator>=0:${PORTSDIR}/devel/p5-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=	Iterator::Misc.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Iterator-Misc/pkg-plist b/devel/p5-Iterator-Misc/pkg-plist
index e200c100c69a..4fbb71de9e01 100644
--- a/devel/p5-Iterator-Misc/pkg-plist
+++ b/devel/p5-Iterator-Misc/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Iterator::Misc.3.gz
 %%SITE_PERL%%/Iterator/Misc.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/Misc/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/Misc
diff --git a/devel/p5-Iterator-Simple/Makefile b/devel/p5-Iterator-Simple/Makefile
index 3453e8cc2832..b2597a999d3b 100644
--- a/devel/p5-Iterator-Simple/Makefile
+++ b/devel/p5-Iterator-Simple/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Simple iterator and utilities
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Iterator::Simple.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Iterator-Simple/pkg-plist b/devel/p5-Iterator-Simple/pkg-plist
index d5ee6dc22517..bf4e222c69b9 100644
--- a/devel/p5-Iterator-Simple/pkg-plist
+++ b/devel/p5-Iterator-Simple/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Iterator::Simple.3.gz
 %%SITE_PERL%%/Iterator/Simple.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/Simple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/Simple
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/Simple
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator
 @dirrmtry %%SITE_PERL%%/Iterator
diff --git a/devel/p5-Iterator-Util/Makefile b/devel/p5-Iterator-Util/Makefile
index 4dd9f8cd3c64..67280733ad56 100644
--- a/devel/p5-Iterator-Util/Makefile
+++ b/devel/p5-Iterator-Util/Makefile
@@ -13,10 +13,7 @@ COMMENT=	Essential utilities for the Iterator class
 BUILD_DEPENDS=	p5-Iterator>=0:${PORTSDIR}/devel/p5-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=	Iterator::Util.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Iterator-Util/pkg-plist b/devel/p5-Iterator-Util/pkg-plist
index 7890eea44a06..8c0569ef87b0 100644
--- a/devel/p5-Iterator-Util/pkg-plist
+++ b/devel/p5-Iterator-Util/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Iterator::Util.3.gz
 %%SITE_PERL%%/Iterator/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/Util/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/Util
diff --git a/devel/p5-Iterator/Makefile b/devel/p5-Iterator/Makefile
index 2e2cd92f86ed..dd9516dbf925 100644
--- a/devel/p5-Iterator/Makefile
+++ b/devel/p5-Iterator/Makefile
@@ -14,10 +14,7 @@ COMMENT=	General-purpose iterator class
 BUILD_DEPENDS=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-MAN3=	Iterator.3
-
 USES=		perl5
 USE_PERL5=	configure
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-Iterator/pkg-plist b/devel/p5-Iterator/pkg-plist
index a8460dcdf2bd..b43996def8db 100644
--- a/devel/p5-Iterator/pkg-plist
+++ b/devel/p5-Iterator/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Iterator.3.gz
 %%SITE_PERL%%/Iterator.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Iterator