diff options
author | taca <taca@pkgsrc.org> | 2010-09-13 14:12:14 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2010-09-13 14:12:14 +0000 |
commit | 6c45feebaf89ebecfc0a87e5bf4fa02b6212a090 (patch) | |
tree | aa7be0540426032af94eb4718e5d05494fbe642f | |
parent | d978479149115a0ae000638ee3462a02dc6ee687 (diff) | |
download | pkgsrc-6c45feebaf89ebecfc0a87e5bf4fa02b6212a090.tar.gz |
* Add CONFLICTS a pattern matches previous package name
without "${RUBY_PKGPREFIX}-".
-rw-r--r-- | devel/rubyforge/Makefile | 4 | ||||
-rw-r--r-- | www/camping/Makefile | 4 | ||||
-rw-r--r-- | www/erubis/Makefile | 4 | ||||
-rw-r--r-- | www/heel/Makefile | 4 | ||||
-rw-r--r-- | www/merb-core/Makefile | 4 | ||||
-rw-r--r-- | www/merb-gen/Makefile | 4 | ||||
-rw-r--r-- | www/raggle/Makefile | 4 | ||||
-rw-r--r-- | www/thoth/Makefile | 4 | ||||
-rw-r--r-- | www/webby/Makefile | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/devel/rubyforge/Makefile b/devel/rubyforge/Makefile index b35335992b1..aa7142d64ff 100644 --- a/devel/rubyforge/Makefile +++ b/devel/rubyforge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/09/10 06:37:04 taca Exp $ +# $NetBSD: Makefile,v 1.8 2010/09/13 14:12:14 taca Exp $ DISTNAME= rubyforge-2.0.4 CATEGORIES= devel @@ -10,7 +10,7 @@ LICENSE= mit DEPENDS+= ${RUBY_PKGPREFIX}-json-pure>=1.1.7:../../textproc/ruby-json-pure -CONFLICTS+= ruby[1-9][0-9]-rubyforge-[0-9]* +CONFLICTS+= ruby[1-9][0-9]-rubyforge-[0-9]* rubyforge-[0-9]* pre-build: cd ${WRKSRC}; ${CHMOD} -R g-w . diff --git a/www/camping/Makefile b/www/camping/Makefile index 0a4047e5d5b..0efa45aaab1 100644 --- a/www/camping/Makefile +++ b/www/camping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/09/10 10:51:56 taca Exp $ +# $NetBSD: Makefile,v 1.3 2010/09/13 14:12:14 taca Exp $ DISTNAME= camping-2.1 CATEGORIES= www @@ -10,7 +10,7 @@ LICENSE= mit DEPENDS+= ${RUBY_PKGPREFIX}-rack>=1.0:../../www/ruby-rack -CONFLICTS+= ruby[1-9][0-9]-camping-[0-9]* +CONFLICTS+= ruby[1-9][0-9]-camping-[0-9]* camping-[0-9]* .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/erubis/Makefile b/www/erubis/Makefile index 15c057fc852..f222fa998b9 100644 --- a/www/erubis/Makefile +++ b/www/erubis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2010/09/10 10:53:49 taca Exp $ +# $NetBSD: Makefile,v 1.4 2010/09/13 14:12:14 taca Exp $ DISTNAME= erubis-2.6.6 CATEGORIES= www @@ -10,7 +10,7 @@ LICENSE= mit DEPENDS+= ${RUBY_PKGPREFIX}-abstract>=1.0.0:../../devel/ruby-abstract -CONFLICTS+= ruby[1-9][0-9]-erubis-* +CONFLICTS+= ruby[1-9][0-9]-erubis-[0-9]* erubis-[0-9]* .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/heel/Makefile b/www/heel/Makefile index fa42cdaa154..56475ce5ad3 100644 --- a/www/heel/Makefile +++ b/www/heel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2010/09/10 10:55:21 taca Exp $ +# $NetBSD: Makefile,v 1.4 2010/09/13 14:12:14 taca Exp $ DISTNAME= heel-2.0.0 CATEGORIES= www @@ -13,7 +13,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-coderay>=0.8.260:../../textproc/ruby-coderay DEPENDS+= ${RUBY_PKGPREFIX}-launchy>=0.3.2:../../misc/ruby-launchy DEPENDS+= ${RUBY_PKGPREFIX}-mime-types>=1.16:../../mail/ruby-mime-types -CONFLICTS+= ruby[1-9][0-9]-heel-* +CONFLICTS+= ruby[1-9][0-9]-heel-[0-9]* heel-[0-9]* .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" 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" diff --git a/www/merb-gen/Makefile b/www/merb-gen/Makefile index 3b79b2829ec..c53f33f8a7c 100644 --- a/www/merb-gen/Makefile +++ b/www/merb-gen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/09/12 02:41:11 taca Exp $ +# $NetBSD: Makefile,v 1.3 2010/09/13 14:12:15 taca Exp $ DISTNAME= merb-gen-1.1.3 CATEGORIES= www @@ -12,7 +12,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-merb-core>=0.9.2:../../www/merb-core DEPENDS+= ${RUBY_PKGPREFIX}-rubigen>=1.2.4:../../devel/rubigen DEPENDS+= ${RUBY_PKGPREFIX}-rspec>=1.1.3:../../devel/ruby-rspec -CONFLICTS+= ruby[1-9][0-9]-merb-gen-* +CONFLICTS+= ruby[1-9][0-9]-merb-gen-[0-9] merb-gen-[0-9] .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/raggle/Makefile b/www/raggle/Makefile index f3ce883fb6e..d50b3bf4161 100644 --- a/www/raggle/Makefile +++ b/www/raggle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2010/09/12 03:31:10 taca Exp $ +# $NetBSD: Makefile,v 1.11 2010/09/13 14:12:15 taca Exp $ DISTNAME= raggle-0.4.4 PKGREVISION= 4 @@ -12,7 +12,7 @@ LICENSE= mit DEPENDS+= ${RUBY_PKGPREFIX}-ncurses>=0.8:../../devel/ruby-ncurses -CONFLICTS+= ruby[1-9][0-9]-raggle-[0-9]* +CONFLICTS+= ruby[1-9][0-9]-raggle-[0-9]* raggle-[0-9]* NO_BUILD= yes diff --git a/www/thoth/Makefile b/www/thoth/Makefile index f0c09d700ac..14e39a0ddd0 100644 --- a/www/thoth/Makefile +++ b/www/thoth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/09/10 13:25:11 taca Exp $ +# $NetBSD: Makefile,v 1.6 2010/09/13 14:12:15 taca Exp $ DISTNAME= thoth-0.2.1 CATEGORIES= www @@ -20,7 +20,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-redcloth>=4.0.3:../../textproc/ruby-redcloth DEPENDS+= ${RUBY_PKGPREFIX}-sequel>=2.5.0:../../databases/ruby-sequel DEPENDS+= ${RUBY_PKGPREFIX}-thin>=0.8.2:../../www/thin -CONFLICTS+= ruby[1-9][0-9]-thoth-* +CONFLICTS+= ruby[1-9][0-9]-thoth-[0-9]* thoth-[0-9]* .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/webby/Makefile b/www/webby/Makefile index 61efc94a3e6..b2762b3d0ac 100644 --- a/www/webby/Makefile +++ b/www/webby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/09/10 13:32:05 taca Exp $ +# $NetBSD: Makefile,v 1.3 2010/09/13 14:12:15 taca Exp $ DISTNAME= webby-0.9.4 CATEGORIES= www @@ -14,7 +14,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-hpricot>=0.6:../../textproc/ruby-hpricot DEPENDS+= ${RUBY_PKGPREFIX}-logging>=0.7.1:../../devel/ruby-logging DEPENDS+= ${RUBY_PKGPREFIX}-rspec>=1.1.3:../../devel/ruby-rspec -CONFLICTS+= ruby[1-9][0-9]-webby-[0-9]* +CONFLICTS+= ruby[1-9][0-9]-webby-[0-9]* webby-[0-9]* .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" |