diff options
| -rw-r--r-- | editors/Makefile | 3 | ||||
| -rw-r--r-- | editors/vim-gtk/Makefile | 5 | ||||
| -rw-r--r-- | editors/vim-kde/Makefile | 5 | ||||
| -rw-r--r-- | editors/vim-motif/Makefile | 5 | ||||
| -rw-r--r-- | editors/vim-xaw/Makefile | 5 | ||||
| -rw-r--r-- | editors/vim/Makefile | 5 |
6 files changed, 17 insertions, 11 deletions
diff --git a/editors/Makefile b/editors/Makefile index 7a40dd6db73..4bfb5095321 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2003/05/15 21:04:21 salo Exp $ +# $NetBSD: Makefile,v 1.88 2003/06/02 08:26:02 martti Exp $ # COMMENT= Editors @@ -75,6 +75,7 @@ SUBDIR+= vile SUBDIR+= vilearn SUBDIR+= vim SUBDIR+= vim-gtk +SUBDIR+= vim-gtk2 SUBDIR+= vim-kde SUBDIR+= vim-motif SUBDIR+= vim-share diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index 47e12fbbe73..900c7620fc1 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2003/06/02 07:27:24 martti Exp $ +# $NetBSD: Makefile,v 1.36 2003/06/02 08:26:03 martti Exp $ .include "../vim-share/Makefile.common" @@ -7,7 +7,8 @@ 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-motif-[0-9]* vim-xaw-[0-9]* +CONFLICTS+= vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]* +CONFLICTS+= vim-xaw-[0-9]* USE_X11= yes CONFIGURE_ARGS+= --enable-gui=gtk diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile index c48d72d1b8e..b4a318baf34 100644 --- a/editors/vim-kde/Makefile +++ b/editors/vim-kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:46 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2003/06/02 08:26:03 martti Exp $ DISTNAME= kvim-${KVIM_VERSION} PKGNAME= vim-kde-${KVIM_VERSION} @@ -15,7 +15,8 @@ COMMENT= Vim editor (vi clone) with X11 KDE3 GUI KVIM_VERSION= 6.1.141 -CONFLICTS+= vim-gtk-[0-9]* vim-share-[0-9]* vim-[0-9]* vim-xaw-[0-9]* +CONFLICTS+= vim-gtk-[0-9]* vim-gtk2-[0-9]* +CONFLICTS+= vim-share-[0-9]* vim-[0-9]* vim-xaw-[0-9]* USE_BUILDLINK2= YES diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile index 851e811768e..2e23e67ee66 100644 --- a/editors/vim-motif/Makefile +++ b/editors/vim-motif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/02/15 18:54:37 martti Exp $ +# $NetBSD: Makefile,v 1.2 2003/06/02 08:26:04 martti Exp $ .include "../vim-share/Makefile.common" @@ -7,7 +7,8 @@ PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL} COMMENT= Vim editor (vi clone) with X11 Motif GUI DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share -CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-xaw-[0-9]* +CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* +CONFLICTS+= vim-xaw-[0-9]* USE_X11= yes CONFIGURE_ARGS+= --enable-gui=motif diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index 9f75e765471..f1c13ef0f0b 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2003/02/15 18:56:18 martti Exp $ +# $NetBSD: Makefile,v 1.25 2003/06/02 08:26:04 martti Exp $ .include "../vim-share/Makefile.common" @@ -7,7 +7,8 @@ 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]* vim-motif-[0-9]* +CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* +CONFLICTS+= vim-motif-[0-9]* USE_X11= yes CONFIGURE_ARGS+= --enable-gui=athena diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 43e829df567..86b495a9f5c 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2003/02/15 18:56:17 martti Exp $ +# $NetBSD: Makefile,v 1.45 2003/06/02 08:26:03 martti Exp $ .include "../vim-share/Makefile.common" @@ -8,7 +8,8 @@ COMMENT= Vim editor (vi clone) without gui DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share -CONFLICTS+= vim-gtk-[0-9]* vim-motif-[0-9]* vim-xaw-[0-9]* +CONFLICTS+= vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]* +CONFLICTS+= vim-xaw-[0-9]* CONFIGURE_ARGS+= --enable-gui=no --without-x CONFIGURE_ARGS+= --with-tlib=ncurses |