7 files changed, 28 insertions, 30 deletions
diff --git a/textproc/ruby-json-pure/Makefile b/textproc/ruby-json-pure/Makefile
index 48ae4b1bb89..af44697db72 100644
--- a/textproc/ruby-json-pure/Makefile
+++ b/textproc/ruby-json-pure/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2011/03/23 14:12:05 taca Exp $
+# $NetBSD: Makefile,v 1.9 2011/06/15 15:14:24 taca Exp $
 
-DISTNAME=	json_pure-1.5.1
+DISTNAME=	json_pure-1.5.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
 CATEGORIES=	textproc
 
diff --git a/textproc/ruby-json-pure/PLIST b/textproc/ruby-json-pure/PLIST
index c7a235589ff..2d10d5ece16 100644
--- a/textproc/ruby-json-pure/PLIST
+++ b/textproc/ruby-json-pure/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/03/23 14:12:05 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/06/15 15:14:24 taca Exp $
 bin/edit_json.rb
 bin/prettify_json.rb
 ${GEM_HOME}/cache/${GEM_NAME}.gem
@@ -6,8 +6,8 @@ ${GEM_LIBDIR}/CHANGES
 ${GEM_LIBDIR}/COPYING
 ${GEM_LIBDIR}/COPYING-json-jruby
 ${GEM_LIBDIR}/GPL
-${GEM_LIBDIR}/README
 ${GEM_LIBDIR}/README-json-jruby.markdown
+${GEM_LIBDIR}/README.rdoc
 ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/TODO
 ${GEM_LIBDIR}/VERSION
@@ -77,6 +77,8 @@ ${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}/lib/json.rb
 ${GEM_LIBDIR}/lib/json/Array.xpm
 ${GEM_LIBDIR}/lib/json/FalseClass.xpm
@@ -137,4 +139,4 @@ ${GEM_LIBDIR}/tests/test_json_string_matching.rb
 ${GEM_LIBDIR}/tests/test_json_unicode.rb
 ${GEM_LIBDIR}/tools/fuzz.rb
 ${GEM_LIBDIR}/tools/server.rb
-${GEM_HOME}/specifications/json_pure-${PKGVERSION}.gemspec
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/textproc/ruby-json-pure/distinfo b/textproc/ruby-json-pure/distinfo
index 08befe5186c..18036f4ddc1 100644
--- a/textproc/ruby-json-pure/distinfo
+++ b/textproc/ruby-json-pure/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2011/03/23 14:12:05 taca Exp $
+$NetBSD: distinfo,v 1.8 2011/06/15 15:14:24 taca Exp $
 
-SHA1 (json_pure-1.5.1.gem) = 22c388da99aebffc7c4979f3f652f469f5ba2965
-RMD160 (json_pure-1.5.1.gem) = 4d901c13d83e3ba154233f99dd482ada99179098
-Size (json_pure-1.5.1.gem) = 669696 bytes
+SHA1 (json_pure-1.5.2.gem) = 2a1e9c95fef7690a9f80e9417766a88c62e1effe
+RMD160 (json_pure-1.5.2.gem) = 33fd809ce19ae058ad474bac8e767312c990730f
+Size (json_pure-1.5.2.gem) = 674816 bytes
 SHA1 (patch-aa) = c80a2a7a1ae78e98dd7d6982a2e5da8963a214d6
diff --git a/textproc/ruby-json/Makefile b/textproc/ruby-json/Makefile
index 214ccd50739..aacd6bd17af 100644
--- a/textproc/ruby-json/Makefile
+++ b/textproc/ruby-json/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2011/03/23 14:12:58 taca Exp $
+# $NetBSD: Makefile,v 1.11 2011/06/15 15:14:24 taca Exp $
 
-DISTNAME=	json-1.5.1
+DISTNAME=	json-1.5.2
 CATEGORIES=	textproc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/textproc/ruby-json/PLIST b/textproc/ruby-json/PLIST
index 56ed0d2660b..f31bb0a5005 100644
--- a/textproc/ruby-json/PLIST
+++ b/textproc/ruby-json/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.7 2011/03/23 14:12:58 taca Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/06/15 15:14:24 taca Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.require_paths
 ${GEM_LIBDIR}/CHANGES
 ${GEM_LIBDIR}/COPYING
 ${GEM_LIBDIR}/COPYING-json-jruby
 ${GEM_LIBDIR}/GPL
-${GEM_LIBDIR}/README
 ${GEM_LIBDIR}/README-json-jruby.markdown
+${GEM_LIBDIR}/README.rdoc
 ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/TODO
 ${GEM_LIBDIR}/VERSION
@@ -77,6 +77,8 @@ ${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.gemspec
+${GEM_LIBDIR}/json_pure.gemspec
 ${GEM_LIBDIR}/json-java.gemspec
 ${GEM_LIBDIR}/lib/json.rb
 ${GEM_LIBDIR}/lib/json/Array.xpm
diff --git a/textproc/ruby-json/distinfo b/textproc/ruby-json/distinfo
index 6863c601b21..e8b195b1402 100644
--- a/textproc/ruby-json/distinfo
+++ b/textproc/ruby-json/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2011/03/23 14:12:58 taca Exp $
+$NetBSD: distinfo,v 1.8 2011/06/15 15:14:24 taca Exp $
 
-SHA1 (json-1.5.1.gem) = 5be4aa27c73b9a0c6159b47fe58b6abc8f100a93
-RMD160 (json-1.5.1.gem) = 3d27421616c3cc2087f738c33d0caec251ca8109
-Size (json-1.5.1.gem) = 669696 bytes
-SHA1 (patch-aa) = 68b3f8f0781230c3389d7ce58b68bf1aea3021c6
+SHA1 (json-1.5.2.gem) = 970af87a3b6e5233c76b8d79d039e3cca627dd75
+RMD160 (json-1.5.2.gem) = cc5f1901918980b650078a14908e023b28199749
+Size (json-1.5.2.gem) = 674816 bytes
+SHA1 (patch-aa) = 9a4ae06e1efb193ef852199bfe9072e2e3adaacf
 SHA1 (patch-ab) = c80a2a7a1ae78e98dd7d6982a2e5da8963a214d6
diff --git a/textproc/ruby-json/patches/patch-aa b/textproc/ruby-json/patches/patch-aa
index e293e902075..3020f90288d 100644
--- a/textproc/ruby-json/patches/patch-aa
+++ b/textproc/ruby-json/patches/patch-aa
@@ -1,15 +1,9 @@
-$NetBSD: patch-aa,v 1.6 2011/03/23 14:12:58 taca Exp $
+$NetBSD: patch-aa,v 1.7 2011/06/15 15:14:24 taca Exp $
 
---- ../json-1.5.1.gemspec.orig	2011-01-26 04:38:55.000000000 +0000
-+++ ../json-1.5.1.gemspec
-@@ -15,14 +15,12 @@ bindir: bin
- cert_chain: []
- 
- date: 2011-01-25 23:00:00 +00:00
--default_executable: edit_json.rb
-+default_executable: []
- dependencies: []
- 
+--- ../json-1.5.2.gemspec.orig	2011-06-15 10:57:07.000000000 +0000
++++ ../json-1.5.2.gemspec
+@@ -48,9 +48,7 @@ dependencies: 
+   version_requirements: *id003
  description: This is a JSON implementation as a Ruby extension in C.
  email: flori@ping.de
 -executables: 
@@ -17,5 +11,5 @@ $NetBSD: patch-aa,v 1.6 2011/03/23 14:12:58 taca Exp $
 -- prettify_json.rb
 +executables: []
  extensions: 
- - ext/json/ext/generator/extconf.rb
  - ext/json/ext/parser/extconf.rb
+ - ext/json/ext/generator/extconf.rb