Update www/merb-gen to 1.1.3.

* Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk.
* Add LICENSE.
* Ajust new ruby package's framework.
* Update dependency according to gemspec.
* Add CONFLICTS since it will install the same name commands both
  ruby18 and ruby19 based packages.

Changes are unknown.

3 files changed, 177 insertions, 105 deletions

diff --git a/www/merb-gen/Makefile b/www/merb-gen/Makefile
index 30dff03cdbf..3b79b2829ec 100644
--- a/www/merb-gen/Makefile
+++ b/www/merb-gen/Makefile
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/04 15:24:00 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2010/09/12 02:41:11 taca Exp $
 
-DISTNAME=	merb-gen-0.9.2
+DISTNAME=	merb-gen-1.1.3
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb application and plugin generator scripts
+LICENSE=	mit
 
-DEPENDS+=	merb-core>=0.9.2:../../www/merb-core
-DEPENDS+=	rubigen>=1.2.4:../../devel/rubigen
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=0.9.2:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-rubigen>=1.2.4:../../devel/rubigen
 DEPENDS+=	${RUBY_PKGPREFIX}-rspec>=1.1.3:../../devel/ruby-rspec
 
-.include "../../misc/rubygems/rubygem.mk"
+CONFLICTS+=	ruby[1-9][0-9]-merb-gen-*
+
+.include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-gen/PLIST b/www/merb-gen/PLIST
index a2b152d8a19..f049317773c 100644
--- a/www/merb-gen/PLIST
+++ b/www/merb-gen/PLIST
@@ -1,103 +1,172 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/09/12 02:41:11 taca Exp $
 bin/merb-gen
-${GEM_HOME}/cache/merb-gen-${PKGVERSION}.gem
+${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/LICENSE
 ${GEM_LIBDIR}/README
 ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/TODO
-${GEM_LIBDIR}/app_generators/merb/USAGE
-${GEM_LIBDIR}/app_generators/merb/merb_generator.rb
-${GEM_LIBDIR}/app_generators/merb/templates/Rakefile
-${GEM_LIBDIR}/app_generators/merb/templates/app/controllers/application.rb
-${GEM_LIBDIR}/app_generators/merb/templates/app/controllers/exceptions.rb
-${GEM_LIBDIR}/app_generators/merb/templates/app/helpers/global_helpers.rb
-${GEM_LIBDIR}/app_generators/merb/templates/app/views/exceptions/internal_server_error.html.erb
-${GEM_LIBDIR}/app_generators/merb/templates/app/views/exceptions/not_acceptable.html.erb
-${GEM_LIBDIR}/app_generators/merb/templates/app/views/exceptions/not_found.html.erb
-${GEM_LIBDIR}/app_generators/merb/templates/app/views/layout/application.html.erb
-${GEM_LIBDIR}/app_generators/merb/templates/autotest/discover.rb
-${GEM_LIBDIR}/app_generators/merb/templates/autotest/merb.rb
-${GEM_LIBDIR}/app_generators/merb/templates/autotest/merb_rspec.rb
-${GEM_LIBDIR}/app_generators/merb/templates/config/environments/development.rb
-${GEM_LIBDIR}/app_generators/merb/templates/config/environments/production.rb
-${GEM_LIBDIR}/app_generators/merb/templates/config/environments/rake.rb
-${GEM_LIBDIR}/app_generators/merb/templates/config/environments/test.rb
-${GEM_LIBDIR}/app_generators/merb/templates/config/init.rb
-${GEM_LIBDIR}/app_generators/merb/templates/config/rack.rb
-${GEM_LIBDIR}/app_generators/merb/templates/config/router.rb
-${GEM_LIBDIR}/app_generators/merb/templates/public/images/merb.jpg
-${GEM_LIBDIR}/app_generators/merb/templates/public/merb.fcgi
-${GEM_LIBDIR}/app_generators/merb/templates/public/stylesheets/master.css
-${GEM_LIBDIR}/app_generators/merb/templates/spec/spec.opts
-${GEM_LIBDIR}/app_generators/merb/templates/spec/spec_helper.rb
-${GEM_LIBDIR}/app_generators/merb/templates/test/test_helper.rb
-${GEM_LIBDIR}/app_generators/merb_flat/merb_flat_generator.rb
-${GEM_LIBDIR}/app_generators/merb_flat/templates/README.txt
-${GEM_LIBDIR}/app_generators/merb_flat/templates/application.rb
-${GEM_LIBDIR}/app_generators/merb_flat/templates/config/framework.rb
-${GEM_LIBDIR}/app_generators/merb_flat/templates/config/init.rb
-${GEM_LIBDIR}/app_generators/merb_flat/templates/views/foo.html.erb
-${GEM_LIBDIR}/app_generators/merb_plugin/merb_plugin_generator.rb
-${GEM_LIBDIR}/app_generators/merb_plugin/templates/LICENSE
-${GEM_LIBDIR}/app_generators/merb_plugin/templates/README
-${GEM_LIBDIR}/app_generators/merb_plugin/templates/Rakefile
-${GEM_LIBDIR}/app_generators/merb_plugin/templates/TODO
-${GEM_LIBDIR}/app_generators/merb_plugin/templates/lib/%base_name%.rb
-${GEM_LIBDIR}/app_generators/merb_plugin/templates/lib/%base_name%/merbtasks.rb
-${GEM_LIBDIR}/app_generators/merb_plugin/templates/spec/%base_name%_spec.rb
-${GEM_LIBDIR}/app_generators/merb_plugin/templates/spec/spec_helper.rb
-${GEM_LIBDIR}/app_generators/merb_plugin/templates/test/%base_name%_test.rb
-${GEM_LIBDIR}/app_generators/merb_plugin/templates/test/test_helper.rb
-${GEM_LIBDIR}/app_generators/merb_very_flat/merb_very_flat_generator.rb
-${GEM_LIBDIR}/app_generators/merb_very_flat/templates/%app_file_name%.rb
-${GEM_LIBDIR}/app_generators/merb_very_flat/templates/README.txt
 ${GEM_LIBDIR}/bin/merb-gen
+${GEM_LIBDIR}/lib/generators/controller.rb
+${GEM_LIBDIR}/lib/generators/fcgi.rb
+${GEM_LIBDIR}/lib/generators/helper.rb
+${GEM_LIBDIR}/lib/generators/layout.rb
+${GEM_LIBDIR}/lib/generators/merb/merb_core.rb
+${GEM_LIBDIR}/lib/generators/merb/merb_flat.rb
+${GEM_LIBDIR}/lib/generators/merb/merb_stack.rb
+${GEM_LIBDIR}/lib/generators/merb/merb_very_flat.rb
+${GEM_LIBDIR}/lib/generators/merb_plugin.rb
+${GEM_LIBDIR}/lib/generators/migration.rb
+${GEM_LIBDIR}/lib/generators/model.rb
+${GEM_LIBDIR}/lib/generators/part_controller.rb
+${GEM_LIBDIR}/lib/generators/passenger.rb
+${GEM_LIBDIR}/lib/generators/resource.rb
+${GEM_LIBDIR}/lib/generators/resource_controller.rb
+${GEM_LIBDIR}/lib/generators/session_migration.rb
+${GEM_LIBDIR}/lib/generators/templates/application/common/Gemfile
+${GEM_LIBDIR}/lib/generators/templates/application/common/Rakefile
+${GEM_LIBDIR}/lib/generators/templates/application/common/dotgitignore
+${GEM_LIBDIR}/lib/generators/templates/application/common/jquery.js
+${GEM_LIBDIR}/lib/generators/templates/application/common/merb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/app/controllers/application.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/app/controllers/exceptions.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/app/helpers/global_helpers.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/app/views/exceptions/not_acceptable.html.erb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/app/views/exceptions/not_found.html.erb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/autotest/discover.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/autotest/merb.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/autotest/merb_rspec.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/config/environments/development.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/config/environments/production.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/config/environments/rake.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/config/environments/staging.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/config/environments/test.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/config/init.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/config/rack.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/config/router.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/doc/rdoc/generators/merb_generator.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/api_grease.js
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/index.html.erb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/merb.css
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/merb.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/merb_doc_styles.css
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/prototype.js
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/lib/merb/session.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/public/favicon.ico
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/public/images/merb.jpg
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/public/javascripts/application.js
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/public/robots.txt
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/public/stylesheets/master.css
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/spec/spec.opts
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/spec/spec_helper.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_core/test/test_helper.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_flat/README.txt
+${GEM_LIBDIR}/lib/generators/templates/application/merb_flat/application.rbt
+${GEM_LIBDIR}/lib/generators/templates/application/merb_flat/config/framework.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_flat/config/init.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_flat/spec/spec_helper.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_flat/test/test_helper.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_flat/views/foo.html.erb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_plugin/LICENSE
+${GEM_LIBDIR}/lib/generators/templates/application/merb_plugin/README
+${GEM_LIBDIR}/lib/generators/templates/application/merb_plugin/Rakefile
+${GEM_LIBDIR}/lib/generators/templates/application/merb_plugin/TODO
+${GEM_LIBDIR}/lib/generators/templates/application/merb_plugin/lib/%base_name%.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_plugin/lib/%base_name%/merbtasks.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_plugin/spec/%base_name%_spec.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_plugin/spec/spec_helper.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_plugin/test/%base_name%_test.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_plugin/test/test_helper.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/Gemfile
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/app/controllers/application.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/app/controllers/exceptions.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/app/helpers/global_helpers.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/app/models/user.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/app/views/exceptions/not_acceptable.html.erb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/app/views/exceptions/not_found.html.erb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/autotest/discover.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/autotest/merb.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/autotest/merb_rspec.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/config.ru
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/config/database.yml
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/config/environments/development.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/config/environments/production.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/config/environments/rake.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/config/environments/staging.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/config/environments/test.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/config/init.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/config/rack.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/config/router.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/doc/rdoc/generators/merb_generator.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/api_grease.js
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/index.html.erb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/merb.css
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/merb.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/merb_doc_styles.css
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/doc/rdoc/generators/template/merb/prototype.js
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/merb/merb-auth/setup.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/merb/merb-auth/strategies.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/merb/session/session.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/public/favicon.ico
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/public/images/merb.jpg
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/public/javascripts/application.js
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/public/robots.txt
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/public/stylesheets/master.css
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/spec/spec.opts
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/spec/spec_helper.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_stack/test/test_helper.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_very_flat/application.rbt
+${GEM_LIBDIR}/lib/generators/templates/application/merb_very_flat/spec/spec_helper.rb
+${GEM_LIBDIR}/lib/generators/templates/application/merb_very_flat/test/test_helper.rb
+${GEM_LIBDIR}/lib/generators/templates/component/controller/app/controllers/%file_name%.rb
+${GEM_LIBDIR}/lib/generators/templates/component/controller/app/views/%file_name%/index.html.erb
+${GEM_LIBDIR}/lib/generators/templates/component/controller/spec/requests/%file_name%_spec.rb
+${GEM_LIBDIR}/lib/generators/templates/component/controller/test/requests/%file_name%_test.rb
+${GEM_LIBDIR}/lib/generators/templates/component/fcgi/dothtaccess
+${GEM_LIBDIR}/lib/generators/templates/component/fcgi/merb.fcgi
+${GEM_LIBDIR}/lib/generators/templates/component/helper/app/helpers/%file_name%_helper.rb
+${GEM_LIBDIR}/lib/generators/templates/component/layout/app/views/layout/%file_name%.html.erb
+${GEM_LIBDIR}/lib/generators/templates/component/layout/spec/views/layout/%file_name%.html.erb_spec.rb
+${GEM_LIBDIR}/lib/generators/templates/component/model/app/models/%file_name%.rb
+${GEM_LIBDIR}/lib/generators/templates/component/model/spec/models/%file_name%_spec.rb
+${GEM_LIBDIR}/lib/generators/templates/component/model/test/models/%file_name%_test.rb
+${GEM_LIBDIR}/lib/generators/templates/component/part_controller/app/parts/%file_name%_part.rb
+${GEM_LIBDIR}/lib/generators/templates/component/part_controller/app/parts/views/%file_name%_part/index.html.erb
+${GEM_LIBDIR}/lib/generators/templates/component/resource_controller/app/controllers/%file_name%.rb
+${GEM_LIBDIR}/lib/generators/templates/component/resource_controller/app/views/%file_name%/edit.html.erb
+${GEM_LIBDIR}/lib/generators/templates/component/resource_controller/app/views/%file_name%/index.html.erb
+${GEM_LIBDIR}/lib/generators/templates/component/resource_controller/app/views/%file_name%/new.html.erb
+${GEM_LIBDIR}/lib/generators/templates/component/resource_controller/app/views/%file_name%/show.html.erb
+${GEM_LIBDIR}/lib/generators/templates/component/resource_controller/spec/requests/%file_name%_spec.rb
+${GEM_LIBDIR}/lib/generators/templates/component/resource_controller/test/controllers/%file_name%_test.rb
 ${GEM_LIBDIR}/lib/merb-gen.rb
-${GEM_LIBDIR}/lib/merb-gen/base.rb
-${GEM_LIBDIR}/lib/merb-gen/helpers.rb
-${GEM_LIBDIR}/merb_default_generators/model/USAGE
-${GEM_LIBDIR}/merb_default_generators/model/model_generator.rb
-${GEM_LIBDIR}/merb_default_generators/model/templates/app/models/%model_file_name%.rb
-${GEM_LIBDIR}/merb_default_generators/resource_controller/USAGE
-${GEM_LIBDIR}/merb_default_generators/resource_controller/resource_controller_generator.rb
-${GEM_LIBDIR}/merb_default_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb
-${GEM_LIBDIR}/merb_default_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb
-${GEM_LIBDIR}/merb_default_generators/resource_controller/templates/app/views/%controller_file_name%/delete.html.erb
-${GEM_LIBDIR}/merb_default_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb
-${GEM_LIBDIR}/merb_default_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb
-${GEM_LIBDIR}/merb_default_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb
-${GEM_LIBDIR}/merb_default_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb
-${GEM_LIBDIR}/merb_generators/controller/USAGE
-${GEM_LIBDIR}/merb_generators/controller/controller_generator.rb
-${GEM_LIBDIR}/merb_generators/controller/templates/app/controllers/%controller_file_name%.rb
-${GEM_LIBDIR}/merb_generators/controller/templates/app/helpers/%controller_file_name%_helper.rb
-${GEM_LIBDIR}/merb_generators/controller/templates/app/views/%controller_file_name%/index.html.erb
-${GEM_LIBDIR}/merb_generators/freezer/USAGE
-${GEM_LIBDIR}/merb_generators/freezer/freezer_generator.rb
-${GEM_LIBDIR}/merb_generators/freezer/templates/script/frozen-merb
-${GEM_LIBDIR}/merb_generators/part_controller/USAGE
-${GEM_LIBDIR}/merb_generators/part_controller/part_controller_generator.rb
-${GEM_LIBDIR}/merb_generators/part_controller/templates/app/helpers/%controller_file_name%_part_helper.rb
-${GEM_LIBDIR}/merb_generators/part_controller/templates/app/parts/%controller_file_name%_part.rb
-${GEM_LIBDIR}/merb_generators/part_controller/templates/app/parts/views/%controller_file_name%_part/index.html.erb
-${GEM_LIBDIR}/merb_generators/resource/USAGE
-${GEM_LIBDIR}/merb_generators/resource/resource_generator.rb
-${GEM_LIBDIR}/rspec_generators/merb_controller_test/merb_controller_test_generator.rb
-${GEM_LIBDIR}/rspec_generators/merb_controller_test/templates/spec/controllers/%controller_full_file_path%_spec.rb
-${GEM_LIBDIR}/rspec_generators/merb_controller_test/templates/spec/helpers/%controller_full_file_path%_helper_spec.rb
-${GEM_LIBDIR}/rspec_generators/merb_model_test/merb_model_test_generator.rb
-${GEM_LIBDIR}/rspec_generators/merb_model_test/templates/spec/models/%model_file_name%_spec.rb
-${GEM_LIBDIR}/rspec_generators/merb_resource_controller_test/merb_resource_controller_test_generator.rb
-${GEM_LIBDIR}/rspec_generators/merb_resource_controller_test/templates/spec/controllers/%controller_full_file_path%_spec.rb
-${GEM_LIBDIR}/rspec_generators/merb_resource_controller_test/templates/spec/helpers/%controller_full_file_path%_helpers.rb
-${GEM_LIBDIR}/rspec_generators/merb_resource_controller_test/templates/spec/views/%controller_full_file_path%/delete.html.erb_spec.rb
-${GEM_LIBDIR}/rspec_generators/merb_resource_controller_test/templates/spec/views/%controller_full_file_path%/edit.html.erb_spec.rb
-${GEM_LIBDIR}/rspec_generators/merb_resource_controller_test/templates/spec/views/%controller_full_file_path%/index.html.erb_spec.rb
-${GEM_LIBDIR}/rspec_generators/merb_resource_controller_test/templates/spec/views/%controller_full_file_path%/new.html.erb_spec.rb
-${GEM_LIBDIR}/rspec_generators/merb_resource_controller_test/templates/spec/views/%controller_full_file_path%/show.html.erb_spec.rb
-${GEM_LIBDIR}/test_unit_generators/merb_controller_test/merb_controller_test_generator.rb
-${GEM_LIBDIR}/test_unit_generators/merb_controller_test/templates/test/functional/%controller_full_file_path%_test.rb
-${GEM_LIBDIR}/test_unit_generators/merb_model_test/merb_model_test_generator.rb
-${GEM_LIBDIR}/test_unit_generators/merb_model_test/templates/test/unit/%model_file_name%_test.rb
-${GEM_LIBDIR}/test_unit_generators/merb_resource_controller_test/merb_resource_controller_test_generator.rb
-${GEM_HOME}/specifications/merb-gen-${PKGVERSION}.gemspec
+${GEM_LIBDIR}/lib/merb-gen/app_generator.rb
+${GEM_LIBDIR}/lib/merb-gen/generator.rb
+${GEM_LIBDIR}/lib/merb-gen/named_generator.rb
+${GEM_LIBDIR}/lib/merb-gen/namespaced_generator.rb
+${GEM_LIBDIR}/lib/merb-gen/templater.rb
+${GEM_LIBDIR}/lib/merb-gen/version.rb
+${GEM_LIBDIR}/spec/controller_spec.rb
+${GEM_LIBDIR}/spec/fcgi_spec.rb
+${GEM_LIBDIR}/spec/fixtures/results/no_modules.test
+${GEM_LIBDIR}/spec/fixtures/results/some_modules.test
+${GEM_LIBDIR}/spec/fixtures/templates/no_modules.test
+${GEM_LIBDIR}/spec/fixtures/templates/some_modules.test
+${GEM_LIBDIR}/spec/generator_spec.rb
+${GEM_LIBDIR}/spec/layout_spec.rb
+${GEM_LIBDIR}/spec/merb_core_spec.rb
+${GEM_LIBDIR}/spec/merb_flat_spec.rb
+${GEM_LIBDIR}/spec/merb_plugin_spec.rb
+${GEM_LIBDIR}/spec/merb_stack_spec.rb
+${GEM_LIBDIR}/spec/merb_very_flat_spec.rb
+${GEM_LIBDIR}/spec/migration_spec.rb
+${GEM_LIBDIR}/spec/model_spec.rb
+${GEM_LIBDIR}/spec/named_generator_spec.rb
+${GEM_LIBDIR}/spec/namespaced_generator_spec.rb
+${GEM_LIBDIR}/spec/part_controller_spec.rb
+${GEM_LIBDIR}/spec/passenger_spec.rb
+${GEM_LIBDIR}/spec/resource_controller_spec.rb
+${GEM_LIBDIR}/spec/resource_spec.rb
+${GEM_LIBDIR}/spec/session_migration_spec.rb
+${GEM_LIBDIR}/spec/spec.opts
+${GEM_LIBDIR}/spec/spec_helper.rb
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/www/merb-gen/distinfo b/www/merb-gen/distinfo
index a7d40fe7e38..0e28704a03a 100644
--- a/www/merb-gen/distinfo
+++ b/www/merb-gen/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/05/16 07:30:43 rillig Exp $
+$NetBSD: distinfo,v 1.3 2010/09/12 02:41:11 taca Exp $
 
-SHA1 (merb-gen-0.9.2.gem) = 36b95d61b3a18d53cdcde303b11dbc3e3774ccbb
-RMD160 (merb-gen-0.9.2.gem) = bd1d1f1f9fe150f90078d2d9fe014ff0de5c3723
-Size (merb-gen-0.9.2.gem) = 34816 bytes
+SHA1 (merb-gen-1.1.3.gem) = dd70ab9e534ded6d7254d19a57526267513002fe
+RMD160 (merb-gen-1.1.3.gem) = 6b98a3befe420116510290e87b955adb42ddc482
+Size (merb-gen-1.1.3.gem) = 155648 bytes