From 42108bd0ee3b19c832d1c32979538db9a8a9b779 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Mon, 13 Sep 2010 14:34:05 +0000
Subject: * Add CONFLICTS a pattern matches previous package name   without
 "${RUBY_PKGPREFIX}-". * Remove duplicated "@comment $NetBSD$" line.

---
 www/merb-cache/Makefile | 4 +++-
 www/merb-cache/PLIST    | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/merb-cache/Makefile b/www/merb-cache/Makefile
index 56949d8fede..aa0e7b77a38 100644
--- a/www/merb-cache/Makefile
+++ b/www/merb-cache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/09/12 02:38:18 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/13 14:34:05 taca Exp $
 
 DISTNAME=	merb-cache-1.1.3
 CATEGORIES=	www
@@ -10,5 +10,7 @@ LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-merb-core>=1.1.3:../../www/merb-core
 
+CONFLICTS+=	merb-cache-[0-9]*
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/merb-cache/PLIST b/www/merb-cache/PLIST
index abc59507cff..0b6eec34995 100644
--- a/www/merb-cache/PLIST
+++ b/www/merb-cache/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2010/09/12 02:38:18 taca Exp $
-@comment $NetBSD: PLIST,v 1.3 2010/09/12 02:38:18 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/09/13 14:34:05 taca Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/LICENSE
 ${GEM_LIBDIR}/README
-- 
cgit v1.2.3