From 079e01746d87ccb85cb55cbb7410d4c6691be1c3 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Mon, 13 Sep 2010 14:39:30 +0000
Subject: * Add two CONFLICTS patterns: 	- matches previous package name
 without "${RUBY_PKGPREFIX}-" 	- matches current "ruby18-" and "ruby19-"
 packages * Since these packages aren't update its version during update of
 Ruby   package's framework, bump PKGREVISION for safe update.  Noted by  
 obache@ on tech-pkg.

---
 www/thin/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'www/thin')

diff --git a/www/thin/Makefile b/www/thin/Makefile
index 306ec0f6702..a3a5b7c7dfe 100644
--- a/www/thin/Makefile
+++ b/www/thin/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/09/10 13:22:19 taca Exp $
+# $NetBSD: Makefile,v 1.7 2010/09/13 14:39:31 taca Exp $
 
 DISTNAME=	thin-1.2.7
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,7 +13,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-rack>=1.0.0:../../www/ruby-rack
 DEPENDS+=	${RUBY_PKGPREFIX}-daemons>=1.0.9:../../misc/ruby-daemons
 DEPENDS+=	${RUBY_PKGPREFIX}-eventmachine>=0.12.6:../../devel/ruby-eventmachine
 
-CONFLICTS+=	ruby[1-9][0-9]-thin-*
+CONFLICTS+=	ruby[1-9][0-9]-thin-[0-9]* thin-[0-9]*
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3