From 6c45feebaf89ebecfc0a87e5bf4fa02b6212a090 Mon Sep 17 00:00:00 2001 From: taca Date: Mon, 13 Sep 2010 14:12:14 +0000 Subject: * Add CONFLICTS a pattern matches previous package name without "${RUBY_PKGPREFIX}-". --- www/merb-core/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/merb-core') diff --git a/www/merb-core/Makefile b/www/merb-core/Makefile index 78b1dce6605..75529ad7615 100644 --- a/www/merb-core/Makefile +++ b/www/merb-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/09/12 02:31:28 taca Exp $ +# $NetBSD: Makefile,v 1.3 2010/09/13 14:12:15 taca Exp $ DISTNAME= merb-core-1.1.3 CATEGORIES= www @@ -14,7 +14,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-rack>=0:../../www/ruby-rack DEPENDS+= ${RUBY_PKGPREFIX}-mime-types>=1.16:../../mail/ruby-mime-types DEPENDS+= ${RUBY_PKGPREFIX}-bundler>=0:../../misc/ruby-bundler -CONFLICTS+= ruby[1-9][0-9]-merb-core-* +CONFLICTS+= ruby[1-9][0-9]-merb-core-[0-9]* merb-core-[0-9]* .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3