diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/ruby-gettext/Makefile | 13 | ||||
-rw-r--r-- | devel/ruby-gettext/distinfo | 8 | ||||
-rw-r--r-- | devel/ruby-gettext/patches/patch-aa | 4 | ||||
-rw-r--r-- | devel/ruby-gettext/patches/patch-ab | 21 | ||||
-rw-r--r-- | devel/ruby-gettext/patches/patch-ac | 16 | ||||
-rw-r--r-- | devel/ruby-gettext/patches/patch-ad | 15 | ||||
-rw-r--r-- | devel/ruby-gettext/patches/patch-ae | 43 |
7 files changed, 110 insertions, 10 deletions
diff --git a/devel/ruby-gettext/Makefile b/devel/ruby-gettext/Makefile index 55150f5378e..662d19ac361 100644 --- a/devel/ruby-gettext/Makefile +++ b/devel/ruby-gettext/Makefile @@ -1,21 +1,20 @@ -# $NetBSD: Makefile,v 1.10 2010/02/02 02:18:38 taca Exp $ +# $NetBSD: Makefile,v 1.11 2010/09/10 05:41:27 taca Exp $ DISTNAME= gettext-2.1.0 -PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} PKGREVISION= 1 CATEGORIES= devel MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://gettext.rubyforge.org/ +HOMEPAGE= http://www.yotabanana.com/hiki/ruby-gettext.html COMMENT= Ruby localization library like as GNU gettext LICENSE= ruby-license DEPENDS+= ${RUBY_PKGPREFIX}-locale>=2.0.5:../../devel/ruby-locale -post-extract: - cd ${WRKSRC}; ${FIND} . -xdev -type f -print | ${XARGS} ${CHMOD} g-w +pre-configure: + cd ${WRKSRC}; ${FIND} . -type f -print | ${XARGS} ${CHMOD} g-w ${CHMOD} -x ${WRKSRC}/samples/makemo.rb - ${RM} ${WRKSRC}/samples/cgi/po/bg/#main.po# + ${RM} -f ${WRKSRC}/samples/cgi/po/bg/#main.po# -.include "../../misc/rubygems/rubygem.mk" +.include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby-gettext/distinfo b/devel/ruby-gettext/distinfo index ef953fd8698..9242204ae66 100644 --- a/devel/ruby-gettext/distinfo +++ b/devel/ruby-gettext/distinfo @@ -1,6 +1,10 @@ -$NetBSD: distinfo,v 1.7 2010/02/02 02:18:38 taca Exp $ +$NetBSD: distinfo,v 1.8 2010/09/10 05:41:27 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 (patch-aa) = aba830cc6dd123079fac8ca024473f156fa9246b +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 index 237db92ff38..137d5ed02e4 100644 --- a/devel/ruby-gettext/patches/patch-aa +++ b/devel/ruby-gettext/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.1 2010/02/02 02:18:39 taca Exp $ +$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 diff --git a/devel/ruby-gettext/patches/patch-ab b/devel/ruby-gettext/patches/patch-ab new file mode 100644 index 00000000000..2123a833aa9 --- /dev/null +++ b/devel/ruby-gettext/patches/patch-ab @@ -0,0 +1,21 @@ +$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 new file mode 100644 index 00000000000..9bdd94e11d5 --- /dev/null +++ b/devel/ruby-gettext/patches/patch-ac @@ -0,0 +1,16 @@ +$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 new file mode 100644 index 00000000000..51a422dabb1 --- /dev/null +++ b/devel/ruby-gettext/patches/patch-ad @@ -0,0 +1,15 @@ +$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 new file mode 100644 index 00000000000..b60f9611333 --- /dev/null +++ b/devel/ruby-gettext/patches/patch-ae @@ -0,0 +1,43 @@ +$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"] |