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>.

6 files changed, 165 insertions, 86 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 33dda9ad2f98..99133e748c02 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME?=	vim
-PATCHLEVEL=	9
-PORTVERSION=	6.4.${PATCHLEVEL}
+PATCHLEVEL=	35
+PORTVERSION=	7.0.${PATCHLEVEL}
 PORTREVISION?=	0
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
@@ -18,9 +18,9 @@ PATCH_SITES=	${MASTER_SITES:S|unix|patches/${PORTVERSION:C/\.[0-9a-z]*$//}|}
 PATCHFILES!=	/usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d  \
 			${PATCHLEVEL} 1 ${PATCHLEVEL}
 #	bits to remove
-BADPATCHES=	000 001
+BADPATCHES=	005 027 028 032
 .for p in ${BADPATCHES}
-PATCHFILES:=	${PATCHFILES:N6.4.${p}}
+PATCHFILES:=	${PATCHFILES:N7.0.${p}}
 .endfor
 
 MAINTAINER?=	obrien@FreeBSD.org
@@ -52,6 +52,8 @@ MLINKS=		vim.1 rvim.1	vim.1 rview.1
 MLINKS+=	vim.1 gvim.1	vim.1 gview.1	vimdiff.1 gvimdiff.1 \
 		vim.1 rgvim.1	vim.1 rgview.1	evim.1 eview.1
 .endif
+MANLANG=	"" ru.KOI8-R ru.UTF-8 pl.ISO8859-2 pl.UTF-8 pl fr.ISO8859-1 \
+		fr.UTF-8 fr it.ISO8859-1 it.UTF-8 it
 
 WANT_GNOME=	yes
 
@@ -184,7 +186,7 @@ cklatest:
 
 find-bad-patches:
 	cd ${DISTDIR} ; egrep -l \
-		'(src/os_win32|src/os_mswin|src/if_ole|src/proto/gui_w32|src/gui_w48|src/gui_mac|src/os_(riscos|cyg|vms))'\
+		'(src/os_win32|src/os_mswin|src/if_ole|src/proto/gui_w32|src/gui_w48|src/gui_mac|src/os_(riscos|cyg|os2|vms))'\
 		vim/${PORTVERSION:C/\.[0-9a-z]*$//}*
 
 .include <bsd.port.post.mk>
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index ef7d23554574..281d51284d11 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,27 +1,96 @@
-MD5 (vim/vim-6.4.tar.bz2) = 774c14d93ce58674b3b2c880edd12d77
-SHA256 (vim/vim-6.4.tar.bz2) = 5141ff8c7ed8ddc769fcf3b2bda386c6255d72163ae6727d8a6031d749be9f95
-SIZE (vim/vim-6.4.tar.bz2) = 3737338
-MD5 (vim/6.4.002) = ac408535c97031cb8351b771c1723dcb
-SHA256 (vim/6.4.002) = c44bdbe513c9dcb87249415171f32b1bb7321663cc8a891220b833376c7eee91
-SIZE (vim/6.4.002) = 7802
-MD5 (vim/6.4.003) = 591a6164c46792f7b41039e979148514
-SHA256 (vim/6.4.003) = 53020fcb1c995f8bb8f97f5d7f15ebb35d64ab3317c669408d8b299f84322290
-SIZE (vim/6.4.003) = 1463
-MD5 (vim/6.4.004) = 89de2693da138c37adfd10fdce957758
-SHA256 (vim/6.4.004) = 90e75fb62818ab6747f5bb8448e5bd6a9f5923af74dcb72ba7c8bef89c43af3d
-SIZE (vim/6.4.004) = 1581
-MD5 (vim/6.4.005) = 362dd6214af5cf5436bd616f148d22f1
-SHA256 (vim/6.4.005) = bfb2965c3859bedda122dc46e2b6c037652aadcc1f30bd9e7ea689def0229f72
-SIZE (vim/6.4.005) = 1577
-MD5 (vim/6.4.006) = 82a1ca21cec39b3624036247f4f40fdc
-SHA256 (vim/6.4.006) = 1fe6be6a4e5378428adb92cf4d783ac3ab52613badf45444b2d01eed0e8cf76b
-SIZE (vim/6.4.006) = 2320
-MD5 (vim/6.4.007) = 253152bc93743b464f08f9f5d831fe52
-SHA256 (vim/6.4.007) = 6888aa7d8d8fc786a07a834676cdf5bf6d0c70777008cd7518b0c5748e9359a8
-SIZE (vim/6.4.007) = 1717
-MD5 (vim/6.4.008) = b4f9997af33d3f857327e4fede95ac3f
-SHA256 (vim/6.4.008) = 14b28c32ad8c2529d7051461c55210d511bd8965a96e9b4295d2788c9fd90c47
-SIZE (vim/6.4.008) = 2199
-MD5 (vim/6.4.009) = 7ccdd6044b9fdd42f544fdb4d179f9e5
-SHA256 (vim/6.4.009) = 15fb7942d7612bf775570e28213af06a182e39ef125e87d1059254652fc2721a
-SIZE (vim/6.4.009) = 2653
+MD5 (vim/vim-7.0.tar.bz2) = 4ca69757678272f718b1041c810d82d8
+SHA256 (vim/vim-7.0.tar.bz2) = 494e27bd169d333917c0febcace466f89d119f71961e8959022fc6eab89764fc
+SIZE (vim/vim-7.0.tar.bz2) = 6575205
+MD5 (vim/7.0.001) = f0a2d3a337ae83e9e2d95156a78325bb
+SHA256 (vim/7.0.001) = 4154ba1a7bea845fe39fa028f15ff5ee4313d8e6784a5041e319108fda3cb282
+SIZE (vim/7.0.001) = 1627
+MD5 (vim/7.0.002) = ede30f39fde8a3e8ac09cfd7b5411c65
+SHA256 (vim/7.0.002) = d3f30df793e2f08561d530ff6de0d86eb7c6969ff4d95aabf22702f61eec1f1e
+SIZE (vim/7.0.002) = 2007
+MD5 (vim/7.0.003) = 75a36566e2082f94ed61a4077c943b2f
+SHA256 (vim/7.0.003) = 25710114391ea557f97e91b021cf988f17393692e37eb4e1c5307eab2c2a5605
+SIZE (vim/7.0.003) = 1876
+MD5 (vim/7.0.004) = 7269378bd86145ea0eaffe1eb0a5493d
+SHA256 (vim/7.0.004) = ef24c17657ce431922e60d0c267a819b2b003ae11206422f97d00137c466f377
+SIZE (vim/7.0.004) = 1596
+MD5 (vim/7.0.006) = 55b7d25640b76317ab85e307eb132766
+SHA256 (vim/7.0.006) = 0244bf01fe3ab1f63189d0f437c00d5a2e5d4dbc9d1460a0765eee2fd1b4d004
+SIZE (vim/7.0.006) = 1347
+MD5 (vim/7.0.007) = 9657085af81eaa8e7e6c9e48d307f272
+SHA256 (vim/7.0.007) = cb9d648c8010dadb8ca1ec94b95f11a131364cf8386a4dc2f383879755baadf5
+SIZE (vim/7.0.007) = 1919
+MD5 (vim/7.0.008) = 090cdd1e165bc40a922c5117d0a59601
+SHA256 (vim/7.0.008) = 0ed018ab6cab92dcb5e1d5504959f586a282bc6d2a0956e98ce99af206a2fd89
+SIZE (vim/7.0.008) = 2081
+MD5 (vim/7.0.009) = 68ac9f593605a753366fc8ac42fd79e6
+SHA256 (vim/7.0.009) = a2d2c4256a62f49b810c39b92699815c748526d9366060d5a5f6b1e7d3200779
+SIZE (vim/7.0.009) = 1625
+MD5 (vim/7.0.010) = 56504f4ec9d6b4d6ed7335199681ee1e
+SHA256 (vim/7.0.010) = 276f6b5ec8508aecb17fa3c18173d072b95f12c3f7c968b75b2199ccfeb0d036
+SIZE (vim/7.0.010) = 3705
+MD5 (vim/7.0.011) = db9286d505d2ef281c8f823870871868
+SHA256 (vim/7.0.011) = e8c34cf78e25f30b176e6cfbdaee8794c0861371fa959a2d63ac20e760e33f6a
+SIZE (vim/7.0.011) = 1989
+MD5 (vim/7.0.012) = a0bfd3053fe2069bc282be9b8b1597b2
+SHA256 (vim/7.0.012) = cd365986015bb2f11b84fe756a831816cb3a2caa40b157f84b28aafdc61c8de5
+SIZE (vim/7.0.012) = 2532
+MD5 (vim/7.0.013) = 81239d59e4cb2ba6c3f26378c533b50b
+SHA256 (vim/7.0.013) = 90b4a80ad9f19da6dfbcec3fddb934b3fb87ee158457f8f9c38ea3409771b186
+SIZE (vim/7.0.013) = 4614
+MD5 (vim/7.0.014) = 03209cae66e9cfbd72e3857cd2d67b22
+SHA256 (vim/7.0.014) = c794195e01b601206e32872e1bc328e95a26e7ceef8f5a8ef8a07eebf43d6d23
+SIZE (vim/7.0.014) = 5712
+MD5 (vim/7.0.015) = e16feb22b9891756bee0ebe1adb2f812
+SHA256 (vim/7.0.015) = bacc693d2dd130e35532e3fccba4ce750feff0595a0df878fc9496edf1e15b95
+SIZE (vim/7.0.015) = 4485
+MD5 (vim/7.0.016) = 116bcde74158f4bb3ffda4726d9d6dfc
+SHA256 (vim/7.0.016) = 1f2727a59c60877c41d495960c53ab8728f16f694acfe52cd744c741c5191d87
+SIZE (vim/7.0.016) = 1810
+MD5 (vim/7.0.017) = 2b33b8827a3866edb817f16c4b31fbb1
+SHA256 (vim/7.0.017) = c1731d5090b70d563db49423a6fe553832d81b8566fe28d67500690ce8a240a4
+SIZE (vim/7.0.017) = 2302
+MD5 (vim/7.0.018) = 1a269105104f99d5e32241d9190c602b
+SHA256 (vim/7.0.018) = 05ff0674112c966b27d9bd96b28daa54f13499a18bb8582ccdcbc78af47b7e4c
+SIZE (vim/7.0.018) = 1649
+MD5 (vim/7.0.019) = 7706eeba105cf01baa04eff7cd4f7985
+SHA256 (vim/7.0.019) = 572f48088ec00ab5a5e8bc1d3b686b71089d969adc5a9e212acc7db9898bee68
+SIZE (vim/7.0.019) = 1425
+MD5 (vim/7.0.020) = 6172b630970e95efa57cd60040d78830
+SHA256 (vim/7.0.020) = ad13ace3c93f95169269278e195dd0f1181a94b2fd2b41cbc654aa2f9b2b84f9
+SIZE (vim/7.0.020) = 1470
+MD5 (vim/7.0.021) = 8859f9e3bbc7109362941555ce83d183
+SHA256 (vim/7.0.021) = cc837e2714b0475269b0584ef3b61dbb113bd1f0bb2a802603d469e108803ff5
+SIZE (vim/7.0.021) = 4240
+MD5 (vim/7.0.022) = 2c2ece4a61357e3dc596652f2d22969f
+SHA256 (vim/7.0.022) = c0d9f9afd8dc01958086bc28f157695118ece2502fa907a13e3e45868536aa07
+SIZE (vim/7.0.022) = 5471
+MD5 (vim/7.0.023) = 0bd6794be699d9a452ebe535d01a4962
+SHA256 (vim/7.0.023) = 3f4b61a68bfde100db692b35fd52c8409e21c7a12937644dcc91f7fef164c6a0
+SIZE (vim/7.0.023) = 5351
+MD5 (vim/7.0.024) = 791b48ad58991de17739305320064a98
+SHA256 (vim/7.0.024) = f56feb7072fcccfaf278f13c77f3f1e8e17b2e52314e1908a78f075dc7f46ba9
+SIZE (vim/7.0.024) = 1619
+MD5 (vim/7.0.025) = fae32b1d4ec524e1975c835a012b267f
+SHA256 (vim/7.0.025) = 2d653641ca9d87aa5105e6a61379798605e8afebe409b64f3f5ba341591d60c2
+SIZE (vim/7.0.025) = 2606
+MD5 (vim/7.0.026) = 58402980c224e1cd104dc551900cc70b
+SHA256 (vim/7.0.026) = 2e8bcb32fafa2506c19dd80201db380332be98ffa2abf76c5b6e3ba791a72a8c
+SIZE (vim/7.0.026) = 1800
+MD5 (vim/7.0.029) = 60d3dec7d595c40fe9c2ab5b9ccccea7
+SHA256 (vim/7.0.029) = 181c2a80ac3f072fa99d245a28c222adbd295b004047aaa6dc5d92782548d7b3
+SIZE (vim/7.0.029) = 1494
+MD5 (vim/7.0.030) = 46df8846343bc4c2f9f0909f212a512e
+SHA256 (vim/7.0.030) = b11033a839e497ff9b0868cf2dea54200b9976f0175f0e985a94c690dc673096
+SIZE (vim/7.0.030) = 1664
+MD5 (vim/7.0.031) = 15e14b878d4e83a616c863e4128f79ec
+SHA256 (vim/7.0.031) = b7106169085a45877b8e84c971c5bcc1c409461bb710b81d2b156bcbe6adb803
+SIZE (vim/7.0.031) = 1808
+MD5 (vim/7.0.033) = 01385aff2103905d3f640e1bb5849e22
+SHA256 (vim/7.0.033) = fa34b0efe8988e881a9ff891b5b0e345491b515be1203fef2c509832d0ff2471
+SIZE (vim/7.0.033) = 2431
+MD5 (vim/7.0.034) = 0512d9e2eb08273607430c422fde0c29
+SHA256 (vim/7.0.034) = 6f179f8675df84ef2d3579c41867818da912700ae68fdf1f8bb8bf4900625709
+SIZE (vim/7.0.034) = 2042
+MD5 (vim/7.0.035) = 3d0a5df37fac6451051bb40ac67c2638
+SHA256 (vim/7.0.035) = f95e2373096c6f715d797d8e99c10bb8c518a53b0aa4e6f7d197e5cb91272d9c
+SIZE (vim/7.0.035) = 5905
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
diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist
index e0047f3f4545..cbb5698f5060 100644
--- a/editors/vim/pkg-plist
+++ b/editors/vim/pkg-plist
@@ -19,4 +19,18 @@ bin/gvimdiff
 @comment Insert PLIST.share-vim here
 @comment -=[ begin PLIST.share-vim ]=-
 @comment -=[ end PLIST.share-vim ]=-
+@dirrmtry man/fr.ISO8859-1/man1
+@dirrmtry man/fr.ISO8859-1
+@dirrmtry man/fr.UTF-8/man1
+@dirrmtry man/fr.UTF-8
+@dirrmtry man/it.ISO8859-1/man1
+@dirrmtry man/it.ISO8859-1
+@dirrmtry man/it.UTF-8/man1
+@dirrmtry man/it.UTF-8
+@dirrmtry man/pl.ISO8859-2/man1
+@dirrmtry man/pl.ISO8859-2
+@dirrmtry man/pl.UTF-8/man1
+@dirrmtry man/pl.UTF-8
+@dirrmtry man/ru.UTF-8/man1
+@dirrmtry man/ru.UTF-8
 @dirrm share/vim