- Fix dependency pattern.

Bump PKGREVISION.

6 files changed, 25 insertions, 20 deletions

diff --git a/www/merb-assets/Makefile b/www/merb-assets/Makefile
index 2941ead3882..31cac8f4700 100644
--- a/www/merb-assets/Makefile
+++ b/www/merb-assets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:40 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/13 00:11:40 taca Exp $
 
 DISTNAME=	merb-assets-1.1.3
 CATEGORIES=	www
@@ -8,7 +8,7 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb plugin that provides helpers for assets and asset bundling
 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-assets-[0-9]*
 
diff --git a/www/merb-auth-core/Makefile b/www/merb-auth-core/Makefile
index ccdc1bcbd26..6696e71cfa5 100644
--- a/www/merb-auth-core/Makefile
+++ b/www/merb-auth-core/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/12 02:54:50 taca Exp $
+# $NetBSD: Makefile,v 1.2 2011/08/13 00:12:38 taca Exp $
 
 DISTNAME=	merb-auth-core-1.1.1
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,7 +9,7 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	MerbAuth is an authentication framework core
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1<1.2:../../www/merb-core
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-auth-more/Makefile b/www/merb-auth-more/Makefile
index 5ff6d70f64a..57cbf790bb1 100644
--- a/www/merb-auth-more/Makefile
+++ b/www/merb-auth-more/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/12 02:56:18 taca Exp $
+# $NetBSD: Makefile,v 1.2 2011/08/13 00:12:56 taca Exp $
 
 DISTNAME=	merb-auth-more-1.1.1
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Addons for merb-auth-core
 
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.1:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.1<1.2:../../www/merb-core
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-auth-slice-password-reset/Makefile b/www/merb-auth-slice-password-reset/Makefile
index 912c6a7a060..e80205233e0 100644
--- a/www/merb-auth-slice-password-reset/Makefile
+++ b/www/merb-auth-slice-password-reset/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/12 02:57:54 taca Exp $
+# $NetBSD: Makefile,v 1.2 2011/08/13 00:14:46 taca Exp $
 
 DISTNAME=	merb-auth-slice-password-reset-1.1.0
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,10 +9,10 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb Slice for password-reset functionality
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-slices>=1.1:../../www/merb-slices
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-core>=1.1.1:../../www/merb-auth-core
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-more>=1.1.1:../../www/merb-auth-more
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-mailer>=1.1.1:../../www/merb-mailer
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-slices>=1.1.0<1.2:../../www/merb-slices
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-core>=1.1.0<1.2:../../www/merb-auth-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-more>=1.1.0<1.2:../../www/merb-auth-more
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-mailer>=1.1.0<1.2:../../www/merb-mailer
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-auth-slice-password/Makefile b/www/merb-auth-slice-password/Makefile
index 3114182cdc2..0db61f15edd 100644
--- a/www/merb-auth-slice-password/Makefile
+++ b/www/merb-auth-slice-password/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/12 02:57:05 taca Exp $
+# $NetBSD: Makefile,v 1.2 2011/08/13 00:13:17 taca Exp $
 
 DISTNAME=	merb-auth-slice-password-1.1.1
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,9 +9,9 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb Slice with password UI support
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-slices>=1.1:../../www/merb-slices
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-core>=1.1.1:../../www/merb-auth-core
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-more>=1.1.1:../../www/merb-auth-more
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-slices>=1.1<2:../../www/merb-slices
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-core>=1.1.1<1.2:../../www/merb-auth-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-more>=1.1.1<1.2:../../www/merb-auth-more
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-auth/Makefile b/www/merb-auth/Makefile
index 7062b72921c..afa113df547 100644
--- a/www/merb-auth/Makefile
+++ b/www/merb-auth/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/12 02:58:46 taca Exp $
+# $NetBSD: Makefile,v 1.2 2011/08/13 00:12:06 taca Exp $
 
 DISTNAME=	merb-auth-1.1.1
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,10 +9,10 @@ HOMEPAGE=	http://www.merbivore.com/
 COMMENT=	Merb plugin that provides authentication support
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1:../../www/merb-core
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-core>=1.1.1:../../www/merb-auth-core
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-more>=1.1.1:../../www/merb-auth-more
-DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-slice-password>=1.1.1:../../www/merb-auth-slice-password
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1<2:../../www/merb-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-core>=1.1.1<1.2:../../www/merb-auth-core
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-more>=1.1.1<1.2:../../www/merb-auth-more
+DEPENDS+=	${RUBY_PKGPREFIX}-merb-auth-slice-password>=1.1.1<1.2:../../www/merb-auth-slice-password
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"