8 files changed, 17 insertions, 56 deletions

diff --git a/textproc/p5-JSON-Syck/Makefile b/textproc/p5-JSON-Syck/Makefile
deleted file mode 100644
index 52830e6e95f9..000000000000
--- a/textproc/p5-JSON-Syck/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	textproc/p5-JSON-Syck
-# Date created:				10 January 2006
-# Whom:					Anton Berezin <tobez@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	JSON-Syck
-PORTVERSION=	0.07
-CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/M/MI/MIYAGAWA
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	tobez@FreeBSD.org
-COMMENT=	Fast, lightweight JSON loader and dumper
-
-BUILD_DEPENDS=	\
-	p5-Storable>0:${PORTSDIR}/devel/p5-Storable
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN3=		JSON::Syck.3
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE=		requires perl 5.6.1 or later. Install lang/perl5.8 and try again
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/textproc/p5-JSON-Syck/distinfo b/textproc/p5-JSON-Syck/distinfo
deleted file mode 100644
index b4c5b7a6143c..000000000000
--- a/textproc/p5-JSON-Syck/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (JSON-Syck-0.07.tar.gz) = b6a3d39bbec98100fc9433e41ebc773b
-SHA256 (JSON-Syck-0.07.tar.gz) = b977740056130d3d1e74a82ffaa3f48744b52dd06c69b3e300aef6cb1ad93527
-SIZE (JSON-Syck-0.07.tar.gz) = 101024
diff --git a/textproc/p5-JSON-Syck/pkg-descr b/textproc/p5-JSON-Syck/pkg-descr
deleted file mode 100644
index b15c0d9e2755..000000000000
--- a/textproc/p5-JSON-Syck/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-JSON::Syck is an implementatoin of JSON parsing and generation using
-libsyck YAML data serialization library. Because JSON is YAML
-(http://redhanded.hobix.com/inspect/yamlIsJson.html), using libsyck
-gives you the fastest and most memory efficient parser and dumper for
-JSON data representation.
-
-WWW: http://search.cpan.org/dist/JSON-Syck/
diff --git a/textproc/p5-JSON-Syck/pkg-plist b/textproc/p5-JSON-Syck/pkg-plist
deleted file mode 100644
index 90de263acabe..000000000000
--- a/textproc/p5-JSON-Syck/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck/Syck.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck/Syck.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/JSON/Syck.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JSON
diff --git a/textproc/p5-YAML-Syck/Makefile b/textproc/p5-YAML-Syck/Makefile
index 88174c2ec6fc..58a746de6e0a 100644
--- a/textproc/p5-YAML-Syck/Makefile
+++ b/textproc/p5-YAML-Syck/Makefile
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	YAML-Syck
-PORTVERSION=	0.38
+PORTVERSION=	0.41
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	YAML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	tobez@FreeBSD.org
-COMMENT=	Fast, lightweight YAML loader and dumper
+COMMENT=	Fast, lightweight YAML and JSON loader and dumper
+
+BUILD_DEPENDS=	\
+	p5-Storable>0:${PORTSDIR}/devel/p5-Storable
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MAN3=		YAML::Syck.3
+MAN3=		JSON::Syck.3 YAML::Syck.3
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/p5-YAML-Syck/distinfo b/textproc/p5-YAML-Syck/distinfo
index e8dbc4920e13..bbe476663a9b 100644
--- a/textproc/p5-YAML-Syck/distinfo
+++ b/textproc/p5-YAML-Syck/distinfo
@@ -1,3 +1,3 @@
-MD5 (YAML-Syck-0.38.tar.gz) = e7f52de12cd9c64aac78adbf4e3baf2b
-SHA256 (YAML-Syck-0.38.tar.gz) = 9d1fc4846a59047d8b7015de9cc6d48ef20f52ea8eff8d080f7d788464558a33
-SIZE (YAML-Syck-0.38.tar.gz) = 107263
+MD5 (YAML-Syck-0.41.tar.gz) = 5076a1fa6d84bebba24d89cba78506f8
+SHA256 (YAML-Syck-0.41.tar.gz) = caea8de469f70e378df12b782b94c653434d0457d97ae7ad135d6e373cc6d95a
+SIZE (YAML-Syck-0.41.tar.gz) = 122491
diff --git a/textproc/p5-YAML-Syck/pkg-descr b/textproc/p5-YAML-Syck/pkg-descr
index ac740ea0d6cf..d70f394d9fa4 100644
--- a/textproc/p5-YAML-Syck/pkg-descr
+++ b/textproc/p5-YAML-Syck/pkg-descr
@@ -1,5 +1,9 @@
 This module provides a Perl interface to the libsyck data serialization
 library.  It exports the Dump and Load functions for converting Perl
-data structures to YAML strings, and the other way around.
+data structures to YAML strings, and the other way around. It also
+provides an implementation of JSON parsing and generation. Because
+JSON is YAML (http://redhanded.hobix.com/inspect/yamlIsJson.html),
+using libsyck gives you the fastest and most memory efficient parser
+and dumper for JSON data representation.
 
 WWW: http://search.cpan.org/dist/YAML-Syck/
diff --git a/textproc/p5-YAML-Syck/pkg-plist b/textproc/p5-YAML-Syck/pkg-plist
index 35157dd0077d..1b92b862a8da 100644
--- a/textproc/p5-YAML-Syck/pkg-plist
+++ b/textproc/p5-YAML-Syck/pkg-plist
@@ -1,6 +1,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Syck/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Syck/Syck.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Syck/Syck.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/JSON/Syck.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Syck.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Syck.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Loader/Syck.pm
@@ -10,3 +11,4 @@
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Loader
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Dumper
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JSON