2 files changed, 22 insertions, 61 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index b32371d5160f..11a9f7e68017 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,21 +7,20 @@
 #
 
 PORTNAME?=	vim
-PATCHLEVEL=	474
-BASE_PATCHLEVEL=405
-PORTVERSION=	6.1.${PATCHLEVEL}
+PATCHLEVEL=	14
+PORTVERSION=	6.2.${PATCHLEVEL}
 PORTREVISION?=	0
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
-DISTNAME=	vim-${PORTVERSION:C/\.[0-9]*$//}.${BASE_PATCHLEVEL}
+DISTNAME=	vim-${PORTVERSION:C/\.[0-9]*$//}
 
 PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
 PATCHFILES!=    /usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d  \
-			`expr ${PATCHLEVEL} - ${BASE_PATCHLEVEL}` `expr ${BASE_PATCHLEVEL} + 1` ${PATCHLEVEL}
+			${PATCHLEVEL} 1 ${PATCHLEVEL}
 #	bits to remove
-BADPATCHES=	414 418 420 421 424 434 437 443 444 445 446 452 454 456 459 465 470
+BADPATCHES=	009 013
 .for p in ${BADPATCHES}
-PATCHFILES:=	${PATCHFILES:N6.1.${p}}
+PATCHFILES:=	${PATCHFILES:N6.2.${p}}
 .endfor
 
 MAINTAINER?=	obrien@FreeBSD.org
@@ -40,7 +39,7 @@ USE_BZIP2=	yes
 USE_REINPLACE=	yes
 DIST_SUBDIR=	vim
 WRKSRC=		${WRKDIR}/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}/src
-PATCH_DIST_ARGS=	-d ${WRKSRC:S/src$//} --forward --quiet -E ${PATCH_DIST_STRIP}
+PATCH_DIST_ARGS= -d ${WRKSRC:S/src$//} --batch --forward --quiet -E ${PATCH_DIST_STRIP}
 # consider
 #PATCH_DIST_ARGS=	-t
 MAKE_ARGS+=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib ${CSCOPE_ARG}"
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index ebb9866a9c7f..6fb48b6c954f 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,53 +1,15 @@
-MD5 (vim/vim-6.1.405.tar.bz2) = d220ff58f2c72ed606e6d0297c2f2a7c
-MD5 (vim/6.1.406) = f76561643e00df18a6b1355f3170c494
-MD5 (vim/6.1.407) = 84d05cfd8f5f52c74b4d6ce79087800b
-MD5 (vim/6.1.408) = f34f9e0ed48fe398f28a172a0ada501b
-MD5 (vim/6.1.409) = d38475aa24dbf68e4e4285fa17edbf2f
-MD5 (vim/6.1.410) = 9102353d3b431b7bb527666c7e02732b
-MD5 (vim/6.1.411) = 773a1a1b12f2d9b9601d37caafbe7111
-MD5 (vim/6.1.412) = c61838b19f90be1d00a4954f579ec825
-MD5 (vim/6.1.413) = bd1749b838a988e4d26dcb6bc75171b8
-MD5 (vim/6.1.415) = bf95d9af6c6f7910dee8c596035f6dc5
-MD5 (vim/6.1.416) = 2af2073695f4c3a0854040f1345afb6c
-MD5 (vim/6.1.417) = f03e51c0d9df321509eab7f539127dca
-MD5 (vim/6.1.419) = 64ae4d3232165d751f654a40dd53ab2a
-MD5 (vim/6.1.422) = 52f30d4c1e49973681dbc9b54cef3e90
-MD5 (vim/6.1.423) = 765a7edafddacc2b76533aadc9a4187e
-MD5 (vim/6.1.425) = 6c1fb0617cd9ae9a0194008a29b68781
-MD5 (vim/6.1.426) = 0d76640c099c5f09522b34d8f1ab7af6
-MD5 (vim/6.1.427) = e76689cd74ce886e44458b7b0c12b78d
-MD5 (vim/6.1.428) = 969082749469ca0307c4548f84cff228
-MD5 (vim/6.1.429) = e20312b97627043a3af0295670b8aa3c
-MD5 (vim/6.1.430) = 1d696165571f6f407a029fc35b9f0c69
-MD5 (vim/6.1.431) = ef45031e7db9ffb5f38a7130330b55bf
-MD5 (vim/6.1.432) = 5725c1a64755698e30b649ccdc6f3062
-MD5 (vim/6.1.433) = 6c13c6a99d5febad47054555578683a5
-MD5 (vim/6.1.435) = fd1b1c5c7d23a35e4678b3d2d03f631e
-MD5 (vim/6.1.436) = a19f011d552268851426e8edd04fd3ed
-MD5 (vim/6.1.438) = 37bd485ff2add4166de8743c27584c55
-MD5 (vim/6.1.439) = 55089d28112d6041d99634e637269c5a
-MD5 (vim/6.1.440) = 665d2adf07448a29cfbc1f83bf28877f
-MD5 (vim/6.1.441) = 87e180466f2a27ed27c0f05cd5631e93
-MD5 (vim/6.1.442) = 728159274d25d9c19489b53b6c2bbe82
-MD5 (vim/6.1.447) = 969154d4961b379edec9b96039bcad73
-MD5 (vim/6.1.448) = 9814a1c2ff7d8e85b4533b81705b240f
-MD5 (vim/6.1.449) = 5042f7d2ba8f8eda450cf6f078cf330a
-MD5 (vim/6.1.450) = 741e9469b1c4e30c890877e67bbf74cd
-MD5 (vim/6.1.451) = 4ae3112c6cffd327b5317df3d3521c4d
-MD5 (vim/6.1.453) = 7620664a9f88cae02014c4846eaf42b9
-MD5 (vim/6.1.455) = eca71dff20d2a5480e85911e2de73f08
-MD5 (vim/6.1.457) = 70772ca0a1c707f6f73eb99caca243b8
-MD5 (vim/6.1.458) = de11ad4ef4c0121f8680bf55464bbbf0
-MD5 (vim/6.1.460) = c8373c354f6a5beecc539c63216845a1
-MD5 (vim/6.1.461) = e3058fa2c070ce93350beda3a9a9a3f1
-MD5 (vim/6.1.462) = 43f321fc1020cccced4156e2e092bcb7
-MD5 (vim/6.1.463) = 014f375242ba4ea230723283a2980d51
-MD5 (vim/6.1.464) = a779e14460aa1383bcd38c15143b622a
-MD5 (vim/6.1.466) = f7a6abef264c47ed8339be9b8eb598e5
-MD5 (vim/6.1.467) = c7fdb64b0b6837f29240ca7532ad5640
-MD5 (vim/6.1.468) = 6bd1b457444d20fe1021a86e79853d9a
-MD5 (vim/6.1.469) = 11648e91f99979322b6eb0b6b74b6ab3
-MD5 (vim/6.1.471) = a91839a3635696275514531120e46938
-MD5 (vim/6.1.472) = 53a2771dffb451130f5e3bae801acac0
-MD5 (vim/6.1.473) = 2c0ac0d968d916a1e9436acb0da6eda9
-MD5 (vim/6.1.474) = d5a03e288ed68e5a261cc37f0965bf0d
+MD5 (vim/vim-6.2.tar.bz2) = c49d360bbd069d00e2a57804f2a123d9
+MD5 (vim/6.2.001) = 02588ec10aff5a6f2a017d6edb37cd69
+MD5 (vim/6.2.002) = 01483a452ebfa13855c0d8ef57484671
+MD5 (vim/6.2.003) = 20d45613b76ea2ad548926e399451852
+MD5 (vim/6.2.004) = 33f552b22ace8b19c327e4d1359bc154
+MD5 (vim/6.2.005) = baac9820bdfec09721b15f07c11b3359
+MD5 (vim/6.2.006) = cc0d438053196e723649643402da386f
+MD5 (vim/6.2.007) = 97cfb7d499f1249d3125b52a6f14e96a
+MD5 (vim/6.2.008) = 6717f22d2c8bfc55ce3f28c4df0cfd23
+MD5 (vim/6.2.009) = 0df4c6e2673cd3a629da5b79b5cef789
+MD5 (vim/6.2.010) = b6625937784e219ebdc75087b7c03678
+MD5 (vim/6.2.011) = 03bf70f97496a7b68416b0bf687ac77e
+MD5 (vim/6.2.012) = e2ff4e3acdd33ab5325b23a0fccd7db2
+MD5 (vim/6.2.013) = 66f1668e3be83cae60a0553edb9c08f2
+MD5 (vim/6.2.014) = 2f0b2b23c7085e7ccf0b2fd07ac0efd6