mark conflict between nvi and nvi-m17n

This commit is contained in:
naddy 2012-07-14 10:19:14 +00:00
parent ecc4994a68
commit 9aae5b7b2b
4 changed files with 8 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.31 2011/12/02 14:36:14 espie Exp $
# $OpenBSD: Makefile,v 1.32 2012/07/14 10:19:14 naddy Exp $
# NetBSD: Makefile,v 1.6 2000/01/19 12:28:44 hubertf Exp
# FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
@ -6,7 +6,7 @@ COMMENT= multilingual clone of vi/ex
DISTNAME= nvi-1.79
PKGNAME= nvi-m17n-1.79.19991117
REVISION= 3
REVISION= 4
CATEGORIES= editors
MASTER_SITES= ftp://ftp.foretune.co.jp/pub/tools/nvi/

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2006/11/11 18:20:43 sturm Exp $
@comment $OpenBSD: PLIST,v 1.4 2012/07/14 10:19:14 naddy Exp $
@conflict nvi-*
bin/nex
bin/nvi
bin/nvi-big5

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/07/14 09:59:30 naddy Exp $
# $OpenBSD: Makefile,v 1.2 2012/07/14 10:19:14 naddy Exp $
COMMENT= ex/vi text editor with wide character support
# commit 9b89eb63aa3331a9fe9ca79af6b7786785ced6e2
DISTNAME= nvi-2.1.0
REVISION= 0
CATEGORIES= editors
HOMEPAGE= https://github.com/lichray/nvi2

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/07/14 09:59:30 naddy Exp $
@comment $OpenBSD: PLIST,v 1.2 2012/07/14 10:19:14 naddy Exp $
@conflict nvi-m17n-*
@bin bin/nex
@bin bin/nvi
@bin bin/nview