Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/converters/p5-JSON/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	11 Oct 2007 18:54:36 -0000	1.9
+++ Makefile	13 Feb 2008 03:03:03 -0000
@@ -6,27 +6,23 @@
 #
 
 PORTNAME=	JSON
-PORTVERSION=	1.14
+PORTVERSION=	2.06
 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)
 
-BUILD_DEPENDS=	${SITE_PERL}/HTTP/Request.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	${SITE_PERL}/HTTP/Request.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 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
-BUILD_DEPENDS+=	${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
-.endif
-
-.include <bsd.port.post.mk>
+MAN3=		JSON.3 \
+		JSON::PP.3 \
+		JSON::PP56.3 \
+		JSON::PP::Boolean.3 \
+		JSON::PP5005.3
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/converters/p5-JSON/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo	11 Oct 2007 18:54:36 -0000	1.8
+++ distinfo	13 Feb 2008 03:03:03 -0000
@@ -1,3 +1,3 @@
-MD5 (JSON-1.14.tar.gz) = d95d9cdb7c0a64a51d3d946915db52fb
-SHA256 (JSON-1.14.tar.gz) = 6840c9208bb5b8121b2daceb4db794dc82f150a727baf60ec6ba186ed99ea8e2
-SIZE (JSON-1.14.tar.gz) = 36432
+MD5 (JSON-2.06.tar.gz) = 85c0d6126625cdabd574476758144134
+SHA256 (JSON-2.06.tar.gz) = 0d96a048954f3a209c070a3335271d9c9083da20877de2da882608d985326824
+SIZE (JSON-2.06.tar.gz) = 62329
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/converters/p5-JSON/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist	11 Oct 2007 18:54:36 -0000	1.6
+++ pkg-plist	13 Feb 2008 03:03:03 -0000
@@ -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
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
-@dirrm %%SITE_PERL%%/JSONRPC/Transport
-@dirrm %%SITE_PERL%%/JSONRPC
-@dirrm %%SITE_PERL%%/JSON
-@dirrmtry %%SITE_PERL%%/Apache
+%%SITE_PERL%%/JSON/PP5005.pm
+%%SITE_PERL%%/JSON/PP/Boolean.pm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
+@dirrmtry %%SITE_PERL%%/JSON/PP
+@dirrmtry %%SITE_PERL%%/JSON