From 22150b6d8956bb714b9e9246cd03e533e9738453 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 12 Sep 2010 02:51:38 +0000 Subject: Update www/merb-sequel to 1.1.1. * Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk. * Update HOMEPAGE. * Add LICENSE. * Ajust new ruby package's framework. Changes are unknown. --- www/merb-sequel/Makefile | 16 ++++++------- www/merb-sequel/PLIST | 52 ++++++++++++++++++++++------------------ www/merb-sequel/distinfo | 9 ++++--- www/merb-sequel/patches/patch-aa | 14 ----------- 4 files changed, 41 insertions(+), 50 deletions(-) delete mode 100644 www/merb-sequel/patches/patch-aa (limited to 'www') diff --git a/www/merb-sequel/Makefile b/www/merb-sequel/Makefile index 2738a27e426..e5c56b099d2 100644 --- a/www/merb-sequel/Makefile +++ b/www/merb-sequel/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.2 2008/04/13 06:58:03 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2010/09/12 02:51:38 taca Exp $ -DISTNAME= merb_sequel-0.9.2 -PKGNAME= ${DISTNAME:S/_/-/g} -PKGREVISION= 1 +DISTNAME= merb_sequel-1.1.1 +PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g} CATEGORIES= databases www MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.merbivore.com/ +HOMEPAGE= http://github.com/pk/merb_sequel COMMENT= Merb plugin for the Sequel ORM +LICENSE= mit -DEPENDS+= merb-core>=0.9.2:../../www/merb-core -DEPENDS+= ${RUBY_PKGPREFIX}-sequel>=1.4.0:../../databases/ruby-sequel +DEPENDS+= ${RUBY_PKGPREFIX}-merb-core>=1.1.0:../../www/merb-core +DEPENDS+= ${RUBY_PKGPREFIX}-sequel>=2.7.0:../../databases/ruby-sequel -.include "../../misc/rubygems/rubygem.mk" +.include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/merb-sequel/PLIST b/www/merb-sequel/PLIST index 5d19f25de38..c6eb548c644 100644 --- a/www/merb-sequel/PLIST +++ b/www/merb-sequel/PLIST @@ -1,31 +1,37 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:27 joerg Exp $ -${GEM_HOME}/cache/merb_sequel-${PKGVERSION}.gem +@comment $NetBSD: PLIST,v 1.3 2010/09/12 02:51:38 taca Exp $ +${GEM_HOME}/cache/${GEM_NAME}.gem +${GEM_LIBDIR}/Generators ${GEM_LIBDIR}/LICENSE -${GEM_LIBDIR}/README +${GEM_LIBDIR}/README.rdoc ${GEM_LIBDIR}/Rakefile ${GEM_LIBDIR}/TODO +${GEM_LIBDIR}/lib/generators/migration.rb +${GEM_LIBDIR}/lib/generators/model.rb +${GEM_LIBDIR}/lib/generators/resource_controller.rb +${GEM_LIBDIR}/lib/generators/session_migration.rb +${GEM_LIBDIR}/lib/generators/templates/migration/schema/migrations/%file_name%.rb +${GEM_LIBDIR}/lib/generators/templates/model/app/models/%file_name%.rb +${GEM_LIBDIR}/lib/generators/templates/resource_controller/app/controllers/%file_name%.rb +${GEM_LIBDIR}/lib/generators/templates/resource_controller/app/views/%file_name%/edit.html.erb +${GEM_LIBDIR}/lib/generators/templates/resource_controller/app/views/%file_name%/index.html.erb +${GEM_LIBDIR}/lib/generators/templates/resource_controller/app/views/%file_name%/new.html.erb +${GEM_LIBDIR}/lib/generators/templates/resource_controller/app/views/%file_name%/show.html.erb +${GEM_LIBDIR}/lib/generators/templates/session_migration/schema/migrations/%version%_sessions.rb ${GEM_LIBDIR}/lib/merb/orms/sequel/connection.rb ${GEM_LIBDIR}/lib/merb/orms/sequel/database.yml.sample +${GEM_LIBDIR}/lib/merb/orms/sequel/model.rb ${GEM_LIBDIR}/lib/merb/session/sequel_session.rb ${GEM_LIBDIR}/lib/merb_sequel.rb ${GEM_LIBDIR}/lib/merb_sequel/merbtasks.rb -${GEM_LIBDIR}/sequel_generators/database_sessions_migration/USAGE -${GEM_LIBDIR}/sequel_generators/database_sessions_migration/database_sessions_migration_generator.rb -${GEM_LIBDIR}/sequel_generators/database_sessions_migration/templates/sessions_migration.erb -${GEM_LIBDIR}/sequel_generators/migration/USAGE -${GEM_LIBDIR}/sequel_generators/migration/migration_generator.rb -${GEM_LIBDIR}/sequel_generators/migration/templates/schema/migrations/%migration_file_name%.rb -${GEM_LIBDIR}/sequel_generators/model/USAGE -${GEM_LIBDIR}/sequel_generators/model/model_generator.rb -${GEM_LIBDIR}/sequel_generators/model/templates/app/models/%model_file_name%.rb -${GEM_LIBDIR}/sequel_generators/resource_controller/USAGE -${GEM_LIBDIR}/sequel_generators/resource_controller/resource_controller_generator.rb -${GEM_LIBDIR}/sequel_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb -${GEM_LIBDIR}/sequel_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb -${GEM_LIBDIR}/sequel_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb -${GEM_LIBDIR}/sequel_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb -${GEM_LIBDIR}/sequel_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb -${GEM_LIBDIR}/sequel_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb -${GEM_LIBDIR}/specs/merb_sequel_spec.rb -${GEM_LIBDIR}/specs/spec_helper.rb -${GEM_HOME}/specifications/merb_sequel-${PKGVERSION}.gemspec +${GEM_LIBDIR}/lib/merb_sequel/rspec/sequel.rb +${GEM_LIBDIR}/lib/merb_sequel/version.rb +${GEM_LIBDIR}/spec/config/database.yml +${GEM_LIBDIR}/spec/merb_sequel_session_spec.rb +${GEM_LIBDIR}/spec/merb_sequel_spec.rb +${GEM_LIBDIR}/spec/rspec/sequel_spec.rb +${GEM_LIBDIR}/spec/sequel_ext_spec.rb +${GEM_LIBDIR}/spec/spec.opts +${GEM_LIBDIR}/spec/spec_controller.rb +${GEM_LIBDIR}/spec/spec_helper.rb +${GEM_LIBDIR}/spec/spec_model.rb +${GEM_HOME}/specifications/${GEM_NAME}.gemspec diff --git a/www/merb-sequel/distinfo b/www/merb-sequel/distinfo index 2fdecbb502a..814a456674c 100644 --- a/www/merb-sequel/distinfo +++ b/www/merb-sequel/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2008/04/14 20:21:20 jlam Exp $ +$NetBSD: distinfo,v 1.3 2010/09/12 02:51:38 taca Exp $ -SHA1 (merb_sequel-0.9.2.gem) = 21d766008d55be9babffc4d8d7239c4c9ac19700 -RMD160 (merb_sequel-0.9.2.gem) = eb0656cedaa2a6eacffba872f6cf8ed6afc6be02 -Size (merb_sequel-0.9.2.gem) = 11264 bytes -SHA1 (patch-aa) = 785f33043aafc404895564c647d53a097854963d +SHA1 (merb_sequel-1.1.1.gem) = f984ec09fbc65851e2f8d0f8724b791b3eb5a65b +RMD160 (merb_sequel-1.1.1.gem) = cbe1f07e070fe39688c4842816f6fd8ead523824 +Size (merb_sequel-1.1.1.gem) = 13824 bytes diff --git a/www/merb-sequel/patches/patch-aa b/www/merb-sequel/patches/patch-aa deleted file mode 100644 index ff6d5c912ee..00000000000 --- a/www/merb-sequel/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2008/04/14 20:21:20 jlam Exp $ - ---- Rakefile.orig 2008-04-14 16:13:27.000000000 -0400 -+++ Rakefile -@@ -25,8 +25,7 @@ specification = Gem::Specification.new d - # Dependencies - #spec.add_dependency("merb", ">= 0.9") - spec.add_dependency("merb-core", ">= 0.9.2") # This will probably only be temporary until there is an official merb gem greater than 0.9 -- spec.add_dependency("sequel", ">= 1.0.0") -- spec.add_dependency("sequel_model", ">= 0.3.3") -+ spec.add_dependency("sequel", ">= 1.4.0") - spec.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*") - end - -- cgit v1.2.3