pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/vim-kde Readded the CONFLICTS line for pkg_alt...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf2fd69de60f
branches:  trunk
changeset: 509638:bf2fd69de60f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Mar 12 17:05:08 2006 +0000

description:
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.

diffstat:

 editors/vim-kde/Makefile |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r a8ade45e7bb7 -r bf2fd69de60f editors/vim-kde/Makefile
--- a/editors/vim-kde/Makefile  Sun Mar 12 16:55:51 2006 +0000
+++ b/editors/vim-kde/Makefile  Sun Mar 12 17:05:08 2006 +0000
@@ -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 @@
 
 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



Home | Main Index | Thread Index | Old Index