Update to Vim 7.1 patchlevel 315.

2 files changed, 71 insertions, 5 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index efb0af26e4ed..c21be29e4bde 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME?=	vim
-PATCHLEVEL=	293
+PATCHLEVEL=	315
 PORTVERSION=	7.1.${PATCHLEVEL}
 RELEASE=	vim-${PORTVERSION:C/\.[0-9a-z]*$//}
-PORTREVISION?=	2
+PORTREVISION?=	0
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
 DISTFILES=	${RELEASE}${EXTRACT_SUFX}
@@ -20,6 +20,9 @@ PATCHFILES!=	/usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d  \
 			${PATCHLEVEL} 1 ${PATCHLEVEL}
 #	bits to remove
 BADPATCHES=	003 007 041 065 070 072 080 088 091 092 124 128 129 134 146 158 168 196 204 275 278 280 282 283 285
+.if !defined(WITH_LANG)
+BADPATCHES+=	312
+.endif
 .for p in ${BADPATCHES}
 PATCHFILES:=	${PATCHFILES:N7.1.${p}}
 .endfor
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index c3cd234d9021..1905be98e616 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -781,9 +781,6 @@ SIZE (vim/7.1.279) = 3848
 MD5 (vim/7.1.281) = 1f6237a15cc4873e163a5f0bd85223c5
 SHA256 (vim/7.1.281) = b1ae0768766dd79071e72e3d66512309d41af9cce2691f46aa52cbf4dd73cd61
 SIZE (vim/7.1.281) = 2094
-MD5 (vim/7.1.283) = 49d3d772edbe80af70eb70036dd44adc
-SHA256 (vim/7.1.283) = f96ec3db0fd8d7842a48e083375d6cbaf3c0593f5c3f7219d694ce501b1027f0
-SIZE (vim/7.1.283) = 7633
 MD5 (vim/7.1.284) = 28f0c0e9b04c737efbd1928487c5ff0c
 SHA256 (vim/7.1.284) = a6a88c065b707e9ce1b1576ad779244990bc6aa60a9344b0ae068762c05d9490
 SIZE (vim/7.1.284) = 2258
@@ -811,3 +808,69 @@ SIZE (vim/7.1.292) = 6698
 MD5 (vim/7.1.293) = 9ce9b70e3b41231ac02519d08b4047cb
 SHA256 (vim/7.1.293) = 68610cb04ec00c86820a92a4517e0cc74bb0c340c3b77e52bfb1648a91444e6a
 SIZE (vim/7.1.293) = 3087
+MD5 (vim/7.1.294) = 22b56382d8981970408d756988aa1d54
+SHA256 (vim/7.1.294) = 1be1571ffe9f9882727864c6a4d5b95f49507a0eb8b71fc6a0385441935c681b
+SIZE (vim/7.1.294) = 2336
+MD5 (vim/7.1.295) = 854f1086b5856052413caa519c695b4e
+SHA256 (vim/7.1.295) = 6fc49ec404a21b3c9f471d9a4dfcd103bd7feb3e3ab87c13766b76bcbc2b1d01
+SIZE (vim/7.1.295) = 6102
+MD5 (vim/7.1.296) = 5abf81e711ffde20fe4feccca95684c8
+SHA256 (vim/7.1.296) = bc3d74ea777c1d99d82ea2d5e631ebc203e605ff128535b82e65da6961910652
+SIZE (vim/7.1.296) = 9374
+MD5 (vim/7.1.297) = c7df3c6ce12cf9e33335890f7f169c5f
+SHA256 (vim/7.1.297) = 59e1abe38630966b299888913daf60d55e65093d7a82bb7cde42ca7f1cf3a038
+SIZE (vim/7.1.297) = 1855
+MD5 (vim/7.1.298) = f0d030613e3a883dbdc73263c0751145
+SHA256 (vim/7.1.298) = 480f1e02d7459c87a381afafb90755d88e49aef3dbea4161c817869fe7eb7c03
+SIZE (vim/7.1.298) = 1558
+MD5 (vim/7.1.299) = 91d8f03873238aa39341e291358a7b06
+SHA256 (vim/7.1.299) = 91f227afb08b351615a9f8450d73cdcd381545a995fe44b43578b99ed323c545
+SIZE (vim/7.1.299) = 9490
+MD5 (vim/7.1.300) = b94fe449244cffdbd704bb8fa71bcae8
+SHA256 (vim/7.1.300) = b22fdb9bb1f2884754de65872b769b3d965326381c459aa4c2712a3a5ad6466d
+SIZE (vim/7.1.300) = 1959
+MD5 (vim/7.1.301) = 193c2520750fab8d3294e160d9395f31
+SHA256 (vim/7.1.301) = 50290b484a3bff81b4527499ed55aa8de7838d598186d9ef7b16625575f493be
+SIZE (vim/7.1.301) = 1673
+MD5 (vim/7.1.302) = ca97f68b3435d0eb640156fcda9cc2b0
+SHA256 (vim/7.1.302) = 2581a4091160c607f80ea1a57387316af984959f039ac573f11746a90307976d
+SIZE (vim/7.1.302) = 1485
+MD5 (vim/7.1.303) = faa0892ccc942c537c8ef52954880ebf
+SHA256 (vim/7.1.303) = 1ee9cc6c7eb41da42acdb3d7fbd1e46fbd2d58a269b2f8df55b441a97648c039
+SIZE (vim/7.1.303) = 1409
+MD5 (vim/7.1.304) = 0c75354f6f98023f56c1d0a7d1ba0559
+SHA256 (vim/7.1.304) = 92d45525ce4e554d184f03f1bc6511141f75abd9351495596ea456f40c3bac81
+SIZE (vim/7.1.304) = 12135
+MD5 (vim/7.1.305) = c1aa4bf8490bbf387b1ddecc057483fc
+SHA256 (vim/7.1.305) = 4daf62d879eaef4ac5430ec74b1f78f6802500bdfe3533b81f9c53e2474633ea
+SIZE (vim/7.1.305) = 4735
+MD5 (vim/7.1.306) = ca4358c905c4cab138911630bd28df23
+SHA256 (vim/7.1.306) = 87a0b43c55e68bd136ca1848e3581de81e87dce85688e7e40d2fd34b534f4cb3
+SIZE (vim/7.1.306) = 2153
+MD5 (vim/7.1.307) = be5ea3de09eb304621ff72eb5d8d17ab
+SHA256 (vim/7.1.307) = b9430b5ae2a861da41c21c913fb36980559b6348aaf2ecf4ca806bbdfb7ed16b
+SIZE (vim/7.1.307) = 23714
+MD5 (vim/7.1.308) = f1c9d9017e60713b4305d0b98b06f828
+SHA256 (vim/7.1.308) = c1cab6b105a3bd3c0ac494bf810e69b8613725b72fda34b86303cbe8bac5c170
+SIZE (vim/7.1.308) = 2673
+MD5 (vim/7.1.309) = 72a47b247eb6766facdbd2a1bba983b3
+SHA256 (vim/7.1.309) = 50e9d51d8336f10e72afa5b9fa899661f59ff467180c8ac15183b3cbd918283f
+SIZE (vim/7.1.309) = 3989
+MD5 (vim/7.1.310) = 21f5e52f31d7bc023cbab7119361cade
+SHA256 (vim/7.1.310) = 9f703365bc32dc789d7cb386c9bb46c59d08fa04a232c3c233739d0ce3d3876b
+SIZE (vim/7.1.310) = 8024
+MD5 (vim/7.1.311) = af930845ac6e7bed800025e69cb7f970
+SHA256 (vim/7.1.311) = 93be72d9a244e51f85033983778f963bdd14a630dd3292083e23d17497a27c27
+SIZE (vim/7.1.311) = 2547
+MD5 (vim/7.1.312) = 5c702d113f7da78499e033dcd7b7a5e0
+SHA256 (vim/7.1.312) = d05f82b15d7d6919541850f1019cfa21e0d025f919778dc9defa3e6ef326964e
+SIZE (vim/7.1.312) = 2346
+MD5 (vim/7.1.313) = 865639f20efa6046e521bcb65e91e7fb
+SHA256 (vim/7.1.313) = 8482a3e8a950120e80735b7c0f64f547ec011210a161005346ab7281494857d1
+SIZE (vim/7.1.313) = 3425
+MD5 (vim/7.1.314) = 7cb1981effee719674b0e164921a3ada
+SHA256 (vim/7.1.314) = a3bb402934376ca85d2ad26d88a87c8d7b4d9a82ac905a86f1c17890e6ec11ce
+SIZE (vim/7.1.314) = 1915
+MD5 (vim/7.1.315) = fd886913727b34a7a80769ac6e80c1e4
+SHA256 (vim/7.1.315) = a53d0b3ab656b427838e39378d2aa212c5e165cbdcb698720c2eaeea23096f74
+SIZE (vim/7.1.315) = 3287