[pkgsrc/trunk]: pkgsrc * Add two CONFLICTS patterns:

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2faa1f405368
branches:  trunk
changeset: 580591:2faa1f405368
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Sep 13 14:49:54 2010 +0000

description:
* Add two CONFLICTS patterns:
        - matches previous package name without "${RUBY_PKGPREFIX}-"
        - matches current "ruby18-" and "ruby19-" packages

Bump PKGREVISION because addition of latter pattern.

diffstat:

 devel/rubigen/Makefile       |  5 ++++-
 sysutils/capistrano/Makefile |  5 ++++-
 www/merb-slices/Makefile     |  5 ++++-
 www/ramaze/Makefile          |  5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diffs (80 lines):

diff -r f19a2198ddb0 -r 2faa1f405368 devel/rubigen/Makefile
--- a/devel/rubigen/Makefile    Mon Sep 13 14:40:40 2010 +0000
+++ b/devel/rubigen/Makefile    Mon Sep 13 14:49:54 2010 +0000
@@ -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@localhost
@@ -10,5 +11,7 @@
 
 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 -r f19a2198ddb0 -r 2faa1f405368 sysutils/capistrano/Makefile
--- a/sysutils/capistrano/Makefile      Mon Sep 13 14:40:40 2010 +0000
+++ b/sysutils/capistrano/Makefile      Mon Sep 13 14:49:54 2010 +0000
@@ -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@localhost
@@ -16,5 +17,7 @@
 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 -r f19a2198ddb0 -r 2faa1f405368 www/merb-slices/Makefile
--- a/www/merb-slices/Makefile  Mon Sep 13 14:40:40 2010 +0000
+++ b/www/merb-slices/Makefile  Mon Sep 13 14:49:54 2010 +0000
@@ -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@localhost
@@ -10,5 +11,7 @@
 
 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 -r f19a2198ddb0 -r 2faa1f405368 www/ramaze/Makefile
--- a/www/ramaze/Makefile       Mon Sep 13 14:40:40 2010 +0000
+++ b/www/ramaze/Makefile       Mon Sep 13 14:49:54 2010 +0000
@@ -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@localhost
@@ -11,5 +12,7 @@
 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"