diff options
author | taca <taca@pkgsrc.org> | 2011-09-04 17:02:39 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2011-09-04 17:02:39 +0000 |
commit | cf78d14c6f437cd859760ceb1895d7eb125078ee (patch) | |
tree | 38410a954cfa3ad3c1f3306ff70121302e3d9d0f | |
parent | 657f0cf4abd9fbfdb2e58cae64dc53652ca59b8e (diff) | |
download | pkgsrc-cf78d14c6f437cd859760ceb1895d7eb125078ee.tar.gz |
Fix handling of String in ruby_code() as recent rubygems.
(From rubygem's repository, 6ff4e0eed52ef066fe33.)
Bump PKGREVISION.
-rw-r--r-- | lang/ruby19-base/Makefile | 4 | ||||
-rw-r--r-- | lang/ruby19-base/distinfo | 4 | ||||
-rw-r--r-- | lang/ruby19-base/patches/patch-an | 13 |
3 files changed, 16 insertions, 5 deletions
diff --git a/lang/ruby19-base/Makefile b/lang/ruby19-base/Makefile index 8d82fc8f917..b2b23011634 100644 --- a/lang/ruby19-base/Makefile +++ b/lang/ruby19-base/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2011/08/27 16:04:22 minskim Exp $ +# $NetBSD: Makefile,v 1.13 2011/09/04 17:02:39 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} #PKGREVISION= diff --git a/lang/ruby19-base/distinfo b/lang/ruby19-base/distinfo index fe28f869b28..2f95b5950a3 100644 --- a/lang/ruby19-base/distinfo +++ b/lang/ruby19-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2011/08/12 15:35:22 taca Exp $ +$NetBSD: distinfo,v 1.8 2011/09/04 17:02:39 taca Exp $ SHA1 (ruby-1.9.2-p290.tar.bz2) = 8f25a74f50a10fdd9724e3c74ccd7bae596e198b RMD160 (ruby-1.9.2-p290.tar.bz2) = 9722a91445fa81a101a2a8ab5753780c4601cc5a @@ -16,7 +16,7 @@ SHA1 (patch-aj) = 245221025da25b6aa28d527672ca4bf0610b92dd SHA1 (patch-ak) = ac49cec94313d22058183f1a3af520591433b726 SHA1 (patch-al) = c4f44e897e525c13a0276a3743fd203e290f6f97 SHA1 (patch-am) = 2136ab402ae94805c1585677eaa8cc6a83696374 -SHA1 (patch-an) = 24734863d0542e8075e8d6383350418cb2c643cb +SHA1 (patch-an) = 296f5dfdad2afcbf9eca56a329a1424e5659d29c SHA1 (patch-ao) = 32ba4bd0eccd849f7294bc60a66d181966e472b9 SHA1 (patch-ap) = 1fdb7563c1ee43466f47a2a98bbdc6a242a84f0f SHA1 (patch-aq) = 740e5231beaa1e42f464f2ec7b52c3ed69bb5f39 diff --git a/lang/ruby19-base/patches/patch-an b/lang/ruby19-base/patches/patch-an index 27dacbdbe84..ebd83dd4ad7 100644 --- a/lang/ruby19-base/patches/patch-an +++ b/lang/ruby19-base/patches/patch-an @@ -1,8 +1,10 @@ -$NetBSD: patch-an,v 1.2 2011/08/12 15:35:22 taca Exp $ +$NetBSD: patch-an,v 1.3 2011/09/04 17:02:39 taca Exp $ * Make sure to load YAML before use it. When should YAML be loaded? * Relax to allow some attribute could be nil. * Complete "http://" to homepage attribute if it isn't begin with it. +* Fix handling of String in ruby_code(). (From rubygem's repository, + 6ff4e0eed52ef066fe33.) --- lib/rubygems/specification.rb.orig 2010-04-22 08:24:42.000000000 +0000 +++ lib/rubygems/specification.rb @@ -69,3 +71,12 @@ $NetBSD: patch-an,v 1.2 2011/08/12 15:35:22 taca Exp $ end # Warnings +@@ -1038,7 +1065,7 @@ class Gem::Specification + + def ruby_code(obj) + case obj +- when String then '%q{' + obj + '}' ++ when String then obj.inspect + when Array then obj.inspect + when Gem::Version then obj.to_s.inspect + when Date then '%q{' + obj.strftime('%Y-%m-%d') + '}' |