- Repository copy from p5-JSON to p5-JSON1.

- Mark p5-JSON1 as conflicting with p5-JSON-2.x.
- Upgrade p5-JSON to 2.07 and mark as conflicting with p5-JSON-1.x.
- Use CPAN macro, add Test-Simple dependency and improve pkg-plist.

PR:	  	ports/120596
Submitted by:	Felippe de Meirelles Motta <lippemail@gmail.com>

5 files changed, 22 insertions, 26 deletions

diff --git a/converters/Makefile b/converters/Makefile
index 98dc58193784..92b1e06a2961 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -58,6 +58,7 @@
     SUBDIR += p5-Encode-JIS2K
     SUBDIR += p5-Encode-compat
     SUBDIR += p5-JSON
+    SUBDIR += p5-JSON1
     SUBDIR += p5-JSON-Any
     SUBDIR += p5-JSON-DWIW
     SUBDIR += p5-JSON-XS
diff --git a/converters/p5-JSON/Makefile b/converters/p5-JSON/Makefile
index 2d8632dd58ef..c7d692f1e94a 100644
--- a/converters/p5-JSON/Makefile
+++ b/converters/p5-JSON/Makefile
@@ -6,27 +6,26 @@
 #
 
 PORTNAME=	JSON
-PORTVERSION=	1.15
+PORTVERSION=	2.07
 CATEGORIES=	converters perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/M/MA/MAKAMAKA
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to convert to JSON (JavaScript Object Notation)
 
+CONFLICTS=	p5-JSON-1.*
+
 RUN_DEPENDS=	${SITE_PERL}/HTTP/Request.pm:${PORTSDIR}/www/p5-libwww
-BUILD_DEPENDS=	${RUN_DEPENDS}
+BUILD_DEPENDS=	${SITE_PERL}/HTTP/Request.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 
 PERL_CONFIGURE=	yes
-MAN3=		Apache::JSONRPC.3 JSON.3 JSON::Converter.3 \
-		JSON::PP.3 JSON::PP5005.3 JSON::PP56.3 JSON::Parser.3 \
-		JSONRPC.3 JSONRPC::Transport::HTTP.3
-
-.include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
-.endif
+MAN3=		JSON.3 \
+		JSON::PP.3 \
+		JSON::PP56.3 \
+		JSON::PP::Boolean.3 \
+		JSON::PP5005.3
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/converters/p5-JSON/distinfo b/converters/p5-JSON/distinfo
index a87308240559..dbd529cbbcba 100644
--- a/converters/p5-JSON/distinfo
+++ b/converters/p5-JSON/distinfo
@@ -1,3 +1,3 @@
-MD5 (JSON-1.15.tar.gz) = 4f96dd0b68b644bc07453afc29105b7c
-SHA256 (JSON-1.15.tar.gz) = d890654a3afd852303b0a52c764a6599535ccf29002c2c90e99a34c39747ffc7
-SIZE (JSON-1.15.tar.gz) = 38395
+MD5 (JSON-2.07.tar.gz) = 1ca7b2851f1a8e835eec46d013da8a2b
+SHA256 (JSON-2.07.tar.gz) = 8d3ddb908c081af800a35664ecfd9b9fb3cab365a5bd20f40f8f7f1342db6d3b
+SIZE (JSON-2.07.tar.gz) = 63054
diff --git a/converters/p5-JSON/pkg-plist b/converters/p5-JSON/pkg-plist
index 752246868946..d085422444df 100644
--- a/converters/p5-JSON/pkg-plist
+++ b/converters/p5-JSON/pkg-plist
@@ -1,15 +1,9 @@
-%%SITE_PERL%%/Apache/JSONRPC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/.packlist
 %%SITE_PERL%%/JSON.pm
-%%SITE_PERL%%/JSON/Converter.pm
 %%SITE_PERL%%/JSON/PP.pm
-%%SITE_PERL%%/JSON/PP5005.pm
 %%SITE_PERL%%/JSON/PP56.pm
-%%SITE_PERL%%/JSON/Parser.pm
-%%SITE_PERL%%/JSONRPC.pm
-%%SITE_PERL%%/JSONRPC/Transport/HTTP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/.packlist
+%%SITE_PERL%%/JSON/PP5005.pm
+%%SITE_PERL%%/JSON/PP/Boolean.pm
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
-@dirrmtry %%SITE_PERL%%/JSONRPC/Transport
-@dirrmtry %%SITE_PERL%%/JSONRPC
+@dirrmtry %%SITE_PERL%%/JSON/PP
 @dirrmtry %%SITE_PERL%%/JSON
-@dirrmtry %%SITE_PERL%%/Apache
diff --git a/converters/p5-JSON1/Makefile b/converters/p5-JSON1/Makefile
index 2d8632dd58ef..0771247a8659 100644
--- a/converters/p5-JSON1/Makefile
+++ b/converters/p5-JSON1/Makefile
@@ -15,6 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to convert to JSON (JavaScript Object Notation)
 
+CONFLICTS=	p5-JSON-2.*
+
 RUN_DEPENDS=	${SITE_PERL}/HTTP/Request.pm:${PORTSDIR}/www/p5-libwww
 BUILD_DEPENDS=	${RUN_DEPENDS}