From 21726835dd92f7e1e3121d83e33bbea714937c68 Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 12 Mar 2006 17:05:08 +0000 Subject: Readded the CONFLICTS line for pkg_alternatives. This package does not really conflict with pkg_alternatives, but with the various vim packages that can be installed via pkg_alternatives. Thanks to wiz for noting this. --- editors/vim-kde/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'editors') diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile index 7a21b532f89..2dc1f4013db 100644 --- a/editors/vim-kde/Makefile +++ b/editors/vim-kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/03/12 13:47:35 rillig Exp $ +# $NetBSD: Makefile,v 1.36 2006/03/12 17:05:08 rillig Exp $ DISTNAME= kvim-${KVIM_VERSION} PKGNAME= vim-kde-${KVIM_VERSION} @@ -17,6 +17,7 @@ KVIM_VERSION= 6.2.14 CONFLICTS+= vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]* CONFLICTS+= vim-share-[0-9]* vim-[0-9]* vim-xaw-[0-9]* +CONFLICTS+= pkg_alternatives-[0-9]* WRKSRC= ${WRKDIR}/kvim-${KVIM_VERSION}/src USE_DIRS+= xdg-1.1 -- cgit v1.2.3