Update ruby-datamapper package to 1.0.2.

Now ruby-datamapper is a "meta-gem" package like a meta-package in pkgsrc.

* Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk.
* Add LICENSE.
* Ajust new ruby package's framework.
* Update dependency according to gemspec.

5 files changed, 43 insertions, 213 deletions

diff --git a/databases/ruby-datamapper/DESCR b/databases/ruby-datamapper/DESCR
index e8217fc31cb..b2fed410f33 100644
--- a/databases/ruby-datamapper/DESCR
+++ b/databases/ruby-datamapper/DESCR
@@ -1,3 +1,15 @@
-DataMapper is a Object Relational Mapper written in Ruby.  The goal
-is to create an ORM which is fast, thread-safe and feature-rich with
-ActiveRecord-compatibility.
+= datamapper
+
+datamapper is a meta gem which requires and includes the most
+commonly used gems from dm-core, dm-more, and others.
+
+Included gems are:
+*  dm-core
+*  dm-aggregates
+*  dm-constraints
+*  dm-migrations
+*  dm-transactions
+*  dm-serializer
+*  dm-timestamps
+*  dm-validations
+*  dm-types
diff --git a/databases/ruby-datamapper/Makefile b/databases/ruby-datamapper/Makefile
index ff7050c237d..a7b659829b5 100644
--- a/databases/ruby-datamapper/Makefile
+++ b/databases/ruby-datamapper/Makefile
@@ -1,16 +1,23 @@
-# $NetBSD: Makefile,v 1.4 2008/09/16 06:28:48 taca Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/12 00:01:14 taca Exp $
 
-DISTNAME=	datamapper-0.3.2
-PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+DISTNAME=	datamapper-1.0.2
 CATEGORIES=	databases
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.datamapper.org/
-COMMENT=	Fast, thread-safe, object-relational mapper
+COMMENT=	Object/Relational Mapper for Ruby
+LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-json-pure>=1.1.2:../../textproc/ruby-json-pure
-DEPENDS+=	${RUBY_PKGPREFIX}-rspec>=1.1.3:../../devel/ruby-rspec
-DEPENDS+=	${RUBY_PKGPREFIX}-validatable>=1.6.7:../../devel/ruby-validatable
+DEPENDS+= \
+  ${RUBY_PKGPREFIX}-dm-core>=1.0.2:../../databases/ruby-dm-core \
+  ${RUBY_PKGPREFIX}-dm-aggregates>=1.0.2:../../databases/ruby-dm-aggregates \
+  ${RUBY_PKGPREFIX}-dm-constraints>=1.0.2:../../databases/ruby-dm-constraints \
+  ${RUBY_PKGPREFIX}-dm-migrations>=1.0.2:../../databases/ruby-dm-migrations \
+  ${RUBY_PKGPREFIX}-dm-transactions>=1.0.2:../../databases/ruby-dm-transactions \
+  ${RUBY_PKGPREFIX}-dm-serializer>=1.0.2:../../databases/ruby-dm-serializer \
+  ${RUBY_PKGPREFIX}-dm-timestamps>=1.0.2:../../databases/ruby-dm-timestamps \
+  ${RUBY_PKGPREFIX}-dm-validations>=1.0.2:../../databases/ruby-dm-validations \
+  ${RUBY_PKGPREFIX}-dm-types>=1.0.2:../../databases/ruby-dm-types
 
-.include "../../misc/rubygems/rubygem.mk"
+.include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-datamapper/PLIST b/databases/ruby-datamapper/PLIST
index 85f46e6303f..95f2cf5d696 100644
--- a/databases/ruby-datamapper/PLIST
+++ b/databases/ruby-datamapper/PLIST
@@ -1,177 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:43:24 joerg Exp $
-${GEM_HOME}/cache/datamapper-${PKGVERSION}.gem
-${GEM_LIBDIR}/CHANGELOG
-${GEM_LIBDIR}/FAQ
-${GEM_LIBDIR}/MIT-LICENSE
-${GEM_LIBDIR}/QUICKLINKS
-${GEM_LIBDIR}/README
-${GEM_LIBDIR}/environment.rb
-${GEM_LIBDIR}/example.rb
-${GEM_LIBDIR}/lib/data_mapper.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/abstract_adapter.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/data_object_adapter.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/mysql_adapter.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/postgresql_adapter.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/sql/coersion.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/sql/commands/load_command.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/sql/mappings/associations_set.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/sql/mappings/column.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/sql/mappings/conditions.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/sql/mappings/schema.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/sql/mappings/table.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/sql/quoting.rb
-${GEM_LIBDIR}/lib/data_mapper/adapters/sqlite3_adapter.rb
-${GEM_LIBDIR}/lib/data_mapper/associations.rb
-${GEM_LIBDIR}/lib/data_mapper/associations/belongs_to_association.rb
-${GEM_LIBDIR}/lib/data_mapper/associations/has_and_belongs_to_many_association.rb
-${GEM_LIBDIR}/lib/data_mapper/associations/has_many_association.rb
-${GEM_LIBDIR}/lib/data_mapper/associations/has_n_association.rb
-${GEM_LIBDIR}/lib/data_mapper/associations/reference.rb
-${GEM_LIBDIR}/lib/data_mapper/attributes.rb
-${GEM_LIBDIR}/lib/data_mapper/auto_migrations.rb
-${GEM_LIBDIR}/lib/data_mapper/base.rb
-${GEM_LIBDIR}/lib/data_mapper/callbacks.rb
-${GEM_LIBDIR}/lib/data_mapper/context.rb
-${GEM_LIBDIR}/lib/data_mapper/database.rb
-${GEM_LIBDIR}/lib/data_mapper/dependency_queue.rb
-${GEM_LIBDIR}/lib/data_mapper/embedded_value.rb
-${GEM_LIBDIR}/lib/data_mapper/identity_map.rb
-${GEM_LIBDIR}/lib/data_mapper/is/tree.rb
-${GEM_LIBDIR}/lib/data_mapper/migration.rb
-${GEM_LIBDIR}/lib/data_mapper/persistence.rb
-${GEM_LIBDIR}/lib/data_mapper/property.rb
-${GEM_LIBDIR}/lib/data_mapper/query.rb
-${GEM_LIBDIR}/lib/data_mapper/support/blank.rb
-${GEM_LIBDIR}/lib/data_mapper/support/connection_pool.rb
-${GEM_LIBDIR}/lib/data_mapper/support/enumerable.rb
-${GEM_LIBDIR}/lib/data_mapper/support/errors.rb
-${GEM_LIBDIR}/lib/data_mapper/support/inflector.rb
-${GEM_LIBDIR}/lib/data_mapper/support/object.rb
-${GEM_LIBDIR}/lib/data_mapper/support/serialization.rb
-${GEM_LIBDIR}/lib/data_mapper/support/silence.rb
-${GEM_LIBDIR}/lib/data_mapper/support/string.rb
-${GEM_LIBDIR}/lib/data_mapper/support/struct.rb
-${GEM_LIBDIR}/lib/data_mapper/support/symbol.rb
-${GEM_LIBDIR}/lib/data_mapper/support/typed_set.rb
-${GEM_LIBDIR}/lib/data_mapper/types/base.rb
-${GEM_LIBDIR}/lib/data_mapper/types/string.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/errors.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/macros.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validatable_instance_methods.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validation_base.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validations/formats/email.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validations/validates_acceptance_of.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validations/validates_confirmation_of.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validations/validates_each.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validations/validates_format_of.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validations/validates_length_of.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validations/validates_numericality_of.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validations/validates_presence_of.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validations/validates_true_for.rb
-${GEM_LIBDIR}/lib/data_mapper/validatable_extensions/validations/validates_uniqueness_of.rb
-${GEM_LIBDIR}/lib/data_mapper/validations.rb
-${GEM_LIBDIR}/lib/data_mapper/validations/number_validator.rb
-${GEM_LIBDIR}/lib/data_mapper/validations/string_validator.rb
-${GEM_LIBDIR}/lib/data_mapper/validations/validator.rb
-${GEM_LIBDIR}/performance.rb
-${GEM_LIBDIR}/plugins/can_has_sphinx/LICENSE
-${GEM_LIBDIR}/plugins/can_has_sphinx/README
-${GEM_LIBDIR}/plugins/can_has_sphinx/REVISION
-${GEM_LIBDIR}/plugins/can_has_sphinx/Rakefile
-${GEM_LIBDIR}/plugins/can_has_sphinx/init.rb
-${GEM_LIBDIR}/plugins/can_has_sphinx/install.rb
-${GEM_LIBDIR}/plugins/can_has_sphinx/lib/acts_as_sphinx.rb
-${GEM_LIBDIR}/plugins/can_has_sphinx/lib/sphinx.rb
-${GEM_LIBDIR}/plugins/can_has_sphinx/scripts/sphinx.sh
-${GEM_LIBDIR}/plugins/can_has_sphinx/tasks/acts_as_sphinx_tasks.rake
-${GEM_LIBDIR}/profile_data_mapper.rb
-${GEM_LIBDIR}/rakefile.rb
-${GEM_LIBDIR}/spec/acts_as_tree_spec.rb
-${GEM_LIBDIR}/spec/adapters/data_object_adapter_spec.rb
-${GEM_LIBDIR}/spec/associations/belongs_to_association_spec.rb
-${GEM_LIBDIR}/spec/associations/has_and_belongs_to_many_association_spec.rb
-${GEM_LIBDIR}/spec/associations/has_many_association_spec.rb
-${GEM_LIBDIR}/spec/attributes_spec.rb
-${GEM_LIBDIR}/spec/auto_migrations_spec.rb
-${GEM_LIBDIR}/spec/callbacks_spec.rb
-${GEM_LIBDIR}/spec/can_has_sphinx.rb
-${GEM_LIBDIR}/spec/coersion_spec.rb
-${GEM_LIBDIR}/spec/column_spec.rb
-${GEM_LIBDIR}/spec/count_command_spec.rb
-${GEM_LIBDIR}/spec/database_spec.rb
-${GEM_LIBDIR}/spec/dataobjects_spec.rb
-${GEM_LIBDIR}/spec/delete_command_spec.rb
-${GEM_LIBDIR}/spec/dependency_spec.rb
-${GEM_LIBDIR}/spec/embedded_value_spec.rb
-${GEM_LIBDIR}/spec/fixtures/animals.yaml
-${GEM_LIBDIR}/spec/fixtures/animals_exhibits.yaml
-${GEM_LIBDIR}/spec/fixtures/careers.yaml
-${GEM_LIBDIR}/spec/fixtures/comments.yaml
-${GEM_LIBDIR}/spec/fixtures/exhibits.yaml
-${GEM_LIBDIR}/spec/fixtures/fruit.yaml
-${GEM_LIBDIR}/spec/fixtures/people.yaml
-${GEM_LIBDIR}/spec/fixtures/posts.yaml
-${GEM_LIBDIR}/spec/fixtures/projects.yaml
-${GEM_LIBDIR}/spec/fixtures/sections.yaml
-${GEM_LIBDIR}/spec/fixtures/serializers.yaml
-${GEM_LIBDIR}/spec/fixtures/tasks.yaml
-${GEM_LIBDIR}/spec/fixtures/tasks_tasks.yaml
-${GEM_LIBDIR}/spec/fixtures/tomatoes.yaml
-${GEM_LIBDIR}/spec/fixtures/users.yaml
-${GEM_LIBDIR}/spec/fixtures/zoos.yaml
-${GEM_LIBDIR}/spec/is_a_tree_spec.rb
-${GEM_LIBDIR}/spec/legacy_spec.rb
-${GEM_LIBDIR}/spec/load_command_spec.rb
-${GEM_LIBDIR}/spec/magic_columns_spec.rb
-${GEM_LIBDIR}/spec/migration_spec.rb
-${GEM_LIBDIR}/spec/mock_adapter.rb
-${GEM_LIBDIR}/spec/models/animal.rb
-${GEM_LIBDIR}/spec/models/candidate.rb
-${GEM_LIBDIR}/spec/models/career.rb
-${GEM_LIBDIR}/spec/models/chain.rb
-${GEM_LIBDIR}/spec/models/comment.rb
-${GEM_LIBDIR}/spec/models/exhibit.rb
-${GEM_LIBDIR}/spec/models/fence.rb
-${GEM_LIBDIR}/spec/models/fruit.rb
-${GEM_LIBDIR}/spec/models/job.rb
-${GEM_LIBDIR}/spec/models/person.rb
-${GEM_LIBDIR}/spec/models/post.rb
-${GEM_LIBDIR}/spec/models/project.rb
-${GEM_LIBDIR}/spec/models/sales_person.rb
-${GEM_LIBDIR}/spec/models/section.rb
-${GEM_LIBDIR}/spec/models/serializer.rb
-${GEM_LIBDIR}/spec/models/task.rb
-${GEM_LIBDIR}/spec/models/tomato.rb
-${GEM_LIBDIR}/spec/models/user.rb
-${GEM_LIBDIR}/spec/models/zoo.rb
-${GEM_LIBDIR}/spec/natural_key_spec.rb
-${GEM_LIBDIR}/spec/paranoia_spec.rb
-${GEM_LIBDIR}/spec/persistence_spec.rb
-${GEM_LIBDIR}/spec/postgres_spec.rb
-${GEM_LIBDIR}/spec/property_spec.rb
-${GEM_LIBDIR}/spec/query_spec.rb
-${GEM_LIBDIR}/spec/save_command_spec.rb
-${GEM_LIBDIR}/spec/schema_spec.rb
-${GEM_LIBDIR}/spec/serialize_spec.rb
-${GEM_LIBDIR}/spec/single_table_inheritance_spec.rb
-${GEM_LIBDIR}/spec/spec_helper.rb
-${GEM_LIBDIR}/spec/support/blank_spec.rb
-${GEM_LIBDIR}/spec/support/inflector_spec.rb
-${GEM_LIBDIR}/spec/support/object_spec.rb
-${GEM_LIBDIR}/spec/support/serialization_spec.rb
-${GEM_LIBDIR}/spec/support/silence_spec.rb
-${GEM_LIBDIR}/spec/support/string_spec.rb
-${GEM_LIBDIR}/spec/support/struct_spec.rb
-${GEM_LIBDIR}/spec/support/typed_set_spec.rb
-${GEM_LIBDIR}/spec/symbolic_operators_spec.rb
-${GEM_LIBDIR}/spec/table_spec.rb
-${GEM_LIBDIR}/spec/types/string.rb
-${GEM_LIBDIR}/spec/validates_confirmation_of_spec.rb
-${GEM_LIBDIR}/spec/validates_format_of_spec.rb
-${GEM_LIBDIR}/spec/validates_length_of_spec.rb
-${GEM_LIBDIR}/spec/validates_uniqueness_of_spec.rb
-${GEM_LIBDIR}/spec/validations/number_validator.rb
-${GEM_LIBDIR}/spec/validations/string_validator.rb
-${GEM_LIBDIR}/spec/validations_spec.rb
-${GEM_LIBDIR}/tasks/fixtures.rb
-${GEM_HOME}/specifications/datamapper-${PKGVERSION}.gemspec
+@comment $NetBSD: PLIST,v 1.3 2010/09/12 00:01:14 taca Exp $
+${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_LIBDIR}/.gitignore
+${GEM_LIBDIR}/History.txt
+${GEM_LIBDIR}/Manifest.txt
+${GEM_LIBDIR}/README.txt
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/lib/datamapper.rb
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/databases/ruby-datamapper/distinfo b/databases/ruby-datamapper/distinfo
index d44d09fd5b2..4e8eb802182 100644
--- a/databases/ruby-datamapper/distinfo
+++ b/databases/ruby-datamapper/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/09/16 06:28:48 taca Exp $
+$NetBSD: distinfo,v 1.5 2010/09/12 00:01:14 taca Exp $
 
-SHA1 (datamapper-0.3.2.gem) = 2a628d93ee183d8831c106cc286ec34e27d2eddb
-RMD160 (datamapper-0.3.2.gem) = 792fe852cfdfe33a8ea8929f4d1de6584225b75b
-Size (datamapper-0.3.2.gem) = 115712 bytes
-SHA1 (patch-aa) = e4a0a1d970b9addaf921c8a63df40b3723739bb6
+SHA1 (datamapper-1.0.2.gem) = bbbf97da8573a667e3fb229bdd1e2f7557324f9e
+RMD160 (datamapper-1.0.2.gem) = 4df33a82728abc13d580817f501aa997ecca61ae
+Size (datamapper-1.0.2.gem) = 5120 bytes
diff --git a/databases/ruby-datamapper/patches/patch-aa b/databases/ruby-datamapper/patches/patch-aa
deleted file mode 100644
index db0e3648c08..00000000000
--- a/databases/ruby-datamapper/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/04/04 15:15:42 jlam Exp $
-
---- rakefile.rb.orig	2008-03-31 17:42:10.000000000 -0400
-+++ rakefile.rb
-@@ -122,12 +122,12 @@ gem_spec = Gem::Specification.new do |s|
-   s.homepage = 'http://datamapper.org' 
-  
-   s.files = PACKAGE_FILES 
-- 
-+
-+  s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
-   s.require_path = 'lib'
-   s.requirements << 'none'
-   s.autorequire = 'data_mapper'
--  s.add_dependency('fastthread')
--  s.add_dependency('json')
-+  s.add_dependency('json_pure')
-   s.add_dependency('rspec')
-   s.add_dependency('validatable')
-