diff options
| author | minskim <minskim@pkgsrc.org> | 2007-02-18 23:49:14 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2007-02-18 23:49:14 +0000 |
| commit | b38b0580dc1ffcbba3ae9a33f82b17ac4227ae31 (patch) | |
| tree | 878b0b9fdfeb181739913a71294225bd2aef125b /www | |
| parent | 018f63184e567117215825ac3d030276059ba653 (diff) | |
| download | pkgsrc-b38b0580dc1ffcbba3ae9a33f82b17ac4227ae31.tar.gz | |
Update rails to 1.2.2.
Changes:
* Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+
[Chad Fowler]
* Require the dispatcher for Rails::Configuration#to_prepare. [Rick]
Diffstat (limited to 'www')
| -rw-r--r-- | www/rails/Makefile | 14 | ||||
| -rw-r--r-- | www/rails/distinfo | 10 | ||||
| -rw-r--r-- | www/rails/patches/patch-ab | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/www/rails/Makefile b/www/rails/Makefile index a3a5d0c492e..2cf1d088d23 100644 --- a/www/rails/Makefile +++ b/www/rails/Makefile @@ -1,19 +1,19 @@ -# $NetBSD: Makefile,v 1.3 2007/01/28 05:45:09 minskim Exp $ +# $NetBSD: Makefile,v 1.4 2007/02/18 23:49:14 minskim Exp $ -DISTNAME= rails-1.2.1 +DISTNAME= rails-1.2.2 CATEGORIES= www -MASTER_SITES= http://rubyforge.org/frs/download.php/16560/ +MASTER_SITES= http://rubyforge.org/frs/download.php/17236/ EXTRACT_SUFX= .tgz MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://www.rubyonrails.org/ COMMENT= Framework for developing database-backed web applications -DEPENDS+= ${RUBY_PKGPREFIX}-activesupport>=1.4.0:../../devel/ruby-activesupport -DEPENDS+= ${RUBY_PKGPREFIX}-activerecord>=1.15.1:../../databases/ruby-activerecord -DEPENDS+= ${RUBY_PKGPREFIX}-actionpack>=1.13.1:../../www/ruby-actionpack +DEPENDS+= ${RUBY_PKGPREFIX}-activesupport>=1.4.1:../../devel/ruby-activesupport +DEPENDS+= ${RUBY_PKGPREFIX}-activerecord>=1.15.2:../../databases/ruby-activerecord +DEPENDS+= ${RUBY_PKGPREFIX}-actionpack>=1.13.2:../../www/ruby-actionpack DEPENDS+= ${RUBY_PKGPREFIX}-actionmailer>=1.3.1:../../mail/ruby-actionmailer -DEPENDS+= ${RUBY_PKGPREFIX}-actionwebservice>=1.2.1:../../www/ruby-actionwebservice +DEPENDS+= ${RUBY_PKGPREFIX}-actionwebservice>=1.2.2:../../www/ruby-actionwebservice NO_BUILD= yes WRKSRC= ${WRKDIR}/rails/vendor/rails/railties diff --git a/www/rails/distinfo b/www/rails/distinfo index 913f8674f22..e02c339cc0a 100644 --- a/www/rails/distinfo +++ b/www/rails/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2007/01/28 05:45:09 minskim Exp $ +$NetBSD: distinfo,v 1.3 2007/02/18 23:49:14 minskim Exp $ -SHA1 (rails-1.2.1.tgz) = 131ac7aedcdfd115e36609b592410343723313e0 -RMD160 (rails-1.2.1.tgz) = ef6e2c92fcbd10b8ed0c2483f16bbec13d1a6f91 -Size (rails-1.2.1.tgz) = 2286678 bytes +SHA1 (rails-1.2.2.tgz) = fd2e388005ed349344ef11bfe89ffcf399f6c100 +RMD160 (rails-1.2.2.tgz) = ffc019677c7ee31815453d49debcf088106974ee +Size (rails-1.2.2.tgz) = 2298475 bytes SHA1 (patch-aa) = 7a3d4f4b435c0de22f00f665092ccff046387170 -SHA1 (patch-ab) = cab06b8633c8ee1ff0510960a4e8f5758ea7fb33 +SHA1 (patch-ab) = 5b1e59728bd652dfa3a2fa537379186581f2dbc4 diff --git a/www/rails/patches/patch-ab b/www/rails/patches/patch-ab index f5347655c29..3d8102e9f11 100644 --- a/www/rails/patches/patch-ab +++ b/www/rails/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2007/01/28 05:45:09 minskim Exp $ +$NetBSD: patch-ab,v 1.3 2007/02/18 23:49:14 minskim Exp $ ---- environments/boot.rb.orig 2007-01-18 13:37:44.000000000 -0800 +--- environments/boot.rb.orig 2007-02-05 21:29:54.000000000 -0800 +++ environments/boot.rb @@ -15,30 +15,7 @@ unless defined?(Rails::Initializer) if File.directory?("#{RAILS_ROOT}/vendor/rails") @@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.2 2007/01/28 05:45:09 minskim Exp $ - rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last - - if rails_gem -- require_gem "rails", "=#{rails_gem.version.version}" +- gem "rails", "=#{rails_gem.version.version}" - require rails_gem.full_gem_path + '/lib/initializer' - else - STDERR.puts %(Cannot find gem for Rails ~>#{version}.0: @@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.2 2007/01/28 05:45:09 minskim Exp $ - exit 1 - end - else -- require_gem "rails" +- gem "rails" - require 'initializer' - end + require 'initializer' |