Update www/merb-datamapper to 1.1.2.

* Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk.
* Update HOMEPAGE.
* Add LICENSE.
* Update dependency according to gemspec.

Changes are unknown.

3 files changed, 41 insertions, 34 deletions

diff --git a/www/merb-datamapper/Makefile b/www/merb-datamapper/Makefile
index 3378c8efc32..4a29275e645 100644
--- a/www/merb-datamapper/Makefile
+++ b/www/merb-datamapper/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/04 15:23:53 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2010/09/12 02:40:00 taca Exp $
 
-DISTNAME=	merb_datamapper-0.9.2
-PKGNAME=	${DISTNAME:S/_/-/g}
+DISTNAME=	merb_datamapper-1.1.2
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
 CATEGORIES=	databases www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.merbivore.com/
+HOMEPAGE=	http://github.com/merb/merb_datamapper
 COMMENT=	Merb plugin for the DataMapper ORM
+LICENSE=	mit
 
-DEPENDS+=	merb-core>=0.9.2:../../www/merb-core
-DEPENDS+=	${RUBY_PKGPREFIX}-datamapper>=0.2.3:../../databases/ruby-datamapper
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-dm-core>=0.10.2:../../databases/ruby-dm-core
+DEPENDS+=	${RUBY_PKGPREFIX}-dm-migrations>=0.10.2:../../databases/ruby-dm-migrations
 
-.include "../../misc/rubygems/rubygem.mk"
+.include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-datamapper/PLIST b/www/merb-datamapper/PLIST
index aebbae299d8..6bf8494beca 100644
--- a/www/merb-datamapper/PLIST
+++ b/www/merb-datamapper/PLIST
@@ -1,29 +1,34 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:26 joerg Exp $
-${GEM_HOME}/cache/merb_datamapper-${PKGVERSION}.gem
+@comment $NetBSD: PLIST,v 1.3 2010/09/12 02:40:00 taca Exp $
+${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_LIBDIR}/Generators
 ${GEM_LIBDIR}/LICENSE
 ${GEM_LIBDIR}/README
 ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/TODO
-${GEM_LIBDIR}/datamapper_generators/migration/USAGE
-${GEM_LIBDIR}/datamapper_generators/migration/migration_generator.rb
-${GEM_LIBDIR}/datamapper_generators/migration/templates/new_migration.erb
-${GEM_LIBDIR}/datamapper_generators/model/USAGE
-${GEM_LIBDIR}/datamapper_generators/model/model_generator.rb
-${GEM_LIBDIR}/datamapper_generators/model/templates/app/models/%model_file_name%.rb
-${GEM_LIBDIR}/datamapper_generators/resource_controller/USAGE
-${GEM_LIBDIR}/datamapper_generators/resource_controller/resource_controller_generator.rb
-${GEM_LIBDIR}/datamapper_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb
-${GEM_LIBDIR}/datamapper_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb
-${GEM_LIBDIR}/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb
-${GEM_LIBDIR}/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb
-${GEM_LIBDIR}/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb
-${GEM_LIBDIR}/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb
-${GEM_LIBDIR}/lib/merb/orms/data_mapper/base.rb
-${GEM_LIBDIR}/lib/merb/orms/data_mapper/connection.rb
-${GEM_LIBDIR}/lib/merb/orms/data_mapper/database.yml.sample
-${GEM_LIBDIR}/lib/merb/session/data_mapper_session.rb
+${GEM_LIBDIR}/lib/generators/data_mapper_migration.rb
+${GEM_LIBDIR}/lib/generators/data_mapper_model.rb
+${GEM_LIBDIR}/lib/generators/data_mapper_resource_controller.rb
+${GEM_LIBDIR}/lib/generators/templates/migration.rb
+${GEM_LIBDIR}/lib/generators/templates/model.rb
+${GEM_LIBDIR}/lib/generators/templates/model_migration.rb
+${GEM_LIBDIR}/lib/generators/templates/resource_controller.rb
+${GEM_LIBDIR}/lib/generators/templates/views/edit.html.erb
+${GEM_LIBDIR}/lib/generators/templates/views/index.html.erb
+${GEM_LIBDIR}/lib/generators/templates/views/new.html.erb
+${GEM_LIBDIR}/lib/generators/templates/views/show.html.erb
 ${GEM_LIBDIR}/lib/merb_datamapper.rb
+${GEM_LIBDIR}/lib/merb_datamapper/connection.rb
+${GEM_LIBDIR}/lib/merb_datamapper/data_mapper_session.rb
+${GEM_LIBDIR}/lib/merb_datamapper/database.yml.sample
 ${GEM_LIBDIR}/lib/merb_datamapper/merbtasks.rb
-${GEM_LIBDIR}/specs/merb_sequel_spec.rb
-${GEM_LIBDIR}/specs/spec_helper.rb
-${GEM_HOME}/specifications/merb_datamapper-${PKGVERSION}.gemspec
+${GEM_LIBDIR}/lib/merb_datamapper/version.rb
+${GEM_LIBDIR}/spec/connection_spec.rb
+${GEM_LIBDIR}/spec/datamapper_id_map_controller.rb
+${GEM_LIBDIR}/spec/datamapper_model.rb
+${GEM_LIBDIR}/spec/datamapper_session_controller.rb
+${GEM_LIBDIR}/spec/identity_map_spec.rb
+${GEM_LIBDIR}/spec/session_spec.rb
+${GEM_LIBDIR}/spec/session_store_spec.rb
+${GEM_LIBDIR}/spec/spec.opts
+${GEM_LIBDIR}/spec/spec_helper.rb
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/www/merb-datamapper/distinfo b/www/merb-datamapper/distinfo
index b9c42d86a13..398fd407066 100644
--- a/www/merb-datamapper/distinfo
+++ b/www/merb-datamapper/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/04/04 15:23:53 jlam Exp $
+$NetBSD: distinfo,v 1.2 2010/09/12 02:40:00 taca Exp $
 
-SHA1 (merb_datamapper-0.9.2.gem) = 32a6942521d611c4f3c15d91e367c2bdd3dcf969
-RMD160 (merb_datamapper-0.9.2.gem) = 2d1e4b3a749d037e15ff18d60b79d6dc4f580676
-Size (merb_datamapper-0.9.2.gem) = 10240 bytes
+SHA1 (merb_datamapper-1.1.2.gem) = 1ad32fb9dba7a380a5b3b79c7b28d5ee66785229
+RMD160 (merb_datamapper-1.1.2.gem) = 0b2c1147aa41e5f1de7f5abaec3fd681595aa67a
+Size (merb_datamapper-1.1.2.gem) = 12288 bytes