Link with force!

Don't install ``ex'' and ``view''.

3 files changed, 92 insertions, 6 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 6596d9a994f3..43273bdb72e8 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Sat June 29, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.1.1.1 1997/05/25 02:59:06 obrien Exp $
+# $Id: Makefile,v 1.2 1997/05/28 10:04:34 obrien Exp $
 #
 
 DISTNAME=	vim-5.0i
@@ -21,7 +21,7 @@ MAINTAINER=     obrien@FreeBSD.org
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_GMAKE=	yes
 ALL_TARGET=	
-MAN1=		vim.1 xxd.1 ctags.1 etags.1
+MAN1=		vim.1 xxd.1 ctags.1
 
 .if defined(HAVE_MOTIF)
 REQUIRES_MOTIF=	yes
@@ -35,6 +35,8 @@ pre-build:
 
 post-install:
 	[ -e ${PREFIX}/bin/gvim ] || /bin/ln -s ${PREFIX}/bin/vim ${PREFIX}/bin/gvim
+	@/bin/rm -f ${PREFIX}/man/man1/etags.1
+	@/bin/ln -sf ${PREFIX}/man/man1/ctags.1.gz ${PREFIX}/man/man1/etags.1.gz
 
 
 .include <bsd.port.mk>
diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01
index 8d99a4858e36..ccd4554816e5 100644
--- a/editors/vim/files/patch-01
+++ b/editors/vim/files/patch-01
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue May 13 01:50:19 1997
-+++ Makefile	Sun May 18 19:45:46 1997
+--- Makefile.orig	Tue May 27 02:48:20 1997
++++ Makefile	Wed May 28 20:10:43 1997
 @@ -559,7 +559,7 @@
  $(MOTIF_COMMENT)GUI_DEFS  = -DUSE_GUI_MOTIF $(NARROW_PROTO)
  $(MOTIF_COMMENT)GUI_IPATH = -I$(GUI_INC_LOC)
@@ -19,3 +19,87 @@
  
  # When configure.in has changed, run autoconf to produce configure
  # If you don't have autoconf, use the configure that's there
+@@ -933,37 +934,37 @@
+ installinks: $(GUI_TARGETS) $(BINLOC)/$(EXTARGET) $(BINLOC)/$(VIEWTARGET) $(BINLOC)/$(RVIMTARGET) $(BINLOC)/$(REXTARGET) $(BINLOC)/$(RVIEWTARGET)
+ 
+ $(BINLOC)/$(EXTARGET):
+-	cd $(BINLOC); ln -s $(VIMTARGET) $(EXTARGET)
++	#cd $(BINLOC); ln -sf $(VIMTARGET) $(EXTARGET)
+ 
+ $(BINLOC)/$(VIEWTARGET):
+-	cd $(BINLOC); ln -s $(VIMTARGET) $(VIEWTARGET)
++	#cd $(BINLOC); ln -sf $(VIMTARGET) $(VIEWTARGET)
+ 
+ $(BINLOC)/$(GVIMTARGET):
+-	cd $(BINLOC); ln -s $(VIMTARGET) $(GVIMTARGET)
++	cd $(BINLOC); ln -sf $(VIMTARGET) $(GVIMTARGET)
+ 
+ $(BINLOC)/$(GEXTARGET):
+-	cd $(BINLOC); ln -s $(VIMTARGET) $(GEXTARGET)
++	cd $(BINLOC); ln -sf $(VIMTARGET) $(GEXTARGET)
+ 
+ $(BINLOC)/$(GVIEWTARGET):
+-	cd $(BINLOC); ln -s $(VIMTARGET) $(GVIEWTARGET)
++	cd $(BINLOC); ln -sf $(VIMTARGET) $(GVIEWTARGET)
+ 
+ $(BINLOC)/$(RVIMTARGET):
+-	cd $(BINLOC); ln -s $(VIMTARGET) $(RVIMTARGET)
++	cd $(BINLOC); ln -sf $(VIMTARGET) $(RVIMTARGET)
+ 
+ $(BINLOC)/$(REXTARGET):
+-	cd $(BINLOC); ln -s $(VIMTARGET) $(REXTARGET)
++	cd $(BINLOC); ln -sf $(VIMTARGET) $(REXTARGET)
+ 
+ $(BINLOC)/$(RVIEWTARGET):
+-	cd $(BINLOC); ln -s $(VIMTARGET) $(RVIEWTARGET)
++	cd $(BINLOC); ln -sf $(VIMTARGET) $(RVIEWTARGET)
+ 
+ $(BINLOC)/$(RGVIMTARGET):
+-	cd $(BINLOC); ln -s $(VIMTARGET) $(RGVIMTARGET)
++	cd $(BINLOC); ln -sf $(VIMTARGET) $(RGVIMTARGET)
+ 
+ $(BINLOC)/$(RGEXTARGET):
+-	cd $(BINLOC); ln -s $(VIMTARGET) $(RGEXTARGET)
++	cd $(BINLOC); ln -sf $(VIMTARGET) $(RGEXTARGET)
+ 
+ $(BINLOC)/$(RGVIEWTARGET):
+-	cd $(BINLOC); ln -s $(VIMTARGET) $(RGVIEWTARGET)
++	cd $(BINLOC); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
+ 
+ uninstall:
+ 	-rm -f $(BINLOC)/$(VIMTARGET) $(BINLOC)/$(GVIMTARGET)
+@@ -990,27 +991,27 @@
+ 
+ shadow:	doc menu.vim syntax
+ 	mkdir shadow
+-	cd shadow; ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../toolcheck ../proto ../*.tab ../configure .
++	cd shadow; ln -sf ../*.[ch] ../*.in ../*.sh ../*.xs ../toolcheck ../proto ../*.tab ../configure .
+ 	cd shadow; rm -f osdef.h config.h ex_cmds.h pathdef.c link.sed
+ 	cp Makefile shadow
+ 	echo "the first targets to make vim are: scratch config myself" > shadow/config.mk
+ # TODO: how do we make a nice shadow for ctags?
+-	cd shadow; ln -s ../ctags .
++	cd shadow; ln -sf ../ctags .
+ 	mkdir shadow/xxd
+-	cd shadow/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* .
++	cd shadow/xxd; ln -sf ../../xxd/*.[ch] ../../xxd/Make* .
+ 	mkdir shadow/testdir
+-	cd shadow/testdir; ln -s ../../testdir/Makefile \
++	cd shadow/testdir; ln -sf ../../testdir/Makefile \
+ 				 ../../testdir/*.in  ../../testdir/*.ok .
+ 
+ # Links needed for doing "make install" in a shadow directory.
+ doc:
+-	ln -s ../doc .
++	ln -sf ../doc .
+ 
+ menu.vim:
+-	ln -s ../menu.vim .
++	ln -sf ../menu.vim .
+ 
+ syntax:
+-	ln -s ../syntax .
++	ln -sf ../syntax .
+ 
+ # Start configure from scratch
+ scrub scratch:
diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist
index 5d79eaac4c9e..6986060cbe38 100644
--- a/editors/vim/pkg-plist
+++ b/editors/vim/pkg-plist
@@ -1,6 +1,6 @@
 bin/ctags
 bin/etags
-bin/ex
+@comment bin/ex
 bin/gex
 bin/gview
 bin/gvim
@@ -10,7 +10,7 @@ bin/rgview
 bin/rgvim
 bin/rview
 bin/rvim
-bin/view
+@comment bin/view
 bin/vim
 bin/xxd
 man/man1/ctags.1.gz