Upgrade to beta version 5.0w.

4 files changed, 28 insertions, 15 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index f27cebf76321..1894586043c0 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Sat June 29, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.17 1998/01/20 11:14:44 obrien Exp $
+# $Id: Makefile,v 1.18 1998/01/26 23:36:55 obrien Exp $
 #
 
-DISTNAME=	vim-5.0v
+DISTNAME=	vim-5.0w
 CATEGORIES=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/beta-test/unix/ \
 		ftp://ftp.nuxi.com/pub/vim/beta-test/unix/ \
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 882ab2de752f..7ed17f5762d9 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,2 +1 @@
-MD5 (vim-5.0v.tar.gz) = d4dc8e9ed0bbfb79cedf62a54f61f171
-MD5 (vim-50u-50u+.diff.gz) = 504db91723ffe92068413a2f181e0bb1
+MD5 (vim-5.0w.tar.gz) = 502a4a59dc643f9b4ca62acf62b250c0
diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01
index efc40f6d5bdd..28fe64510878 100644
--- a/editors/vim/files/patch-01
+++ b/editors/vim/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Nov  9 15:34:28 1997
-+++ Makefile	Tue Nov 11 06:51:53 1997
-@@ -249,6 +249,7 @@
+--- Makefile.orig	Sun Feb  8 12:18:57 1998
++++ Makefile	Mon Feb  9 02:07:52 1998
+@@ -260,6 +260,7 @@
  
  ### Extra configure arguments - just put anything here, just an example
  #CONF_ARGS = --exec-prefix=/usr
@@ -8,7 +8,7 @@
  
  ### For creating a plain Vim without any X11 related fancies use this one:
  ### (otherwise Vim configure will try to include xterm titlebar access)
-@@ -1018,31 +1019,31 @@
+@@ -1058,28 +1059,28 @@
  installinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
  
  $(BINDIR)/$(EXTARGET):
@@ -23,10 +23,6 @@
 -	cd $(BINDIR); ln -s $(VIMTARGET) $(GVIMTARGET)
 +	cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIMTARGET)
  
- $(BINDIR)/$(GEXTARGET):
--	cd $(BINDIR); ln -s $(VIMTARGET) $(GEXTARGET)
-+	cd $(BINDIR); ln -sf $(VIMTARGET) $(GEXTARGET)
- 
  $(BINDIR)/$(GVIEWTARGET):
 -	cd $(BINDIR); ln -s $(VIMTARGET) $(GVIEWTARGET)
 +	cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIEWTARGET)
@@ -47,5 +43,5 @@
 -	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
 +	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
  
- uninstall:
- 	-rm -f $(BINDIR)/$(VIMTARGET)$(SUFFIX) $(BINDIR)/$(GVIMTARGET)
+ # 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.
diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist
index ad9c1e5e05c7..0968b0edb3e2 100644
--- a/editors/vim/pkg-plist
+++ b/editors/vim/pkg-plist
@@ -3,7 +3,7 @@ bin/ctags
 bin/xxd
 bin/etags
 @comment bin/ex
-bin/gex
+@comment bin/gex
 bin/gview
 bin/gvim
 bin/rgview
@@ -21,10 +21,13 @@ share/vim/doc/cmdline.txt
 share/vim/doc/digraph.txt
 share/vim/doc/editing.txt
 share/vim/doc/eval.txt
+share/vim/doc/farsi.txt
 share/vim/doc/gui.txt
 share/vim/doc/gui_x11.txt
+share/vim/doc/gui_w32.txt
 share/vim/doc/help.txt
 share/vim/doc/howto.txt
+share/vim/doc/if_ole.txt
 share/vim/doc/if_perl.txt
 share/vim/doc/if_python.txt
 share/vim/doc/index.txt
@@ -34,7 +37,16 @@ share/vim/doc/map.txt
 share/vim/doc/message.txt
 share/vim/doc/motion.txt
 share/vim/doc/options.txt
+share/vim/doc/os_amiga.txt
+share/vim/doc/os_archi.txt
+share/vim/doc/os_beos.txt
+share/vim/doc/os_dos.txt
+share/vim/doc/os_mac.txt
+share/vim/doc/os_mint.txt
+share/vim/doc/os_msdos.txt
+share/vim/doc/os_os2.txt
 share/vim/doc/os_unix.txt
+share/vim/doc/os_win32.txt
 share/vim/doc/pattern.txt
 share/vim/doc/quickfix.txt
 share/vim/doc/recover.txt
@@ -61,9 +73,11 @@ share/vim/syntax/amiga.vim
 share/vim/syntax/asm.vim
 share/vim/syntax/asn.vim
 share/vim/syntax/asmh8300.vim
+share/vim/syntax/atlas.vim
 share/vim/syntax/awk.vim
 share/vim/syntax/bib.vim
 share/vim/syntax/c.vim
+share/vim/syntax/cobol.vim
 share/vim/syntax/colortest.vim
 share/vim/syntax/cpp.vim
 share/vim/syntax/csh.vim
@@ -72,12 +86,14 @@ share/vim/syntax/diff.vim
 share/vim/syntax/dosbatch.vim
 share/vim/syntax/dosini.vim
 share/vim/syntax/dracula.vim
+share/vim/syntax/eiffel.vim
 share/vim/syntax/elmfilt.vim
 share/vim/syntax/expect.vim
 share/vim/syntax/esqlc.vim
 share/vim/syntax/fortran.vim
 share/vim/syntax/gp.vim
 share/vim/syntax/help.vim
+share/vim/syntax/hitest.vim
 share/vim/syntax/html.vim
 share/vim/syntax/idl.vim
 share/vim/syntax/inform.vim
@@ -91,6 +107,7 @@ share/vim/syntax/mail.vim
 share/vim/syntax/make.vim
 share/vim/syntax/maple.vim
 share/vim/syntax/matlab.vim
+share/vim/syntax/mib.vim
 share/vim/syntax/model.vim
 share/vim/syntax/modula2.vim
 share/vim/syntax/muttrc.vim
@@ -98,6 +115,7 @@ share/vim/syntax/nosyntax.vim
 share/vim/syntax/objc.vim
 share/vim/syntax/pascal.vim
 share/vim/syntax/perl.vim
+share/vim/syntax/pike.vim
 share/vim/syntax/pod.vim
 share/vim/syntax/postscr.vim
 share/vim/syntax/pov.vim