Update ruby-actionpack to 2.0.2.

There have been too many changes.  Please see CHANGELOG for the complete list:

http://dev.rubyonrails.org/browser/tags/rel_2-0-2/actionpack/CHANGELOG

4 files changed, 59 insertions, 66 deletions

diff --git a/www/ruby-actionpack/Makefile b/www/ruby-actionpack/Makefile
index 6ad1234f2fe..91142bd686c 100644
--- a/www/ruby-actionpack/Makefile
+++ b/www/ruby-actionpack/Makefile
@@ -1,23 +1,21 @@
-# $NetBSD: Makefile,v 1.10 2007/12/10 05:47:02 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2008/02/09 06:23:29 minskim Exp $
 
-DISTNAME=	actionpack-1.13.6
+DISTNAME=	actionpack-2.0.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	www ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/28329/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/29351/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/actionpack/
 COMMENT=	Two-step approach to web response generation
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=1.4.4:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.0.2:../../devel/ruby-activesupport
 
 NO_BUILD=		yes
 USE_RUBY_INSTALL=	yes
-EXAMPLESDIR=		${RUBY_EXAMPLESDIR}/actionpack
 
 REPLACE_RUBY+=	lib/action_controller/session/drb_server.rb
-REPLACE_RUBY+=	examples/*.cgi examples/*.fcgi examples/*.rbx
 
 .include "../../lang/ruby/modules.mk"
 .include "../../lang/ruby/replace.mk"
@@ -26,14 +24,8 @@ post-install:
 	${INSTALL_DATA} \
 		${WRKSRC}/lib/action_controller/templates/rescues/* \
 		${RUBY_SITELIBDIR}/action_controller/templates/rescues
-	${INSTALL_DATA} \
-		${WRKSRC}/lib/action_controller/templates/scaffolds/* \
-		${RUBY_SITELIBDIR}/action_controller/templates/scaffolds
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/actionpack
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${RUBY_DOCDIR}/actionpack
 	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/actionpack
-	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-	${CHOWN} -R ${BINOWN}:${BINGRP} ${EXAMPLESDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-actionpack/PLIST b/www/ruby-actionpack/PLIST
index 35ce103e241..cf5eeaa49f5 100644
--- a/www/ruby-actionpack/PLIST
+++ b/www/ruby-actionpack/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2007/10/16 03:17:31 minskim Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/02/09 06:23:29 minskim Exp $
 ${RUBY_SITELIBDIR}/action_controller.rb
 ${RUBY_SITELIBDIR}/action_controller/assertions.rb
-${RUBY_SITELIBDIR}/action_controller/assertions/deprecated_assertions.rb
 ${RUBY_SITELIBDIR}/action_controller/assertions/dom_assertions.rb
 ${RUBY_SITELIBDIR}/action_controller/assertions/model_assertions.rb
 ${RUBY_SITELIBDIR}/action_controller/assertions/response_assertions.rb
@@ -11,122 +10,107 @@ ${RUBY_SITELIBDIR}/action_controller/assertions/tag_assertions.rb
 ${RUBY_SITELIBDIR}/action_controller/base.rb
 ${RUBY_SITELIBDIR}/action_controller/benchmarking.rb
 ${RUBY_SITELIBDIR}/action_controller/caching.rb
-${RUBY_SITELIBDIR}/action_controller/cgi_ext/cgi_ext.rb
-${RUBY_SITELIBDIR}/action_controller/cgi_ext/cgi_methods.rb
-${RUBY_SITELIBDIR}/action_controller/cgi_ext/cookie_performance_fix.rb
-${RUBY_SITELIBDIR}/action_controller/cgi_ext/pstore_performance_fix.rb
-${RUBY_SITELIBDIR}/action_controller/cgi_ext/raw_post_data_fix.rb
-${RUBY_SITELIBDIR}/action_controller/cgi_ext/session_performance_fix.rb
+${RUBY_SITELIBDIR}/action_controller/cgi_ext.rb
+${RUBY_SITELIBDIR}/action_controller/cgi_ext/cookie.rb
+${RUBY_SITELIBDIR}/action_controller/cgi_ext/query_extension.rb
+${RUBY_SITELIBDIR}/action_controller/cgi_ext/session.rb
+${RUBY_SITELIBDIR}/action_controller/cgi_ext/stdinput.rb
 ${RUBY_SITELIBDIR}/action_controller/cgi_process.rb
 ${RUBY_SITELIBDIR}/action_controller/components.rb
 ${RUBY_SITELIBDIR}/action_controller/cookies.rb
-${RUBY_SITELIBDIR}/action_controller/deprecated_dependencies.rb
-${RUBY_SITELIBDIR}/action_controller/deprecated_redirects.rb
-${RUBY_SITELIBDIR}/action_controller/deprecated_request_methods.rb
+${RUBY_SITELIBDIR}/action_controller/dispatcher.rb
 ${RUBY_SITELIBDIR}/action_controller/filters.rb
 ${RUBY_SITELIBDIR}/action_controller/flash.rb
 ${RUBY_SITELIBDIR}/action_controller/helpers.rb
+${RUBY_SITELIBDIR}/action_controller/http_authentication.rb
 ${RUBY_SITELIBDIR}/action_controller/integration.rb
 ${RUBY_SITELIBDIR}/action_controller/layout.rb
-${RUBY_SITELIBDIR}/action_controller/macros/auto_complete.rb
-${RUBY_SITELIBDIR}/action_controller/macros/in_place_editing.rb
 ${RUBY_SITELIBDIR}/action_controller/mime_responds.rb
 ${RUBY_SITELIBDIR}/action_controller/mime_type.rb
-${RUBY_SITELIBDIR}/action_controller/pagination.rb
+${RUBY_SITELIBDIR}/action_controller/mime_types.rb
+${RUBY_SITELIBDIR}/action_controller/polymorphic_routes.rb
+${RUBY_SITELIBDIR}/action_controller/record_identifier.rb
 ${RUBY_SITELIBDIR}/action_controller/request.rb
+${RUBY_SITELIBDIR}/action_controller/request_forgery_protection.rb
+${RUBY_SITELIBDIR}/action_controller/request_profiler.rb
 ${RUBY_SITELIBDIR}/action_controller/rescue.rb
 ${RUBY_SITELIBDIR}/action_controller/resources.rb
 ${RUBY_SITELIBDIR}/action_controller/response.rb
 ${RUBY_SITELIBDIR}/action_controller/routing.rb
-${RUBY_SITELIBDIR}/action_controller/scaffolding.rb
+${RUBY_SITELIBDIR}/action_controller/routing_optimisation.rb
 ${RUBY_SITELIBDIR}/action_controller/session/active_record_store.rb
+${RUBY_SITELIBDIR}/action_controller/session/cookie_store.rb
 ${RUBY_SITELIBDIR}/action_controller/session/drb_server.rb
 ${RUBY_SITELIBDIR}/action_controller/session/drb_store.rb
 ${RUBY_SITELIBDIR}/action_controller/session/mem_cache_store.rb
 ${RUBY_SITELIBDIR}/action_controller/session_management.rb
 ${RUBY_SITELIBDIR}/action_controller/status_codes.rb
 ${RUBY_SITELIBDIR}/action_controller/streaming.rb
-${RUBY_SITELIBDIR}/action_controller/templates/rescues/_request_and_response.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/rescues/_trace.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/rescues/diagnostics.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/rescues/layout.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/rescues/missing_template.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/rescues/routing_error.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/rescues/template_error.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/rescues/unknown_action.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/scaffolds/edit.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/scaffolds/layout.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/scaffolds/list.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/scaffolds/new.rhtml
-${RUBY_SITELIBDIR}/action_controller/templates/scaffolds/show.rhtml
+${RUBY_SITELIBDIR}/action_controller/templates/rescues/_request_and_response.erb
+${RUBY_SITELIBDIR}/action_controller/templates/rescues/_trace.erb
+${RUBY_SITELIBDIR}/action_controller/templates/rescues/diagnostics.erb
+${RUBY_SITELIBDIR}/action_controller/templates/rescues/layout.erb
+${RUBY_SITELIBDIR}/action_controller/templates/rescues/missing_template.erb
+${RUBY_SITELIBDIR}/action_controller/templates/rescues/routing_error.erb
+${RUBY_SITELIBDIR}/action_controller/templates/rescues/template_error.erb
+${RUBY_SITELIBDIR}/action_controller/templates/rescues/unknown_action.erb
+${RUBY_SITELIBDIR}/action_controller/test_case.rb
 ${RUBY_SITELIBDIR}/action_controller/test_process.rb
 ${RUBY_SITELIBDIR}/action_controller/url_rewriter.rb
 ${RUBY_SITELIBDIR}/action_controller/vendor/html-scanner/html/document.rb
 ${RUBY_SITELIBDIR}/action_controller/vendor/html-scanner/html/node.rb
+${RUBY_SITELIBDIR}/action_controller/vendor/html-scanner/html/sanitizer.rb
 ${RUBY_SITELIBDIR}/action_controller/vendor/html-scanner/html/selector.rb
 ${RUBY_SITELIBDIR}/action_controller/vendor/html-scanner/html/tokenizer.rb
 ${RUBY_SITELIBDIR}/action_controller/vendor/html-scanner/html/version.rb
-${RUBY_SITELIBDIR}/action_controller/vendor/xml_node.rb
 ${RUBY_SITELIBDIR}/action_controller/verification.rb
 ${RUBY_SITELIBDIR}/action_view.rb
 ${RUBY_SITELIBDIR}/action_view/base.rb
 ${RUBY_SITELIBDIR}/action_view/compiled_templates.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/active_record_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/asset_tag_helper.rb
+${RUBY_SITELIBDIR}/action_view/helpers/atom_feed_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/benchmark_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/cache_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/capture_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/date_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/debug_helper.rb
-${RUBY_SITELIBDIR}/action_view/helpers/deprecated_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/form_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/form_options_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/form_tag_helper.rb
-${RUBY_SITELIBDIR}/action_view/helpers/java_script_macros_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/javascript_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/javascripts/controls.js
 ${RUBY_SITELIBDIR}/action_view/helpers/javascripts/dragdrop.js
 ${RUBY_SITELIBDIR}/action_view/helpers/javascripts/effects.js
 ${RUBY_SITELIBDIR}/action_view/helpers/javascripts/prototype.js
 ${RUBY_SITELIBDIR}/action_view/helpers/number_helper.rb
-${RUBY_SITELIBDIR}/action_view/helpers/pagination_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/prototype_helper.rb
+${RUBY_SITELIBDIR}/action_view/helpers/record_identification_helper.rb
+${RUBY_SITELIBDIR}/action_view/helpers/record_tag_helper.rb
+${RUBY_SITELIBDIR}/action_view/helpers/sanitize_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/scriptaculous_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/tag_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/text_helper.rb
 ${RUBY_SITELIBDIR}/action_view/helpers/url_helper.rb
 ${RUBY_SITELIBDIR}/action_view/partials.rb
 ${RUBY_SITELIBDIR}/action_view/template_error.rb
+${RUBY_SITELIBDIR}/action_view/template_handler.rb
+${RUBY_SITELIBDIR}/action_view/template_handlers/builder.rb
+${RUBY_SITELIBDIR}/action_view/template_handlers/erb.rb
+${RUBY_SITELIBDIR}/action_view/template_handlers/rjs.rb
 ${RUBY_DOCDIR}/actionpack/CHANGELOG
 ${RUBY_DOCDIR}/actionpack/README
-${RUBY_EXAMPLESDIR}/actionpack/address_book/index.rhtml
-${RUBY_EXAMPLESDIR}/actionpack/address_book/layout.rhtml
-${RUBY_EXAMPLESDIR}/actionpack/address_book_controller.cgi
-${RUBY_EXAMPLESDIR}/actionpack/address_book_controller.fcgi
-${RUBY_EXAMPLESDIR}/actionpack/address_book_controller.rb
-${RUBY_EXAMPLESDIR}/actionpack/address_book_controller.rbx
-${RUBY_EXAMPLESDIR}/actionpack/benchmark.rb
-${RUBY_EXAMPLESDIR}/actionpack/benchmark_with_ar.fcgi
-${RUBY_EXAMPLESDIR}/actionpack/blog_controller.cgi
-${RUBY_EXAMPLESDIR}/actionpack/debate/index.rhtml
-${RUBY_EXAMPLESDIR}/actionpack/debate/new_topic.rhtml
-${RUBY_EXAMPLESDIR}/actionpack/debate/topic.rhtml
-${RUBY_EXAMPLESDIR}/actionpack/debate_controller.cgi
-@dirrm ${RUBY_EXAMPLESDIR}/actionpack/debate
-@dirrm ${RUBY_EXAMPLESDIR}/actionpack/address_book
-@dirrm ${RUBY_EXAMPLESDIR}/actionpack
 @dirrm ${RUBY_DOCDIR}/actionpack
+@dirrm ${RUBY_SITELIBDIR}/action_view/template_handlers
 @dirrm ${RUBY_SITELIBDIR}/action_view/helpers/javascripts
 @dirrm ${RUBY_SITELIBDIR}/action_view/helpers
 @dirrm ${RUBY_SITELIBDIR}/action_view
 @dirrm ${RUBY_SITELIBDIR}/action_controller/vendor/html-scanner/html
 @dirrm ${RUBY_SITELIBDIR}/action_controller/vendor/html-scanner
 @dirrm ${RUBY_SITELIBDIR}/action_controller/vendor
-@dirrm ${RUBY_SITELIBDIR}/action_controller/templates/scaffolds
 @dirrm ${RUBY_SITELIBDIR}/action_controller/templates/rescues
 @dirrm ${RUBY_SITELIBDIR}/action_controller/templates
 @dirrm ${RUBY_SITELIBDIR}/action_controller/session
-@dirrm ${RUBY_SITELIBDIR}/action_controller/macros
 @dirrm ${RUBY_SITELIBDIR}/action_controller/cgi_ext
 @dirrm ${RUBY_SITELIBDIR}/action_controller/assertions
 @dirrm ${RUBY_SITELIBDIR}/action_controller
diff --git a/www/ruby-actionpack/distinfo b/www/ruby-actionpack/distinfo
index 9772925f4e7..8bbf397fdb6 100644
--- a/www/ruby-actionpack/distinfo
+++ b/www/ruby-actionpack/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2007/12/10 05:47:03 minskim Exp $
+$NetBSD: distinfo,v 1.12 2008/02/09 06:23:29 minskim Exp $
 
-SHA1 (actionpack-1.13.6.tgz) = 1ef33772dd6a560fdccec70972cad3d30189e4e2
-RMD160 (actionpack-1.13.6.tgz) = 855386e7a843c9245e42dcf3eeae81ce2986340e
-Size (actionpack-1.13.6.tgz) = 614571 bytes
+SHA1 (actionpack-2.0.2.tgz) = 4c0826f0800a31d85570c2e15f5f0ee51cc61975
+RMD160 (actionpack-2.0.2.tgz) = 7b21059840936da297421327766b5e2ee5b9d46d
+Size (actionpack-2.0.2.tgz) = 707629 bytes
 SHA1 (patch-ab) = bfba841b0af9d503a71745cc8d992e9d09d94191
+SHA1 (patch-ac) = 772c013b7a1544d3b53687960b63d6b94c70767d
diff --git a/www/ruby-actionpack/patches/patch-ac b/www/ruby-actionpack/patches/patch-ac
new file mode 100644
index 00000000000..27dbf5c2089
--- /dev/null
+++ b/www/ruby-actionpack/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2008/02/09 06:23:29 minskim Exp $
+
+--- lib/action_controller.rb.orig	2008-02-08 21:54:06.000000000 -0800
++++ lib/action_controller.rb
+@@ -26,11 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unles
+ 
+ unless defined?(ActiveSupport)
+   begin
+-    $:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib"
+     require 'active_support'
+-  rescue LoadError
+-    require 'rubygems'
+-    gem 'activesupport'
+   end
+ end
+