summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editors/nvi/ALTERNATIVES3
-rw-r--r--editors/nvi/Makefile4
-rw-r--r--editors/vim-gtk/Makefile7
-rw-r--r--editors/vim-gtk2/Makefile7
-rw-r--r--editors/vim-kde/Makefile5
-rw-r--r--editors/vim-motif/Makefile7
-rw-r--r--editors/vim-share/ALTERNATIVES3
-rw-r--r--editors/vim-share/Makefile6
-rw-r--r--editors/vim-share/Makefile.common8
-rw-r--r--editors/vim-xaw/Makefile7
-rw-r--r--editors/vim/Makefile7
11 files changed, 41 insertions, 23 deletions
diff --git a/editors/nvi/ALTERNATIVES b/editors/nvi/ALTERNATIVES
new file mode 100644
index 00000000000..90e25faacd8
--- /dev/null
+++ b/editors/nvi/ALTERNATIVES
@@ -0,0 +1,3 @@
+bin/ex @PREFIX@/bin/nex
+bin/vi @PREFIX@/bin/nvi
+bin/view @PREFIX@/bin/nview
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index 06bf2e4b585..d248112d03f 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/11/28 13:46:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/25 13:48:54 jmmv Exp $
#
DISTNAME= nvi-1.81.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://www.kotnet.org/~skimo/nvi/devel/
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index d8053fa7d6e..73698deef20 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.44 2005/01/06 20:40:04 adrianp Exp $
-
-.include "../vim-share/Makefile.common"
+# $NetBSD: Makefile,v 1.45 2005/01/25 13:48:54 jmmv Exp $
PKGNAME= vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION= 1
COMMENT= Vim editor (vi clone) with X11 GTK+ GUI
+.include "../vim-share/Makefile.common"
+
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
CONFLICTS+= vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index d6c8762aaf8..6fe3920a4ce 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2005/01/06 20:40:38 adrianp Exp $
-
-.include "../vim-share/Makefile.common"
+# $NetBSD: Makefile,v 1.12 2005/01/25 13:48:54 jmmv Exp $
PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION= 1
COMMENT= Vim editor (vi clone) with X11 GTK2 GUI
+.include "../vim-share/Makefile.common"
+
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]*
CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index 637d479c901..9219c483e08 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2005/01/06 14:11:03 tron Exp $
+# $NetBSD: Makefile,v 1.25 2005/01/25 13:48:54 jmmv Exp $
DISTNAME= kvim-${KVIM_VERSION}
PKGNAME= vim-kde-${KVIM_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= editors kde
MASTER_SITES= ftp://ftp.rutgers.edu/pub/kde/stable/apps/KDE3.x/utils/ \
ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/utils/ \
@@ -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_BUILDLINK3= YES
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index f492e98e39a..22253c3bb62 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2005/01/06 20:41:11 adrianp Exp $
-
-.include "../vim-share/Makefile.common"
+# $NetBSD: Makefile,v 1.11 2005/01/25 13:48:54 jmmv Exp $
PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION= 1
COMMENT= Vim editor (vi clone) with X11 Motif GUI
+.include "../vim-share/Makefile.common"
+
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
diff --git a/editors/vim-share/ALTERNATIVES b/editors/vim-share/ALTERNATIVES
new file mode 100644
index 00000000000..fb6f8eb529d
--- /dev/null
+++ b/editors/vim-share/ALTERNATIVES
@@ -0,0 +1,3 @@
+bin/ex @PREFIX@/bin/vim -e
+bin/vi @PREFIX@/bin/vim
+bin/view @PREFIX@/bin/vim -R
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 6f7dae3ae48..c44efd41dd0 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2004/06/21 08:23:48 martti Exp $
-
-.include "Makefile.common"
+# $NetBSD: Makefile,v 1.11 2005/01/25 13:48:54 jmmv Exp $
PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
COMMENT= Data files for the vim editor (vi clone)
+.include "Makefile.common"
+
CONFIGURE_ARGS+= --disable-gui
INSTALL_TARGET= installruntime installmacros installtutor installtools
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 42bb1912641..319d4c2fb3b 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2005/01/06 20:38:06 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.40 2005/01/25 13:48:54 jmmv Exp $
VIM_VERSION= 6.3
VIM_PATCHLEVEL= 045
@@ -38,3 +38,9 @@ PATCH_DIST_ARGS= -d ${WRKDIR}/vim63 --forward --quiet \
-E ${PATCH_DIST_STRIP}
PATCHDIR?= ${.CURDIR}/../vim-share/patches
DISTINFO_FILE?= ${.CURDIR}/../vim-share/distinfo
+
+.if empty(PKGNAME:Mvim-share*)
+ALTERNATIVES_SRC= ${.CURDIR}/../../editors/vim-share/ALTERNATIVES
+.else
+ALTERNATIVES_SRC=
+.endif
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 1b984680175..71e5cfa79df 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2005/01/06 20:42:15 adrianp Exp $
-
-.include "../vim-share/Makefile.common"
+# $NetBSD: Makefile,v 1.34 2005/01/25 13:48:54 jmmv Exp $
PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION= 1
+
+.include "../vim-share/Makefile.common"
COMMENT= Vim editor (vi clone) with X11 Athena GUI
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index bfc6252fc83..767c028cb7f 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.57 2005/01/06 20:39:28 adrianp Exp $
-
-.include "../vim-share/Makefile.common"
+# $NetBSD: Makefile,v 1.58 2005/01/25 13:48:54 jmmv Exp $
PKGNAME= vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION= 1
COMMENT= Vim editor (vi clone) without GUI
+.include "../vim-share/Makefile.common"
+
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
CONFLICTS+= vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 08:51:05 +0000