diff options
| author | taca <taca> | 2010-09-13 14:12:14 +0000 |
|---|---|---|
| committer | taca <taca> | 2010-09-13 14:12:14 +0000 |
| commit | 43b51ed8d03f59855301b1118c778f50a691c939 (patch) | |
| tree | aa7be0540426032af94eb4718e5d05494fbe642f /www/merb-core | |
| parent | 0d1e1ee74c8cb4f1b561f4812813b94132c56d26 (diff) | |
| download | pkgsrc-43b51ed8d03f59855301b1118c778f50a691c939.tar.gz | |
* Add CONFLICTS a pattern matches previous package name
without "${RUBY_PKGPREFIX}-".
Diffstat (limited to 'www/merb-core')
| -rw-r--r-- | www/merb-core/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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" |