From 734fc039098843884b540ffd6cd2663580806956 Mon Sep 17 00:00:00 2001
From: seb <seb>
Date: Fri, 31 May 2002 16:06:04 +0000
Subject: Mark as conflicting with nvi package from editors/nvi.

---
 editors/nvi-m17n/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'editors/nvi-m17n/Makefile')

diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index fe85094a94d..048eb25918d 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/05/31 15:19:56 seb Exp $
+# $NetBSD: Makefile,v 1.18 2002/05/31 16:06:04 seb Exp $
 # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
 
 DISTNAME=	nvi-1.79
@@ -14,7 +14,7 @@ PATCHFILES=	nvi-1.79.m17n-19991117.diff.gz
 MAINTAINER=	itojun@itojun.org
 COMMENT=	Clone of vi/ex, with multilingual patch
 
-CONFLICTS=	vigor-[0-9]*
+CONFLICTS=	vigor-[0-9]* nvi-[0-9]*
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
 GNU_CONFIGURE=	YES
-- 
cgit v1.2.3