summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authormartti <martti@pkgsrc.org>2003-02-15 18:56:17 +0000
committermartti <martti@pkgsrc.org>2003-02-15 18:56:17 +0000
commitbe6e0d22b1eae9f3825197ee59a21b44f03298f9 (patch)
treebb3f0a8ebde41e5efd72dd9e11d1a4366157dba7 /editors
parent3c174853c2c8311003d1f65d01a88f2c3aa41387 (diff)
downloadpkgsrc-be6e0d22b1eae9f3825197ee59a21b44f03298f9.tar.gz
This CONFLICTs with vim-motif
Diffstat (limited to 'editors')
-rw-r--r--editors/vim-gtk/Makefile4
-rw-r--r--editors/vim-xaw/Makefile4
-rw-r--r--editors/vim/Makefile4
3 files changed, 6 insertions, 6 deletions
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 3b799e95373..a58a3a8a233 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/09/14 00:10:46 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2003/02/15 18:56:18 martti Exp $
.include "../vim-share/Makefile.common"
@@ -7,7 +7,7 @@ PKGNAME= vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
COMMENT= Vim editor (vi clone) with X11 GTK+ GUI
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
-CONFLICTS+= vim-[0-9]* vim-xaw-[0-9]*
+CONFLICTS+= vim-[0-9]* vim-motif-[0-9]* vim-xaw-[0-9]*
USE_X11= yes
CONFIGURE_ARGS+= --enable-gui=gtk
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 24c77e1b64f..9f75e765471 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/01/04 23:01:45 cjep Exp $
+# $NetBSD: Makefile,v 1.24 2003/02/15 18:56:18 martti Exp $
.include "../vim-share/Makefile.common"
@@ -7,7 +7,7 @@ PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
COMMENT= Vim editor (vi clone) with X11 Athena GUI
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
-CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]*
+CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]*
USE_X11= yes
CONFIGURE_ARGS+= --enable-gui=athena
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index b7d7cf92589..43e829df567 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2002/09/14 00:10:45 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2003/02/15 18:56:17 martti Exp $
.include "../vim-share/Makefile.common"
@@ -8,7 +8,7 @@ COMMENT= Vim editor (vi clone) without gui
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
-CONFLICTS+= vim-xaw-[0-9]* vim-gtk-[0-9]*
+CONFLICTS+= vim-gtk-[0-9]* vim-motif-[0-9]* vim-xaw-[0-9]*
CONFIGURE_ARGS+= --enable-gui=no --without-x
CONFIGURE_ARGS+= --with-tlib=ncurses