From c75010e99f727676e8b60da9c8ee0b7dbc833629 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Tue, 25 Jan 2005 13:48:54 +0000
Subject: Make nvi and vim* use the alternatives system to install wrappers for
 bin/vi, bin/ex and bin/view.  Bump their PKGREVISIONs.

vim-kde is an exception because it currently installs programs with these
names.  So, as it's currently marked as vulnerable and as I don't have KDE
installed ATM, I'm marking it as conflicting.
---
 editors/vim-share/ALTERNATIVES    | 3 +++
 editors/vim-share/Makefile        | 6 +++---
 editors/vim-share/Makefile.common | 8 +++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 editors/vim-share/ALTERNATIVES

(limited to 'editors/vim-share')

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
-- 
cgit v1.2.3