3 files changed, 47 insertions, 20 deletions

diff --git a/devel/p5-JSON-RPC/Makefile b/devel/p5-JSON-RPC/Makefile
index f63918a327b9..96da4f47e1ce 100644
--- a/devel/p5-JSON-RPC/Makefile
+++ b/devel/p5-JSON-RPC/Makefile
@@ -6,22 +6,44 @@
 #
 
 PORTNAME=	JSON-RPC
-PORTVERSION=	0.96
-PORTREVISION=	1
+PORTVERSION=	1.01
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vvatlin@masterhost.ru
 COMMENT=	Perl implementation of JSON-RPC 1.1 protocol
 
-RUN_DEPENDS=	p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
+BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
+		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
+		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
+		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
+		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
+		p5-Router-Simple>=0:${PORTSDIR}/www/p5-Router-Simple \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	YES
+PERL_CONFIGURE=	yes
 
-MAN3=		JSON::RPC.3 JSON::RPC::Server.3 JSON::RPC::Client.3 \
-		JSON::RPC::Procedure.3 JSON::RPC::Server::CGI.3 JSONRPC.3 \
-		JSON::RPC::Server::Daemon.3 JSON::RPC::Server::Apache2.3
+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
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501001
+BUILD_DEPENDS+=	p5-parent>=0:${PORTSDIR}/devel/p5-parent
+RUN_DEPENDS+=	p5-parent>=0:${PORTSDIR}/devel/p5-parent
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-JSON-RPC/distinfo b/devel/p5-JSON-RPC/distinfo
index 7f7bf66f7f89..b70d374b6971 100644
--- a/devel/p5-JSON-RPC/distinfo
+++ b/devel/p5-JSON-RPC/distinfo
@@ -1,2 +1,2 @@
-SHA256 (JSON-RPC-0.96.tar.gz) = 043624b5bd8a9eef18fd03082a1d99b45e3c5202786752a32e051590b565ba15
-SIZE (JSON-RPC-0.96.tar.gz) = 14206
+SHA256 (JSON-RPC-1.01.tar.gz) = 240f37c6aec872c7715e6ab89f881678b2706393915958961b4a6b327a25d314
+SIZE (JSON-RPC-1.01.tar.gz) = 35852
diff --git a/devel/p5-JSON-RPC/pkg-plist b/devel/p5-JSON-RPC/pkg-plist
index 645cae59d164..f3b105dd888c 100644
--- a/devel/p5-JSON-RPC/pkg-plist
+++ b/devel/p5-JSON-RPC/pkg-plist
@@ -1,14 +1,19 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/.packlist
 %%SITE_PERL%%/JSON/RPC.pm
-%%SITE_PERL%%/JSON/RPC/Client.pm
-%%SITE_PERL%%/JSON/RPC/Server.pm
+%%SITE_PERL%%/JSON/RPC/Constants.pm
+%%SITE_PERL%%/JSON/RPC/Dispatch.pm
+%%SITE_PERL%%/JSON/RPC/Legacy.pm
+%%SITE_PERL%%/JSON/RPC/Legacy/Client.pm
+%%SITE_PERL%%/JSON/RPC/Legacy/Procedure.pm
+%%SITE_PERL%%/JSON/RPC/Legacy/Server.pm
+%%SITE_PERL%%/JSON/RPC/Legacy/Server/Apache2.pm
+%%SITE_PERL%%/JSON/RPC/Legacy/Server/CGI.pm
+%%SITE_PERL%%/JSON/RPC/Legacy/Server/Daemon.pm
+%%SITE_PERL%%/JSON/RPC/Parser.pm
 %%SITE_PERL%%/JSON/RPC/Procedure.pm
-%%SITE_PERL%%/JSON/RPC/Server/CGI.pm
-%%SITE_PERL%%/JSON/RPC/Server/Daemon.pm
-%%SITE_PERL%%/JSON/RPC/Server/Apache2.pm
-%%SITE_PERL%%/JSONRPC.pm
-@dirrm %%SITE_PERL%%/JSON/RPC/Server
-@dirrm %%SITE_PERL%%/JSON/RPC
-@dirrmtry %%SITE_PERL%%/JSON
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/RPC/.packlist
 @dirrm %%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