- Update to 1.2.6

PR:		117668
Submitted by:	Alexander Logvinov <ports@logvinov.com>
Approved by:	portmgr (linimon), maintainer timeout
Security:	http://www.vuxml.org/freebsd/44fb0302-9d38-11dc-9114-001c2514716c.html
		http://www.vuxml.org/freebsd/30acb8ae-9d46-11dc-9114-001c2514716c.html

3 files changed, 55 insertions, 54 deletions

diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile
index e05418e7a603..8db6b6a370cc 100644
--- a/www/rubygem-rails/Makefile
+++ b/www/rubygem-rails/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	rails
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.6
 CATEGORIES=	www rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,11 +14,11 @@ MAINTAINER=	jw@innerewut.de
 COMMENT=	MVC web application framework
 
 BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
-		${LOCALBASE}/${SPEC_DIR}/activesupport-1.4.2.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
-		${LOCALBASE}/${SPEC_DIR}/activerecord-1.15.3.gemspec:${PORTSDIR}/databases/rubygem-activerecord \
-		${LOCALBASE}/${SPEC_DIR}/actionpack-1.13.3.gemspec:${PORTSDIR}/www/rubygem-actionpack \
-		${LOCALBASE}/${SPEC_DIR}/actionmailer-1.3.3.gemspec:${PORTSDIR}/mail/rubygem-actionmailer \
-		${LOCALBASE}/${SPEC_DIR}/actionwebservice-1.2.3.gemspec:${PORTSDIR}/www/rubygem-actionwebservice
+		${LOCALBASE}/${SPEC_DIR}/activesupport-1.4.4.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
+		${LOCALBASE}/${SPEC_DIR}/activerecord-1.15.6.gemspec:${PORTSDIR}/databases/rubygem-activerecord \
+		${LOCALBASE}/${SPEC_DIR}/actionpack-1.13.6.gemspec:${PORTSDIR}/www/rubygem-actionpack \
+		${LOCALBASE}/${SPEC_DIR}/actionmailer-1.3.6.gemspec:${PORTSDIR}/mail/rubygem-actionmailer \
+		${LOCALBASE}/${SPEC_DIR}/actionwebservice-1.2.6.gemspec:${PORTSDIR}/www/rubygem-actionwebservice
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 OPTIONS=	FCGI "FastCGI support" Off\
diff --git a/www/rubygem-rails/distinfo b/www/rubygem-rails/distinfo
index ffc9fbc662fb..015dfe89ecd9 100644
--- a/www/rubygem-rails/distinfo
+++ b/www/rubygem-rails/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/rails-1.2.3.gem) = 297d9c6e30a57f5f4794780293698c54
-SHA256 (rubygem/rails-1.2.3.gem) = 58ed2135a5b41b825350113924d34e1f36cf5fa05030c78e8d3c49614dfbf209
-SIZE (rubygem/rails-1.2.3.gem) = 168448
+MD5 (rubygem/rails-1.2.6.gem) = 4c4a58ef8e703199f97ddb15791e2541
+SHA256 (rubygem/rails-1.2.6.gem) = 5e83cfc2a47d9c4bb5390ffee63e69b32034da281d51b2955c605dcdbecf5c79
+SIZE (rubygem/rails-1.2.6.gem) = 170496
diff --git a/www/rubygem-rails/pkg-plist b/www/rubygem-rails/pkg-plist
index 547fb87c4ee3..f18712ea2f4c 100644
--- a/www/rubygem-rails/pkg-plist
+++ b/www/rubygem-rails/pkg-plist
@@ -11,29 +11,29 @@ bin/rails
 %%GEM_LIB_DIR%%/bin/console
 %%GEM_LIB_DIR%%/bin/destroy
 %%GEM_LIB_DIR%%/bin/generate
-%%GEM_LIB_DIR%%/bin/plugin
-%%GEM_LIB_DIR%%/bin/rails
-%%GEM_LIB_DIR%%/bin/runner
-%%GEM_LIB_DIR%%/bin/server
 %%GEM_LIB_DIR%%/bin/performance/benchmarker
 %%GEM_LIB_DIR%%/bin/performance/profiler
+%%GEM_LIB_DIR%%/bin/plugin
 %%GEM_LIB_DIR%%/bin/process/inspector
 %%GEM_LIB_DIR%%/bin/process/reaper
 %%GEM_LIB_DIR%%/bin/process/spawner
-%%GEM_LIB_DIR%%/builtin/rails_info/rails_info_controller.rb
+%%GEM_LIB_DIR%%/bin/rails
+%%GEM_LIB_DIR%%/bin/runner
+%%GEM_LIB_DIR%%/bin/server
 %%GEM_LIB_DIR%%/builtin/rails_info/rails/info.rb
 %%GEM_LIB_DIR%%/builtin/rails_info/rails/info_controller.rb
 %%GEM_LIB_DIR%%/builtin/rails_info/rails/info_helper.rb
+%%GEM_LIB_DIR%%/builtin/rails_info/rails_info_controller.rb
 %%GEM_LIB_DIR%%/configs/apache.conf
-%%GEM_LIB_DIR%%/configs/empty.log
-%%GEM_LIB_DIR%%/configs/lighttpd.conf
-%%GEM_LIB_DIR%%/configs/routes.rb
 %%GEM_LIB_DIR%%/configs/databases/frontbase.yml
 %%GEM_LIB_DIR%%/configs/databases/mysql.yml
 %%GEM_LIB_DIR%%/configs/databases/oracle.yml
 %%GEM_LIB_DIR%%/configs/databases/postgresql.yml
 %%GEM_LIB_DIR%%/configs/databases/sqlite2.yml
 %%GEM_LIB_DIR%%/configs/databases/sqlite3.yml
+%%GEM_LIB_DIR%%/configs/empty.log
+%%GEM_LIB_DIR%%/configs/lighttpd.conf
+%%GEM_LIB_DIR%%/configs/routes.rb
 %%GEM_LIB_DIR%%/doc/README_FOR_APP
 %%GEM_LIB_DIR%%/dispatches/dispatch.fcgi
 %%GEM_LIB_DIR%%/dispatches/dispatch.rb
@@ -49,94 +49,81 @@ bin/rails
 %%GEM_LIB_DIR%%/html/404.html
 %%GEM_LIB_DIR%%/html/500.html
 %%GEM_LIB_DIR%%/html/favicon.ico
-%%GEM_LIB_DIR%%/html/index.html
-%%GEM_LIB_DIR%%/html/robots.txt
 %%GEM_LIB_DIR%%/html/images/rails.png
+%%GEM_LIB_DIR%%/html/index.html
 %%GEM_LIB_DIR%%/html/javascripts/application.js
 %%GEM_LIB_DIR%%/html/javascripts/controls.js
 %%GEM_LIB_DIR%%/html/javascripts/dragdrop.js
 %%GEM_LIB_DIR%%/html/javascripts/effects.js
 %%GEM_LIB_DIR%%/html/javascripts/prototype.js
+%%GEM_LIB_DIR%%/html/robots.txt
 %%GEM_LIB_DIR%%/lib/binding_of_caller.rb
 %%GEM_LIB_DIR%%/lib/breakpoint.rb
 %%GEM_LIB_DIR%%/lib/breakpoint_client.rb
 %%GEM_LIB_DIR%%/lib/code_statistics.rb
-%%GEM_LIB_DIR%%/lib/commands.rb
-%%GEM_LIB_DIR%%/lib/console_app.rb
-%%GEM_LIB_DIR%%/lib/console_sandbox.rb
-%%GEM_LIB_DIR%%/lib/console_with_helpers.rb
-%%GEM_LIB_DIR%%/lib/dispatcher.rb
-%%GEM_LIB_DIR%%/lib/fcgi_handler.rb
-%%GEM_LIB_DIR%%/lib/initializer.rb
-%%GEM_LIB_DIR%%/lib/rails_generator.rb
-%%GEM_LIB_DIR%%/lib/railties_path.rb
-%%GEM_LIB_DIR%%/lib/ruby_version_check.rb
-%%GEM_LIB_DIR%%/lib/rubyprof_ext.rb
-%%GEM_LIB_DIR%%/lib/test_help.rb
-%%GEM_LIB_DIR%%/lib/webrick_server.rb
 %%GEM_LIB_DIR%%/lib/commands/about.rb
 %%GEM_LIB_DIR%%/lib/commands/breakpointer.rb
 %%GEM_LIB_DIR%%/lib/commands/console.rb
 %%GEM_LIB_DIR%%/lib/commands/destroy.rb
 %%GEM_LIB_DIR%%/lib/commands/generate.rb
-%%GEM_LIB_DIR%%/lib/commands/plugin.rb
-%%GEM_LIB_DIR%%/lib/commands/runner.rb
-%%GEM_LIB_DIR%%/lib/commands/server.rb
-%%GEM_LIB_DIR%%/lib/commands/update.rb
 %%GEM_LIB_DIR%%/lib/commands/ncgi/listener
 %%GEM_LIB_DIR%%/lib/commands/ncgi/tracker
 %%GEM_LIB_DIR%%/lib/commands/performance/benchmarker.rb
 %%GEM_LIB_DIR%%/lib/commands/performance/profiler.rb
+%%GEM_LIB_DIR%%/lib/commands/plugin.rb
 %%GEM_LIB_DIR%%/lib/commands/process/inspector.rb
 %%GEM_LIB_DIR%%/lib/commands/process/reaper.rb
 %%GEM_LIB_DIR%%/lib/commands/process/spawner.rb
 %%GEM_LIB_DIR%%/lib/commands/process/spinner.rb
+%%GEM_LIB_DIR%%/lib/commands/runner.rb
+%%GEM_LIB_DIR%%/lib/commands/server.rb
 %%GEM_LIB_DIR%%/lib/commands/servers/base.rb
 %%GEM_LIB_DIR%%/lib/commands/servers/lighttpd.rb
 %%GEM_LIB_DIR%%/lib/commands/servers/mongrel.rb
 %%GEM_LIB_DIR%%/lib/commands/servers/webrick.rb
+%%GEM_LIB_DIR%%/lib/commands/update.rb
+%%GEM_LIB_DIR%%/lib/commands.rb
+%%GEM_LIB_DIR%%/lib/console_app.rb
+%%GEM_LIB_DIR%%/lib/console_sandbox.rb
+%%GEM_LIB_DIR%%/lib/console_with_helpers.rb
+%%GEM_LIB_DIR%%/lib/dispatcher.rb
+%%GEM_LIB_DIR%%/lib/fcgi_handler.rb
+%%GEM_LIB_DIR%%/lib/initializer.rb
 %%GEM_LIB_DIR%%/lib/rails/version.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/base.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/commands.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generated_attribute.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/lookup.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/manifest.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/options.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/scripts.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/simple_logger.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/spec.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/applications/app/app_generator.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/applications/app/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/controller_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/templates/controller.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/templates/functional_test.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/templates/helper.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/templates/view.rhtml
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/controller/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/integration_test/integration_test_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/integration_test/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/integration_test/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/mailer_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/templates/mailer.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/templates/unit_test.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/templates/view.rhtml
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/mailer/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/migration/migration_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/migration/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/migration/templates/migration.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/migration/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/model_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/templates/fixtures.yml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/templates/migration.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/templates/model.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/templates/unit_test.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/model/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/observer/observer_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/observer/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/observer/templates/observer.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/observer/templates/unit_test.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/observer/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/plugin_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/generator.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/init.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/install.rb
@@ -147,6 +134,7 @@ bin/rails
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/uninstall.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/unit_test.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/templates/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/plugin/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/resource_generator.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/controller.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/fixtures.yml
@@ -157,7 +145,6 @@ bin/rails
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/unit_test.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/resource/templates/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/controller.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/form.rhtml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.rhtml
@@ -169,8 +156,8 @@ bin/rails
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/templates/view_show.rhtml
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/scaffold_resource_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/fixtures.yml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/functional_test.rb
@@ -184,17 +171,28 @@ bin/rails
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.rhtml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.rhtml
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.rhtml
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/scaffold_resource/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/session_migration/session_migration_generator.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/session_migration/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/session_migration/templates/migration.rb
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/USAGE
-%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/web_service_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/session_migration/USAGE
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/templates/api_definition.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/templates/controller.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/templates/functional_test.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/USAGE
+%%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/web_service_generator.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/lookup.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/manifest.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/options.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/scripts/destroy.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/scripts/generate.rb
 %%GEM_LIB_DIR%%/lib/rails_generator/scripts/update.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/scripts.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/simple_logger.rb
+%%GEM_LIB_DIR%%/lib/rails_generator/spec.rb
+%%GEM_LIB_DIR%%/lib/rails_generator.rb
+%%GEM_LIB_DIR%%/lib/railties_path.rb
+%%GEM_LIB_DIR%%/lib/ruby_version_check.rb
+%%GEM_LIB_DIR%%/lib/rubyprof_ext.rb
 %%GEM_LIB_DIR%%/lib/tasks/databases.rake
 %%GEM_LIB_DIR%%/lib/tasks/documentation.rake
 %%GEM_LIB_DIR%%/lib/tasks/framework.rake
@@ -202,9 +200,12 @@ bin/rails
 %%GEM_LIB_DIR%%/lib/tasks/misc.rake
 %%GEM_LIB_DIR%%/lib/tasks/pre_namespace_aliases.rake
 %%GEM_LIB_DIR%%/lib/tasks/rails.rb
+%%GEM_LIB_DIR%%/lib/tasks/routes.rake
 %%GEM_LIB_DIR%%/lib/tasks/statistics.rake
 %%GEM_LIB_DIR%%/lib/tasks/testing.rake
 %%GEM_LIB_DIR%%/lib/tasks/tmp.rake
+%%GEM_LIB_DIR%%/lib/test_help.rb
+%%GEM_LIB_DIR%%/lib/webrick_server.rb
 @dirrm %%GEM_LIB_DIR%%/lib/tasks
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/scripts
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/templates