* Add CONFLICTS a pattern matches previous package name

  without "${RUBY_PKGPREFIX}-".

16 files changed, 48 insertions, 16 deletions

diff --git a/www/merb-action-args/Makefile b/www/merb-action-args/Makefile
index 34218840b5f..597c40b1163 100644
--- a/www/merb-action-args/Makefile
+++ b/www/merb-action-args/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:32:52 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:40 taca Exp $
 
 DISTNAME=	merb-action-args-1.1.3
 CATEGORIES=	www
@@ -12,5 +12,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
 DEPENDS+=	${RUBY_PKGPREFIX}-ruby2ruby>=1.1.9:../../devel/ruby2ruby
 DEPENDS+=	${RUBY_PKGPREFIX}-parsetree>=2.2.1:../../devel/ruby-parsetree
 
+CONFLICTS+=	merb-action-args-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-activerecord/Makefile b/www/merb-activerecord/Makefile
index e3ea07d7943..8bb29fa8b51 100644
--- a/www/merb-activerecord/Makefile
+++ b/www/merb-activerecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:34:34 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:40 taca Exp $
 
 DISTNAME=	merb_activerecord-1.0.0.1
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
@@ -11,5 +11,7 @@ LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=0.9.2:../../www/merb-core
 
+CONFLICTS+=	merb-activerecord-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-assets/Makefile b/www/merb-assets/Makefile
index b71d335fa39..2941ead3882 100644
--- a/www/merb-assets/Makefile
+++ b/www/merb-assets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:36:18 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:40 taca Exp $
 
 DISTNAME=	merb-assets-1.1.3
 CATEGORIES=	www
@@ -10,5 +10,7 @@ LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
 
+CONFLICTS+=	merb-assets-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-builder/Makefile b/www/merb-builder/Makefile
index b7f36859a74..f878897cbdc 100644
--- a/www/merb-builder/Makefile
+++ b/www/merb-builder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:37:08 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:41 taca Exp $
 
 DISTNAME=	merb-builder-0.9.8
 CATEGORIES=	www
@@ -11,5 +11,7 @@ LICENSE=	mit
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=0.9.8:../../www/merb-core
 DEPENDS+=	${RUBY_PKGPREFIX}-builder>=2.0.0:../../textproc/ruby-builder
 
+CONFLICTS+=	merb-builder-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-datamapper/Makefile b/www/merb-datamapper/Makefile
index 4a29275e645..f5f09d44eb1 100644
--- a/www/merb-datamapper/Makefile
+++ b/www/merb-datamapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:40:00 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:41 taca Exp $
 
 DISTNAME=	merb_datamapper-1.1.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
@@ -13,5 +13,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1:../../www/merb-core
 DEPENDS+=	${RUBY_PKGPREFIX}-dm-core>=0.10.2:../../databases/ruby-dm-core
 DEPENDS+=	${RUBY_PKGPREFIX}-dm-migrations>=0.10.2:../../databases/ruby-dm-migrations
 
+CONFLICTS+=	merb-datamapper-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-haml/Makefile b/www/merb-haml/Makefile
index 57f328a184f..ff0e53d5085 100644
--- a/www/merb-haml/Makefile
+++ b/www/merb-haml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:42:28 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:41 taca Exp $
 
 DISTNAME=	merb-haml-1.1.3
 CATEGORIES=	www
@@ -11,5 +11,7 @@ LICENSE=	mit
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
 DEPENDS+=	${RUBY_PKGPREFIX}-haml>=2.0.3:../../textproc/ruby-haml
 
+CONFLICTS+=	merb-haml-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-has-flash/Makefile b/www/merb-has-flash/Makefile
index c6bb987fbf7..fad4290c2e5 100644
--- a/www/merb-has-flash/Makefile
+++ b/www/merb-has-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:43:28 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:41 taca Exp $
 
 DISTNAME=	merb_has_flash-1.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
@@ -11,5 +11,7 @@ LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=0.9.2:../../www/merb-core
 
+CONFLICTS+=	merb-has-flash-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-helpers/Makefile b/www/merb-helpers/Makefile
index 033e2d19497..45febc10bb8 100644
--- a/www/merb-helpers/Makefile
+++ b/www/merb-helpers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:44:03 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:41 taca Exp $
 
 DISTNAME=	merb-helpers-1.1.3
 CATEGORIES=	www
@@ -10,5 +10,7 @@ LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
 
+CONFLICTS+=	merb-helper-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-mailer/Makefile b/www/merb-mailer/Makefile
index 310d37ae8ca..cdd7f9f4ac1 100644
--- a/www/merb-mailer/Makefile
+++ b/www/merb-mailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:45:31 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:41 taca Exp $
 
 DISTNAME=	merb-mailer-1.1.3
 CATEGORIES=	www
@@ -11,5 +11,7 @@ LICENSE=	mit
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
 DEPENDS+=	${RUBY_PKGPREFIX}-mailfactory>=1.2.3:../../mail/ruby-mailfactory
 
+CONFLICTS+=	merb-mailer-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-more/Makefile b/www/merb-more/Makefile
index 4d6fad8b3f8..69c54cb4cf3 100644
--- a/www/merb-more/Makefile
+++ b/www/merb-more/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 03:08:30 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:42 taca Exp $
 
 DISTNAME=	merb-more-1.0.15
 CATEGORIES=	www
@@ -21,5 +21,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-merb-helpers>=1.0.15:../../www/merb-helpers
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-mailer>=1.0.15:../../www/merb-mailer
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-param-protection>=1.0.15:../../www/merb-param-protection
 
+CONFLICTS+=	merb-more-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-param-protection/Makefile b/www/merb-param-protection/Makefile
index aa24eb3fa05..3c06ed7861a 100644
--- a/www/merb-param-protection/Makefile
+++ b/www/merb-param-protection/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:46:38 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:42 taca Exp $
 
 DISTNAME=	merb-param-protection-1.1.3
 CATEGORIES=	www
@@ -10,5 +10,7 @@ LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
 
+CONFLICTS+=	merb-param-protection-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-parts/Makefile b/www/merb-parts/Makefile
index 8c088ab2303..af85234c49a 100644
--- a/www/merb-parts/Makefile
+++ b/www/merb-parts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:50:27 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:42 taca Exp $
 
 DISTNAME=	merb-parts-0.9.8
 CATEGORIES=	www
@@ -10,5 +10,7 @@ LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=0.9.8:../../www/merb-core
 
+CONFLICTS+=	merb-parts-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-sequel/Makefile b/www/merb-sequel/Makefile
index e5c56b099d2..00deb2ec2bf 100644
--- a/www/merb-sequel/Makefile
+++ b/www/merb-sequel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/09/12 02:51:38 taca Exp $
+# $NetBSD: Makefile,v 1.4 2010/09/13 14:32:42 taca Exp $
 
 DISTNAME=	merb_sequel-1.1.1
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
@@ -12,5 +12,7 @@ LICENSE=	mit
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.0:../../www/merb-core
 DEPENDS+=	${RUBY_PKGPREFIX}-sequel>=2.7.0:../../databases/ruby-sequel
 
+CONFLICTS+=	merb-sequel-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-stories/Makefile b/www/merb-stories/Makefile
index 609c83afc38..da1b189d50d 100644
--- a/www/merb-stories/Makefile
+++ b/www/merb-stories/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:52:32 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:42 taca Exp $
 
 DISTNAME=	merb_stories-0.9.13
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
@@ -12,5 +12,7 @@ COMMENT=	Merb plugin that provides helpers for using RSpec
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=0.9.2:../../www/merb-core
 DEPENDS+=	${RUBY_PKGPREFIX}-rspec>=1.1.3:../../devel/ruby-rspec
 
+CONFLICTS+=	merb-stories-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-test-unit/Makefile b/www/merb-test-unit/Makefile
index 8c4a74975c6..9710cb07215 100644
--- a/www/merb-test-unit/Makefile
+++ b/www/merb-test-unit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:53:26 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:42 taca Exp $
 
 DISTNAME=	merb_test_unit-0.9.13
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
@@ -11,5 +11,7 @@ LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=0.9.9:../../www/merb-core
 
+CONFLICTS+=	merb-test-unit-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb/Makefile b/www/merb/Makefile
index 502472ce7df..6756a1e49b3 100644
--- a/www/merb/Makefile
+++ b/www/merb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 03:02:22 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:32:40 taca Exp $
 
 DISTNAME=	merb-1.1.3
 CATEGORIES=	www
@@ -24,5 +24,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-datamapper>=0.10.0:../../databases/ruby-datamapper
 DEPENDS+=	${RUBY_PKGPREFIX}-do_sqlite3>=0.10.0:../../databases/ruby-do_sqlite3
 DEPENDS+=	${RUBY_PKGPREFIX}-rspec>=0:../../devel/ruby-rspec
 
+CONFLICTS+=	merb-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"