Update ruby-json package to 1.6.0.

2011-09-12 (1.6.0)
  * Extract utilities (prettifier and GUI-editor) in its own gem json-utils.
  * Split json/add/core into different files for classes to be serialised.

4 files changed, 15 insertions, 38 deletions

diff --git a/textproc/ruby-json/Makefile b/textproc/ruby-json/Makefile
index 77a1a01b47d..0e6689f85ea 100644
--- a/textproc/ruby-json/Makefile
+++ b/textproc/ruby-json/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2011/09/12 13:42:29 taca Exp $
+# $NetBSD: Makefile,v 1.14 2011/09/13 15:15:18 taca Exp $
 
-DISTNAME=	json-1.5.4
+DISTNAME=	json-1.6.0
 CATEGORIES=	textproc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -9,12 +9,9 @@ COMMENT=	Native extension implementation of JSON for Ruby
 LICENSE=	ruby-license
 
 GEM_CLEANBUILD=	ext/json/ext/generator/* ext/json/ext/parser/*
-REPLACE_RUBY=	tools/fuzz.rb tools/server.rb
 
 post-extract:
 	cd ${WRKSRC}; ${FIND} . -xdev -type f -print | ${XARGS} ${CHMOD} g-w
 
-REPLACE_RUBY_DIRS=	tools
-
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-json/PLIST b/textproc/ruby-json/PLIST
index 65555bc0ea8..1365aeb5672 100644
--- a/textproc/ruby-json/PLIST
+++ b/textproc/ruby-json/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2011/09/12 13:42:29 taca Exp $
+@comment $NetBSD: PLIST,v 1.11 2011/09/13 15:15:18 taca Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.require_paths
 ${GEM_LIBDIR}/CHANGES
@@ -48,8 +48,6 @@ ${GEM_LIBDIR}/benchmarks/ohai.json
 ${GEM_LIBDIR}/benchmarks/ohai.ruby
 ${GEM_LIBDIR}/benchmarks/parser2_benchmark.rb
 ${GEM_LIBDIR}/benchmarks/parser_benchmark.rb
-${GEM_LIBDIR}/bin/edit_json.rb
-${GEM_LIBDIR}/bin/prettify_json.rb
 ${GEM_LIBDIR}/data/example.json
 ${GEM_LIBDIR}/data/index.html
 ${GEM_LIBDIR}/data/prototype.js
@@ -82,21 +80,19 @@ ${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
-${GEM_LIBDIR}/lib/json/Hash.xpm
-${GEM_LIBDIR}/lib/json/Key.xpm
-${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/date.rb
+${GEM_LIBDIR}/lib/json/add/date_time.rb
+${GEM_LIBDIR}/lib/json/add/exception.rb
+${GEM_LIBDIR}/lib/json/add/range.rb
 ${GEM_LIBDIR}/lib/json/add/rational.rb
+${GEM_LIBDIR}/lib/json/add/regexp.rb
+${GEM_LIBDIR}/lib/json/add/struct.rb
+${GEM_LIBDIR}/lib/json/add/symbol.rb
+${GEM_LIBDIR}/lib/json/add/time.rb
 ${GEM_LIBDIR}/lib/json/common.rb
-${GEM_LIBDIR}/lib/json/editor.rb
 ${GEM_LIBDIR}/lib/json/ext.rb
-${GEM_LIBDIR}/lib/json/json.xpm
 ${GEM_LIBDIR}/lib/json/pure.rb
 ${GEM_LIBDIR}/lib/json/pure/generator.rb
 ${GEM_LIBDIR}/lib/json/pure/parser.rb
diff --git a/textproc/ruby-json/distinfo b/textproc/ruby-json/distinfo
index c7e2ab30b55..ba00f5ca962 100644
--- a/textproc/ruby-json/distinfo
+++ b/textproc/ruby-json/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.10 2011/09/12 13:42:29 taca Exp $
+$NetBSD: distinfo,v 1.11 2011/09/13 15:15:18 taca Exp $
 
-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 (json-1.6.0.gem) = 5504d43231bc81054ab47ee6923bb50247c586a1
+RMD160 (json-1.6.0.gem) = 22809011e05c079c5afff1103674eec690d3154f
+Size (json-1.6.0.gem) = 654336 bytes
 SHA1 (patch-ab) = c80a2a7a1ae78e98dd7d6982a2e5da8963a214d6
diff --git a/textproc/ruby-json/patches/patch-aa b/textproc/ruby-json/patches/patch-aa
deleted file mode 100644
index c8a1bfee952..00000000000
--- a/textproc/ruby-json/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2011/09/12 13:42:30 taca Exp $
-
---- ../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.
- email: flori@ping.de
--executables: 
--- edit_json.rb
--- prettify_json.rb
-+executables: []
- extensions: 
- - ext/json/ext/parser/extconf.rb
- - ext/json/ext/generator/extconf.rb