Support STAGEDIR.

8 files changed, 56 insertions, 66 deletions

diff --git a/devel/p5-JSON-Path/Makefile b/devel/p5-JSON-Path/Makefile
index da080272f173..42405c7f311b 100644
--- a/devel/p5-JSON-Path/Makefile
+++ b/devel/p5-JSON-Path/Makefile
@@ -18,9 +18,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		JSON::Path.3
-
-NO_STAGE=	yes
 post-patch::
 	@${RM} ${WRKSRC}/lib/JSON/Path.pm.orig
 
diff --git a/devel/p5-JSON-Path/pkg-plist b/devel/p5-JSON-Path/pkg-plist
index b3538d017c77..1b28979cc9ee 100644
--- a/devel/p5-JSON-Path/pkg-plist
+++ b/devel/p5-JSON-Path/pkg-plist
@@ -1,7 +1,6 @@
-@comment $FreeBSD$
+%%PERL5_MAN3%%/JSON::Path.3.gz
 %%SITE_PERL%%/JSON/Path.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Path/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Path
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Path
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JSON
 @dirrmtry %%SITE_PERL%%/JSON
diff --git a/devel/p5-JSON-RPC-Common/Makefile b/devel/p5-JSON-RPC-Common/Makefile
index d27157be8ae8..46e1e861fe51 100644
--- a/devel/p5-JSON-RPC-Common/Makefile
+++ b/devel/p5-JSON-RPC-Common/Makefile
@@ -24,23 +24,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		JSON::RPC::Common::Marshal::Text.3 \
-		JSON::RPC::Common::Message.3 \
-		JSON::RPC::Common::Procedure::Call.3 \
-		JSON::RPC::Common::Procedure::Return::Version_1_1.3 \
-		JSON::RPC::Common::Procedure::Return::Error.3 \
-		JSON::RPC::Common::Procedure::Call::Version_1_0.3 \
-		JSON::RPC::Common::Procedure::Return.3 \
-		JSON::RPC::Common.3 \
-		JSON::RPC::Common::Procedure::Return::Version_2_0.3 \
-		JSON::RPC::Common::Procedure::Return::Version_1_0.3 \
-		JSON::RPC::Common::Procedure::Call::Version_1_1.3 \
-		JSON::RPC::Common::Procedure::Return::Version_2_0::Error.3 \
-		JSON::RPC::Common::TypeConstraints.3 \
-		JSON::RPC::Common::Procedure::Return::Version_1_1::Error.3 \
-		JSON::RPC::Common::Procedure::Call::Version_2_0.3 \
-		JSON::RPC::Common::Procedure::Return::Version_1_0::Error.3 \
-		JSON::RPC::Common::Marshal::HTTP.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/p5-JSON-RPC-Common/pkg-plist b/devel/p5-JSON-RPC-Common/pkg-plist
index 0a5429ef80ba..dfa9ae5cddf7 100644
--- a/devel/p5-JSON-RPC-Common/pkg-plist
+++ b/devel/p5-JSON-RPC-Common/pkg-plist
@@ -1,31 +1,48 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/Common/.packlist
+%%PERL5_MAN3%%/JSON::RPC::Common.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Marshal::HTTP.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Marshal::Text.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Message.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Call.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Call::Version_1_0.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Call::Version_1_1.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Call::Version_2_0.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Return.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Return::Error.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Return::Version_1_0.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Return::Version_1_0::Error.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Return::Version_1_1.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Return::Version_1_1::Error.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Return::Version_2_0.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::Procedure::Return::Version_2_0::Error.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Common::TypeConstraints.3.gz
 %%SITE_PERL%%/JSON/RPC/Common.pm
-%%SITE_PERL%%/JSON/RPC/Common/Message.pm
-%%SITE_PERL%%/JSON/RPC/Common/TypeConstraints.pm
-%%SITE_PERL%%/JSON/RPC/Common/Marshal/Text.pm
 %%SITE_PERL%%/JSON/RPC/Common/Marshal/HTTP.pm
+%%SITE_PERL%%/JSON/RPC/Common/Marshal/Text.pm
+%%SITE_PERL%%/JSON/RPC/Common/Message.pm
 %%SITE_PERL%%/JSON/RPC/Common/Procedure/Call.pm
+%%SITE_PERL%%/JSON/RPC/Common/Procedure/Call/Version_1_0.pm
+%%SITE_PERL%%/JSON/RPC/Common/Procedure/Call/Version_1_1.pm
+%%SITE_PERL%%/JSON/RPC/Common/Procedure/Call/Version_2_0.pm
 %%SITE_PERL%%/JSON/RPC/Common/Procedure/Return.pm
-%%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_1_1.pm
 %%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Error.pm
-%%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_2_0.pm
 %%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_1_0.pm
-%%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_2_0/Error.pm
-%%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_1_1/Error.pm
 %%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_1_0/Error.pm
-%%SITE_PERL%%/JSON/RPC/Common/Procedure/Call/Version_1_0.pm
-%%SITE_PERL%%/JSON/RPC/Common/Procedure/Call/Version_1_1.pm
-%%SITE_PERL%%/JSON/RPC/Common/Procedure/Call/Version_2_0.pm
-@dirrm %%SITE_PERL%%/JSON/RPC/Common/Procedure/Call
+%%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_1_1.pm
+%%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_1_1/Error.pm
+%%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_2_0.pm
+%%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_2_0/Error.pm
+%%SITE_PERL%%/JSON/RPC/Common/TypeConstraints.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/Common/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/Common
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
 @dirrm %%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_2_0
 @dirrm %%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_1_1
 @dirrm %%SITE_PERL%%/JSON/RPC/Common/Procedure/Return/Version_1_0
 @dirrm %%SITE_PERL%%/JSON/RPC/Common/Procedure/Return
+@dirrm %%SITE_PERL%%/JSON/RPC/Common/Procedure/Call
 @dirrm %%SITE_PERL%%/JSON/RPC/Common/Procedure
 @dirrm %%SITE_PERL%%/JSON/RPC/Common/Marshal
 @dirrm %%SITE_PERL%%/JSON/RPC/Common
 @dirrmtry %%SITE_PERL%%/JSON/RPC
 @dirrmtry %%SITE_PERL%%/JSON
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/Common
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
diff --git a/devel/p5-JSON-RPC-Dispatcher/Makefile b/devel/p5-JSON-RPC-Dispatcher/Makefile
index af001346b65a..0028117f9b79 100644
--- a/devel/p5-JSON-RPC-Dispatcher/Makefile
+++ b/devel/p5-JSON-RPC-Dispatcher/Makefile
@@ -19,11 +19,6 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		JSON::RPC::Dispatcher.3 \
-		JSON::RPC::Dispatcher::App.3 \
-		JSON::RPC::Dispatcher::Procedure.3
-
-NO_STAGE=	yes
 post-patch:
 	${RM} ${WRKSRC}/lib/JSON/RPC/Dispatcher.pm.orig
 
diff --git a/devel/p5-JSON-RPC-Dispatcher/pkg-plist b/devel/p5-JSON-RPC-Dispatcher/pkg-plist
index 73e8bea2fd02..0ec640f2979a 100644
--- a/devel/p5-JSON-RPC-Dispatcher/pkg-plist
+++ b/devel/p5-JSON-RPC-Dispatcher/pkg-plist
@@ -1,10 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/Dispatcher/.packlist
+%%PERL5_MAN3%%/JSON::RPC::Dispatcher.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Dispatcher::App.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Dispatcher::Procedure.3.gz
 %%SITE_PERL%%/JSON/RPC/Dispatcher.pm
 %%SITE_PERL%%/JSON/RPC/Dispatcher/App.pm
 %%SITE_PERL%%/JSON/RPC/Dispatcher/Procedure.pm
-@dirrm %%SITE_PERL%%/JSON/RPC/Dispatcher
-@dirrmtry %%SITE_PERL%%/JSON/RPC
-@dirrmtry %%SITE_PERL%%/JSON
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/Dispatcher/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/Dispatcher
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
+@dirrm %%SITE_PERL%%/JSON/RPC/Dispatcher
+@dirrmtry %%SITE_PERL%%/JSON/RPC
+@dirrmtry %%SITE_PERL%%/JSON
diff --git a/devel/p5-JSON-RPC/Makefile b/devel/p5-JSON-RPC/Makefile
index 9df032b0e9a2..e4954c7f5dca 100644
--- a/devel/p5-JSON-RPC/Makefile
+++ b/devel/p5-JSON-RPC/Makefile
@@ -23,21 +23,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		JSON::RPC.3 \
-		JSON::RPC::Constants.3 \
-		JSON::RPC::Dispatch.3 \
-		JSON::RPC::Legacy.3 \
-		JSON::RPC::Legacy::Client.3 \
-		JSON::RPC::Legacy::Procedure.3 \
-		JSON::RPC::Legacy::Server.3 \
-		JSON::RPC::Legacy::Server::Apache2.3 \
-		JSON::RPC::Legacy::Server::CGI.3 \
-		JSON::RPC::Legacy::Server::Daemon.3 \
-		JSON::RPC::Parser.3 \
-		JSON::RPC::Procedure.3 \
-		JSON::RPC::Test.3
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501400
diff --git a/devel/p5-JSON-RPC/pkg-plist b/devel/p5-JSON-RPC/pkg-plist
index 17785c6b1cd7..975c27142e7f 100644
--- a/devel/p5-JSON-RPC/pkg-plist
+++ b/devel/p5-JSON-RPC/pkg-plist
@@ -1,3 +1,16 @@
+%%PERL5_MAN3%%/JSON::RPC.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Constants.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Dispatch.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Legacy.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Legacy::Client.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Legacy::Procedure.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Legacy::Server.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Legacy::Server::Apache2.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Legacy::Server::CGI.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Legacy::Server::Daemon.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Parser.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Procedure.3.gz
+%%PERL5_MAN3%%/JSON::RPC::Test.3.gz
 %%SITE_PERL%%/JSON/RPC.pm
 %%SITE_PERL%%/JSON/RPC/Constants.pm
 %%SITE_PERL%%/JSON/RPC/Dispatch.pm
@@ -12,9 +25,9 @@
 %%SITE_PERL%%/JSON/RPC/Procedure.pm
 %%SITE_PERL%%/JSON/RPC/Test.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
 @dirrm %%SITE_PERL%%/JSON/RPC/Legacy/Server
 @dirrm %%SITE_PERL%%/JSON/RPC/Legacy
-@dirrm %%SITE_PERL%%/JSON/RPC
+@dirrmtry %%SITE_PERL%%/JSON/RPC
 @dirrmtry %%SITE_PERL%%/JSON