Upgrade to vim-5.0p.

Apply patch to work with Perl5 support (needed especically if perl5 was
installed as a package).

5 files changed, 103 insertions, 17 deletions

diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 4c8c64b67e86..fc3801ef7f3a 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Sat June 29, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.7 1997/08/22 19:55:35 obrien Exp $
+# $Id: Makefile,v 1.8 1997/10/01 09:59:51 obrien Exp $
 #
 
-DISTNAME=	vim-5.0o
+DISTNAME=	vim-5.0p
 CATEGORIES=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/beta-test/unix/ \
 		ftp://ftp.nuxi.com/pub/vim/beta-test/unix/ \
@@ -20,7 +20,6 @@ MAINTAINER=     obrien@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 MAKE_FLAGS=	CONF_ARGS=--prefix=${PREFIX} -f
-USE_GMAKE=	yes
 ALL_TARGET=	
 MAN1=		vim.1 xxd.1 ctags.1
 
diff --git a/editors/vim6/distinfo b/editors/vim6/distinfo
index b14e2ff2fb07..3be45c797591 100644
--- a/editors/vim6/distinfo
+++ b/editors/vim6/distinfo
@@ -1 +1 @@
-MD5 (vim-5.0o.tar.gz) = 223186f32d457f1cff8e7da259a77d2f
+MD5 (vim-5.0p.tar.gz) = a50ead0bed59fdd35e8569ba50f11436
diff --git a/editors/vim6/files/patch-01 b/editors/vim6/files/patch-01
index 59c6a385df96..6cc0393e7e2b 100644
--- a/editors/vim6/files/patch-01
+++ b/editors/vim6/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Sep 28 13:45:32 1997
-+++ Makefile	Wed Oct 15 02:24:25 1997
-@@ -597,7 +597,7 @@
+--- Makefile.orig	Sun Oct 19 16:11:50 1997
++++ Makefile	Mon Oct 20 09:51:51 1997
+@@ -614,7 +614,7 @@
  MOTIF_DEFS	= -DUSE_GUI_MOTIF $(NARROW_PROTO)
  MOTIF_IPATH	= -I$(GUI_INC_LOC)
  MOTIF_LIBS_DIR	= -L$(GUI_LIB_LOC)
@@ -9,12 +9,62 @@
  MOTIF_TARGETS	= $(BINDIR)/$(GVIMTARGET) \
  				$(BINDIR)/$(GEXTARGET) \
  				$(BINDIR)/$(GVIEWTARGET) \
-@@ -837,7 +837,7 @@
+@@ -857,7 +857,8 @@
  	GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
  		CC="$(CC)" CFLAGS="$(CFLAGS)" TERM_LIB="$(TERM_LIB)" \
  	$(CONF_SHELL) ./configure $(CONF_OPT_GUI) $(CONF_OPT_X) \
 -	$(CONF_OPT_PERL) $(CONF_OPT_PYTHON) $(CONF_ARGS)
-+	$(CONF_OPT_PYTHON) $(CONF_ARGS)
++	$(CONF_OPT_PERL) $(CONF_OPT_PYTHON) $(CONF_ARGS) \
++	--prefix=$(PREFIX)
  
  # When configure.in has changed, run autoconf to produce configure
  # If you don't have autoconf, use the configure that's there
+@@ -999,37 +1000,37 @@
+ installinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(REXTARGET) $(BINDIR)/$(RVIEWTARGET)
+ 
+ $(BINDIR)/$(EXTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
++	#cd $(BINDIR); ln -sf $(VIMTARGET) $(EXTARGET)
+ 
+ $(BINDIR)/$(VIEWTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
++	#cd $(BINDIR); ln -sf $(VIMTARGET) $(VIEWTARGET)
+ 
+ $(BINDIR)/$(GVIMTARGET):
+-	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)
+ 
+ $(BINDIR)/$(RVIMTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RVIMTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIMTARGET)
+ 
+ $(BINDIR)/$(REXTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(REXTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(REXTARGET)
+ 
+ $(BINDIR)/$(RVIEWTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RVIEWTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIEWTARGET)
+ 
+ $(BINDIR)/$(RGVIMTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIMTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIMTARGET)
+ 
+ $(BINDIR)/$(RGEXTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RGEXTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGEXTARGET)
+ 
+ $(BINDIR)/$(RGVIEWTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
+ 
+ uninstall:
+ 	-rm -f $(BINDIR)/$(VIMTARGET)$(SUFFIX) $(BINDIR)/$(GVIMTARGET)
diff --git a/editors/vim6/files/patch-02 b/editors/vim6/files/patch-02
index 13e801d89f71..a49c212f97b0 100644
--- a/editors/vim6/files/patch-02
+++ b/editors/vim6/files/patch-02
@@ -1,7 +1,16 @@
---- configure.orig	Sat Aug 23 15:28:24 1997
-+++ configure	Sat Aug 23 15:29:56 1997
-@@ -1995,7 +1995,7 @@
- echo "configure:1996: checking for location of Motif GUI libs" >&5
+--- configure.orig	Thu Sep 25 15:30:18 1997
++++ configure	Sun Oct 19 22:53:37 1997
+@@ -951,7 +951,7 @@
+ 	PERL_CFLAGS="$perlcppflags"
+       fi
+       perllibs=`cd $srcdir;$vi_cv_path_perl -MExtUtils::Embed \
+-	      -e 'ldopts' | sed '/Warning/d'`
++	      -e 'ldopts' | sed '/Warning/d' | sed '/Note (probably harmless)/d'`
+       if test "X$perllibs" != "X"; then
+ 	LIBS="$perllibs $LIBS"
+       fi
+@@ -2175,7 +2175,7 @@
+ echo "configure:2176: checking for location of Motif GUI libs" >&5
    GUI_LIB_LOC=
    for try in $gui_libs; do
 -    if test -f "$try/libXm.a" -o -f "$try/libXm.so" -o -f "$try/libXm.sl"; then
diff --git a/editors/vim6/pkg-plist b/editors/vim6/pkg-plist
index 1b49f724a537..7b6030113aa8 100644
--- a/editors/vim6/pkg-plist
+++ b/editors/vim6/pkg-plist
@@ -1,4 +1,6 @@
+bin/vim
 bin/ctags
+bin/xxd
 bin/etags
 @comment bin/ex
 bin/gex
@@ -11,8 +13,6 @@ bin/rgvim
 bin/rview
 bin/rvim
 @comment bin/view
-bin/vim
-bin/xxd
 man/man1/ctags.1.gz
 man/man1/etags.1.gz
 man/man1/vim.1.gz
@@ -22,9 +22,12 @@ share/vim/doc/change.txt
 share/vim/doc/cmdline.txt
 share/vim/doc/digraph.txt
 share/vim/doc/editing.txt
+share/vim/doc/errors.txt
 share/vim/doc/eval.txt
 share/vim/doc/farsi.txt
 share/vim/doc/gui.txt
+share/vim/doc/gui_w32.txt
+share/vim/doc/gui_x11.txt
 share/vim/doc/help.txt
 share/vim/doc/howto.txt
 share/vim/doc/if_perl.txt
@@ -52,7 +55,6 @@ share/vim/doc/rightleft.txt
 share/vim/doc/scroll.txt
 share/vim/doc/starting.txt
 share/vim/doc/syntax.txt
-share/vim/doc/tags
 share/vim/doc/tagsearch.txt
 share/vim/doc/term.txt
 share/vim/doc/tips.txt
@@ -64,34 +66,60 @@ share/vim/doc/version5.txt
 share/vim/doc/vi_diff.txt
 share/vim/doc/visual.txt
 share/vim/doc/windows.txt
-share/vim/menu.vim
+share/vim/doc/tags
 share/vim/syntax/ada.vim
 share/vim/syntax/asm.vim
 share/vim/syntax/asmh8300.vim
+share/vim/syntax/awk.vim
 share/vim/syntax/c.vim
 share/vim/syntax/cpp.vim
+share/vim/syntax/csh.vim
 share/vim/syntax/cterm.vim
+share/vim/syntax/diff.vim
 share/vim/syntax/dosbatch.vim
+share/vim/syntax/dosini.vim
+share/vim/syntax/expect.vim
 share/vim/syntax/fortran.vim
 share/vim/syntax/help.vim
 share/vim/syntax/html.vim
 share/vim/syntax/java.vim
+share/vim/syntax/javacc.vim
+share/vim/syntax/lex.vim
 share/vim/syntax/lisp.vim
 share/vim/syntax/mail.vim
 share/vim/syntax/make.vim
 share/vim/syntax/maple.vim
 share/vim/syntax/matlab.vim
+share/vim/syntax/model.vim
+share/vim/syntax/modula2.vim
+share/vim/syntax/nosyntax.vim
 share/vim/syntax/objc.vim
 share/vim/syntax/pascal.vim
 share/vim/syntax/perl.vim
 share/vim/syntax/postscr.vim
+share/vim/syntax/procmail.vim
+share/vim/syntax/prolog.vim
+share/vim/syntax/python.vim
+share/vim/syntax/sather.vim
 share/vim/syntax/scripts.vim
 share/vim/syntax/sh.vim
+share/vim/syntax/sm.vim
 share/vim/syntax/sql.vim
 share/vim/syntax/syntax.vim
+share/vim/syntax/tcl.vim
+share/vim/syntax/telixsalt.vim
 share/vim/syntax/tex.vim
+share/vim/syntax/uil.vim
 share/vim/syntax/verilog.vim
+share/vim/syntax/vgrindefs.vim
 share/vim/syntax/vhdl.vim
 share/vim/syntax/vim.vim
+share/vim/syntax/viminfo.vim
+share/vim/syntax/vrml.vim
 share/vim/syntax/xmath.vim
+share/vim/syntax/yacc.vim
 share/vim/syntax/zsh.vim
+share/vim/menu.vim
+@dirrm share/vim/doc
+@dirrm share/vim/syntax
+@dirrm share/vim