Upgrade the Vim port to version 7.0, patchlevel 35.

At PL35 it is now well stable and appropriate as a production editor.
MANLANG support taken from PR 98979, submitted by Roman Bogorodskiy
<novel@freebsd.org>.

3 files changed, 48 insertions, 54 deletions

diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01
index b0da2e79e2e4..ad07ae52e785 100644
--- a/editors/vim/files/patch-01
+++ b/editors/vim/files/patch-01
@@ -70,48 +70,3 @@
  
  # 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.
-@@ -1845,34 +1846,34 @@
- 			$(DEST_MAN)/$(EVIEWNAME).1
- 
- $(DEST_MAN)/$(EXNAME).1:
--	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(EXNAME).1
-+	#cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(EXNAME).1
- 
- $(DEST_MAN)/$(VIEWNAME).1:
--	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(VIEWNAME).1
-+	#cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(VIEWNAME).1
- 
- $(DEST_MAN)/$(GVIMNAME).1:
--	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(GVIMNAME).1
-+	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(GVIMNAME).1
- 
- $(DEST_MAN)/$(GVIEWNAME).1:
--	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(GVIEWNAME).1
-+	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(GVIEWNAME).1
- 
- $(DEST_MAN)/$(RVIMNAME).1:
--	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RVIMNAME).1
-+	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RVIMNAME).1
- 
- $(DEST_MAN)/$(RVIEWNAME).1:
--	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RVIEWNAME).1
-+	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RVIEWNAME).1
- 
- $(DEST_MAN)/$(RGVIMNAME).1:
--	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RGVIMNAME).1
-+	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RGVIMNAME).1
- 
- $(DEST_MAN)/$(RGVIEWNAME).1:
--	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RGVIEWNAME).1
-+	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1
- 
- $(DEST_MAN)/$(GVIMDIFFNAME).1:
--	cd $(DEST_MAN); ln -s $(VIMDIFFNAME).1 $(GVIMDIFFNAME).1
-+	cd $(DEST_MAN); ln -sf $(VIMDIFFNAME).1 $(GVIMDIFFNAME).1
- 
- $(DEST_MAN)/$(EVIEWNAME).1:
--	cd $(DEST_MAN); ln -s $(EVIMNAME).1 $(EVIEWNAME).1
-+	cd $(DEST_MAN); ln -sf $(EVIMNAME).1 $(EVIEWNAME).1
- 
- uninstall: uninstall_runtime
- 	-rm -f $(DEST_BIN)/$(VIMTARGET)
diff --git a/editors/vim/files/patch-configure b/editors/vim/files/patch-configure
index def640982ee2..c368a63bbdfc 100644
--- a/editors/vim/files/patch-configure
+++ b/editors/vim/files/patch-configure
@@ -1,11 +1,8 @@
---- auto/configure.orig	Sat Oct 15 05:55:10 2005
-+++ auto/configure	Sun Oct 23 18:13:17 2005
-@@ -2184,7 +2184,7 @@ echo "configure:2177: checking for locat
- 	    echo "$ac_t""$try/tclConfig.sh" 1>&6
- 	    . $try/tclConfig.sh
+--- auto/configure.orig	Thu May  4 03:46:19 2006
++++ auto/configure	Mon Jun 19 03:01:38 2006
+@@ -4644,3 +4644,4 @@ echo "${ECHO_T}$try/tclConfig.sh" >&6
  	    	    TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
--	    	    	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\ /\X/' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
-+	    	    	    TCL_DEFS=`echo $TCL_DEFS       | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
+-	    	    	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
++	    	    	    TCL_DEFS=`echo $TCL_DEFS |       tr ' ' '\012' | sed -e 's/\\\\ /\\\\X/g' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
++
  	    break
- 	  fi
- 	done
diff --git a/editors/vim/files/patch-installml.sh b/editors/vim/files/patch-installml.sh
new file mode 100644
index 000000000000..136015bcec51
--- /dev/null
+++ b/editors/vim/files/patch-installml.sh
@@ -0,0 +1,42 @@
+--- installml.sh.orig	Sun Apr 30 08:48:53 2006
++++ installml.sh	Mon Jun 19 03:36:37 2006
+@@ -55,12 +55,12 @@ if test $what = "install" -a \( -f $dest
+    # ex
+-   if test ! -f $destdir/$exname.1 -a -f $destdir/$vimname.1; then
+-      echo creating link $destdir/$exname.1
+-      cd $destdir; ln -s $vimname.1 $exname.1
+-   fi
++   #if test ! -f $destdir/$exname.1 -a -f $destdir/$vimname.1; then
++   #   echo creating link $destdir/$exname.1
++   #   cd $destdir; ln -s $vimname.1 $exname.1
++   #fi
+ 
+    # view
+-   if test ! -f $destdir/$viewname.1 -a -f $destdir/$vimname.1; then
+-      echo creating link $destdir/$viewname.1
+-      cd $destdir; ln -s $vimname.1 $viewname.1
+-   fi
++   #if test ! -f $destdir/$viewname.1 -a -f $destdir/$vimname.1; then
++   #   echo creating link $destdir/$viewname.1
++   #   cd $destdir; ln -s $vimname.1 $viewname.1
++   #fi
+ 
+@@ -121,10 +121,10 @@ if test $what = "uninstall"; then
+ 
+-   if test -L $destdir/$exname.1; then
+-      echo deleting $destdir/$exname.1
+-      rm -f $destdir/$exname.1
+-   fi
+-   if test -L $destdir/$viewname.1; then
+-      echo deleting $destdir/$viewname.1
+-      rm -f $destdir/$viewname.1
+-   fi
++   #if test -L $destdir/$exname.1; then
++   #   echo deleting $destdir/$exname.1
++   #   rm -f $destdir/$exname.1
++   #fi
++   #if test -L $destdir/$viewname.1; then
++   #   echo deleting $destdir/$viewname.1
++   #   rm -f $destdir/$viewname.1
++   #fi
+    if test -L $destdir/$rvimname.1; then