7 files changed, 25 insertions, 21 deletions
diff --git a/textproc/ruby-json-pure/Makefile b/textproc/ruby-json-pure/Makefile
index cc1caff331f..0b576d15292 100644
--- a/textproc/ruby-json-pure/Makefile
+++ b/textproc/ruby-json-pure/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2011/08/12 17:20:20 taca Exp $
+# $NetBSD: Makefile,v 1.11 2011/09/12 13:42:30 taca Exp $
 
-DISTNAME=	json_pure-1.5.3
+DISTNAME=	json_pure-1.5.4
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
 CATEGORIES=	textproc
 
@@ -9,6 +9,8 @@ HOMEPAGE=	http://flori.github.com/json
 COMMENT=	Pure Ruby implementation of JSON
 LICENSE=	ruby-license
 
+DEPENDS+=	${RUBY_PKGPREFIX}-spruz>=0.2.8<0.3:../../devel/ruby-spruz
+
 REPLACE_RUBY=	tools/fuzz.rb tools/server.rb
 
 post-extract:
diff --git a/textproc/ruby-json-pure/PLIST b/textproc/ruby-json-pure/PLIST
index 28d152af8a1..23e732c0b18 100644
--- a/textproc/ruby-json-pure/PLIST
+++ b/textproc/ruby-json-pure/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2011/08/12 17:20:20 taca Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/09/12 13:42:30 taca Exp $
 bin/edit_json.rb
 bin/prettify_json.rb
 ${GEM_HOME}/cache/${GEM_NAME}.gem
@@ -89,8 +89,9 @@ ${GEM_LIBDIR}/lib/json/NilClass.xpm
 ${GEM_LIBDIR}/lib/json/Numeric.xpm
 ${GEM_LIBDIR}/lib/json/String.xpm
 ${GEM_LIBDIR}/lib/json/TrueClass.xpm
+${GEM_LIBDIR}/lib/json/add/complex.rb
 ${GEM_LIBDIR}/lib/json/add/core.rb
-${GEM_LIBDIR}/lib/json/add/rails.rb
+${GEM_LIBDIR}/lib/json/add/rational.rb
 ${GEM_LIBDIR}/lib/json/common.rb
 ${GEM_LIBDIR}/lib/json/editor.rb
 ${GEM_LIBDIR}/lib/json/ext.rb
diff --git a/textproc/ruby-json-pure/distinfo b/textproc/ruby-json-pure/distinfo
index 2c93e6ca776..1bbca95754f 100644
--- a/textproc/ruby-json-pure/distinfo
+++ b/textproc/ruby-json-pure/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2011/08/12 17:20:20 taca Exp $
+$NetBSD: distinfo,v 1.10 2011/09/12 13:42:30 taca Exp $
 
-SHA1 (json_pure-1.5.3.gem) = 147b75f2a19b76f0cec2d444a3cd97322275472e
-RMD160 (json_pure-1.5.3.gem) = dab15a0c937b782c12002618cb46e34b397392e4
-Size (json_pure-1.5.3.gem) = 674816 bytes
+SHA1 (json_pure-1.5.4.gem) = f46cb4f913764e993b31d26f2575bf9d7c6f2ec0
+RMD160 (json_pure-1.5.4.gem) = 30475d36c4067d2b7640cbb1653e7d8a0ec5764d
+Size (json_pure-1.5.4.gem) = 678912 bytes
 SHA1 (patch-aa) = c80a2a7a1ae78e98dd7d6982a2e5da8963a214d6
diff --git a/textproc/ruby-json/Makefile b/textproc/ruby-json/Makefile
index 3cf2169973f..77a1a01b47d 100644
--- a/textproc/ruby-json/Makefile
+++ b/textproc/ruby-json/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2011/08/12 17:20:20 taca Exp $
+# $NetBSD: Makefile,v 1.13 2011/09/12 13:42:29 taca Exp $
 
-DISTNAME=	json-1.5.3
+DISTNAME=	json-1.5.4
 CATEGORIES=	textproc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/textproc/ruby-json/PLIST b/textproc/ruby-json/PLIST
index f340c4d592f..65555bc0ea8 100644
--- a/textproc/ruby-json/PLIST
+++ b/textproc/ruby-json/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/08/12 17:20:20 taca Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/09/12 13:42:29 taca Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.require_paths
 ${GEM_LIBDIR}/CHANGES
@@ -78,9 +78,9 @@ ${GEM_LIBDIR}/java/src/json/ext/RuntimeInfo.java
 ${GEM_LIBDIR}/java/src/json/ext/StringDecoder.java
 ${GEM_LIBDIR}/java/src/json/ext/StringEncoder.java
 ${GEM_LIBDIR}/java/src/json/ext/Utils.java
+${GEM_LIBDIR}/json-java.gemspec
 ${GEM_LIBDIR}/json.gemspec
 ${GEM_LIBDIR}/json_pure.gemspec
-${GEM_LIBDIR}/json-java.gemspec
 ${GEM_LIBDIR}/lib/json.rb
 ${GEM_LIBDIR}/lib/json/Array.xpm
 ${GEM_LIBDIR}/lib/json/FalseClass.xpm
@@ -90,8 +90,9 @@ ${GEM_LIBDIR}/lib/json/NilClass.xpm
 ${GEM_LIBDIR}/lib/json/Numeric.xpm
 ${GEM_LIBDIR}/lib/json/String.xpm
 ${GEM_LIBDIR}/lib/json/TrueClass.xpm
+${GEM_LIBDIR}/lib/json/add/complex.rb
 ${GEM_LIBDIR}/lib/json/add/core.rb
-${GEM_LIBDIR}/lib/json/add/rails.rb
+${GEM_LIBDIR}/lib/json/add/rational.rb
 ${GEM_LIBDIR}/lib/json/common.rb
 ${GEM_LIBDIR}/lib/json/editor.rb
 ${GEM_LIBDIR}/lib/json/ext.rb
diff --git a/textproc/ruby-json/distinfo b/textproc/ruby-json/distinfo
index af136c8f1ab..c7e2ab30b55 100644
--- a/textproc/ruby-json/distinfo
+++ b/textproc/ruby-json/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2011/08/12 17:20:20 taca Exp $
+$NetBSD: distinfo,v 1.10 2011/09/12 13:42:29 taca Exp $
 
-SHA1 (json-1.5.3.gem) = 3289c1acacd148c787f361c2c01ef454a4c70553
-RMD160 (json-1.5.3.gem) = c9687e4554bb1146db3f1a04131c638d32a1f34c
-Size (json-1.5.3.gem) = 675328 bytes
-SHA1 (patch-aa) = 140136976b07693905b9346514ae7ee12c18506e
+SHA1 (json-1.5.4.gem) = f67c848af3014c986017baf1ffe07cc855a16f48
+RMD160 (json-1.5.4.gem) = c1fc66f466efbeedf2cd741fb3b9b9d2da6b9281
+Size (json-1.5.4.gem) = 678912 bytes
+SHA1 (patch-aa) = 2f5ab9ae57daaf3189b1bc6aeaf28ce4a76118b9
 SHA1 (patch-ab) = c80a2a7a1ae78e98dd7d6982a2e5da8963a214d6
diff --git a/textproc/ruby-json/patches/patch-aa b/textproc/ruby-json/patches/patch-aa
index f5f1cd37946..c8a1bfee952 100644
--- a/textproc/ruby-json/patches/patch-aa
+++ b/textproc/ruby-json/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2011/08/12 17:20:20 taca Exp $
+$NetBSD: patch-aa,v 1.9 2011/09/12 13:42:30 taca Exp $
 
---- ../json-1.5.3.gemspec.orig	2011-08-04 02:01:16.000000000 +0000
-+++ ../json-1.5.3.gemspec
+--- ../json-1.5.4.gemspec.orig	2011-09-01 06:59:02.000000000 +0000
++++ ../json-1.5.4.gemspec
 @@ -47,9 +47,7 @@ dependencies: 
    version_requirements: *id003
  description: This is a JSON implementation as a Ruby extension in C.