summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorminskim <minskim>2007-02-03 22:01:05 +0000
committerminskim <minskim>2007-02-03 22:01:05 +0000
commit81d5b8450cd340333d321cd09c48109e800293cf (patch)
treeda07869618435cf34292c369cb7c77cbf82e47c9 /devel
parentf96de3923d9ee4d261622abb7478eaa1016b8ae1 (diff)
downloadpkgsrc-81d5b8450cd340333d321cd09c48109e800293cf.tar.gz
Make this work with ruby18-base>1.8.5.
From activesupport svn: Ruby 1.8-cvs and 1.9 define a private Time#to_date that overrides Active Support. Make it public to preserve compatibility. Bump PKGREVISION.
Diffstat (limited to 'devel')
-rw-r--r--devel/ruby-activesupport/Makefile3
-rw-r--r--devel/ruby-activesupport/distinfo4
-rw-r--r--devel/ruby-activesupport/patches/patch-aa20
-rw-r--r--devel/ruby-activesupport/patches/patch-ab13
4 files changed, 38 insertions, 2 deletions
diff --git a/devel/ruby-activesupport/Makefile b/devel/ruby-activesupport/Makefile
index 579e8d61629..eecdba7f0bd 100644
--- a/devel/ruby-activesupport/Makefile
+++ b/devel/ruby-activesupport/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2007/01/29 08:14:42 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/03 22:01:05 minskim Exp $
DISTNAME= activesupport-1.4.0
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= devel ruby
MASTER_SITES= http://rubyforge.org/frs/download.php/16508/
EXTRACT_SUFX= .tgz
diff --git a/devel/ruby-activesupport/distinfo b/devel/ruby-activesupport/distinfo
index 4bce178b3fb..5f1d1043043 100644
--- a/devel/ruby-activesupport/distinfo
+++ b/devel/ruby-activesupport/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2007/01/28 04:39:50 minskim Exp $
+$NetBSD: distinfo,v 1.7 2007/02/03 22:01:05 minskim Exp $
SHA1 (activesupport-1.4.0.tgz) = 46b4c4ce300ff5b274a7709912241ddbbb948c5a
RMD160 (activesupport-1.4.0.tgz) = 18bd7205fafe0c71d8f27a1539734a68853ea7af
Size (activesupport-1.4.0.tgz) = 213162 bytes
+SHA1 (patch-aa) = d49d9f6c9a1f1ef23cfdb6df0f35a9391cc6934d
+SHA1 (patch-ab) = 25d4bf00f57e2708ac5af41383c1d13ff74a0c1d
diff --git a/devel/ruby-activesupport/patches/patch-aa b/devel/ruby-activesupport/patches/patch-aa
new file mode 100644
index 00000000000..be003b8c6ee
--- /dev/null
+++ b/devel/ruby-activesupport/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.1 2007/02/03 22:01:05 minskim Exp $
+
+http://dev.rubyonrails.org/changeset/6099
+
+--- lib/active_support/core_ext/time.rb.orig 2006-11-23 16:36:47.000000000 +0000
++++ lib/active_support/core_ext/time.rb
+@@ -1,3 +1,13 @@
++require 'date'
++require 'time'
++
++# Ruby 1.8-cvs and 1.9 define private Time#to_date
++class Time
++ %w(to_date to_datetime).each do |method|
++ public method if private_instance_methods.include?(method)
++ end
++end
++
+ require File.dirname(__FILE__) + '/time/calculations'
+ require File.dirname(__FILE__) + '/time/conversions'
+
diff --git a/devel/ruby-activesupport/patches/patch-ab b/devel/ruby-activesupport/patches/patch-ab
new file mode 100644
index 00000000000..c14b70d0d50
--- /dev/null
+++ b/devel/ruby-activesupport/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/02/03 22:01:05 minskim Exp $
+
+http://dev.rubyonrails.org/changeset/6099
+
+--- lib/active_support/core_ext/time/conversions.rb.orig 2006-11-23 16:36:46.000000000 +0000
++++ lib/active_support/core_ext/time/conversions.rb
+@@ -1,6 +1,3 @@
+-require 'date'
+-require 'time'
+-
+ module ActiveSupport #:nodoc:
+ module CoreExtensions #:nodoc:
+ module Time #:nodoc: