Install as a gem using the pkgsrc rubygem.mk framework instead of

directly into site_ruby.

4 files changed, 377 insertions, 158 deletions

diff --git a/www/ruby-actionpack/Makefile b/www/ruby-actionpack/Makefile
index 91142bd686c..8030392e248 100644
--- a/www/ruby-actionpack/Makefile
+++ b/www/ruby-actionpack/Makefile
@@ -1,31 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2008/02/09 06:23:29 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/04 15:30:02 jlam Exp $
 
 DISTNAME=	actionpack-2.0.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES=	www ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/29351/
-EXTRACT_SUFX=	.tgz
+PKGREVISION=	1
+CATEGORIES=	www
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/actionpack/
 COMMENT=	Two-step approach to web response generation
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.0.2:../../devel/ruby-activesupport
-
-NO_BUILD=		yes
-USE_RUBY_INSTALL=	yes
-
-REPLACE_RUBY+=	lib/action_controller/session/drb_server.rb
-
-.include "../../lang/ruby/modules.mk"
-.include "../../lang/ruby/replace.mk"
-
-post-install:
-	${INSTALL_DATA} \
-		${WRKSRC}/lib/action_controller/templates/rescues/* \
-		${RUBY_SITELIBDIR}/action_controller/templates/rescues
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/actionpack
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${RUBY_DOCDIR}/actionpack
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/actionpack
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.0.2nb1:../../devel/ruby-activesupport
 
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-actionpack/PLIST b/www/ruby-actionpack/PLIST
index cf5eeaa49f5..ef2d355dacc 100644
--- a/www/ruby-actionpack/PLIST
+++ b/www/ruby-actionpack/PLIST
@@ -1,116 +1,368 @@
-@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/dom_assertions.rb
-${RUBY_SITELIBDIR}/action_controller/assertions/model_assertions.rb
-${RUBY_SITELIBDIR}/action_controller/assertions/response_assertions.rb
-${RUBY_SITELIBDIR}/action_controller/assertions/routing_assertions.rb
-${RUBY_SITELIBDIR}/action_controller/assertions/selector_assertions.rb
-${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.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/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/mime_responds.rb
-${RUBY_SITELIBDIR}/action_controller/mime_type.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/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.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/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/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/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/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
-@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/rescues
-@dirrm ${RUBY_SITELIBDIR}/action_controller/templates
-@dirrm ${RUBY_SITELIBDIR}/action_controller/session
-@dirrm ${RUBY_SITELIBDIR}/action_controller/cgi_ext
-@dirrm ${RUBY_SITELIBDIR}/action_controller/assertions
-@dirrm ${RUBY_SITELIBDIR}/action_controller
+@comment $NetBSD: PLIST,v 1.12 2008/04/04 15:30:02 jlam Exp $
+${GEM_HOME}/cache/actionpack-${PKGVERSION}.gem
+${GEM_LIBDIR}/CHANGELOG
+${GEM_LIBDIR}/MIT-LICENSE
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/RUNNING_UNIT_TESTS
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/install.rb
+${GEM_LIBDIR}/lib/action_controller.rb
+${GEM_LIBDIR}/lib/action_controller/assertions.rb
+${GEM_LIBDIR}/lib/action_controller/assertions/dom_assertions.rb
+${GEM_LIBDIR}/lib/action_controller/assertions/model_assertions.rb
+${GEM_LIBDIR}/lib/action_controller/assertions/response_assertions.rb
+${GEM_LIBDIR}/lib/action_controller/assertions/routing_assertions.rb
+${GEM_LIBDIR}/lib/action_controller/assertions/selector_assertions.rb
+${GEM_LIBDIR}/lib/action_controller/assertions/tag_assertions.rb
+${GEM_LIBDIR}/lib/action_controller/base.rb
+${GEM_LIBDIR}/lib/action_controller/benchmarking.rb
+${GEM_LIBDIR}/lib/action_controller/caching.rb
+${GEM_LIBDIR}/lib/action_controller/cgi_ext.rb
+${GEM_LIBDIR}/lib/action_controller/cgi_ext/cookie.rb
+${GEM_LIBDIR}/lib/action_controller/cgi_ext/query_extension.rb
+${GEM_LIBDIR}/lib/action_controller/cgi_ext/session.rb
+${GEM_LIBDIR}/lib/action_controller/cgi_ext/stdinput.rb
+${GEM_LIBDIR}/lib/action_controller/cgi_process.rb
+${GEM_LIBDIR}/lib/action_controller/components.rb
+${GEM_LIBDIR}/lib/action_controller/cookies.rb
+${GEM_LIBDIR}/lib/action_controller/dispatcher.rb
+${GEM_LIBDIR}/lib/action_controller/filters.rb
+${GEM_LIBDIR}/lib/action_controller/flash.rb
+${GEM_LIBDIR}/lib/action_controller/helpers.rb
+${GEM_LIBDIR}/lib/action_controller/http_authentication.rb
+${GEM_LIBDIR}/lib/action_controller/integration.rb
+${GEM_LIBDIR}/lib/action_controller/layout.rb
+${GEM_LIBDIR}/lib/action_controller/mime_responds.rb
+${GEM_LIBDIR}/lib/action_controller/mime_type.rb
+${GEM_LIBDIR}/lib/action_controller/mime_types.rb
+${GEM_LIBDIR}/lib/action_controller/polymorphic_routes.rb
+${GEM_LIBDIR}/lib/action_controller/record_identifier.rb
+${GEM_LIBDIR}/lib/action_controller/request.rb
+${GEM_LIBDIR}/lib/action_controller/request_forgery_protection.rb
+${GEM_LIBDIR}/lib/action_controller/request_profiler.rb
+${GEM_LIBDIR}/lib/action_controller/rescue.rb
+${GEM_LIBDIR}/lib/action_controller/resources.rb
+${GEM_LIBDIR}/lib/action_controller/response.rb
+${GEM_LIBDIR}/lib/action_controller/routing.rb
+${GEM_LIBDIR}/lib/action_controller/routing_optimisation.rb
+${GEM_LIBDIR}/lib/action_controller/session/active_record_store.rb
+${GEM_LIBDIR}/lib/action_controller/session/cookie_store.rb
+${GEM_LIBDIR}/lib/action_controller/session/drb_server.rb
+${GEM_LIBDIR}/lib/action_controller/session/drb_store.rb
+${GEM_LIBDIR}/lib/action_controller/session/mem_cache_store.rb
+${GEM_LIBDIR}/lib/action_controller/session_management.rb
+${GEM_LIBDIR}/lib/action_controller/status_codes.rb
+${GEM_LIBDIR}/lib/action_controller/streaming.rb
+${GEM_LIBDIR}/lib/action_controller/templates/rescues/_request_and_response.erb
+${GEM_LIBDIR}/lib/action_controller/templates/rescues/_trace.erb
+${GEM_LIBDIR}/lib/action_controller/templates/rescues/diagnostics.erb
+${GEM_LIBDIR}/lib/action_controller/templates/rescues/layout.erb
+${GEM_LIBDIR}/lib/action_controller/templates/rescues/missing_template.erb
+${GEM_LIBDIR}/lib/action_controller/templates/rescues/routing_error.erb
+${GEM_LIBDIR}/lib/action_controller/templates/rescues/template_error.erb
+${GEM_LIBDIR}/lib/action_controller/templates/rescues/unknown_action.erb
+${GEM_LIBDIR}/lib/action_controller/test_case.rb
+${GEM_LIBDIR}/lib/action_controller/test_process.rb
+${GEM_LIBDIR}/lib/action_controller/url_rewriter.rb
+${GEM_LIBDIR}/lib/action_controller/vendor/html-scanner/html/document.rb
+${GEM_LIBDIR}/lib/action_controller/vendor/html-scanner/html/node.rb
+${GEM_LIBDIR}/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
+${GEM_LIBDIR}/lib/action_controller/vendor/html-scanner/html/selector.rb
+${GEM_LIBDIR}/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
+${GEM_LIBDIR}/lib/action_controller/vendor/html-scanner/html/version.rb
+${GEM_LIBDIR}/lib/action_controller/verification.rb
+${GEM_LIBDIR}/lib/action_pack.rb
+${GEM_LIBDIR}/lib/action_pack/version.rb
+${GEM_LIBDIR}/lib/action_view.rb
+${GEM_LIBDIR}/lib/action_view/base.rb
+${GEM_LIBDIR}/lib/action_view/compiled_templates.rb
+${GEM_LIBDIR}/lib/action_view/helpers/active_record_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/asset_tag_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/atom_feed_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/benchmark_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/cache_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/capture_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/date_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/debug_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/form_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/form_options_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/form_tag_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/javascript_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/javascripts/controls.js
+${GEM_LIBDIR}/lib/action_view/helpers/javascripts/dragdrop.js
+${GEM_LIBDIR}/lib/action_view/helpers/javascripts/effects.js
+${GEM_LIBDIR}/lib/action_view/helpers/javascripts/prototype.js
+${GEM_LIBDIR}/lib/action_view/helpers/number_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/prototype_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/record_identification_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/record_tag_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/sanitize_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/scriptaculous_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/tag_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/text_helper.rb
+${GEM_LIBDIR}/lib/action_view/helpers/url_helper.rb
+${GEM_LIBDIR}/lib/action_view/partials.rb
+${GEM_LIBDIR}/lib/action_view/template_error.rb
+${GEM_LIBDIR}/lib/action_view/template_handler.rb
+${GEM_LIBDIR}/lib/action_view/template_handlers/builder.rb
+${GEM_LIBDIR}/lib/action_view/template_handlers/erb.rb
+${GEM_LIBDIR}/lib/action_view/template_handlers/rjs.rb
+${GEM_LIBDIR}/lib/actionpack.rb
+${GEM_LIBDIR}/test/abstract_unit.rb
+${GEM_LIBDIR}/test/action_view_test.rb
+${GEM_LIBDIR}/test/active_record_unit.rb
+${GEM_LIBDIR}/test/activerecord/active_record_store_test.rb
+${GEM_LIBDIR}/test/activerecord/render_partial_with_record_identification_test.rb
+${GEM_LIBDIR}/test/controller/action_pack_assertions_test.rb
+${GEM_LIBDIR}/test/controller/addresses_render_test.rb
+${GEM_LIBDIR}/test/controller/assert_select_test.rb
+${GEM_LIBDIR}/test/controller/base_test.rb
+${GEM_LIBDIR}/test/controller/benchmark_test.rb
+${GEM_LIBDIR}/test/controller/caching_test.rb
+${GEM_LIBDIR}/test/controller/capture_test.rb
+${GEM_LIBDIR}/test/controller/cgi_test.rb
+${GEM_LIBDIR}/test/controller/components_test.rb
+${GEM_LIBDIR}/test/controller/content_type_test.rb
+${GEM_LIBDIR}/test/controller/controller_fixtures/app/controllers/admin/user_controller.rb
+${GEM_LIBDIR}/test/controller/controller_fixtures/app/controllers/user_controller.rb
+${GEM_LIBDIR}/test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib/plugin_controller.rb
+${GEM_LIBDIR}/test/controller/cookie_test.rb
+${GEM_LIBDIR}/test/controller/custom_handler_test.rb
+${GEM_LIBDIR}/test/controller/deprecation/deprecated_base_methods_test.rb
+${GEM_LIBDIR}/test/controller/dispatcher_test.rb
+${GEM_LIBDIR}/test/controller/fake_controllers.rb
+${GEM_LIBDIR}/test/controller/fake_models.rb
+${GEM_LIBDIR}/test/controller/filter_params_test.rb
+${GEM_LIBDIR}/test/controller/filters_test.rb
+${GEM_LIBDIR}/test/controller/flash_test.rb
+${GEM_LIBDIR}/test/controller/fragment_store_setting_test.rb
+${GEM_LIBDIR}/test/controller/helper_test.rb
+${GEM_LIBDIR}/test/controller/html-scanner/document_test.rb
+${GEM_LIBDIR}/test/controller/html-scanner/node_test.rb
+${GEM_LIBDIR}/test/controller/html-scanner/sanitizer_test.rb
+${GEM_LIBDIR}/test/controller/html-scanner/tag_node_test.rb
+${GEM_LIBDIR}/test/controller/html-scanner/text_node_test.rb
+${GEM_LIBDIR}/test/controller/html-scanner/tokenizer_test.rb
+${GEM_LIBDIR}/test/controller/http_authentication_test.rb
+${GEM_LIBDIR}/test/controller/integration_test.rb
+${GEM_LIBDIR}/test/controller/layout_test.rb
+${GEM_LIBDIR}/test/controller/mime_responds_test.rb
+${GEM_LIBDIR}/test/controller/mime_type_test.rb
+${GEM_LIBDIR}/test/controller/new_render_test.rb
+${GEM_LIBDIR}/test/controller/polymorphic_routes_test.rb
+${GEM_LIBDIR}/test/controller/record_identifier_test.rb
+${GEM_LIBDIR}/test/controller/redirect_test.rb
+${GEM_LIBDIR}/test/controller/render_test.rb
+${GEM_LIBDIR}/test/controller/request_forgery_protection_test.rb
+${GEM_LIBDIR}/test/controller/request_test.rb
+${GEM_LIBDIR}/test/controller/rescue_test.rb
+${GEM_LIBDIR}/test/controller/resources_test.rb
+${GEM_LIBDIR}/test/controller/routing_test.rb
+${GEM_LIBDIR}/test/controller/selector_test.rb
+${GEM_LIBDIR}/test/controller/send_file_test.rb
+${GEM_LIBDIR}/test/controller/session/cookie_store_test.rb
+${GEM_LIBDIR}/test/controller/session/mem_cache_store_test.rb
+${GEM_LIBDIR}/test/controller/session_fixation_test.rb
+${GEM_LIBDIR}/test/controller/session_management_test.rb
+${GEM_LIBDIR}/test/controller/test_test.rb
+${GEM_LIBDIR}/test/controller/url_rewriter_test.rb
+${GEM_LIBDIR}/test/controller/verification_test.rb
+${GEM_LIBDIR}/test/controller/view_paths_test.rb
+${GEM_LIBDIR}/test/controller/webservice_test.rb
+${GEM_LIBDIR}/test/fixtures/addresses/list.erb
+${GEM_LIBDIR}/test/fixtures/companies.yml
+${GEM_LIBDIR}/test/fixtures/company.rb
+${GEM_LIBDIR}/test/fixtures/content_type/render_default_content_types_for_respond_to.rhtml
+${GEM_LIBDIR}/test/fixtures/content_type/render_default_for_rhtml.rhtml
+${GEM_LIBDIR}/test/fixtures/content_type/render_default_for_rjs.rjs
+${GEM_LIBDIR}/test/fixtures/content_type/render_default_for_rxml.rxml
+${GEM_LIBDIR}/test/fixtures/db_definitions/sqlite.sql
+${GEM_LIBDIR}/test/fixtures/developer.rb
+${GEM_LIBDIR}/test/fixtures/developers.yml
+${GEM_LIBDIR}/test/fixtures/developers_projects.yml
+${GEM_LIBDIR}/test/fixtures/fun/games/hello_world.erb
+${GEM_LIBDIR}/test/fixtures/helpers/abc_helper.rb
+${GEM_LIBDIR}/test/fixtures/helpers/fun/games_helper.rb
+${GEM_LIBDIR}/test/fixtures/helpers/fun/pdf_helper.rb
+${GEM_LIBDIR}/test/fixtures/layout_tests/alt/hello.rhtml
+${GEM_LIBDIR}/test/fixtures/layout_tests/layouts/controller_name_space/nested.rhtml
+${GEM_LIBDIR}/test/fixtures/layout_tests/layouts/item.rhtml
+${GEM_LIBDIR}/test/fixtures/layout_tests/layouts/layout_test.rhtml
+${GEM_LIBDIR}/test/fixtures/layout_tests/layouts/multiple_extensions.html.erb
+${GEM_LIBDIR}/test/fixtures/layout_tests/layouts/third_party_template_library.mab
+${GEM_LIBDIR}/test/fixtures/layout_tests/views/hello.rhtml
+${GEM_LIBDIR}/test/fixtures/layouts/builder.builder
+${GEM_LIBDIR}/test/fixtures/layouts/standard.erb
+${GEM_LIBDIR}/test/fixtures/layouts/talk_from_action.erb
+${GEM_LIBDIR}/test/fixtures/layouts/yield.erb
+${GEM_LIBDIR}/test/fixtures/multipart/binary_file
+${GEM_LIBDIR}/test/fixtures/multipart/bracketed_param
+${GEM_LIBDIR}/test/fixtures/multipart/large_text_file
+${GEM_LIBDIR}/test/fixtures/multipart/mixed_files
+${GEM_LIBDIR}/test/fixtures/multipart/mona_lisa.jpg
+${GEM_LIBDIR}/test/fixtures/multipart/single_parameter
+${GEM_LIBDIR}/test/fixtures/multipart/text_file
+${GEM_LIBDIR}/test/fixtures/override/test/hello_world.erb
+${GEM_LIBDIR}/test/fixtures/override2/layouts/test/sub.erb
+${GEM_LIBDIR}/test/fixtures/post_test/layouts/post.html.erb
+${GEM_LIBDIR}/test/fixtures/post_test/layouts/super_post.iphone.erb
+${GEM_LIBDIR}/test/fixtures/post_test/post/index.html.erb
+${GEM_LIBDIR}/test/fixtures/post_test/post/index.iphone.erb
+${GEM_LIBDIR}/test/fixtures/post_test/super_post/index.html.erb
+${GEM_LIBDIR}/test/fixtures/post_test/super_post/index.iphone.erb
+${GEM_LIBDIR}/test/fixtures/project.rb
+${GEM_LIBDIR}/test/fixtures/projects.yml
+${GEM_LIBDIR}/test/fixtures/public/404.html
+${GEM_LIBDIR}/test/fixtures/public/500.html
+${GEM_LIBDIR}/test/fixtures/public/images/rails.png
+${GEM_LIBDIR}/test/fixtures/public/javascripts/application.js
+${GEM_LIBDIR}/test/fixtures/public/javascripts/bank.js
+${GEM_LIBDIR}/test/fixtures/public/javascripts/robber.js
+${GEM_LIBDIR}/test/fixtures/public/stylesheets/bank.css
+${GEM_LIBDIR}/test/fixtures/public/stylesheets/robber.css
+${GEM_LIBDIR}/test/fixtures/replies.yml
+${GEM_LIBDIR}/test/fixtures/reply.rb
+${GEM_LIBDIR}/test/fixtures/respond_to/all_types_with_layout.html.erb
+${GEM_LIBDIR}/test/fixtures/respond_to/all_types_with_layout.js.rjs
+${GEM_LIBDIR}/test/fixtures/respond_to/custom_constant_handling_without_block.mobile.erb
+${GEM_LIBDIR}/test/fixtures/respond_to/iphone_with_html_response_type.html.erb
+${GEM_LIBDIR}/test/fixtures/respond_to/iphone_with_html_response_type.iphone.erb
+${GEM_LIBDIR}/test/fixtures/respond_to/layouts/missing.html.erb
+${GEM_LIBDIR}/test/fixtures/respond_to/layouts/standard.html.erb
+${GEM_LIBDIR}/test/fixtures/respond_to/layouts/standard.iphone.erb
+${GEM_LIBDIR}/test/fixtures/respond_to/using_defaults.html.erb
+${GEM_LIBDIR}/test/fixtures/respond_to/using_defaults.js.rjs
+${GEM_LIBDIR}/test/fixtures/respond_to/using_defaults.xml.builder
+${GEM_LIBDIR}/test/fixtures/respond_to/using_defaults_with_type_list.html.erb
+${GEM_LIBDIR}/test/fixtures/respond_to/using_defaults_with_type_list.js.rjs
+${GEM_LIBDIR}/test/fixtures/respond_to/using_defaults_with_type_list.xml.builder
+${GEM_LIBDIR}/test/fixtures/scope/test/modgreet.erb
+${GEM_LIBDIR}/test/fixtures/test/_customer.erb
+${GEM_LIBDIR}/test/fixtures/test/_customer_greeting.erb
+${GEM_LIBDIR}/test/fixtures/test/_hash_greeting.erb
+${GEM_LIBDIR}/test/fixtures/test/_hash_object.erb
+${GEM_LIBDIR}/test/fixtures/test/_hello.builder
+${GEM_LIBDIR}/test/fixtures/test/_layout_for_partial.html.erb
+${GEM_LIBDIR}/test/fixtures/test/_partial.erb
+${GEM_LIBDIR}/test/fixtures/test/_partial.html.erb
+${GEM_LIBDIR}/test/fixtures/test/_partial.js.erb
+${GEM_LIBDIR}/test/fixtures/test/_partial_for_use_in_layout.html.erb
+${GEM_LIBDIR}/test/fixtures/test/_partial_only.erb
+${GEM_LIBDIR}/test/fixtures/test/_person.erb
+${GEM_LIBDIR}/test/fixtures/test/action_talk_to_layout.erb
+${GEM_LIBDIR}/test/fixtures/test/block_content_for.erb
+${GEM_LIBDIR}/test/fixtures/test/calling_partial_with_layout.html.erb
+${GEM_LIBDIR}/test/fixtures/test/capturing.erb
+${GEM_LIBDIR}/test/fixtures/test/content_for.erb
+${GEM_LIBDIR}/test/fixtures/test/content_for_concatenated.erb
+${GEM_LIBDIR}/test/fixtures/test/content_for_with_parameter.erb
+${GEM_LIBDIR}/test/fixtures/test/delete_with_js.rjs
+${GEM_LIBDIR}/test/fixtures/test/dot.directory/render_file_with_ivar.erb
+${GEM_LIBDIR}/test/fixtures/test/enum_rjs_test.rjs
+${GEM_LIBDIR}/test/fixtures/test/erb_content_for.erb
+${GEM_LIBDIR}/test/fixtures/test/formatted_html_erb.html.erb
+${GEM_LIBDIR}/test/fixtures/test/formatted_xml_erb.builder
+${GEM_LIBDIR}/test/fixtures/test/formatted_xml_erb.html.erb
+${GEM_LIBDIR}/test/fixtures/test/formatted_xml_erb.xml.erb
+${GEM_LIBDIR}/test/fixtures/test/greeting.erb
+${GEM_LIBDIR}/test/fixtures/test/hello.builder
+${GEM_LIBDIR}/test/fixtures/test/hello_world.erb
+${GEM_LIBDIR}/test/fixtures/test/hello_world_container.builder
+${GEM_LIBDIR}/test/fixtures/test/hello_world_from_rxml.builder
+${GEM_LIBDIR}/test/fixtures/test/hello_world_with_layout_false.erb
+${GEM_LIBDIR}/test/fixtures/test/hello_xml_world.builder
+${GEM_LIBDIR}/test/fixtures/test/list.erb
+${GEM_LIBDIR}/test/fixtures/test/non_erb_block_content_for.builder
+${GEM_LIBDIR}/test/fixtures/test/potential_conflicts.erb
+${GEM_LIBDIR}/test/fixtures/test/render_file_with_ivar.erb
+${GEM_LIBDIR}/test/fixtures/test/render_file_with_locals.erb
+${GEM_LIBDIR}/test/fixtures/test/render_to_string_test.erb
+${GEM_LIBDIR}/test/fixtures/test/update_element_with_capture.erb
+${GEM_LIBDIR}/test/fixtures/test/using_layout_around_block.html.erb
+${GEM_LIBDIR}/test/fixtures/topic.rb
+${GEM_LIBDIR}/test/fixtures/topics.yml
+${GEM_LIBDIR}/test/template/active_record_helper_test.rb
+${GEM_LIBDIR}/test/template/asset_tag_helper_test.rb
+${GEM_LIBDIR}/test/template/atom_feed_helper_test.rb
+${GEM_LIBDIR}/test/template/benchmark_helper_test.rb
+${GEM_LIBDIR}/test/template/compiled_templates_test.rb
+${GEM_LIBDIR}/test/template/date_helper_test.rb
+${GEM_LIBDIR}/test/template/erb_util_test.rb
+${GEM_LIBDIR}/test/template/form_helper_test.rb
+${GEM_LIBDIR}/test/template/form_options_helper_test.rb
+${GEM_LIBDIR}/test/template/form_tag_helper_test.rb
+${GEM_LIBDIR}/test/template/javascript_helper_test.rb
+${GEM_LIBDIR}/test/template/number_helper_test.rb
+${GEM_LIBDIR}/test/template/prototype_helper_test.rb
+${GEM_LIBDIR}/test/template/sanitize_helper_test.rb
+${GEM_LIBDIR}/test/template/scriptaculous_helper_test.rb
+${GEM_LIBDIR}/test/template/tag_helper_test.rb
+${GEM_LIBDIR}/test/template/text_helper_test.rb
+${GEM_LIBDIR}/test/template/url_helper_test.rb
+${GEM_LIBDIR}/test/testing_sandbox.rb
+${GEM_HOME}/specifications/actionpack-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/test/template
+@dirrm ${GEM_LIBDIR}/test/fixtures/test/dot.directory
+@dirrm ${GEM_LIBDIR}/test/fixtures/test
+@dirrm ${GEM_LIBDIR}/test/fixtures/scope/test
+@dirrm ${GEM_LIBDIR}/test/fixtures/scope
+@dirrm ${GEM_LIBDIR}/test/fixtures/respond_to/layouts
+@dirrm ${GEM_LIBDIR}/test/fixtures/respond_to
+@dirrm ${GEM_LIBDIR}/test/fixtures/public/stylesheets
+@dirrm ${GEM_LIBDIR}/test/fixtures/public/javascripts
+@dirrm ${GEM_LIBDIR}/test/fixtures/public/images
+@dirrm ${GEM_LIBDIR}/test/fixtures/public
+@dirrm ${GEM_LIBDIR}/test/fixtures/post_test/super_post
+@dirrm ${GEM_LIBDIR}/test/fixtures/post_test/post
+@dirrm ${GEM_LIBDIR}/test/fixtures/post_test/layouts
+@dirrm ${GEM_LIBDIR}/test/fixtures/post_test
+@dirrm ${GEM_LIBDIR}/test/fixtures/override2/layouts/test
+@dirrm ${GEM_LIBDIR}/test/fixtures/override2/layouts
+@dirrm ${GEM_LIBDIR}/test/fixtures/override2
+@dirrm ${GEM_LIBDIR}/test/fixtures/override/test
+@dirrm ${GEM_LIBDIR}/test/fixtures/override
+@dirrm ${GEM_LIBDIR}/test/fixtures/multipart
+@dirrm ${GEM_LIBDIR}/test/fixtures/layouts
+@dirrm ${GEM_LIBDIR}/test/fixtures/layout_tests/views
+@dirrm ${GEM_LIBDIR}/test/fixtures/layout_tests/layouts/controller_name_space
+@dirrm ${GEM_LIBDIR}/test/fixtures/layout_tests/layouts
+@dirrm ${GEM_LIBDIR}/test/fixtures/layout_tests/alt
+@dirrm ${GEM_LIBDIR}/test/fixtures/layout_tests
+@dirrm ${GEM_LIBDIR}/test/fixtures/helpers/fun
+@dirrm ${GEM_LIBDIR}/test/fixtures/helpers
+@dirrm ${GEM_LIBDIR}/test/fixtures/fun/games
+@dirrm ${GEM_LIBDIR}/test/fixtures/fun
+@dirrm ${GEM_LIBDIR}/test/fixtures/db_definitions
+@dirrm ${GEM_LIBDIR}/test/fixtures/content_type
+@dirrm ${GEM_LIBDIR}/test/fixtures/addresses
+@dirrm ${GEM_LIBDIR}/test/fixtures
+@dirrm ${GEM_LIBDIR}/test/controller/session
+@dirrm ${GEM_LIBDIR}/test/controller/html-scanner
+@dirrm ${GEM_LIBDIR}/test/controller/deprecation
+@dirrm ${GEM_LIBDIR}/test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib
+@dirrm ${GEM_LIBDIR}/test/controller/controller_fixtures/vendor/plugins/bad_plugin
+@dirrm ${GEM_LIBDIR}/test/controller/controller_fixtures/vendor/plugins
+@dirrm ${GEM_LIBDIR}/test/controller/controller_fixtures/vendor
+@dirrm ${GEM_LIBDIR}/test/controller/controller_fixtures/app/controllers/admin
+@dirrm ${GEM_LIBDIR}/test/controller/controller_fixtures/app/controllers
+@dirrm ${GEM_LIBDIR}/test/controller/controller_fixtures/app
+@dirrm ${GEM_LIBDIR}/test/controller/controller_fixtures
+@dirrm ${GEM_LIBDIR}/test/controller
+@dirrm ${GEM_LIBDIR}/test/activerecord
+@dirrm ${GEM_LIBDIR}/test
+@dirrm ${GEM_LIBDIR}/lib/action_view/template_handlers
+@dirrm ${GEM_LIBDIR}/lib/action_view/helpers/javascripts
+@dirrm ${GEM_LIBDIR}/lib/action_view/helpers
+@dirrm ${GEM_LIBDIR}/lib/action_view
+@dirrm ${GEM_LIBDIR}/lib/action_pack
+@dirrm ${GEM_LIBDIR}/lib/action_controller/vendor/html-scanner/html
+@dirrm ${GEM_LIBDIR}/lib/action_controller/vendor/html-scanner
+@dirrm ${GEM_LIBDIR}/lib/action_controller/vendor
+@dirrm ${GEM_LIBDIR}/lib/action_controller/templates/rescues
+@dirrm ${GEM_LIBDIR}/lib/action_controller/templates
+@dirrm ${GEM_LIBDIR}/lib/action_controller/session
+@dirrm ${GEM_LIBDIR}/lib/action_controller/cgi_ext
+@dirrm ${GEM_LIBDIR}/lib/action_controller/assertions
+@dirrm ${GEM_LIBDIR}/lib/action_controller
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}
diff --git a/www/ruby-actionpack/distinfo b/www/ruby-actionpack/distinfo
index 8bbf397fdb6..31c7af8026c 100644
--- a/www/ruby-actionpack/distinfo
+++ b/www/ruby-actionpack/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2008/02/09 06:23:29 minskim Exp $
+$NetBSD: distinfo,v 1.13 2008/04/04 15:30:02 jlam Exp $
 
-SHA1 (actionpack-2.0.2.tgz) = 4c0826f0800a31d85570c2e15f5f0ee51cc61975
-RMD160 (actionpack-2.0.2.tgz) = 7b21059840936da297421327766b5e2ee5b9d46d
-Size (actionpack-2.0.2.tgz) = 707629 bytes
+SHA1 (actionpack-2.0.2.gem) = 90afb3597274565f56cc489e0fdfc139157f7035
+RMD160 (actionpack-2.0.2.gem) = fff4c35d844553f3298f2f1f5c0d384ed3673b3e
+Size (actionpack-2.0.2.gem) = 711168 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
deleted file mode 100644
index 27dbf5c2089..00000000000
--- a/www/ruby-actionpack/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
-