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

directly into site_ruby.

5 files changed, 331 insertions, 126 deletions

diff --git a/databases/ruby-activerecord/Makefile b/databases/ruby-activerecord/Makefile
index 323e7bda009..c811c2e634e 100644
--- a/databases/ruby-activerecord/Makefile
+++ b/databases/ruby-activerecord/Makefile
@@ -1,32 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2008/02/09 06:20:25 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/04 15:30:00 jlam Exp $
 
 DISTNAME=	activerecord-2.0.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES=	databases ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/29348/
-EXTRACT_SUFX=	.tgz
+PKGREVISION=	1
+CATEGORIES=	databases
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/activerecord/
 COMMENT=	Object-relation mapping put on rails
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.0.2:../../devel/ruby-activesupport
-
-NO_BUILD=		yes
-NO_CONFIGURE=		yes
-USE_RUBY_INSTALL=	yes
-EXAMPLES=		associations.png
-
-.include "../../lang/ruby/modules.mk"
-
-post-install:
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/active_record
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${RUBY_DOCDIR}/active_record
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/active_record
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/active_record
-.for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/examples/${f} \
-		${RUBY_EXAMPLESDIR}/active_record
-.endfor
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.0.2nb1:../../devel/ruby-activesupport
 
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-activerecord/PLIST b/databases/ruby-activerecord/PLIST
index b747bf4f645..f018370bed8 100644
--- a/databases/ruby-activerecord/PLIST
+++ b/databases/ruby-activerecord/PLIST
@@ -1,57 +1,322 @@
-@comment $NetBSD: PLIST,v 1.10 2008/02/09 06:20:25 minskim Exp $
-${RUBY_SITELIBDIR}/active_record.rb
-${RUBY_SITELIBDIR}/active_record/aggregations.rb
-${RUBY_SITELIBDIR}/active_record/associations.rb
-${RUBY_SITELIBDIR}/active_record/associations/association_collection.rb
-${RUBY_SITELIBDIR}/active_record/associations/association_proxy.rb
-${RUBY_SITELIBDIR}/active_record/associations/belongs_to_association.rb
-${RUBY_SITELIBDIR}/active_record/associations/belongs_to_polymorphic_association.rb
-${RUBY_SITELIBDIR}/active_record/associations/has_and_belongs_to_many_association.rb
-${RUBY_SITELIBDIR}/active_record/associations/has_many_association.rb
-${RUBY_SITELIBDIR}/active_record/associations/has_many_through_association.rb
-${RUBY_SITELIBDIR}/active_record/associations/has_one_association.rb
-${RUBY_SITELIBDIR}/active_record/attribute_methods.rb
-${RUBY_SITELIBDIR}/active_record/base.rb
-${RUBY_SITELIBDIR}/active_record/calculations.rb
-${RUBY_SITELIBDIR}/active_record/callbacks.rb
-${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/connection_specification.rb
-${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/database_statements.rb
-${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/query_cache.rb
-${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/quoting.rb
-${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/schema_definitions.rb
-${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/schema_statements.rb
-${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract_adapter.rb
-${RUBY_SITELIBDIR}/active_record/connection_adapters/mysql_adapter.rb
-${RUBY_SITELIBDIR}/active_record/connection_adapters/postgresql_adapter.rb
-${RUBY_SITELIBDIR}/active_record/connection_adapters/sqlite3_adapter.rb
-${RUBY_SITELIBDIR}/active_record/connection_adapters/sqlite_adapter.rb
-${RUBY_SITELIBDIR}/active_record/fixtures.rb
-${RUBY_SITELIBDIR}/active_record/locking/optimistic.rb
-${RUBY_SITELIBDIR}/active_record/locking/pessimistic.rb
-${RUBY_SITELIBDIR}/active_record/migration.rb
-${RUBY_SITELIBDIR}/active_record/observer.rb
-${RUBY_SITELIBDIR}/active_record/query_cache.rb
-${RUBY_SITELIBDIR}/active_record/reflection.rb
-${RUBY_SITELIBDIR}/active_record/schema.rb
-${RUBY_SITELIBDIR}/active_record/schema_dumper.rb
-${RUBY_SITELIBDIR}/active_record/serialization.rb
-${RUBY_SITELIBDIR}/active_record/serializers/json_serializer.rb
-${RUBY_SITELIBDIR}/active_record/serializers/xml_serializer.rb
-${RUBY_SITELIBDIR}/active_record/timestamp.rb
-${RUBY_SITELIBDIR}/active_record/transactions.rb
-${RUBY_SITELIBDIR}/active_record/validations.rb
-${RUBY_SITELIBDIR}/active_record/vendor/db2.rb
-${RUBY_SITELIBDIR}/active_record/vendor/mysql.rb
-${RUBY_SITELIBDIR}/active_record/version.rb
-${RUBY_DOCDIR}/active_record/CHANGELOG
-${RUBY_DOCDIR}/active_record/README
-${RUBY_EXAMPLESDIR}/active_record/associations.png
-@dirrm ${RUBY_EXAMPLESDIR}/active_record
-@dirrm ${RUBY_DOCDIR}/active_record
-@dirrm ${RUBY_SITELIBDIR}/active_record/vendor
-@dirrm ${RUBY_SITELIBDIR}/active_record/serializers
-@dirrm ${RUBY_SITELIBDIR}/active_record/locking
-@dirrm ${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract
-@dirrm ${RUBY_SITELIBDIR}/active_record/connection_adapters
-@dirrm ${RUBY_SITELIBDIR}/active_record/associations
-@dirrm ${RUBY_SITELIBDIR}/active_record
+@comment $NetBSD: PLIST,v 1.11 2008/04/04 15:30:00 jlam Exp $
+${GEM_HOME}/cache/activerecord-${PKGVERSION}.gem
+${GEM_LIBDIR}/CHANGELOG
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/RUNNING_UNIT_TESTS
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/examples/associations.png
+${GEM_LIBDIR}/install.rb
+${GEM_LIBDIR}/lib/active_record.rb
+${GEM_LIBDIR}/lib/active_record/aggregations.rb
+${GEM_LIBDIR}/lib/active_record/associations.rb
+${GEM_LIBDIR}/lib/active_record/associations/association_collection.rb
+${GEM_LIBDIR}/lib/active_record/associations/association_proxy.rb
+${GEM_LIBDIR}/lib/active_record/associations/belongs_to_association.rb
+${GEM_LIBDIR}/lib/active_record/associations/belongs_to_polymorphic_association.rb
+${GEM_LIBDIR}/lib/active_record/associations/has_and_belongs_to_many_association.rb
+${GEM_LIBDIR}/lib/active_record/associations/has_many_association.rb
+${GEM_LIBDIR}/lib/active_record/associations/has_many_through_association.rb
+${GEM_LIBDIR}/lib/active_record/associations/has_one_association.rb
+${GEM_LIBDIR}/lib/active_record/attribute_methods.rb
+${GEM_LIBDIR}/lib/active_record/base.rb
+${GEM_LIBDIR}/lib/active_record/calculations.rb
+${GEM_LIBDIR}/lib/active_record/callbacks.rb
+${GEM_LIBDIR}/lib/active_record/connection_adapters/abstract/connection_specification.rb
+${GEM_LIBDIR}/lib/active_record/connection_adapters/abstract/database_statements.rb
+${GEM_LIBDIR}/lib/active_record/connection_adapters/abstract/query_cache.rb
+${GEM_LIBDIR}/lib/active_record/connection_adapters/abstract/quoting.rb
+${GEM_LIBDIR}/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+${GEM_LIBDIR}/lib/active_record/connection_adapters/abstract/schema_statements.rb
+${GEM_LIBDIR}/lib/active_record/connection_adapters/abstract_adapter.rb
+${GEM_LIBDIR}/lib/active_record/connection_adapters/mysql_adapter.rb
+${GEM_LIBDIR}/lib/active_record/connection_adapters/postgresql_adapter.rb
+${GEM_LIBDIR}/lib/active_record/connection_adapters/sqlite3_adapter.rb
+${GEM_LIBDIR}/lib/active_record/connection_adapters/sqlite_adapter.rb
+${GEM_LIBDIR}/lib/active_record/fixtures.rb
+${GEM_LIBDIR}/lib/active_record/locking/optimistic.rb
+${GEM_LIBDIR}/lib/active_record/locking/pessimistic.rb
+${GEM_LIBDIR}/lib/active_record/migration.rb
+${GEM_LIBDIR}/lib/active_record/observer.rb
+${GEM_LIBDIR}/lib/active_record/query_cache.rb
+${GEM_LIBDIR}/lib/active_record/reflection.rb
+${GEM_LIBDIR}/lib/active_record/schema.rb
+${GEM_LIBDIR}/lib/active_record/schema_dumper.rb
+${GEM_LIBDIR}/lib/active_record/serialization.rb
+${GEM_LIBDIR}/lib/active_record/serializers/json_serializer.rb
+${GEM_LIBDIR}/lib/active_record/serializers/xml_serializer.rb
+${GEM_LIBDIR}/lib/active_record/timestamp.rb
+${GEM_LIBDIR}/lib/active_record/transactions.rb
+${GEM_LIBDIR}/lib/active_record/validations.rb
+${GEM_LIBDIR}/lib/active_record/vendor/db2.rb
+${GEM_LIBDIR}/lib/active_record/vendor/mysql.rb
+${GEM_LIBDIR}/lib/active_record/version.rb
+${GEM_LIBDIR}/lib/activerecord.rb
+${GEM_LIBDIR}/test/aaa_create_tables_test.rb
+${GEM_LIBDIR}/test/abstract_unit.rb
+${GEM_LIBDIR}/test/active_schema_test_mysql.rb
+${GEM_LIBDIR}/test/adapter_test.rb
+${GEM_LIBDIR}/test/adapter_test_sqlserver.rb
+${GEM_LIBDIR}/test/aggregations_test.rb
+${GEM_LIBDIR}/test/all.sh
+${GEM_LIBDIR}/test/ar_schema_test.rb
+${GEM_LIBDIR}/test/association_inheritance_reload.rb
+${GEM_LIBDIR}/test/associations/callbacks_test.rb
+${GEM_LIBDIR}/test/associations/cascaded_eager_loading_test.rb
+${GEM_LIBDIR}/test/associations/eager_singularization_test.rb
+${GEM_LIBDIR}/test/associations/eager_test.rb
+${GEM_LIBDIR}/test/associations/extension_test.rb
+${GEM_LIBDIR}/test/associations/inner_join_association_test.rb
+${GEM_LIBDIR}/test/associations/join_model_test.rb
+${GEM_LIBDIR}/test/associations_test.rb
+${GEM_LIBDIR}/test/attribute_methods_test.rb
+${GEM_LIBDIR}/test/base_test.rb
+${GEM_LIBDIR}/test/binary_test.rb
+${GEM_LIBDIR}/test/calculations_test.rb
+${GEM_LIBDIR}/test/callbacks_test.rb
+${GEM_LIBDIR}/test/class_inheritable_attributes_test.rb
+${GEM_LIBDIR}/test/column_alias_test.rb
+${GEM_LIBDIR}/test/connection_test_firebird.rb
+${GEM_LIBDIR}/test/connection_test_mysql.rb
+${GEM_LIBDIR}/test/connections/native_db2/connection.rb
+${GEM_LIBDIR}/test/connections/native_firebird/connection.rb
+${GEM_LIBDIR}/test/connections/native_frontbase/connection.rb
+${GEM_LIBDIR}/test/connections/native_mysql/connection.rb
+${GEM_LIBDIR}/test/connections/native_openbase/connection.rb
+${GEM_LIBDIR}/test/connections/native_oracle/connection.rb
+${GEM_LIBDIR}/test/connections/native_postgresql/connection.rb
+${GEM_LIBDIR}/test/connections/native_sqlite/connection.rb
+${GEM_LIBDIR}/test/connections/native_sqlite3/connection.rb
+${GEM_LIBDIR}/test/connections/native_sqlite3/in_memory_connection.rb
+${GEM_LIBDIR}/test/connections/native_sybase/connection.rb
+${GEM_LIBDIR}/test/copy_table_test_sqlite.rb
+${GEM_LIBDIR}/test/datatype_test_postgresql.rb
+${GEM_LIBDIR}/test/date_time_test.rb
+${GEM_LIBDIR}/test/default_test_firebird.rb
+${GEM_LIBDIR}/test/defaults_test.rb
+${GEM_LIBDIR}/test/deprecated_finder_test.rb
+${GEM_LIBDIR}/test/finder_test.rb
+${GEM_LIBDIR}/test/fixtures/accounts.yml
+${GEM_LIBDIR}/test/fixtures/all/developers.yml
+${GEM_LIBDIR}/test/fixtures/all/people.csv
+${GEM_LIBDIR}/test/fixtures/all/tasks.yml
+${GEM_LIBDIR}/test/fixtures/author.rb
+${GEM_LIBDIR}/test/fixtures/author_favorites.yml
+${GEM_LIBDIR}/test/fixtures/authors.yml
+${GEM_LIBDIR}/test/fixtures/auto_id.rb
+${GEM_LIBDIR}/test/fixtures/bad_fixtures/attr_with_numeric_first_char
+${GEM_LIBDIR}/test/fixtures/bad_fixtures/attr_with_spaces
+${GEM_LIBDIR}/test/fixtures/bad_fixtures/blank_line
+${GEM_LIBDIR}/test/fixtures/bad_fixtures/duplicate_attributes
+${GEM_LIBDIR}/test/fixtures/bad_fixtures/missing_value
+${GEM_LIBDIR}/test/fixtures/binaries.yml
+${GEM_LIBDIR}/test/fixtures/binary.rb
+${GEM_LIBDIR}/test/fixtures/book.rb
+${GEM_LIBDIR}/test/fixtures/books.yml
+${GEM_LIBDIR}/test/fixtures/categories.yml
+${GEM_LIBDIR}/test/fixtures/categories/special_categories.yml
+${GEM_LIBDIR}/test/fixtures/categories/subsubdir/arbitrary_filename.yml
+${GEM_LIBDIR}/test/fixtures/categories_ordered.yml
+${GEM_LIBDIR}/test/fixtures/categories_posts.yml
+${GEM_LIBDIR}/test/fixtures/categorization.rb
+${GEM_LIBDIR}/test/fixtures/categorizations.yml
+${GEM_LIBDIR}/test/fixtures/category.rb
+${GEM_LIBDIR}/test/fixtures/citation.rb
+${GEM_LIBDIR}/test/fixtures/column_name.rb
+${GEM_LIBDIR}/test/fixtures/comment.rb
+${GEM_LIBDIR}/test/fixtures/comments.yml
+${GEM_LIBDIR}/test/fixtures/companies.yml
+${GEM_LIBDIR}/test/fixtures/company.rb
+${GEM_LIBDIR}/test/fixtures/company_in_module.rb
+${GEM_LIBDIR}/test/fixtures/computer.rb
+${GEM_LIBDIR}/test/fixtures/computers.yml
+${GEM_LIBDIR}/test/fixtures/contact.rb
+${GEM_LIBDIR}/test/fixtures/course.rb
+${GEM_LIBDIR}/test/fixtures/courses.yml
+${GEM_LIBDIR}/test/fixtures/customer.rb
+${GEM_LIBDIR}/test/fixtures/customers.yml
+${GEM_LIBDIR}/test/fixtures/db_definitions/db2.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/db2.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/db22.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/db22.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/firebird.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/firebird.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/firebird2.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/firebird2.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/frontbase.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/frontbase.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/frontbase2.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/frontbase2.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/openbase.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/openbase.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/openbase2.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/openbase2.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/oracle.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/oracle.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/oracle2.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/oracle2.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/postgresql.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/postgresql.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/postgresql2.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/postgresql2.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/schema.rb
+${GEM_LIBDIR}/test/fixtures/db_definitions/schema2.rb
+${GEM_LIBDIR}/test/fixtures/db_definitions/sqlite.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/sqlite.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/sqlite2.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/sqlite2.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/sybase.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/sybase.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/sybase2.drop.sql
+${GEM_LIBDIR}/test/fixtures/db_definitions/sybase2.sql
+${GEM_LIBDIR}/test/fixtures/default.rb
+${GEM_LIBDIR}/test/fixtures/developer.rb
+${GEM_LIBDIR}/test/fixtures/developers.yml
+${GEM_LIBDIR}/test/fixtures/developers_projects.yml
+${GEM_LIBDIR}/test/fixtures/developers_projects/david_action_controller
+${GEM_LIBDIR}/test/fixtures/developers_projects/david_active_record
+${GEM_LIBDIR}/test/fixtures/developers_projects/jamis_active_record
+${GEM_LIBDIR}/test/fixtures/edge.rb
+${GEM_LIBDIR}/test/fixtures/edges.yml
+${GEM_LIBDIR}/test/fixtures/entrant.rb
+${GEM_LIBDIR}/test/fixtures/entrants.yml
+${GEM_LIBDIR}/test/fixtures/example.log
+${GEM_LIBDIR}/test/fixtures/fk_test_has_fk.yml
+${GEM_LIBDIR}/test/fixtures/fk_test_has_pk.yml
+${GEM_LIBDIR}/test/fixtures/flowers.jpg
+${GEM_LIBDIR}/test/fixtures/funny_jokes.yml
+${GEM_LIBDIR}/test/fixtures/item.rb
+${GEM_LIBDIR}/test/fixtures/items.yml
+${GEM_LIBDIR}/test/fixtures/joke.rb
+${GEM_LIBDIR}/test/fixtures/keyboard.rb
+${GEM_LIBDIR}/test/fixtures/legacy_thing.rb
+${GEM_LIBDIR}/test/fixtures/legacy_things.yml
+${GEM_LIBDIR}/test/fixtures/matey.rb
+${GEM_LIBDIR}/test/fixtures/mateys.yml
+${GEM_LIBDIR}/test/fixtures/migrations/1_people_have_last_names.rb
+${GEM_LIBDIR}/test/fixtures/migrations/2_we_need_reminders.rb
+${GEM_LIBDIR}/test/fixtures/migrations/3_innocent_jointable.rb
+${GEM_LIBDIR}/test/fixtures/migrations_with_decimal/1_give_me_big_numbers.rb
+${GEM_LIBDIR}/test/fixtures/migrations_with_duplicate/1_people_have_last_names.rb
+${GEM_LIBDIR}/test/fixtures/migrations_with_duplicate/2_we_need_reminders.rb
+${GEM_LIBDIR}/test/fixtures/migrations_with_duplicate/3_foo.rb
+${GEM_LIBDIR}/test/fixtures/migrations_with_duplicate/3_innocent_jointable.rb
+${GEM_LIBDIR}/test/fixtures/migrations_with_missing_versions/1000_people_have_middle_names.rb
+${GEM_LIBDIR}/test/fixtures/migrations_with_missing_versions/1_people_have_last_names.rb
+${GEM_LIBDIR}/test/fixtures/migrations_with_missing_versions/3_we_need_reminders.rb
+${GEM_LIBDIR}/test/fixtures/migrations_with_missing_versions/4_innocent_jointable.rb
+${GEM_LIBDIR}/test/fixtures/minimalistic.rb
+${GEM_LIBDIR}/test/fixtures/minimalistics.yml
+${GEM_LIBDIR}/test/fixtures/mixed_case_monkey.rb
+${GEM_LIBDIR}/test/fixtures/mixed_case_monkeys.yml
+${GEM_LIBDIR}/test/fixtures/mixins.yml
+${GEM_LIBDIR}/test/fixtures/movie.rb
+${GEM_LIBDIR}/test/fixtures/movies.yml
+${GEM_LIBDIR}/test/fixtures/naked/csv/accounts.csv
+${GEM_LIBDIR}/test/fixtures/naked/yml/accounts.yml
+${GEM_LIBDIR}/test/fixtures/naked/yml/companies.yml
+${GEM_LIBDIR}/test/fixtures/naked/yml/courses.yml
+${GEM_LIBDIR}/test/fixtures/order.rb
+${GEM_LIBDIR}/test/fixtures/parrot.rb
+${GEM_LIBDIR}/test/fixtures/parrots.yml
+${GEM_LIBDIR}/test/fixtures/parrots_pirates.yml
+${GEM_LIBDIR}/test/fixtures/people.yml
+${GEM_LIBDIR}/test/fixtures/person.rb
+${GEM_LIBDIR}/test/fixtures/pirate.rb
+${GEM_LIBDIR}/test/fixtures/pirates.yml
+${GEM_LIBDIR}/test/fixtures/post.rb
+${GEM_LIBDIR}/test/fixtures/posts.yml
+${GEM_LIBDIR}/test/fixtures/project.rb
+${GEM_LIBDIR}/test/fixtures/projects.yml
+${GEM_LIBDIR}/test/fixtures/reader.rb
+${GEM_LIBDIR}/test/fixtures/readers.yml
+${GEM_LIBDIR}/test/fixtures/reply.rb
+${GEM_LIBDIR}/test/fixtures/reserved_words/distinct.yml
+${GEM_LIBDIR}/test/fixtures/reserved_words/distincts_selects.yml
+${GEM_LIBDIR}/test/fixtures/reserved_words/group.yml
+${GEM_LIBDIR}/test/fixtures/reserved_words/select.yml
+${GEM_LIBDIR}/test/fixtures/reserved_words/values.yml
+${GEM_LIBDIR}/test/fixtures/ship.rb
+${GEM_LIBDIR}/test/fixtures/ships.yml
+${GEM_LIBDIR}/test/fixtures/subject.rb
+${GEM_LIBDIR}/test/fixtures/subscriber.rb
+${GEM_LIBDIR}/test/fixtures/subscribers/first
+${GEM_LIBDIR}/test/fixtures/subscribers/second
+${GEM_LIBDIR}/test/fixtures/tag.rb
+${GEM_LIBDIR}/test/fixtures/tagging.rb
+${GEM_LIBDIR}/test/fixtures/taggings.yml
+${GEM_LIBDIR}/test/fixtures/tags.yml
+${GEM_LIBDIR}/test/fixtures/task.rb
+${GEM_LIBDIR}/test/fixtures/tasks.yml
+${GEM_LIBDIR}/test/fixtures/topic.rb
+${GEM_LIBDIR}/test/fixtures/topics.yml
+${GEM_LIBDIR}/test/fixtures/treasure.rb
+${GEM_LIBDIR}/test/fixtures/treasures.yml
+${GEM_LIBDIR}/test/fixtures/vertex.rb
+${GEM_LIBDIR}/test/fixtures/vertices.yml
+${GEM_LIBDIR}/test/fixtures_test.rb
+${GEM_LIBDIR}/test/inheritance_test.rb
+${GEM_LIBDIR}/test/json_serialization_test.rb
+${GEM_LIBDIR}/test/lifecycle_test.rb
+${GEM_LIBDIR}/test/locking_test.rb
+${GEM_LIBDIR}/test/method_scoping_test.rb
+${GEM_LIBDIR}/test/migration_test.rb
+${GEM_LIBDIR}/test/migration_test_firebird.rb
+${GEM_LIBDIR}/test/mixin_test.rb
+${GEM_LIBDIR}/test/modules_test.rb
+${GEM_LIBDIR}/test/multiple_db_test.rb
+${GEM_LIBDIR}/test/pk_test.rb
+${GEM_LIBDIR}/test/query_cache_test.rb
+${GEM_LIBDIR}/test/readonly_test.rb
+${GEM_LIBDIR}/test/reflection_test.rb
+${GEM_LIBDIR}/test/reserved_word_test_mysql.rb
+${GEM_LIBDIR}/test/schema_authorization_test_postgresql.rb
+${GEM_LIBDIR}/test/schema_dumper_test.rb
+${GEM_LIBDIR}/test/schema_test_postgresql.rb
+${GEM_LIBDIR}/test/serialization_test.rb
+${GEM_LIBDIR}/test/synonym_test_oracle.rb
+${GEM_LIBDIR}/test/table_name_test_sqlserver.rb
+${GEM_LIBDIR}/test/threaded_connections_test.rb
+${GEM_LIBDIR}/test/transactions_test.rb
+${GEM_LIBDIR}/test/unconnected_test.rb
+${GEM_LIBDIR}/test/validations_test.rb
+${GEM_LIBDIR}/test/xml_serialization_test.rb
+${GEM_HOME}/specifications/activerecord-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/test/fixtures/subscribers
+@dirrm ${GEM_LIBDIR}/test/fixtures/reserved_words
+@dirrm ${GEM_LIBDIR}/test/fixtures/naked/yml
+@dirrm ${GEM_LIBDIR}/test/fixtures/naked/csv
+@dirrm ${GEM_LIBDIR}/test/fixtures/naked
+@dirrm ${GEM_LIBDIR}/test/fixtures/migrations_with_missing_versions
+@dirrm ${GEM_LIBDIR}/test/fixtures/migrations_with_duplicate
+@dirrm ${GEM_LIBDIR}/test/fixtures/migrations_with_decimal
+@dirrm ${GEM_LIBDIR}/test/fixtures/migrations
+@dirrm ${GEM_LIBDIR}/test/fixtures/developers_projects
+@dirrm ${GEM_LIBDIR}/test/fixtures/db_definitions
+@dirrm ${GEM_LIBDIR}/test/fixtures/categories/subsubdir
+@dirrm ${GEM_LIBDIR}/test/fixtures/categories
+@dirrm ${GEM_LIBDIR}/test/fixtures/bad_fixtures
+@dirrm ${GEM_LIBDIR}/test/fixtures/all
+@dirrm ${GEM_LIBDIR}/test/fixtures
+@dirrm ${GEM_LIBDIR}/test/connections/native_sybase
+@dirrm ${GEM_LIBDIR}/test/connections/native_sqlite3
+@dirrm ${GEM_LIBDIR}/test/connections/native_sqlite
+@dirrm ${GEM_LIBDIR}/test/connections/native_postgresql
+@dirrm ${GEM_LIBDIR}/test/connections/native_oracle
+@dirrm ${GEM_LIBDIR}/test/connections/native_openbase
+@dirrm ${GEM_LIBDIR}/test/connections/native_mysql
+@dirrm ${GEM_LIBDIR}/test/connections/native_frontbase
+@dirrm ${GEM_LIBDIR}/test/connections/native_firebird
+@dirrm ${GEM_LIBDIR}/test/connections/native_db2
+@dirrm ${GEM_LIBDIR}/test/connections
+@dirrm ${GEM_LIBDIR}/test/associations
+@dirrm ${GEM_LIBDIR}/test
+@dirrm ${GEM_LIBDIR}/lib/active_record/vendor
+@dirrm ${GEM_LIBDIR}/lib/active_record/serializers
+@dirrm ${GEM_LIBDIR}/lib/active_record/locking
+@dirrm ${GEM_LIBDIR}/lib/active_record/connection_adapters/abstract
+@dirrm ${GEM_LIBDIR}/lib/active_record/connection_adapters
+@dirrm ${GEM_LIBDIR}/lib/active_record/associations
+@dirrm ${GEM_LIBDIR}/lib/active_record
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/examples
+@dirrm ${GEM_LIBDIR}
diff --git a/databases/ruby-activerecord/distinfo b/databases/ruby-activerecord/distinfo
index 8a79292e633..2cecb1feab1 100644
--- a/databases/ruby-activerecord/distinfo
+++ b/databases/ruby-activerecord/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.11 2008/02/09 06:20:25 minskim Exp $
+$NetBSD: distinfo,v 1.12 2008/04/04 15:30:00 jlam Exp $
 
-SHA1 (activerecord-2.0.2.tgz) = f16bc4332814c2dbb1f58b736aecd2950acaeb4b
-RMD160 (activerecord-2.0.2.tgz) = 80d6678e773d0c0cfcf4ca5529152e8a441a1fe1
-Size (activerecord-2.0.2.tgz) = 422583 bytes
-SHA1 (patch-aa) = 72ffb3910a719ed02daf90c9b80c24d9ebee6696
-SHA1 (patch-ab) = 1c195d73f21452ffe5d7ed51e09707332e78d06e
+SHA1 (activerecord-2.0.2.gem) = 9a7a0356fd20e65dd61d2a2c8441ad336c2fba80
+RMD160 (activerecord-2.0.2.gem) = fe105181e94577fbd96619b703e888df5198707e
+Size (activerecord-2.0.2.gem) = 422400 bytes
diff --git a/databases/ruby-activerecord/patches/patch-aa b/databases/ruby-activerecord/patches/patch-aa
deleted file mode 100644
index 11f2cd25034..00000000000
--- a/databases/ruby-activerecord/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/02/09 06:20:25 minskim Exp $
-
---- lib/active_record.rb.orig	2008-02-08 21:45:03.000000000 -0800
-+++ lib/active_record.rb
-@@ -25,15 +25,7 @@ $:.unshift(File.dirname(__FILE__)) unles
-   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
- 
- unless defined? ActiveSupport
--  active_support_path = File.dirname(__FILE__) + "/../../activesupport/lib"
--  if File.exist?(active_support_path)
--    $:.unshift active_support_path
--    require 'active_support'
--  else
--    require 'rubygems'
--    gem 'activesupport'
--    require 'active_support'
--  end
-+  require 'active_support'
- end
- 
- require 'active_record/base'
diff --git a/databases/ruby-activerecord/patches/patch-ab b/databases/ruby-activerecord/patches/patch-ab
deleted file mode 100644
index 6d4813d5894..00000000000
--- a/databases/ruby-activerecord/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/02/09 06:20:25 minskim Exp $
-
---- lib/active_record/connection_adapters/abstract/connection_specification.rb.orig	2008-02-08 21:48:27.000000000 -0800
-+++ lib/active_record/connection_adapters/abstract/connection_specification.rb
-@@ -221,15 +221,7 @@ module ActiveRecord
-           unless spec.key?(:adapter) then raise AdapterNotSpecified, "database configuration does not specify adapter" end
- 
-           begin
--            require 'rubygems'
--            gem "activerecord-#{spec[:adapter]}-adapter"
-             require "active_record/connection_adapters/#{spec[:adapter]}_adapter"
--          rescue LoadError
--            begin
--              require "active_record/connection_adapters/#{spec[:adapter]}_adapter"
--            rescue LoadError
--              raise "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{$!})"
--            end
-           end
- 
-           adapter_method = "#{spec[:adapter]}_connection"