Remove all files that might conflict with a `normal vi', eg. bin/ex and

man/man1/view.1. The functionality is still there, the links are just no
longer created.

9 files changed, 26 insertions, 25 deletions

diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index d6773aab4b6..ec16e355ce9 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/01/15 18:46:26 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2000/01/25 17:13:16 pooka Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -35,8 +35,6 @@ post-install:
 	${LN} -fs vim ${PREFIX}/bin/gview
 	${LN} -fs vim ${PREFIX}/bin/rgvim
 	${LN} -fs vim ${PREFIX}/bin/rgview
-	${LN} -fs vim ${PREFIX}/bin/ex
-	${LN} -fs vim ${PREFIX}/bin/view
 	${LN} -fs vim ${PREFIX}/bin/rvim
 	${LN} -fs vim ${PREFIX}/bin/rview
 
diff --git a/editors/vim-gtk/pkg/PLIST b/editors/vim-gtk/pkg/PLIST
index b520d9f3d1a..d2dcae961d7 100644
--- a/editors/vim-gtk/pkg/PLIST
+++ b/editors/vim-gtk/pkg/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 1999/12/21 13:18:17 pooka Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/01/25 17:13:17 pooka Exp $
 bin/vim
 bin/gvim
 bin/gview
 bin/rgvim
 bin/rgview
-bin/ex
-bin/view
 bin/rvim
 bin/rview
 man/man1/gvim.1
diff --git a/editors/vim-share/files/patch-sum b/editors/vim-share/files/patch-sum
index 3ac9e183ead..18024a10718 100644
--- a/editors/vim-share/files/patch-sum
+++ b/editors/vim-share/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/01/17 17:36:32 pooka Exp $
+$NetBSD: patch-sum,v 1.3 2000/01/25 17:13:17 pooka Exp $
 
 MD5 (patch-aa) = 951d4e8cdc4a7405601c21515c013af8
-MD5 (patch-ac) = 5df1fe0e56b832356d05b35ed1a08046
+MD5 (patch-ac) = f08e5029ca1409c64e5ea60d22c89b21
 MD5 (patch-za) = e53e72a98abbb723d60c03b8bf1fc55d
 MD5 (patch-zb) = 221296b5d4e7413473f9cc4098a611fd
diff --git a/editors/vim-share/patches/patch-ac b/editors/vim-share/patches/patch-ac
index 15fc383b437..de2a4a0f3ce 100644
--- a/editors/vim-share/patches/patch-ac
+++ b/editors/vim-share/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2000/01/17 17:36:33 pooka Exp $
+$NetBSD: patch-ac,v 1.3 2000/01/25 17:13:18 pooka Exp $
 
 --- Makefile.orig	Sun Jan 16 16:03:04 2000
-+++ Makefile	Mon Jan 17 13:35:17 2000
++++ Makefile	Tue Jan 25 18:56:02 2000
 @@ -737,7 +737,7 @@
  ### might not work when they are changed!)
  VIMDIR = /vim
@@ -19,3 +19,18 @@ $NetBSD: patch-ac,v 1.2 2000/01/17 17:36:33 pooka Exp $
  	@echo generating $(MANSUBDIR)/$(VIMNAME).1
  	@sed -e s+/usr/local/lib/vim+$(VIMLOC)+ \
  		-e s+$(VIMLOC)/doc+$(HELPENDLOC)+ \
+@@ -1469,13 +1470,7 @@
+ 
+ # create links for the manual pages with various names to vim.	This is only
+ # done when the links (or manpages with the same name) don't exist yet.
+-installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1 $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
+-
+-$(MANSUBDIR)/$(EXNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
+-
+-$(MANSUBDIR)/$(VIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
++installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(GVIMNAME).1:
+ 	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIMNAME).1
diff --git a/editors/vim-share/pkg/PLIST b/editors/vim-share/pkg/PLIST
index 9416dfbc262..280d242bca4 100644
--- a/editors/vim-share/pkg/PLIST
+++ b/editors/vim-share/pkg/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2000/01/17 17:36:34 pooka Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/01/25 17:13:18 pooka Exp $
 bin/vimtutor
 bin/vim-ctags
 bin/vim-etags
 bin/xxd
 man/man1/vim.1
 man/man1/vimtutor.1
-man/man1/ex.1
-man/man1/view.1
 man/man1/rvim.1
 man/man1/rview.1
 man/man1/vim-ctags.1
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 37d2adfdc94..6ab45682e7c 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/01/15 18:46:27 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/01/25 17:13:19 pooka Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -33,8 +33,6 @@ post-install:
 	${LN} -fs vim ${PREFIX}/bin/gview
 	${LN} -fs vim ${PREFIX}/bin/rgvim
 	${LN} -fs vim ${PREFIX}/bin/rgview
-	${LN} -fs vim ${PREFIX}/bin/ex
-	${LN} -fs vim ${PREFIX}/bin/view
 	${LN} -fs vim ${PREFIX}/bin/rvim
 	${LN} -fs vim ${PREFIX}/bin/rview
 
diff --git a/editors/vim-xaw/pkg/PLIST b/editors/vim-xaw/pkg/PLIST
index d97d9054e34..1b692f739e7 100644
--- a/editors/vim-xaw/pkg/PLIST
+++ b/editors/vim-xaw/pkg/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/12/21 13:26:30 pooka Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/01/25 17:13:19 pooka Exp $
 bin/vim
 bin/gvim
 bin/gview
 bin/rgvim
 bin/rgview
-bin/ex
-bin/view
 bin/rvim
 bin/rview
 man/man1/gvim.1
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 47543be2d5a..1d8cbc4aa02 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2000/01/17 17:36:35 pooka Exp $
+# $NetBSD: Makefile,v 1.31 2000/01/25 17:13:14 pooka Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -23,8 +23,6 @@ DEPENDS+=               ncurses>=4.2:../../devel/ncurses
 .endif
 
 post-install:
-	${LN} -fs vim ${PREFIX}/bin/ex
-	${LN} -fs vim ${PREFIX}/bin/view
 	${LN} -fs vim ${PREFIX}/bin/rvim
 	${LN} -fs vim ${PREFIX}/bin/rview
 
diff --git a/editors/vim/pkg/PLIST b/editors/vim/pkg/PLIST
index 0d07aecb255..8c0376f8aa1 100644
--- a/editors/vim/pkg/PLIST
+++ b/editors/vim/pkg/PLIST
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 1999/12/21 13:18:12 pooka Exp $
+@comment $NetBSD: PLIST,v 1.12 2000/01/25 17:13:16 pooka Exp $
 bin/vim
-bin/ex
-bin/view
 bin/rvim
 bin/rview