summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2011-08-13 00:08:58 +0000
committertaca <taca@pkgsrc.org>2011-08-13 00:08:58 +0000
commit3a5beaebbe2c1e966f2c0d031eb2f2e60b91ae66 (patch)
tree0ae2ac1a95ba3735d00f8b80ccf78b8a81ac0a2b
parent6c0a7c5beb45825be25e1e2149341a3a265418c8 (diff)
downloadpkgsrc-3a5beaebbe2c1e966f2c0d031eb2f2e60b91ae66.tar.gz
Fix dependency pattern.
Bump PKGREVISION.
-rw-r--r--www/merb-action-args/Makefile5
-rw-r--r--www/merb-activerecord/Makefile5
-rw-r--r--www/merb/Makefile27
3 files changed, 20 insertions, 17 deletions
diff --git a/www/merb-action-args/Makefile b/www/merb-action-args/Makefile
index 597c40b1163..a9d7a063cf1 100644
--- a/www/merb-action-args/Makefile
+++ b/www/merb-action-args/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:40 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/13 00:09:44 taca Exp $
DISTNAME= merb-action-args-1.1.3
+PKGREVISION= 1
CATEGORIES= www
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -8,7 +9,7 @@ HOMEPAGE= http://www.merbivore.com/
COMMENT= Merb plugin to map query parameters to controller method arguments
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}-ruby2ruby>=1.1.9:../../devel/ruby2ruby
DEPENDS+= ${RUBY_PKGPREFIX}-parsetree>=2.2.1:../../devel/ruby-parsetree
diff --git a/www/merb-activerecord/Makefile b/www/merb-activerecord/Makefile
index 8bb29fa8b51..37345ab1b20 100644
--- a/www/merb-activerecord/Makefile
+++ b/www/merb-activerecord/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:40 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/13 00:10:13 taca Exp $
DISTNAME= merb_activerecord-1.0.0.1
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
+PKGREVISION= 1
CATEGORIES= databases www
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -9,7 +10,7 @@ HOMEPAGE= http://www.merbivore.com/
COMMENT= Merb plugin for the ActiveRecord ORM
LICENSE= mit
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-core>=0.9.2:../../www/merb-core
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-core>=0.9.9:../../www/merb-core
CONFLICTS+= merb-activerecord-[0-9]*
diff --git a/www/merb/Makefile b/www/merb/Makefile
index 6756a1e49b3..3e5d9d09ce7 100644
--- a/www/merb/Makefile
+++ b/www/merb/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:40 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/13 00:08:58 taca Exp $
DISTNAME= merb-1.1.3
+PKGREVISION= 1
CATEGORIES= www
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -8,18 +9,18 @@ HOMEPAGE= http://www.merbivore.com/
COMMENT= Mongrel + Erb -- pocket rocket web framework
LICENSE= mit
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-action-args>=1.1.3:../../www/merb-action-args
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-assets>=1.1.3:../../www/merb-assets
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-auth>=1.1:../../www/merb-auth
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-cache>=1.1.3:../../www/merb-cache
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-exceptions>=1.1.3:../../www/merb-exceptions
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-gen>=1.1.3:../../www/merb-gen
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-haml>=1.1.3:../../www/merb-haml
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-helpers>=1.1.3:../../www/merb-helpers
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-mailer>=1.1.3:../../www/merb-mailer
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-param-protection>=1.1.3:../../www/merb-param-protection
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-slices>=1.1.3:../../www/merb-slices
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-datamapper>=1.1:../../www/merb-datamapper
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-action-args>=1.1.3<1.2:../../www/merb-action-args
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-assets>=1.1.3<1.2:../../www/merb-assets
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-auth>=1.1<1.2:../../www/merb-auth
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-cache>=1.1.3<1.2:../../www/merb-cache
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-exceptions>=1.1.3<1.2:../../www/merb-exceptions
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-gen>=1.1.3<1.2:../../www/merb-gen
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-haml>=1.1.3<1.2:../../www/merb-haml
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-helpers>=1.1.3<1.2:../../www/merb-helpers
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-mailer>=1.1.3<1.2:../../www/merb-mailer
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-param-protection>=1.1.3<1.2:../../www/merb-param-protection
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-slices>=1.1.3<1.2:../../www/merb-slices
+DEPENDS+= ${RUBY_PKGPREFIX}-merb-datamapper>=1.1<2:../../www/merb-datamapper
DEPENDS+= ${RUBY_PKGPREFIX}-datamapper>=0.10.0:../../databases/ruby-datamapper
DEPENDS+= ${RUBY_PKGPREFIX}-do_sqlite3>=0.10.0:../../databases/ruby-do_sqlite3
DEPENDS+= ${RUBY_PKGPREFIX}-rspec>=0:../../devel/ruby-rspec