Update rails to 1.2.5.

Changes:

* Correct RAILS_GEM_VERSION regexp. Use =version gem requirement instead of
  ~>version so you don't get surprised by a beta gem in production. This
  change means upgrading to 1.2.5 will require a boot.rb upgrade.
* Move custom inflections example so available before route generation.
* Add a new rake task to aid debugging of named routes.
* use Gem.find_name instead of search when freezing gems. Prevent false
  positives for other gems with rails in the name. Closes #8729 [wselman]
* Fix syntax error in dispatcher than wrecked failsafe responses.
* Add Active Resource to rails:freeze:edge and drop Action Web Service.
* Give generate scaffold a more descriptive database message.  Closes #7316
* Canonicalize RAILS_ROOT by using File.expand_path on Windows, which doesn't
  have to worry about symlinks, and Pathname#realpath elsewhere, which
  respects symlinks in relative paths but is incompatible with Windows. #6755
  [Jeremy Kemper, trevor]

4 files changed, 31 insertions, 26 deletions

diff --git a/www/rails/Makefile b/www/rails/Makefile
index d164d57c3f4..f214ed74397 100644
--- a/www/rails/Makefile
+++ b/www/rails/Makefile
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.5 2007/04/30 21:26:03 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2007/10/16 04:03:42 minskim Exp $
 
-DISTNAME=	rails-1.2.3
+DISTNAME=	rails-1.2.5
 CATEGORIES=	www
-MASTER_SITES=	http://rubyforge.org/frs/download.php/18404/
-EXTRACT_SUFX=	.gem
+MASTER_SITES=	http://rubyforge.org/frs/download.php/26563/
+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.2:../../devel/ruby-activesupport
-DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=1.15.3:../../databases/ruby-activerecord
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=1.13.3:../../www/ruby-actionpack
-DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=1.3.3:../../mail/ruby-actionmailer
-DEPENDS+=	${RUBY_PKGPREFIX}-actionwebservice>=1.2.3:../../www/ruby-actionwebservice
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=1.4.4:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=1.15.5:../../databases/ruby-activerecord
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=1.13.5:../../www/ruby-actionpack
+DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=1.3.5:../../mail/ruby-actionmailer
+DEPENDS+=	${RUBY_PKGPREFIX}-actionwebservice>=1.2.5:../../www/ruby-actionwebservice
 
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/rails/vendor/rails/railties
 
 REPLACE_RUBY_DIRS=	${WRKSRC}/bin ${WRKSRC}/dispatches	\
 			${WRKSRC}/lib/commands/ncgi
diff --git a/www/rails/PLIST b/www/rails/PLIST
index 0394ab732ed..5f43d9cd6a0 100644
--- a/www/rails/PLIST
+++ b/www/rails/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/28 05:45:09 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/10/16 04:03:42 minskim Exp $
 bin/rails
 ${RUBY_SITELIBDIR}/binding_of_caller.rb
 ${RUBY_SITELIBDIR}/breakpoint.rb
@@ -143,6 +143,7 @@ ${RUBY_SITELIBDIR}/tasks/log.rake
 ${RUBY_SITELIBDIR}/tasks/misc.rake
 ${RUBY_SITELIBDIR}/tasks/pre_namespace_aliases.rake
 ${RUBY_SITELIBDIR}/tasks/rails.rb
+${RUBY_SITELIBDIR}/tasks/routes.rake
 ${RUBY_SITELIBDIR}/tasks/statistics.rake
 ${RUBY_SITELIBDIR}/tasks/testing.rake
 ${RUBY_SITELIBDIR}/tasks/tmp.rake
diff --git a/www/rails/distinfo b/www/rails/distinfo
index f294f2f1ccd..0b354ecff47 100644
--- a/www/rails/distinfo
+++ b/www/rails/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2007/04/30 21:26:21 minskim Exp $
+$NetBSD: distinfo,v 1.5 2007/10/16 04:03:43 minskim Exp $
 
-SHA1 (rails-1.2.3.gem) = 53302796daa82d5635d4044cb30f50d9cf4b3ad9
-RMD160 (rails-1.2.3.gem) = 7dcddf8dcad20a9c0cbda6a3924ccaf893ba6ce2
-Size (rails-1.2.3.gem) = 168448 bytes
+SHA1 (rails-1.2.5.tgz) = 0bec27d4017682a394bd1677d5cc24405d618d64
+RMD160 (rails-1.2.5.tgz) = 0462e044c92e2c2ba95ba84e67aed54002a3a700
+Size (rails-1.2.5.tgz) = 8319184 bytes
 SHA1 (patch-aa) = 7a3d4f4b435c0de22f00f665092ccff046387170
-SHA1 (patch-ab) = 5b1e59728bd652dfa3a2fa537379186581f2dbc4
+SHA1 (patch-ab) = 46e835f687d88436ee011d5a0134637ae05f3180
diff --git a/www/rails/patches/patch-ab b/www/rails/patches/patch-ab
index 3d8102e9f11..091b7ec8ae4 100644
--- a/www/rails/patches/patch-ab
+++ b/www/rails/patches/patch-ab
@@ -1,27 +1,30 @@
-$NetBSD: patch-ab,v 1.3 2007/02/18 23:49:14 minskim Exp $
+$NetBSD: patch-ab,v 1.4 2007/10/16 04:03:43 minskim Exp $
 
---- environments/boot.rb.orig	2007-02-05 21:29:54.000000000 -0800
+--- environments/boot.rb.orig	2007-10-12 09:35:07.000000000 -0700
 +++ environments/boot.rb
-@@ -15,30 +15,7 @@ unless defined?(Rails::Initializer)
+@@ -6,33 +6,7 @@ unless defined?(Rails::Initializer)
    if File.directory?("#{RAILS_ROOT}/vendor/rails")
      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
    else
 -    require 'rubygems'
 -
--    environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join
--    environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/
--    rails_gem_version = $1
+-    rails_gem_version =
+-      if defined? RAILS_GEM_VERSION
+-        RAILS_GEM_VERSION
+-      else
+-        File.read("#{File.dirname(__FILE__)}/environment.rb") =~ /^[^#]*RAILS_GEM_VERSION\s+=\s+'([\d.]+)'/
+-        $1
+-      end
 -
--    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
--      # Asking for 1.1.6 will give you 1.1.6.5206, if available -- makes it easier to use beta gems
--      rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last
+-    if rails_gem_version
+-      rails_gem = Gem.cache.search('rails', "=#{rails_gem_version}.0").sort_by { |g| g.version.version }.last
 -
 -      if rails_gem
 -        gem "rails", "=#{rails_gem.version.version}"
 -        require rails_gem.full_gem_path + '/lib/initializer'
 -      else
--        STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
--    Install the missing gem with 'gem install -v=#{version} rails', or
+-        STDERR.puts %(Cannot find gem for Rails =#{rails_gem_version}.0:
+-    Install the missing gem with 'gem install -v=#{rails_gem_version} rails', or
 -    change environment.rb to define RAILS_GEM_VERSION with your desired version.
 -  )
 -        exit 1