Update to Vim 7.3 patchlevel 632.

3 files changed, 148 insertions, 4 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index d2dfe75682df..59c778facb70 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -10,10 +10,10 @@ PORTNAME?=	vim
 #		! _NEVER_ reduce or lower PATCHLEVEL, even if the PATCHLEVEL
 #		! value # is added to BADPATCHES.  Doing otherwise will cause
 #		! PORTEPOCH to be needed, which we do NOT want.
-PATCHLEVEL=	556
+PATCHLEVEL=	632
 PORTVERSION=	7.3.${PATCHLEVEL}
 RELEASE=	vim-${PORTVERSION:C/\.[0-9a-z]*$//}
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
 DISTFILES=	${RELEASE}${EXTRACT_SUFX}
@@ -23,7 +23,7 @@ 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=	122 225 235 246 247 252 253 336 386 387 400 434 487 491 527
+BADPATCHES=	122 225 235 246 247 252 253 336 386 387 400 434 487 491 527 569 578 579 580 581 583 584 603 611 629
 .for p in ${BADPATCHES}
 PATCHFILES:=	${PATCHFILES:N7.3.${p}}
 .endfor
@@ -260,7 +260,7 @@ find-bad-patches:
 		vim/${PORTVERSION:C/\.[0-9a-z]*$//}*
 
 ckp:
-	${MAKE} -DPATCH_DEBUG clean patch
+	/usr/bin/time -h ${MAKE} -DPATCH_DEBUG clean patch
 
 ckmtree:
 	${MTREE_CMD} -f ${MTREE_FILE} -p ${PREFIX}
diff --git a/editors/vim/add-bad.sh b/editors/vim/add-bad.sh
new file mode 100644
index 000000000000..a13edbca61c7
--- /dev/null
+++ b/editors/vim/add-bad.sh
@@ -0,0 +1,12 @@
+:
+# $FreeBSD$
+
+usage() {
+	echo 'usage: ${0##*/} <bad patch #s to add to ${BADPATCHES}>'
+	exit 1
+}
+if [ $# -lt 1 ]; then
+	usage
+fi
+
+sed -i '' "s/^BADPATCHES=.*$/& $*/" Makefile
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 4beec2a2866c..ecc559d8a10b 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1082,3 +1082,135 @@ SHA256 (vim/7.3.555) = 9dc8c7591d7ea2acd7c4601ec89eedefc572f59929b0a9d7c2abfd7b2
 SIZE (vim/7.3.555) = 7968
 SHA256 (vim/7.3.556) = 5ae29a58521ef18a0223eb65e285bbaf4c17fe81b2ea54d84e4081f5f7012ff6
 SIZE (vim/7.3.556) = 2194
+SHA256 (vim/7.3.557) = 1411f5dc21e2374bec734e047de5855d2c76db2968913033598d92bda1d06327
+SIZE (vim/7.3.557) = 2958
+SHA256 (vim/7.3.558) = 4124c8eec1c2382f2ef2e04054389f1450dfeeb328c658df90e5a06989a9cbde
+SIZE (vim/7.3.558) = 2956
+SHA256 (vim/7.3.559) = 11c8b45c74b1b00083de6c8550fa9672775c68b1cf14a1d134ce7e0597dd66be
+SIZE (vim/7.3.559) = 3483
+SHA256 (vim/7.3.560) = cba814f00e17a1757b4a9a4e1a63bb91b6d37b447fff3f561fdeb3eb76d7c52f
+SIZE (vim/7.3.560) = 1551
+SHA256 (vim/7.3.561) = e19c1269b315dabc96f5d5e10f739a8e861e6ed7535b7a7f493d746379d341fb
+SIZE (vim/7.3.561) = 1511
+SHA256 (vim/7.3.562) = 9aa35fba6bbbd0bc9a343fd7c34058f5ffa29c68fdaef6193fb643252679a765
+SIZE (vim/7.3.562) = 1659
+SHA256 (vim/7.3.563) = 7e0598364cfb5a8bba72420b1aa7ddc2285abb6b23fcc262771e087528238376
+SIZE (vim/7.3.563) = 2742
+SHA256 (vim/7.3.564) = 8c967522c9dcc37a450273cd0d139b92700be68067a885fbe7a6b11c35f76007
+SIZE (vim/7.3.564) = 1785
+SHA256 (vim/7.3.565) = 07289d4a1615ee677df7086b9baaa53cf6d1ceea7d2fa7a90f73813ddd30f1f5
+SIZE (vim/7.3.565) = 1806
+SHA256 (vim/7.3.566) = 60425749b2f7920165aba371406c06117bf38fc16719250337fac20dd50770a3
+SIZE (vim/7.3.566) = 2363
+SHA256 (vim/7.3.567) = adfaa7355ac66b27a4145ab43371a66b3c87fae207014e1c5498eacedbb49b93
+SIZE (vim/7.3.567) = 1739
+SHA256 (vim/7.3.568) = 16916b1fec3d53c3a643b5b080092327f5c1576dbd974fc5de4cd17573cc1a2a
+SIZE (vim/7.3.568) = 3890
+SHA256 (vim/7.3.570) = 313c759a22186977471e005039434a9d5c092e096ab16a7992994d6b589cf058
+SIZE (vim/7.3.570) = 4659
+SHA256 (vim/7.3.571) = 7513139e24a06c320cc52ed87f42bfbe2f7583594afec22e2f8436ed3c6df914
+SIZE (vim/7.3.571) = 3915
+SHA256 (vim/7.3.572) = ce075ac247ad47bf8bc93640903b25bfdada5b97b28c72cd283a714b01a76686
+SIZE (vim/7.3.572) = 1915
+SHA256 (vim/7.3.573) = 4d6a277c07bac8ed80abf029c5bfd23c0a00ac9afd8f86dde19cf4daa86d1422
+SIZE (vim/7.3.573) = 1419
+SHA256 (vim/7.3.574) = 3de9e2335240e472d95fa91f1f1168cc5de9e60988be895807bdd3be39c7421c
+SIZE (vim/7.3.574) = 2491
+SHA256 (vim/7.3.575) = 2b9c94af86530b5d36bffe7efbac7bea34c165f187c9846a158e1e1628b359f4
+SIZE (vim/7.3.575) = 1586
+SHA256 (vim/7.3.576) = a1f09dffc0f150b307752e23553babb334dbbdbadae44a0da6231755e1a4a1a1
+SIZE (vim/7.3.576) = 7301
+SHA256 (vim/7.3.577) = 11396f08c3fc1c0f5876072227867e48bda32fc4f08c7cfce813254029bbf246
+SIZE (vim/7.3.577) = 6542
+SHA256 (vim/7.3.582) = 54bc901113e6c4cfd3653aaf3a768dbd0e676819a218ab0602f63eb16e591d16
+SIZE (vim/7.3.582) = 1342
+SHA256 (vim/7.3.585) = cdada243fb0600e87a1b4e865b76ac7a087be7bbcb32e15face7a38ebcccdbcc
+SIZE (vim/7.3.585) = 1696
+SHA256 (vim/7.3.586) = cead6b79d1fe08fd549c2baeeddbd0531cfde488b1b9a993576aaa760d6cf5de
+SIZE (vim/7.3.586) = 3055
+SHA256 (vim/7.3.587) = c2c7ea4249d69bac731bdb933f27cc1b37abe1cd41caafbc2c7bcc5f2f7f42c9
+SIZE (vim/7.3.587) = 2248
+SHA256 (vim/7.3.588) = 0c267f8854c6cd6ef1af7e0c4ca5cf72b4fd415c08bcc2e763a2c9498f5ba3ba
+SIZE (vim/7.3.588) = 2464
+SHA256 (vim/7.3.589) = 5e4f0262a9094dfb6843229c9ccbfe402b9a12d7250c519fa8be128b5cf4c3ee
+SIZE (vim/7.3.589) = 1974
+SHA256 (vim/7.3.590) = d4bf79d5b6d50c9fe922cd19cc19b39a3094f96c817e88cb371e04225fecab59
+SIZE (vim/7.3.590) = 1804
+SHA256 (vim/7.3.591) = 1284bd37036daf3ea7f39635ae3fb365fcb464cf5c055d179250c6d24cd91156
+SIZE (vim/7.3.591) = 5247
+SHA256 (vim/7.3.592) = cd91a5753ae4dc97aefa04ab07495c8b7b8d7ebea0d38429b8bc1955ef2cc757
+SIZE (vim/7.3.592) = 3343
+SHA256 (vim/7.3.593) = 1bc6e0c2eec3fd70218c9024067ffdea4caf0e1044cdacda9059bc2730ebe30d
+SIZE (vim/7.3.593) = 2237
+SHA256 (vim/7.3.594) = 9f78caf7143416bcfec8ca564eb737502ceb518a04e843004d42a995e13c3612
+SIZE (vim/7.3.594) = 4873
+SHA256 (vim/7.3.595) = 323c53092d700da8900fa717deeee40e59c29f3054f322b01061ed81212bcd6a
+SIZE (vim/7.3.595) = 3921
+SHA256 (vim/7.3.596) = 36359a01947834275281eb318a5bfbf5a1f418b7d44d4e79842684d3dffaa419
+SIZE (vim/7.3.596) = 4967
+SHA256 (vim/7.3.597) = a5b05ea3425cba4ea8f0b2851a9f8c8005097cad37ceb95d0b4cf81e30b5b782
+SIZE (vim/7.3.597) = 21669
+SHA256 (vim/7.3.598) = c442ed186dccf379115fe04357cc8e67bebc7a39f57b5a2531425c3c0eac4de7
+SIZE (vim/7.3.598) = 2635
+SHA256 (vim/7.3.599) = 93efa292c00e457aebc7dfa166ea3c5182e06da72de949398ca5c55c8acad88e
+SIZE (vim/7.3.599) = 3042
+SHA256 (vim/7.3.600) = 6ac05bfecf1d46bda5f144d83645109a8ed1344904dae1d8d021b544163b1bd1
+SIZE (vim/7.3.600) = 1572
+SHA256 (vim/7.3.601) = 0f7b4b0f1dd098cfd6a095ed8c0347bb729db0af3db76685190770ba2fe79d44
+SIZE (vim/7.3.601) = 1492
+SHA256 (vim/7.3.602) = 6ad72a988da2247b0845d36c14a38707e90801a8a936e02e2b75d1a0500350a8
+SIZE (vim/7.3.602) = 1532
+SHA256 (vim/7.3.604) = a7156288fb23c18c9b97ba5c424789d2b0db07d09b366910cb77c66f64176c58
+SIZE (vim/7.3.604) = 1861
+SHA256 (vim/7.3.605) = 798bec8afa11e4b7fc1ba90f95d71d205c5b2873de2072d0e8055b32ad30070b
+SIZE (vim/7.3.605) = 2334
+SHA256 (vim/7.3.606) = a0ccf6df3cb0078f3afd00fe070466f5b0576aa8de0ea40b52eb95b71c786d7f
+SIZE (vim/7.3.606) = 2522
+SHA256 (vim/7.3.607) = 62ccf8336829930ed36653d2b09372bdae2912715a585631f5eacb9c27f509a0
+SIZE (vim/7.3.607) = 2139
+SHA256 (vim/7.3.608) = 4448b607806054642f47c2b6be6e733868172395f6f8cf66b1d90896c81f7349
+SIZE (vim/7.3.608) = 3847
+SHA256 (vim/7.3.609) = 67324c1351fc887c9bdb660ef85042ac76b44842af7eae8485143eb5a799c053
+SIZE (vim/7.3.609) = 5843
+SHA256 (vim/7.3.610) = fdc4bf41b6db3cbb9e0501f6623478e0eb17c73da5b68b08831341a40e3bc9ba
+SIZE (vim/7.3.610) = 12106
+SHA256 (vim/7.3.612) = f44e86c1d153f0ad6506df382ca3fc1c40d0214fb53bf0862fdf31f2f0d97fc7
+SIZE (vim/7.3.612) = 2081
+SHA256 (vim/7.3.613) = 65b84e4905d444f03656a4cfb2321cccf7171095fa664f252ac89ebe8535bbe0
+SIZE (vim/7.3.613) = 6886
+SHA256 (vim/7.3.614) = 97a0fd70ec54f0f8114f0a0b344e111730605e0f6c8df391b88fd5b73cbce821
+SIZE (vim/7.3.614) = 5747
+SHA256 (vim/7.3.615) = 86f84fb8f75b3e3c5a6f3823bcfc9a961e914b5b30c517dc54124b5d8043dbaa
+SIZE (vim/7.3.615) = 2915
+SHA256 (vim/7.3.616) = 698e84f53b9e566cf74df5ba542222e047965d05bcfd8c6c2735ec647614d2b3
+SIZE (vim/7.3.616) = 1289
+SHA256 (vim/7.3.617) = 89995b8621c10053264ab42ec5786e9c8e7f7085c75424dd5a324e1e8eed8f21
+SIZE (vim/7.3.617) = 1781
+SHA256 (vim/7.3.618) = 16d0288545da48f8a0aef5a6fc58ae57b64dc6067c11cf7e68c1c5787b6f169a
+SIZE (vim/7.3.618) = 10033
+SHA256 (vim/7.3.619) = a9ea8dd9b200780ed6436e1c7f42c8f4cfbc9ea618ae0c8a1c6ec6eebfb0b764
+SIZE (vim/7.3.619) = 1583
+SHA256 (vim/7.3.620) = 5a08ebb036fe4ad59493185a2a45e7bb4796d1ce91190e61473378d0ecc50a69
+SIZE (vim/7.3.620) = 4897
+SHA256 (vim/7.3.621) = 3495b5ef1ad5e34d221984b3bf28301c0b66f5a6fe28c239b482d68224ba27a1
+SIZE (vim/7.3.621) = 2259
+SHA256 (vim/7.3.622) = 054de6e9f355fe13cfcbfcb55b132d499bc136894efcd4588584c59fbecac61b
+SIZE (vim/7.3.622) = 1867
+SHA256 (vim/7.3.623) = 0f6e3e19bcff1a1730d404d0d9714fa9dd1e1fb2b6b265e37288baebaa22ade3
+SIZE (vim/7.3.623) = 2426
+SHA256 (vim/7.3.624) = 1f9174a6a6207c27918f0d9a2fafde237f073896bed42e508653cd8f0b07afa4
+SIZE (vim/7.3.624) = 1800
+SHA256 (vim/7.3.625) = b5d55f10ff040d4b51b14c78507b6b53d109b41417afc9aff035cd493878fcc1
+SIZE (vim/7.3.625) = 4327
+SHA256 (vim/7.3.626) = 5dba1d33716d054c315a591ee4bd886a6e3231aafb528ab679ac614fdd299d46
+SIZE (vim/7.3.626) = 1500
+SHA256 (vim/7.3.627) = 9ebebe46b6e7f5564d4b1d6b870590ec1a0fd15b6d2f6b6189eee177c4ff873d
+SIZE (vim/7.3.627) = 2803
+SHA256 (vim/7.3.628) = 25bdb13b6ed7707e69c75bdcc3fb6dd47f4ea80d43a4f0bc0295a35d8c06d621
+SIZE (vim/7.3.628) = 1802
+SHA256 (vim/7.3.630) = e523b4d92a5e315fbdd799562ebcf21d391e44335bce138938fe05ac053e79f8
+SIZE (vim/7.3.630) = 1487
+SHA256 (vim/7.3.631) = 07c64812e1d891adcdd435de0d7fdce1a0978585a4633cd15a7eb647ffbd6867
+SIZE (vim/7.3.631) = 10100
+SHA256 (vim/7.3.632) = 5333562455ee471bf133815ce77f182819fa71ccf65eb811f1e9d4de62b3d7a6
+SIZE (vim/7.3.632) = 14770