Update to Vim 7.3 patchlevel 669.

2 files changed, 67 insertions, 5 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 4effb0fd8da3..ebe14ebf775d 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -10,7 +10,7 @@ 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=	632
+PATCHLEVEL=	669
 PORTVERSION=	7.3.${PATCHLEVEL}
 RELEASE=	vim-${PORTVERSION:C/\.[0-9a-z]*$//}
 PORTREVISION?=	0
@@ -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 569 578 579 580 581 583 584 603 611 629
+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 640 650 654 655 656 657 658 659 660 670 671 672
 .for p in ${BADPATCHES}
 PATCHFILES:=	${PATCHFILES:N7.3.${p}}
 .endfor
@@ -244,14 +244,20 @@ post-install:
 show-options:
 	@${MAKE} -DWITH_OPTIONS showconfig
 
+.if defined(ONT_CHECKSUM)
+checksum:
+.endif
+
 cklatest: .PHONY
 	@${ECHO} -n "Currently at: "
 	@${MAKE} -V PATCHLEVEL
-	-(ncftpls \
+	-(${SED} -i '' "s/^PATCHLEVEL=.*$$/PATCHLEVEL=	`ncftpls \
 	    ftp://ftp.vim.org/pub/vim/patches/${PORTVERSION:C/\.[0-9a-z]*$//}/ \
 		| grep "^${PORTVERSION:C/\.[0-9a-z]*$//}" \
 		| ${SED} -n -e 's/${PORTVERSION:C/[0-9]*$//}\([0-9][0-9][0-9]\)$$/\1/p' \
-		| ${TAIL} -1)
+		| ${TAIL} -1`/" Makefile)
+	@${ECHO} -n "Now at: "
+	@${MAKE} -V PATCHLEVEL
 
 find-bad-patches:
 	@cd ${DISTDIR} ; egrep -l \
@@ -259,7 +265,7 @@ find-bad-patches:
 		vim/${PORTVERSION:C/\.[0-9a-z]*$//}*
 
 ckp:
-	/usr/bin/time -h ${MAKE} -DPATCH_DEBUG clean patch
+	/usr/bin/time -h ${MAKE} -DPATCH_DEBUG -DONT_CHECKSUM clean patch
 
 ckmtree:
 	${MTREE_CMD} -f ${MTREE_FILE} -p ${PREFIX}
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index ecc559d8a10b..b8f278e8fcac 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1214,3 +1214,59 @@ SHA256 (vim/7.3.631) = 07c64812e1d891adcdd435de0d7fdce1a0978585a4633cd15a7eb647f
 SIZE (vim/7.3.631) = 10100
 SHA256 (vim/7.3.632) = 5333562455ee471bf133815ce77f182819fa71ccf65eb811f1e9d4de62b3d7a6
 SIZE (vim/7.3.632) = 14770
+SHA256 (vim/7.3.633) = 274fc8f2a3ef28b449fd4664b5f8514ad5816d1e2d9189972e7f9c19b49b0ecb
+SIZE (vim/7.3.633) = 2238
+SHA256 (vim/7.3.634) = 85eb94cf4e5f1bb3017d5381a6ae86868e3c0dc9171a307c9203f54fa1f084d8
+SIZE (vim/7.3.634) = 1884
+SHA256 (vim/7.3.635) = cd47974be70bfd70ce465c6527bf10f6d4f98516867cecb7714343fc915c154b
+SIZE (vim/7.3.635) = 1586
+SHA256 (vim/7.3.636) = 64db24e33da0d22f019b8290f28ddcdf048e5243cb3c1228ff103474460d8a1c
+SIZE (vim/7.3.636) = 4539
+SHA256 (vim/7.3.637) = de93acc384628668006456e100a5e6ffd2f1bc9ec9b2c5a004f430b547c6400a
+SIZE (vim/7.3.637) = 3117
+SHA256 (vim/7.3.638) = 6f7887c75d407fe4256d5f84a814e31f1979e44e75e3ba1053f6bc9913b5a532
+SIZE (vim/7.3.638) = 1783
+SHA256 (vim/7.3.639) = c063f6b59bab5fcf18caa824326646404055e5d78bebbefd4d94efc3c28ddfa9
+SIZE (vim/7.3.639) = 31440
+SHA256 (vim/7.3.641) = 5a9bd68b5ab4aba5f2a341d588a165cdb847330c3283541dde625ba420873de9
+SIZE (vim/7.3.641) = 2219
+SHA256 (vim/7.3.642) = 01879a4272a220758e33c38aa427ab2b0cd7b8e051f02c675a0433dbfe1beba3
+SIZE (vim/7.3.642) = 1810
+SHA256 (vim/7.3.643) = 14bbc87b7dc545db6f0096f5ed18c17c316cc5f10902f5f6562a015e89700afc
+SIZE (vim/7.3.643) = 2060
+SHA256 (vim/7.3.644) = 721b97af1e590018db33731daf3db969079f393ec9e4e9cbc77636195091a9bd
+SIZE (vim/7.3.644) = 1925
+SHA256 (vim/7.3.645) = 4a71d75cf9c1c965b30abc424eb23eab1544324dcd86254e1d766fa3831bb94a
+SIZE (vim/7.3.645) = 2910
+SHA256 (vim/7.3.646) = 8c4c736094c6b9a58b6395f7d691ccc35d135a2e915ea5ad3be571636ecf7475
+SIZE (vim/7.3.646) = 2353
+SHA256 (vim/7.3.647) = 65cd32edef0659506e2a3289a77dd2db21040c5ca1a0a228bac58bee2b145a94
+SIZE (vim/7.3.647) = 5213
+SHA256 (vim/7.3.648) = c7834743c061002dcabc7a66fca292ebdcb83d46c41801c1988d95047fbd825f
+SIZE (vim/7.3.648) = 3831
+SHA256 (vim/7.3.649) = 6d130d6f71a3b85db9c504977b79a5bd3595e3e4b2991541312be077b4d5147f
+SIZE (vim/7.3.649) = 2256
+SHA256 (vim/7.3.651) = 6522bb98bb344a0b5b361f095b2e4ed05ed5414e534afe9a49a221314dafab71
+SIZE (vim/7.3.651) = 3120
+SHA256 (vim/7.3.652) = 9b591a32aa6a9abddefef1bd841114a8d8731b7c93898ed508119cec63152623
+SIZE (vim/7.3.652) = 2304
+SHA256 (vim/7.3.653) = 4335b11d86c62f422252e95366711294cb20dace0b78e3f1d6dec861aed8ca68
+SIZE (vim/7.3.653) = 7986
+SHA256 (vim/7.3.661) = c262b87fea4fbc073a763c6ae85d1094eb79e7ab73841652c774101bfe9c3dda
+SIZE (vim/7.3.661) = 5339
+SHA256 (vim/7.3.662) = 4aa755a3c4abfcba9ffd615f95c660134754adfb493259486951b72c69c8b060
+SIZE (vim/7.3.662) = 3126
+SHA256 (vim/7.3.663) = 1915a7bf40492d1d326ae4dc5469de811d0a90501851c376f73a088625f6bf81
+SIZE (vim/7.3.663) = 1498
+SHA256 (vim/7.3.664) = 075f48f9c4d5d174d2dc9cccdd673310e8455cd977fbc5528015453c17639c20
+SIZE (vim/7.3.664) = 2171
+SHA256 (vim/7.3.665) = 51eea22315f1f14c7bde218cfec2d8785b0e7bae9393554b1f9ac6d938e54184
+SIZE (vim/7.3.665) = 2414
+SHA256 (vim/7.3.666) = 200fd2a397373d2fbb0cf646302baca9c2252d5fa9934b4dd68dcc13c72c49ea
+SIZE (vim/7.3.666) = 3195
+SHA256 (vim/7.3.667) = 66d8536c2eafc9f4f0911976eabc72cfb29ea56379dee3de6bfea92bb4157758
+SIZE (vim/7.3.667) = 3213
+SHA256 (vim/7.3.668) = ac90bf07f1aedfee48d7a036fe4ad950bf22ff04c412dc7915b50d910290eb47
+SIZE (vim/7.3.668) = 2763
+SHA256 (vim/7.3.669) = ddf9f56a0705dd9c1be116b52b390ef95a31887e1be6cc8325354ed6226ae9aa
+SIZE (vim/7.3.669) = 4757