- Fix dependency pattern.

Bump PKGREVISION.

7 files changed, 23 insertions, 17 deletions

diff --git a/www/merb-cache/Makefile b/www/merb-cache/Makefile
index aa0e7b77a38..570afaa1b30 100644
--- a/www/merb-cache/Makefile
+++ b/www/merb-cache/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/09/13 14:34:05 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/13 00:17:40 taca Exp $
 
 DISTNAME=	merb-cache-1.1.3
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,7 +9,7 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb plugin that provides caching (page, action, fragment, object)
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3<1.2:../../www/merb-core
 
 CONFLICTS+=	merb-cache-[0-9]*
 
diff --git a/www/merb-exceptions/Makefile b/www/merb-exceptions/Makefile
index 779974650e6..1e159dcd714 100644
--- a/www/merb-exceptions/Makefile
+++ b/www/merb-exceptions/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/12 02:59:29 taca Exp $
+# $NetBSD: Makefile,v 1.2 2011/08/13 00:18:06 taca Exp $
 
 DISTNAME=	merb-exceptions-1.1.3
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,8 +9,8 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb plugin that supports exception notification
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-mailer>=1.1.3:../../www/merb-mailer
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3<1.2:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-mailer>=1.1.3<1.2:../../www/merb-mailer
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-gen/Makefile b/www/merb-gen/Makefile
index c53f33f8a7c..73407842b81 100644
--- a/www/merb-gen/Makefile
+++ b/www/merb-gen/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/09/13 14:12:15 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/13 00:18:29 taca Exp $
 
 DISTNAME=	merb-gen-1.1.3
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,9 +9,8 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb application and plugin generator scripts
 LICENSE=	mit
 
-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
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3<1.2:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-templater>=1.0.0:../../devel/ruby-templater
 
 CONFLICTS+=	ruby[1-9][0-9]-merb-gen-[0-9] merb-gen-[0-9]
 
diff --git a/www/merb-haml/Makefile b/www/merb-haml/Makefile
index ff0e53d5085..8c62b45f6c7 100644
--- a/www/merb-haml/Makefile
+++ b/www/merb-haml/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:41 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/13 00:19:01 taca Exp $
 
 DISTNAME=	merb-haml-1.1.3
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,7 +9,7 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb plugin that provides HAML template support
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3<1.2:../../www/merb-core
 DEPENDS+=	${RUBY_PKGPREFIX}-haml>=2.0.3:../../textproc/ruby-haml
 
 CONFLICTS+=	merb-haml-[0-9]*
diff --git a/www/merb-helpers/Makefile b/www/merb-helpers/Makefile
index 45febc10bb8..ed4344baa5e 100644
--- a/www/merb-helpers/Makefile
+++ b/www/merb-helpers/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:41 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/13 00:19:32 taca Exp $
 
 DISTNAME=	merb-helpers-1.1.3
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,7 +9,7 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb plugin that provides various view helpers
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3<1.2:../../www/merb-core
 
 CONFLICTS+=	merb-helper-[0-9]*
 
diff --git a/www/merb-mailer/Makefile b/www/merb-mailer/Makefile
index cdd7f9f4ac1..8f2609f23a7 100644
--- a/www/merb-mailer/Makefile
+++ b/www/merb-mailer/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:41 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/13 00:19:58 taca Exp $
 
 DISTNAME=	merb-mailer-1.1.3
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,7 +9,7 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb plugin that provides mailer functionality
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3<1.2:../../www/merb-core
 DEPENDS+=	${RUBY_PKGPREFIX}-mailfactory>=1.2.3:../../mail/ruby-mailfactory
 
 CONFLICTS+=	merb-mailer-[0-9]*
diff --git a/www/merb-param-protection/Makefile b/www/merb-param-protection/Makefile
index 3c06ed7861a..353c9fc4973 100644
--- a/www/merb-param-protection/Makefile
+++ b/www/merb-param-protection/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:42 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/13 00:20:25 taca Exp $
 
 DISTNAME=	merb-param-protection-1.1.3
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,7 +9,7 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb plugin supplying methods to filter parameters
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3<1.2:../../www/merb-core
 
 CONFLICTS+=	merb-param-protection-[0-9]*