Update ruby-gettext package to 2.2.0.

Ruby 1.9 support release.

### Improvements

  * Supported ruby-1.9. [Patch by hallelujah]
  * Supported $SAFE=1. [Patch by bon]
  * Improved argument check. [Suggested by Morus Walter]
  * Supported ruby-1.8.6 again. [Bug#27447] [Reported by Mamoru Tasaka]

### Fixes

  * Fixed Ukrainan translation path. [Bug#28277] [Reported by Gunnar Wolf]
  * Fixed a bug that only the last path in GETTEXT_PATH environment
    variable is used. [Bug#28345] [Reported by Ivan Pirlik]
  * Fixed a bug that Ruby-GetText-Package modifies $LOAD_PATH. [Bug#28094]
    [Reported by Tatsuki Sugiura]

8 files changed, 34 insertions, 155 deletions

diff --git a/devel/ruby-gettext/Makefile b/devel/ruby-gettext/Makefile
index 662d19ac361..160fb5c6262 100644
--- a/devel/ruby-gettext/Makefile
+++ b/devel/ruby-gettext/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2010/09/10 05:41:27 taca Exp $
+# $NetBSD: Makefile,v 1.12 2012/03/12 15:41:37 taca Exp $
 
-DISTNAME=	gettext-2.1.0
-PKGREVISION=	1
+DISTNAME=	gettext-2.2.0
 CATEGORIES=	devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/ruby-gettext/PLIST b/devel/ruby-gettext/PLIST
index 65707ac9eeb..f03060c4754 100644
--- a/devel/ruby-gettext/PLIST
+++ b/devel/ruby-gettext/PLIST
@@ -1,20 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2010/02/02 02:18:38 taca Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/03/12 15:41:37 taca Exp $
 bin/rgettext
 bin/rmsgfmt
 bin/rmsgmerge
-${GEM_HOME}/cache/gettext-${PKGVERSION}.gem
+${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/COPYING
-${GEM_LIBDIR}/ChangeLog
-${GEM_LIBDIR}/ChangeLog-1
-${GEM_LIBDIR}/NEWS-1
 ${GEM_LIBDIR}/README.rdoc
 ${GEM_LIBDIR}/Rakefile
-${GEM_LIBDIR}/benchmark/1.93.0.txt
-${GEM_LIBDIR}/benchmark/2.0.0.txt
-${GEM_LIBDIR}/benchmark/2.0.4.txt
-${GEM_LIBDIR}/benchmark/2.1.0.txt
-${GEM_LIBDIR}/benchmark/benchmark.rb
-${GEM_LIBDIR}/benchmark/test.rb
 ${GEM_LIBDIR}/bin/rgettext
 ${GEM_LIBDIR}/bin/rmsgfmt
 ${GEM_LIBDIR}/bin/rmsgmerge
@@ -40,10 +31,11 @@ ${GEM_LIBDIR}/data/locale/pt_BR/LC_MESSAGES/rgettext.mo
 ${GEM_LIBDIR}/data/locale/ru/LC_MESSAGES/rgettext.mo
 ${GEM_LIBDIR}/data/locale/sr/LC_MESSAGES/rgettext.mo
 ${GEM_LIBDIR}/data/locale/sv/LC_MESSAGES/rgettext.mo
-${GEM_LIBDIR}/data/locale/ua/LC_MESSAGES/rgettext.mo
+${GEM_LIBDIR}/data/locale/uk/LC_MESSAGES/rgettext.mo
 ${GEM_LIBDIR}/data/locale/vi/LC_MESSAGES/rgettext.mo
 ${GEM_LIBDIR}/data/locale/zh/LC_MESSAGES/rgettext.mo
 ${GEM_LIBDIR}/data/locale/zh_TW/LC_MESSAGES/rgettext.mo
+${GEM_LIBDIR}/doc/text/news.md
 ${GEM_LIBDIR}/gettext.gemspec
 ${GEM_LIBDIR}/lib/gettext.rb
 ${GEM_LIBDIR}/lib/gettext/cgi.rb
@@ -92,11 +84,10 @@ ${GEM_LIBDIR}/po/rgettext.pot
 ${GEM_LIBDIR}/po/ru/rgettext.po
 ${GEM_LIBDIR}/po/sr/rgettext.po
 ${GEM_LIBDIR}/po/sv/rgettext.po
-${GEM_LIBDIR}/po/ua/rgettext.po
+${GEM_LIBDIR}/po/uk/rgettext.po
 ${GEM_LIBDIR}/po/vi/rgettext.po
 ${GEM_LIBDIR}/po/zh/rgettext.po
 ${GEM_LIBDIR}/po/zh_TW/rgettext.po
-${GEM_LIBDIR}/replace.rb
 ${GEM_LIBDIR}/samples/README
 ${GEM_LIBDIR}/samples/cgi/README
 ${GEM_LIBDIR}/samples/cgi/Rakefile
@@ -188,10 +179,10 @@ ${GEM_LIBDIR}/samples/cgi/locale/sr/LC_MESSAGES/helloerb1.mo
 ${GEM_LIBDIR}/samples/cgi/locale/sr/LC_MESSAGES/helloerb2.mo
 ${GEM_LIBDIR}/samples/cgi/locale/sr/LC_MESSAGES/hellolib.mo
 ${GEM_LIBDIR}/samples/cgi/locale/sr/LC_MESSAGES/main.mo
-${GEM_LIBDIR}/samples/cgi/locale/ua/LC_MESSAGES/helloerb1.mo
-${GEM_LIBDIR}/samples/cgi/locale/ua/LC_MESSAGES/helloerb2.mo
-${GEM_LIBDIR}/samples/cgi/locale/ua/LC_MESSAGES/hellolib.mo
-${GEM_LIBDIR}/samples/cgi/locale/ua/LC_MESSAGES/main.mo
+${GEM_LIBDIR}/samples/cgi/locale/uk/LC_MESSAGES/helloerb1.mo
+${GEM_LIBDIR}/samples/cgi/locale/uk/LC_MESSAGES/helloerb2.mo
+${GEM_LIBDIR}/samples/cgi/locale/uk/LC_MESSAGES/hellolib.mo
+${GEM_LIBDIR}/samples/cgi/locale/uk/LC_MESSAGES/main.mo
 ${GEM_LIBDIR}/samples/cgi/locale/vi/LC_MESSAGES/helloerb1.mo
 ${GEM_LIBDIR}/samples/cgi/locale/vi/LC_MESSAGES/helloerb2.mo
 ${GEM_LIBDIR}/samples/cgi/locale/vi/LC_MESSAGES/hellolib.mo
@@ -289,10 +280,10 @@ ${GEM_LIBDIR}/samples/cgi/po/sr/helloerb1.po
 ${GEM_LIBDIR}/samples/cgi/po/sr/helloerb2.po
 ${GEM_LIBDIR}/samples/cgi/po/sr/hellolib.po
 ${GEM_LIBDIR}/samples/cgi/po/sr/main.po
-${GEM_LIBDIR}/samples/cgi/po/ua/helloerb1.po
-${GEM_LIBDIR}/samples/cgi/po/ua/helloerb2.po
-${GEM_LIBDIR}/samples/cgi/po/ua/hellolib.po
-${GEM_LIBDIR}/samples/cgi/po/ua/main.po
+${GEM_LIBDIR}/samples/cgi/po/uk/helloerb1.po
+${GEM_LIBDIR}/samples/cgi/po/uk/helloerb2.po
+${GEM_LIBDIR}/samples/cgi/po/uk/hellolib.po
+${GEM_LIBDIR}/samples/cgi/po/uk/main.po
 ${GEM_LIBDIR}/samples/cgi/po/vi/helloerb1.po
 ${GEM_LIBDIR}/samples/cgi/po/vi/helloerb2.po
 ${GEM_LIBDIR}/samples/cgi/po/vi/hellolib.po
@@ -460,13 +451,13 @@ ${GEM_LIBDIR}/samples/locale/sv/LC_MESSAGES/hello_gtk.mo
 ${GEM_LIBDIR}/samples/locale/sv/LC_MESSAGES/hello_noop.mo
 ${GEM_LIBDIR}/samples/locale/sv/LC_MESSAGES/hello_plural.mo
 ${GEM_LIBDIR}/samples/locale/sv/LC_MESSAGES/hello_tk.mo
-${GEM_LIBDIR}/samples/locale/ua/LC_MESSAGES/hello.mo
-${GEM_LIBDIR}/samples/locale/ua/LC_MESSAGES/hello2.mo
-${GEM_LIBDIR}/samples/locale/ua/LC_MESSAGES/hello_glade2.mo
-${GEM_LIBDIR}/samples/locale/ua/LC_MESSAGES/hello_gtk.mo
-${GEM_LIBDIR}/samples/locale/ua/LC_MESSAGES/hello_noop.mo
-${GEM_LIBDIR}/samples/locale/ua/LC_MESSAGES/hello_plural.mo
-${GEM_LIBDIR}/samples/locale/ua/LC_MESSAGES/hello_tk.mo
+${GEM_LIBDIR}/samples/locale/uk/LC_MESSAGES/hello.mo
+${GEM_LIBDIR}/samples/locale/uk/LC_MESSAGES/hello2.mo
+${GEM_LIBDIR}/samples/locale/uk/LC_MESSAGES/hello_glade2.mo
+${GEM_LIBDIR}/samples/locale/uk/LC_MESSAGES/hello_gtk.mo
+${GEM_LIBDIR}/samples/locale/uk/LC_MESSAGES/hello_noop.mo
+${GEM_LIBDIR}/samples/locale/uk/LC_MESSAGES/hello_plural.mo
+${GEM_LIBDIR}/samples/locale/uk/LC_MESSAGES/hello_tk.mo
 ${GEM_LIBDIR}/samples/locale/vi/LC_MESSAGES/hello.mo
 ${GEM_LIBDIR}/samples/locale/vi/LC_MESSAGES/hello2.mo
 ${GEM_LIBDIR}/samples/locale/vi/LC_MESSAGES/hello_glade2.mo
@@ -644,13 +635,13 @@ ${GEM_LIBDIR}/samples/po/sv/hello_noop.po
 ${GEM_LIBDIR}/samples/po/sv/hello_plural.po
 ${GEM_LIBDIR}/samples/po/sv/hello_tk.po
 ${GEM_LIBDIR}/samples/po/test.rb
-${GEM_LIBDIR}/samples/po/ua/hello.po
-${GEM_LIBDIR}/samples/po/ua/hello2.po
-${GEM_LIBDIR}/samples/po/ua/hello_glade2.po
-${GEM_LIBDIR}/samples/po/ua/hello_gtk.po
-${GEM_LIBDIR}/samples/po/ua/hello_noop.po
-${GEM_LIBDIR}/samples/po/ua/hello_plural.po
-${GEM_LIBDIR}/samples/po/ua/hello_tk.po
+${GEM_LIBDIR}/samples/po/uk/hello.po
+${GEM_LIBDIR}/samples/po/uk/hello2.po
+${GEM_LIBDIR}/samples/po/uk/hello_glade2.po
+${GEM_LIBDIR}/samples/po/uk/hello_gtk.po
+${GEM_LIBDIR}/samples/po/uk/hello_noop.po
+${GEM_LIBDIR}/samples/po/uk/hello_plural.po
+${GEM_LIBDIR}/samples/po/uk/hello_tk.po
 ${GEM_LIBDIR}/samples/po/vi/hello.po
 ${GEM_LIBDIR}/samples/po/vi/hello2.po
 ${GEM_LIBDIR}/samples/po/vi/hello_glade2.po
@@ -673,7 +664,6 @@ ${GEM_LIBDIR}/samples/po/zh_TW/hello_noop.po
 ${GEM_LIBDIR}/samples/po/zh_TW/hello_plural.po
 ${GEM_LIBDIR}/samples/po/zh_TW/hello_tk.po
 ${GEM_LIBDIR}/src/poparser.ry
-${GEM_LIBDIR}/test.rb
 ${GEM_LIBDIR}/test/README
 ${GEM_LIBDIR}/test/Rakefile
 ${GEM_LIBDIR}/test/locale/cr/LC_MESSAGES/plural.mo
@@ -758,4 +748,4 @@ ${GEM_LIBDIR}/test/tools/files/simple_translation.rb
 ${GEM_LIBDIR}/test/tools/files/version.po
 ${GEM_LIBDIR}/test/tools/test.pot
 ${GEM_LIBDIR}/test/tools/test_tools.rb
-${GEM_HOME}/specifications/gettext-${PKGVERSION}.gemspec
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/devel/ruby-gettext/distinfo b/devel/ruby-gettext/distinfo
index 9242204ae66..f951c31246c 100644
--- a/devel/ruby-gettext/distinfo
+++ b/devel/ruby-gettext/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.8 2010/09/10 05:41:27 taca Exp $
+$NetBSD: distinfo,v 1.9 2012/03/12 15:41:37 taca Exp $
 
-SHA1 (gettext-2.1.0.gem) = e12577608e2150ec9895e7dfac4816dd8e3d43cc
-RMD160 (gettext-2.1.0.gem) = 91f94bc8e87157730628c963b11c39c7f1bd0c76
-Size (gettext-2.1.0.gem) = 199168 bytes
+SHA1 (gettext-2.2.0.gem) = e946ac8dd750d3dc9c317950b1a4b683885c418b
+RMD160 (gettext-2.2.0.gem) = b244912f12c48df505b869e85d17dd040f31e2eb
+Size (gettext-2.2.0.gem) = 169472 bytes
 SHA1 (patch-aa) = 5415998d82d44f29893eb5d8247c61b882633e23
-SHA1 (patch-ab) = 96897ff2330f4d11626235e72bcef1dc0fc2cbd0
 SHA1 (patch-ac) = 7dc7eba8f176c69ef71d2537822e46a49d5c5773
 SHA1 (patch-ad) = e9b9c285945327a6b4e3f905e3b9c932f73453d6
 SHA1 (patch-ae) = 1f4fb087af927947ad138065103171934a7cd49c
diff --git a/devel/ruby-gettext/patches/patch-aa b/devel/ruby-gettext/patches/patch-aa
deleted file mode 100644
index 137d5ed02e4..00000000000
--- a/devel/ruby-gettext/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2010/09/10 05:41:27 taca Exp $
-
-Remove a junk file.
-
---- ../gettext-2.1.0.gemspec.orig	2010-02-02 01:11:06.000000000 +0000
-+++ ../gettext-2.1.0.gemspec
-@@ -404,7 +404,6 @@ files: 
- - samples/cgi/po/hu/helloerb1.po
- - samples/cgi/po/hu/hellolib.po
- - samples/cgi/po/bg/helloerb2.po
--- samples/cgi/po/bg/#main.po#
- - samples/cgi/po/bg/main.po
- - samples/cgi/po/bg/helloerb1.po
- - samples/cgi/po/bg/hellolib.po
diff --git a/devel/ruby-gettext/patches/patch-ab b/devel/ruby-gettext/patches/patch-ab
deleted file mode 100644
index 2123a833aa9..00000000000
--- a/devel/ruby-gettext/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/09/10 05:41:27 taca Exp $
-
-Use rake command name from environment if it is avaiable.
-
---- Rakefile.orig	2010-08-27 06:25:19.000000000 +0000
-+++ Rakefile
-@@ -194,11 +194,13 @@ task :package => [:makemo]
- ############################################################
- desc 'Run all tests'
- task :test do
-+   rake = ENV['RAKE']
-+   rake = 'rake' if rake.nil?
-    Dir.chdir("test") do
-      if RUBY_PLATFORM =~ /win32/
-        sh "rake.bat", "test"
-      else
--       sh "rake", "test"
-+       sh rake, "test"
-      end
-    end
- end
diff --git a/devel/ruby-gettext/patches/patch-ac b/devel/ruby-gettext/patches/patch-ac
deleted file mode 100644
index 9bdd94e11d5..00000000000
--- a/devel/ruby-gettext/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/09/10 05:41:27 taca Exp $
-
-Fix for Ruby 1.9, commit b26c9d218711b186b565 from
-http://github.com/mutoh/gettext/commits/master.
-
---- lib/gettext/runtime/class_info.rb.orig	2010-08-27 06:59:01.000000000 +0000
-+++ lib/gettext/runtime/class_info.rb
-@@ -12,7 +12,7 @@ module GetText
-     # klass should kind of the class, not object.
-     def normalize_class(klass)
-       ret = (klass.kind_of? Module) ? klass : klass.class
--      if ret.name =~ /^\#<|^$/ or ret == GetText
-+      if ret.name =~ /^\#<|^$/ or ret == GetText or ret.name.nil?
-         ret = Object
-       end
-       ret
diff --git a/devel/ruby-gettext/patches/patch-ad b/devel/ruby-gettext/patches/patch-ad
deleted file mode 100644
index 51a422dabb1..00000000000
--- a/devel/ruby-gettext/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/09/10 05:41:27 taca Exp $
-
-Fix for Ruby 1.9, commit df5446c9f8ed1b8cfd70 from
-http://github.com/mutoh/gettext/commits/master.
-
---- test/Rakefile.orig	2010-08-27 06:25:19.000000000 +0000
-+++ test/Rakefile
-@@ -12,6 +12,6 @@ desc 'Run all tests'
- task :test do
-    Dir.glob("**/test_*.rb").each do |path|
-     puts ""
--    ruby "-I../lib:../../locale/lib -rubygems #{path}"
-+    ruby "-I../lib:../../locale/lib:. -rubygems #{path}"
-    end
- end
diff --git a/devel/ruby-gettext/patches/patch-ae b/devel/ruby-gettext/patches/patch-ae
deleted file mode 100644
index b60f9611333..00000000000
--- a/devel/ruby-gettext/patches/patch-ae
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2010/09/10 05:41:27 taca Exp $
-
-Fix for Ruby 1.9, commit df5446c9f8ed1b8cfd70 from
-http://github.com/mutoh/gettext/commits/master.
-
---- test/test_parser.rb.orig	2010-08-27 07:41:29.000000000 +0000
-+++ test/test_parser.rb
-@@ -7,7 +7,7 @@ require 'gettext/tools/rgettext'
- 
- class TestGetTextParser < Test::Unit::TestCase
-   def test_ruby
--    @ary = GetText::RGetText.parse('testlib/gettext.rb')
-+    @ary = GetText::RGetText.parse(['testlib/gettext.rb'])
- 
-     assert_target 'aaa', ['testlib/gettext.rb:8']
-     assert_target 'aaa\n', ['testlib/gettext.rb:12']
-@@ -36,7 +36,7 @@ class TestGetTextParser < Test::Unit::Te
-   end
- 
-   def test_ruby_N
--    @ary = GetText::RGetText.parse('testlib/N_.rb')
-+    @ary = GetText::RGetText.parse(['testlib/N_.rb'])
- 
-     assert_target 'aaa', ['testlib/N_.rb:8']
-     assert_target 'aaa\n', ['testlib/N_.rb:12']
-@@ -54,7 +54,7 @@ class TestGetTextParser < Test::Unit::Te
-   end
- 
-   def test_ruby_n
--    @ary = GetText::RGetText.parse('testlib/ngettext.rb')
-+    @ary = GetText::RGetText.parse(['testlib/ngettext.rb'])
-     assert_plural_target "aaa", "aaa2", ['testlib/ngettext.rb:8']
-     assert_plural_target "bbb\\n", "ccc2\\nccc2", ['testlib/ngettext.rb:12']
-     assert_plural_target "ddd\\nddd", "ddd2\\nddd2", ['testlib/ngettext.rb:16']
-@@ -72,7 +72,7 @@ class TestGetTextParser < Test::Unit::Te
-   end
-   
-   def test_ruby_p
--    @ary = GetText::RGetText.parse('testlib/pgettext.rb')
-+    @ary = GetText::RGetText.parse(['testlib/pgettext.rb'])
-     assert_target_in_context "AAA", "BBB", ["testlib/pgettext.rb:8", "testlib/pgettext.rb:12"]
-     assert_target_in_context "AAA|BBB", "CCC", ["testlib/pgettext.rb:16"]
-     assert_target_in_context "AAA", "CCC", ["testlib/pgettext.rb:20"]