summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2011-08-13 00:21:37 +0000
committertaca <taca@pkgsrc.org>2011-08-13 00:21:37 +0000
commit42958ad60a110ca674511b468d6b5144c2204f1c (patch)
tree8d030df57cdb0e04618255bd972d16ac64cc49fa /www
parent6603b7c48cf39870945e5836bcbbb01e00aabba2 (diff)
downloadpkgsrc-42958ad60a110ca674511b468d6b5144c2204f1c.tar.gz
- Fix dependency pattern.
Bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r--www/merb-slices/Makefile6
-rw-r--r--www/merb-stories/Makefile6
2 files changed, 6 insertions, 6 deletions
diff --git a/www/merb-slices/Makefile b/www/merb-slices/Makefile
index ec688e999a3..09b66114c88 100644
--- a/www/merb-slices/Makefile
+++ b/www/merb-slices/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/09/13 14:49:54 taca Exp $
+# $NetBSD: Makefile,v 1.3 2011/08/13 00:21:37 taca Exp $
DISTNAME= merb-slices-1.1.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.merbivore.com/
COMMENT= Merb plugin that supports reusable application 'slices'
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+= ruby[1-9][0-9]-merb-slices-[0-9]*
diff --git a/www/merb-stories/Makefile b/www/merb-stories/Makefile
index da1b189d50d..0dc6b958f8f 100644
--- a/www/merb-stories/Makefile
+++ b/www/merb-stories/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:42 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/13 00:22:00 taca Exp $
DISTNAME= merb_stories-0.9.13
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://rubyforge.org/frs/download.php/46246/
@@ -9,8 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.merbivore.com/
COMMENT= Merb plugin that provides helpers for using RSpec
-DEPENDS+= ${RUBY_PKGPREFIX}-merb-core>=0.9.2:../../www/merb-core
-DEPENDS+= ${RUBY_PKGPREFIX}-rspec>=1.1.3:../../devel/ruby-rspec
+DEPENDS+= ${RUBY_PKGPREFIX}-merb>=0.4.0:../../www/merb
CONFLICTS+= merb-stories-[0-9]*