diff options
| author | pooka <pooka@pkgsrc.org> | 2001-08-06 17:44:44 +0000 |
|---|---|---|
| committer | pooka <pooka@pkgsrc.org> | 2001-08-06 17:44:44 +0000 |
| commit | 5fd19e91d084485c0ebcae23e279fe70596ff252 (patch) | |
| tree | 54291a7675bc9f5c263a1ab8b40d09597e9c5f04 /editors | |
| parent | 0a5bcf94ed78aa28755f97a90ae1486639ca31cc (diff) | |
| download | pkgsrc-5fd19e91d084485c0ebcae23e279fe70596ff252.tar.gz | |
add conflicts for vim6 (vim-devel)
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/vim-gtk/Makefile | 4 | ||||
| -rw-r--r-- | editors/vim-share/Makefile.common | 4 | ||||
| -rw-r--r-- | editors/vim-xaw/Makefile | 4 | ||||
| -rw-r--r-- | editors/vim/Makefile | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index 13e284f440d..8cad7c4a101 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/06/29 04:54:52 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2001/08/06 17:44:45 pooka Exp $ .include "../vim-share/Makefile.common" @@ -7,7 +7,7 @@ PKGNAME= vim-gtk-${VIM_VERSION} COMMENT= Vim editor (vi clone) with X11 GTK+ GUI DEPENDS+= vim-share-${VIM_VERSION}:../vim-share -CONFLICTS= vim-[0-9]* vim-xaw-* +CONFLICTS+= vim-[0-9]* vim-xaw-* DISTFILES+= ${DISTNAME}-rt${EXTRACT_SUFX} diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common index 040a6478d6d..ccfc97f1379 100644 --- a/editors/vim-share/Makefile.common +++ b/editors/vim-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2001/06/06 06:07:29 pooka Exp $ +# $NetBSD: Makefile.common,v 1.9 2001/08/06 17:44:45 pooka Exp $ VIM_VERSION= 5.8 DISTNAME= vim-${VIM_VERSION} CATEGORIES= editors @@ -10,5 +10,7 @@ DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} MAINTAINER= pooka@netbsd.org HOMEPAGE= http://www.vim.org +CONFLICTS+= vim-6* + GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/src diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index ebd2c5e07b3..50fc6a6dbac 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/06/20 19:57:48 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/08/06 17:44:45 pooka Exp $ .include "../vim-share/Makefile.common" @@ -7,7 +7,7 @@ PKGNAME= vim-xaw-${VIM_VERSION} COMMENT= Vim editor (vi clone) with X11 Athena GUI DEPENDS+= vim-share-${VIM_VERSION}:../vim-share -CONFLICTS= vim-[0-9]* vim-gtk-* +CONFLICTS+= vim-[0-9]* vim-gtk-* USE_X11= yes USE_XAW= yes diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 46396e031fe..defcd7d3014 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2001/06/20 18:59:37 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2001/08/06 17:44:44 pooka Exp $ .include "../vim-share/Makefile.common" @@ -8,7 +8,7 @@ COMMENT= Vim editor (vi clone) without gui DEPENDS+= vim-share-${VIM_VERSION}:../vim-share -CONFLICTS= vim-xaw-* vim-gtk-* +CONFLICTS+= vim-xaw-* vim-gtk-* USE_BUILDLINK_ONLY= # defined |