Update ruby-json to 1.2.0

Too many changes, see:

http://github.com/flori/json/blob/master/CHANGES

4 files changed, 66 insertions, 42 deletions

diff --git a/textproc/ruby-json/Makefile b/textproc/ruby-json/Makefile
index d04fb03176a..8036fd73296 100644
--- a/textproc/ruby-json/Makefile
+++ b/textproc/ruby-json/Makefile
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2008/09/15 08:38:01 taca Exp $
+# $NetBSD: Makefile,v 1.3 2009/11/23 13:33:47 fhajny Exp $
 
-DISTNAME=	json-1.1.3
+DISTNAME=	json-1.2.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://json.rubyforge.org/
 COMMENT=	Native extension implementation of JSON for Ruby
+LICENSE=	ruby-license
+
+GEM_BUILD=	gemspec
 
 post-extract:
 	cd ${WRKSRC}; ${FIND} . -xdev -type f -print | ${XARGS} ${CHMOD} g-w
diff --git a/textproc/ruby-json/PLIST b/textproc/ruby-json/PLIST
index 1244794b76c..3d942e5c891 100644
--- a/textproc/ruby-json/PLIST
+++ b/textproc/ruby-json/PLIST
@@ -1,17 +1,46 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/11/23 13:33:47 fhajny Exp $
 ${GEM_HOME}/cache/json-${PKGVERSION}.gem
 ${GEM_LIBDIR}/.require_paths
 ${GEM_LIBDIR}/CHANGES
+${GEM_LIBDIR}/COPYING
 ${GEM_LIBDIR}/GPL
 ${GEM_LIBDIR}/README
-${GEM_LIBDIR}/RUBY
 ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/TODO
 ${GEM_LIBDIR}/VERSION
-${GEM_LIBDIR}/benchmarks/benchmark.txt
-${GEM_LIBDIR}/benchmarks/benchmark_generator.rb
-${GEM_LIBDIR}/benchmarks/benchmark_parser.rb
-${GEM_LIBDIR}/benchmarks/benchmark_rails.rb
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat
+${GEM_LIBDIR}/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log
+${GEM_LIBDIR}/benchmarks/generator_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
@@ -77,9 +106,9 @@ ${GEM_LIBDIR}/tests/fixtures/pass17.json
 ${GEM_LIBDIR}/tests/fixtures/pass2.json
 ${GEM_LIBDIR}/tests/fixtures/pass26.json
 ${GEM_LIBDIR}/tests/fixtures/pass3.json
-${GEM_LIBDIR}/tests/runner.rb
 ${GEM_LIBDIR}/tests/test_json.rb
 ${GEM_LIBDIR}/tests/test_json_addition.rb
+${GEM_LIBDIR}/tests/test_json_encoding.rb
 ${GEM_LIBDIR}/tests/test_json_fixtures.rb
 ${GEM_LIBDIR}/tests/test_json_generate.rb
 ${GEM_LIBDIR}/tests/test_json_rails.rb
diff --git a/textproc/ruby-json/distinfo b/textproc/ruby-json/distinfo
index 03ece1f3f52..00c001dae54 100644
--- a/textproc/ruby-json/distinfo
+++ b/textproc/ruby-json/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/09/15 08:38:01 taca Exp $
+$NetBSD: distinfo,v 1.3 2009/11/23 13:33:47 fhajny Exp $
 
-SHA1 (json-1.1.3.gem) = 93803450acefbcff87a1e2f796162924d218240c
-RMD160 (json-1.1.3.gem) = 6f38933b01143d404fe76b6e8b74e0ceda0e9a3d
-Size (json-1.1.3.gem) = 113664 bytes
-SHA1 (patch-aa) = 8787445abfb91162e0bd1d182dea9d65053bf04a
+SHA1 (json-1.2.0.gem) = 418f823b76ba63a3af0b0f082aeca1fdb9105b41
+RMD160 (json-1.2.0.gem) = f144cf6c41c2b52621359d353c5ae22e3e3d366b
+Size (json-1.2.0.gem) = 385536 bytes
+SHA1 (patch-aa) = 061f1dae8a49fd170b55d146fa963983c6cdf203
diff --git a/textproc/ruby-json/patches/patch-aa b/textproc/ruby-json/patches/patch-aa
index ad7502c2288..e58f8ec11c0 100644
--- a/textproc/ruby-json/patches/patch-aa
+++ b/textproc/ruby-json/patches/patch-aa
@@ -1,31 +1,23 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/04/04 15:21:43 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2009/11/23 13:33:47 fhajny Exp $
 
---- Rakefile.orig	1969-12-31 19:00:00.000000000 -0500
-+++ Rakefile
-@@ -12,7 +12,7 @@ include Config
- ON_WINDOWS        = RUBY_PLATFORM =~ /mswin32/i 
- PKG_NAME          = 'json'
- PKG_VERSION       = File.read('VERSION').chomp
--PKG_FILES         = FileList["**/*"].exclude(/CVS|pkg|coverage|Makefile/).exclude(/\.(so|bundle|o|#{CONFIG['DLEXT']})$/)
-+PKG_FILES         = FileList["**/*"].exclude(/CVS|pkg|coverage|Makefile/).exclude(/\.(so|bundle|o|orig|#{CONFIG['DLEXT']})$/)
- EXT_ROOT_DIR      = 'ext/json/ext'
- EXT_PARSER_DIR    = "#{EXT_ROOT_DIR}/parser"
- EXT_PARSER_DL     = "#{EXT_ROOT_DIR}/parser.#{CONFIG['DLEXT']}"
-@@ -219,8 +219,6 @@ if defined? Gem
-     s.require_paths << 'lib'
+Do not install executables, those are part of ruby-json-pure
+
+--- ../json-1.2.0.gemspec.orig	2009-11-22 15:25:00.909294000 +0000
++++ ../json-1.2.0.gemspec
+@@ -10,14 +10,12 @@ bindir: bin
+ cert_chain: []
  
-     s.bindir = "bin"
--    s.executables = ["edit_json.rb"]
--    s.default_executable = "edit_json.rb"
+ date: 2009-11-07 23:00:00 +00:00
+-default_executable: edit_json.rb
++default_executable: []
+ dependencies: []
  
-     s.has_rdoc = true
-     s.rdoc_options <<
-@@ -243,7 +241,7 @@ if defined? Gem
-     mkdir_p 'pkg'
-     spec_win_ext = Gem::Specification.new do |s|
-       s.name = 'json'
--      s.platform = Gem::Platform::WIN32
-+      s.platform = Gem::Platform::CURRENT
-       s.version = PKG_VERSION
-       s.summary = "A JSON implementation as a Ruby extension"
-       s.description = ""
+ 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/generator/extconf.rb
+ - ext/json/ext/parser/extconf.rb