diff options
| author | taca <taca> | 2010-09-13 14:49:54 +0000 |
|---|---|---|
| committer | taca <taca> | 2010-09-13 14:49:54 +0000 |
| commit | 1ae7a0a1c8eea9df43cbebfabb0c866a078dded1 (patch) | |
| tree | 167eb06cd084ec03ea574d885026e7442db919df | |
| parent | 0f1613d1aad206089d85a734cb96fedfc002c670 (diff) | |
| download | pkgsrc-1ae7a0a1c8eea9df43cbebfabb0c866a078dded1.tar.gz | |
* Add two CONFLICTS patterns:
- matches previous package name without "${RUBY_PKGPREFIX}-"
- matches current "ruby18-" and "ruby19-" packages
Bump PKGREVISION because addition of latter pattern.
| -rw-r--r-- | devel/rubigen/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/capistrano/Makefile | 5 | ||||
| -rw-r--r-- | www/merb-slices/Makefile | 5 | ||||
| -rw-r--r-- | www/ramaze/Makefile | 5 |
4 files changed, 16 insertions, 4 deletions
diff --git a/devel/rubigen/Makefile b/devel/rubigen/Makefile index eb0e9623413..0cb44c1b7e7 100644 --- a/devel/rubigen/Makefile +++ b/devel/rubigen/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2010/09/10 05:07:22 taca Exp $ +# $NetBSD: Makefile,v 1.7 2010/09/13 14:49:54 taca Exp $ DISTNAME= rubigen-1.5.5 +PKGREVISION= 1 CATEGORIES= devel MAINTAINER= pkgsrc-users@NetBSD.org @@ -10,5 +11,7 @@ LICENSE= mit DEPENDS+= ${RUBY_PKGPREFIX}-activesupport>=2.3.5:../../devel/ruby-activesupport +CONFLICTS+= ruby[1-9][0-9]-rubigen-* rubigen-* + .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/capistrano/Makefile b/sysutils/capistrano/Makefile index b62c4654126..8dca0ad35e0 100644 --- a/sysutils/capistrano/Makefile +++ b/sysutils/capistrano/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2010/09/10 07:50:03 taca Exp $ +# $NetBSD: Makefile,v 1.5 2010/09/13 14:49:54 taca Exp $ DISTNAME= capistrano-2.5.19 +PKGREVISION= 1 CATEGORIES= sysutils MAINTAINER= pkgsrc-users@NetBSD.org @@ -16,5 +17,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-net-sftp>=2.0.0:../../security/ruby-net-sftp DEPENDS+= ${RUBY_PKGPREFIX}-net-scp>=1.0.0:../../security/ruby-net-scp DEPENDS+= ${RUBY_PKGPREFIX}-highline>=0:../../devel/ruby-highline +CONFLICTS+= ruby[1-9][0-9]-capistrano-[0-9]* capistrano-[0-9]* + .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/merb-slices/Makefile b/www/merb-slices/Makefile index 3133fae763e..ec688e999a3 100644 --- a/www/merb-slices/Makefile +++ b/www/merb-slices/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/09/12 03:00:06 taca Exp $ +# $NetBSD: Makefile,v 1.2 2010/09/13 14:49:54 taca Exp $ DISTNAME= merb-slices-1.1.3 +PKGREVISION= 1 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org @@ -10,5 +11,7 @@ LICENSE= mit DEPENDS+= ${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core +CONFLICTS+= ruby[1-9][0-9]-merb-slices-[0-9]* + .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ramaze/Makefile b/www/ramaze/Makefile index b4c6aaab5aa..4718cbae642 100644 --- a/www/ramaze/Makefile +++ b/www/ramaze/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2010/09/10 12:42:12 taca Exp $ +# $NetBSD: Makefile,v 1.5 2010/09/13 14:49:54 taca Exp $ DISTNAME= ramaze-2010.06.18 +PKGREVISION= 1 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org @@ -11,5 +12,7 @@ LICENSE= ruby-license DEPENDS+= ${RUBY_PKGPREFIX}-rack>=0.2.0:../../www/ruby-rack DEPENDS+= ${RUBY_PKGPREFIX}-innate>=2010.03:../../www/ruby-innate +CONFLICTS+= ruby[1-9][0-9]-ramaze-[0-9]* ramaze-[0-9]* + .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" |