Update rails to 2.1.0.

New major features:
- Time zones
- Dirty tracking
- Gem Dependencies
- Named scope
- UTC-based migrations
- Better caching

3 files changed, 28 insertions, 14 deletions

diff --git a/www/rails/Makefile b/www/rails/Makefile
index 8e7a6df31c5..b072cd60e01 100644
--- a/www/rails/Makefile
+++ b/www/rails/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2008/04/04 15:30:01 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/20 04:35:36 minskim Exp $
 
-DISTNAME=	rails-2.0.2
-PKGREVISION=	1
+DISTNAME=	rails-2.1.0
 CATEGORIES=	www
 
 MAINTAINER=	minskim@NetBSD.org
@@ -9,11 +8,16 @@ HOMEPAGE=	http://www.rubyonrails.org/
 COMMENT=	Framework for developing database-backed web applications
 
 DEPENDS+=	rake>=0.8.1:../../devel/rake
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.0.2nb1:../../devel/ruby-activesupport
-DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=2.0.2nb1:../../databases/ruby-activerecord
-DEPENDS+=	${RUBY_PKGPREFIX}-activeresource>=2.0.2nb1:../../www/ruby-activeresource
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.0.2nb1:../../www/ruby-actionpack
-DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=2.0.2nb1:../../mail/ruby-actionmailer
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.1.0:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=2.1.0:../../databases/ruby-activerecord
+DEPENDS+=	${RUBY_PKGPREFIX}-activeresource>=2.1.0:../../www/ruby-activeresource
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.1.0:../../www/ruby-actionpack
+DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=2.1.0:../../mail/ruby-actionmailer
+
+REPLACE_RUBY=	bin/about bin/console bin/dbconsole bin/destroy bin/generate	\
+		bin/performance/benchmarker bin/performance/profiler		\
+		bin/performance/request bin/plugin bin/process/inspector	\
+		bin/process/reaper bin/process/spawner bin/runner bin/server
 
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/rails/PLIST b/www/rails/PLIST
index ddd8f51e40a..6f50fa8cf0f 100644
--- a/www/rails/PLIST
+++ b/www/rails/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/04/04 15:30:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/06/20 04:35:36 minskim Exp $
 bin/rails
 ${GEM_HOME}/cache/rails-${PKGVERSION}.gem
 ${GEM_LIBDIR}/CHANGELOG
@@ -7,6 +7,7 @@ ${GEM_LIBDIR}/README
 ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/bin/about
 ${GEM_LIBDIR}/bin/console
+${GEM_LIBDIR}/bin/dbconsole
 ${GEM_LIBDIR}/bin/destroy
 ${GEM_LIBDIR}/bin/generate
 ${GEM_LIBDIR}/bin/performance/benchmarker
@@ -33,6 +34,7 @@ ${GEM_LIBDIR}/configs/databases/sqlite3.yml
 ${GEM_LIBDIR}/configs/empty.log
 ${GEM_LIBDIR}/configs/initializers/inflections.rb
 ${GEM_LIBDIR}/configs/initializers/mime_types.rb
+${GEM_LIBDIR}/configs/initializers/new_rails_defaults.rb
 ${GEM_LIBDIR}/configs/lighttpd.conf
 ${GEM_LIBDIR}/configs/routes.rb
 ${GEM_LIBDIR}/dispatches/dispatch.fcgi
@@ -64,6 +66,7 @@ ${GEM_LIBDIR}/lib/code_statistics.rb
 ${GEM_LIBDIR}/lib/commands.rb
 ${GEM_LIBDIR}/lib/commands/about.rb
 ${GEM_LIBDIR}/lib/commands/console.rb
+${GEM_LIBDIR}/lib/commands/dbconsole.rb
 ${GEM_LIBDIR}/lib/commands/destroy.rb
 ${GEM_LIBDIR}/lib/commands/generate.rb
 ${GEM_LIBDIR}/lib/commands/ncgi/listener
@@ -81,6 +84,7 @@ ${GEM_LIBDIR}/lib/commands/server.rb
 ${GEM_LIBDIR}/lib/commands/servers/base.rb
 ${GEM_LIBDIR}/lib/commands/servers/lighttpd.rb
 ${GEM_LIBDIR}/lib/commands/servers/mongrel.rb
+${GEM_LIBDIR}/lib/commands/servers/new_mongrel.rb
 ${GEM_LIBDIR}/lib/commands/servers/webrick.rb
 ${GEM_LIBDIR}/lib/commands/update.rb
 ${GEM_LIBDIR}/lib/console_app.rb
@@ -89,6 +93,10 @@ ${GEM_LIBDIR}/lib/console_with_helpers.rb
 ${GEM_LIBDIR}/lib/dispatcher.rb
 ${GEM_LIBDIR}/lib/fcgi_handler.rb
 ${GEM_LIBDIR}/lib/initializer.rb
+${GEM_LIBDIR}/lib/rails/gem_builder.rb
+${GEM_LIBDIR}/lib/rails/gem_dependency.rb
+${GEM_LIBDIR}/lib/rails/mongrel_server/commands.rb
+${GEM_LIBDIR}/lib/rails/mongrel_server/handler.rb
 ${GEM_LIBDIR}/lib/rails/plugin.rb
 ${GEM_LIBDIR}/lib/rails/plugin/loader.rb
 ${GEM_LIBDIR}/lib/rails/plugin/locator.rb
@@ -179,6 +187,7 @@ ${GEM_LIBDIR}/lib/tasks/annotations.rake
 ${GEM_LIBDIR}/lib/tasks/databases.rake
 ${GEM_LIBDIR}/lib/tasks/documentation.rake
 ${GEM_LIBDIR}/lib/tasks/framework.rake
+${GEM_LIBDIR}/lib/tasks/gems.rake
 ${GEM_LIBDIR}/lib/tasks/log.rake
 ${GEM_LIBDIR}/lib/tasks/misc.rake
 ${GEM_LIBDIR}/lib/tasks/rails.rb
@@ -217,6 +226,7 @@ ${GEM_HOME}/specifications/rails-${PKGVERSION}.gemspec
 @dirrm ${GEM_LIBDIR}/lib/rails_generator/generators
 @dirrm ${GEM_LIBDIR}/lib/rails_generator
 @dirrm ${GEM_LIBDIR}/lib/rails/plugin
+@dirrm ${GEM_LIBDIR}/lib/rails/mongrel_server
 @dirrm ${GEM_LIBDIR}/lib/rails
 @dirrm ${GEM_LIBDIR}/lib/commands/servers
 @dirrm ${GEM_LIBDIR}/lib/commands/process
@@ -241,4 +251,4 @@ ${GEM_HOME}/specifications/rails-${PKGVERSION}.gemspec
 @dirrm ${GEM_LIBDIR}/bin/performance
 @dirrm ${GEM_LIBDIR}/bin
 @dirrm ${GEM_LIBDIR}
-@exec ${MKDIR} %D/${GEM_DOCDIR}
+@exec ${MKDIR} %D/lib/ruby/gems/1.8/doc/${PKGNAME}
diff --git a/www/rails/distinfo b/www/rails/distinfo
index 966981eec6c..75b97026ad4 100644
--- a/www/rails/distinfo
+++ b/www/rails/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2008/04/04 15:30:01 jlam Exp $
+$NetBSD: distinfo,v 1.9 2008/06/20 04:35:36 minskim Exp $
 
-SHA1 (rails-2.0.2.gem) = 35428ad8ed0e1ee76d040283d5333ff4fb5f4261
-RMD160 (rails-2.0.2.gem) = 8847ac68e31a1b4b5c919d650beb293e4e63ce08
-Size (rails-2.0.2.gem) = 183808 bytes
+SHA1 (rails-2.1.0.gem) = 7c5ab9edba65923d7332d842217e0e7fc6b66404
+RMD160 (rails-2.1.0.gem) = 321cf6fc1eee86183eaa45aa098631d3ea20bad6
+Size (rails-2.1.0.gem) = 204288 bytes