+ Remove databases/ruby-sequel-model -- it has been merged into

  databases/ruby-sequel as of version 1.4.0.

+ Update dependencies for www/thoth and www/merb-sequel to reflect
  removal of ruby-sequel-model -- use ruby-sequel instead.  Bump the
  PKGREVISION for these two packages.

6 files changed, 7 insertions, 68 deletions

diff --git a/databases/ruby-sequel-model/DESCR b/databases/ruby-sequel-model/DESCR
deleted file mode 100644
index 988b51804ac..00000000000
--- a/databases/ruby-sequel-model/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Sequel is a database access toolkit for Ruby.  Sequel provides thread
-safety, connection pooling, and a concise DSL for constructing queries
-and table schemas.
-
-Sequel makes it easy to deal with multiple records without having to
-break your teeth on SQL.
diff --git a/databases/ruby-sequel-model/Makefile b/databases/ruby-sequel-model/Makefile
deleted file mode 100644
index 778057bb868..00000000000
--- a/databases/ruby-sequel-model/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/04 15:16:20 jlam Exp $
-
-DISTNAME=	sequel_model-0.5.0.2
-PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
-CATEGORIES=	databases
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://sequel.rubyforge.org/
-COMMENT=	Model components for Sequel
-
-BUILD_DEPENDS+=	${RUBY_PKGPREFIX}-rspec>=1.1.3:../../devel/ruby-rspec
-DEPENDS+=	${RUBY_PKGPREFIX}-assistance>=0.1.2:../../devel/ruby-assistance
-DEPENDS+=	${RUBY_PKGPREFIX}-sequel-core>=1.0:../../databases/ruby-sequel-core
-
-.include "../../misc/rubygems/rubygem.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-sequel-model/PLIST b/databases/ruby-sequel-model/PLIST
deleted file mode 100644
index dab904627cc..00000000000
--- a/databases/ruby-sequel-model/PLIST
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/04/04 15:16:20 jlam Exp $
-${GEM_HOME}/cache/sequel_model-${PKGVERSION}.gem
-${GEM_LIBDIR}/CHANGELOG
-${GEM_LIBDIR}/COPYING
-${GEM_LIBDIR}/README
-${GEM_LIBDIR}/Rakefile
-${GEM_LIBDIR}/lib/sequel_model.rb
-${GEM_LIBDIR}/lib/sequel_model/associations.rb
-${GEM_LIBDIR}/lib/sequel_model/base.rb
-${GEM_LIBDIR}/lib/sequel_model/caching.rb
-${GEM_LIBDIR}/lib/sequel_model/hooks.rb
-${GEM_LIBDIR}/lib/sequel_model/plugins.rb
-${GEM_LIBDIR}/lib/sequel_model/pretty_table.rb
-${GEM_LIBDIR}/lib/sequel_model/record.rb
-${GEM_LIBDIR}/lib/sequel_model/schema.rb
-${GEM_LIBDIR}/lib/sequel_model/validations.rb
-${GEM_LIBDIR}/spec/associations_spec.rb
-${GEM_LIBDIR}/spec/base_spec.rb
-${GEM_LIBDIR}/spec/caching_spec.rb
-${GEM_LIBDIR}/spec/deprecated_relations_spec.rb
-${GEM_LIBDIR}/spec/hooks_spec.rb
-${GEM_LIBDIR}/spec/model_spec.rb
-${GEM_LIBDIR}/spec/plugins_spec.rb
-${GEM_LIBDIR}/spec/rcov.opts
-${GEM_LIBDIR}/spec/record_spec.rb
-${GEM_LIBDIR}/spec/schema_spec.rb
-${GEM_LIBDIR}/spec/spec.opts
-${GEM_LIBDIR}/spec/spec_helper.rb
-${GEM_LIBDIR}/spec/validations_spec.rb
-${GEM_HOME}/specifications/sequel_model-${PKGVERSION}.gemspec
-@dirrm ${GEM_LIBDIR}/spec
-@dirrm ${GEM_LIBDIR}/lib/sequel_model
-@dirrm ${GEM_LIBDIR}/lib
-@dirrm ${GEM_LIBDIR}
diff --git a/databases/ruby-sequel-model/distinfo b/databases/ruby-sequel-model/distinfo
deleted file mode 100644
index ed7b777b466..00000000000
--- a/databases/ruby-sequel-model/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/04/04 15:16:20 jlam Exp $
-
-SHA1 (sequel_model-0.5.0.2.gem) = 96586559c923913a60d3e3226c90915deaa4487d
-RMD160 (sequel_model-0.5.0.2.gem) = 1844af806a403271b3fb8d005d68ddc9d43df728
-Size (sequel_model-0.5.0.2.gem) = 34304 bytes
diff --git a/www/merb-sequel/Makefile b/www/merb-sequel/Makefile
index 90f28ca4dbb..2738a27e426 100644
--- a/www/merb-sequel/Makefile
+++ b/www/merb-sequel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/04 15:25:00 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/13 06:58:03 jlam Exp $
 
 DISTNAME=	merb_sequel-0.9.2
 PKGNAME=	${DISTNAME:S/_/-/g}
+PKGREVISION=	1
 CATEGORIES=	databases www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -9,8 +10,7 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb plugin for the Sequel ORM
 
 DEPENDS+=	merb-core>=0.9.2:../../www/merb-core
-DEPENDS+=	${RUBY_PKGPREFIX}-sequel>=1.0.0:../../databases/ruby-sequel
-DEPENDS+=	${RUBY_PKGPREFIX}-sequel-model>=0.3.3:../../databases/ruby-sequel-model
+DEPENDS+=	${RUBY_PKGPREFIX}-sequel>=1.4.0:../../databases/ruby-sequel
 
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/thoth/Makefile b/www/thoth/Makefile
index fa667bf8477..47d52acf298 100644
--- a/www/thoth/Makefile
+++ b/www/thoth/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/04 15:26:51 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/13 06:58:03 jlam Exp $
 
 DISTNAME=	thoth-0.1.2
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -16,9 +17,8 @@ DEPENDS+=	${RUBY_PKGPREFIX}-hpricot>=0.6:../../textproc/ruby-hpricot
 DEPENDS+=	${RUBY_PKGPREFIX}-jsmin>=1.0.0:../../www/ruby-jsmin
 DEPENDS+=	${RUBY_PKGPREFIX}-json-pure>=1.1.2:../../textproc/ruby-json-pure
 DEPENDS+=	${RUBY_PKGPREFIX}-redcloth>=3.0.4:../../textproc/ruby-redcloth
-DEPENDS+=	${RUBY_PKGPREFIX}-sequel-core>=1.3:../../databases/ruby-sequel-core
-DEPENDS+=	${RUBY_PKGPREFIX}-sequel-model>=0.5.0.2:../../databases/ruby-sequel-model
-DEPENDS+=	${RUBY_PKGPREFIX}-sequel>=1.3:../../databases/ruby-sequel
+DEPENDS+=	${RUBY_PKGPREFIX}-sequel-core>=1.4.0:../../databases/ruby-sequel-core
+DEPENDS+=	${RUBY_PKGPREFIX}-sequel>=1.4.0:../../databases/ruby-sequel
 DEPENDS+=	thin>=0.7.1:../../www/thin
 
 GEM_BUILD=	gemspec