diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 332c019790da..6fa08d2e6cf8 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,175 +1,175 @@
 # ex:ts=8
 # Ports collection makefile for:  vim
 # Date created:			  Sat June 29, 1996
 # Whom:				  David O'Brien (obrien@cs.ucdavis.edu)
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	vim
-PATCHLEVEL=	314
+PATCHLEVEL=	319
 PORTVERSION=	6.1.${PATCHLEVEL}
 PORTREVISION?=	0
 CATEGORIES?=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
 		ftp://relay.nuxi.com/pub/vim/unix/ \
 		ftp://ftp.vim.org/pub/vim/unix/  \
 		ftp://ftp.is.co.za/applications/editors/vim/unix/  \
 		ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unix/  \
 		ftp://ftp.mirror.ac.uk/sites/ftp.vim.org/pub/vim/unix/
 DISTNAME=	vim-${PORTVERSION:C/\.[0-9]*$//}
 
 PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
 PATCHFILES!=    /usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d  \
 			${PATCHLEVEL} 1 ${PATCHLEVEL}
 #	bits to remove
 BADPATCHES= 002 016 019 023 035 044 049 050 066 073 076 086 088 093 100 119 147 148 149 151 154 173 184 188 190 198 202 221 223 228 230 235 238 240 243 245 253 259 285 287 290 291 292 295 300 301 303 304 311 313 315
 .for p in ${BADPATCHES}
 PATCHFILES:=	${PATCHFILES:N6.1.${p}}
 .endfor
 
 MAINTAINER?=	obrien@FreeBSD.org
 
 SLAVEDIRS=	editors/vim-lite
 
 .if defined(PACKAGE_BUILDING) && !defined(LITE)
 WITH_TCL=	yes
 WITH_PERL=	yes
 WITH_PYTHON=	yes
 WITH_CSCOPE=	yes
 .endif
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GNOMENG=	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}
 # consider
 #PATCH_DIST_ARGS=	-t
 MAKE_ARGS+=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib ${CSCOPE_ARG}"
 ALL_TARGET=	#
 PLIST_SUB=	VIM_VER=${DISTNAME:S/-//:S/.//}
 DATADIR=	${PREFIX}/share/vim/${DISTNAME:S/-//:S/.//}
 MAN1=		evim.1 vim.1 vimdiff.1 vimtutor.1 xxd.1
 MLINKS=		vim.1 rvim.1  vim.1 rview.1
 .if !defined(LITE)
 MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1  \
 		eview.1 gvimdiff.1
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(LITE)
 MAKE_ARGS+=	CONF_OPT_FEAT="--with-features=big"
 I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
 
 .if defined(NO_GUI)
 WITHOUT_X11=	yes
 .endif
 
 .if defined(WITH_CSCOPE)
 RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
 CSCOPE_ARG=	--enable-cscope
 .endif
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=	yes
 MAKE_ARGS+=	CONF_OPT_PYTHON="--enable-pythoninterp"
 .endif
 
 .if defined(WITH_PERL)
 USE_PERL5=	yes
 MAKE_ARGS+=	CONF_OPT_PERL="--enable-perlinterp"
 .endif
 
 .if defined(WITH_TCL)
 BUILD_DEPENDS=	tclsh8.3:${PORTSDIR}/lang/tcl83
 LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 MAKE_ARGS+=	CONF_OPT_TCL="--enable-tclinterp"
 .endif
 
 .if defined(WITH_RUBY)
 USE_RUBY=	yes
 MAKE_ARGS+=	CONF_OPT_RUBY="--enable-rubyinterp"
 .endif
 
 .if !defined(WITHOUT_X11)
 #	for now default the GUI to the GTK+ one
 #	will be reviewed when the GTK+ 1.{3,4} behemoth is released
 .if !defined(WITH_ATHENA) && !defined(WITH_MOTIF) && !defined(WITH_GNOME)
 WITH_GNOME=	gtk12
 .endif
 
 .if defined(WITH_ATHENA)
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=athena" ${I18N}
 .elif defined(WITH_GNOME)
 .if ${WITH_GNOME:Mgnomelibs}!="" || ${WITH_GNOME}=="yes" || \
 	${WITH_GNOME}=="1"
 USE_GNOME=	gnomelibs gnomeprefix
 PKGNAMESUFFIX=	-gnome
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${X11BASE}" ${I18N}
 MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
 .else
 USE_GNOME=	gtk12
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
 MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
 .endif
 .elif defined(WITH_MOTIF)
 USE_MOTIF=	yes
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
 .endif
 .else	# WITHOUT_X11
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x" ${I18N}
 .endif	# WITHOUT_X11
 
 .else	# LITE
 PKGNAMESUFFIX=	-lite
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte"
 MAKE_ARGS+=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp --disable-rubyinterp"
 .endif	# LITE
 
 .if exists(${PREFIX}/lib/libiconv.so)
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
 .endif
 
 # Until the bsd.gnome.mk people fix their damned file
 .if defined(WITH_GNOME)
 USE_XLIB=	yes
 .endif
 
 pre-configure:
 	@(cd ${WRKSRC}; ${MAKE} distclean)
 	@${REINPLACE_CMD} -e 's|8\.2|8.3|; \
 		s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|; \
 		s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|' \
 		${WRKSRC}/auto/configure
 
 post-install:
 	[ -e ${PREFIX}/bin/gvim ] || (cd ${PREFIX}/bin ; ${LN} -sf vim gvim)
 	#	below needed for `vim-lite' port
 	${TEST} -e ${PREFIX}/bin/rgvim  || (cd ${PREFIX}/bin ; ${LN} -sf vim rgvim)
 	${TEST} -e ${PREFIX}/bin/gview  || (cd ${PREFIX}/bin ; ${LN} -sf vim gview)
 	${TEST} -e ${PREFIX}/bin/rgview || (cd ${PREFIX}/bin ; ${LN} -sf vim rgview)
 	${TEST} -e ${PREFIX}/bin/evim   || (cd ${PREFIX}/bin ; ${LN} -sf vim evim)
 	${TEST} -e ${PREFIX}/bin/eview  || (cd ${PREFIX}/bin ; ${LN} -sf vim eview)
 	${TEST} -e ${PREFIX}/bin/gvimdiff  \
 		|| (cd ${PREFIX}/bin ; ${LN} -sf vim gvimdiff)
 	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${DATADIR}/keymap
 	cd ${PREFIX} ;\
 	    ${FIND} share/vim/${DISTNAME:S/-//:S/.//}/ -type f -o -type l	\
 	    	| sort \
 	    	>${WRKDIR}/PLIST.share-vim
 	cd ${PREFIX} ;\
 	    ${FIND} share/vim/${DISTNAME:S/-//:S/.//}/ -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' \
 		>>${WRKDIR}/PLIST.share-vim
 	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.share-vim"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "r ${WRKDIR}/PLIST.share-vim"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-vim
 	cd ${WRKDIR} ; ex < ex.script
 
 .include <bsd.port.post.mk>
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 094a51ff4647..92fc4452a2a8 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,265 +1,269 @@
 MD5 (vim/vim-6.1.tar.bz2) = 7fd0f915adc7c0dab89772884268b030
 MD5 (vim/6.1.001) = 97bdbe371953b9d25f006f8b58b53532
 MD5 (vim/6.1.003) = 0e000edba66562473a5f1e9b5b269bb8
 MD5 (vim/6.1.004) = 90e6ac3d029d3b97303049d5b8597fb0
 MD5 (vim/6.1.005) = 1422e38ec6a6dd10b5c35e162bbd98f4
 MD5 (vim/6.1.006) = a04a75f46459f82972be1a43a66cfb4b
 MD5 (vim/6.1.007) = f3c6157cce44cb8ad54c883a83448a42
 MD5 (vim/6.1.008) = 6f0cabc70c5f656905322d1231261aa2
 MD5 (vim/6.1.009) = 97c9f87b79ce41e9b620d572e5c298e4
 MD5 (vim/6.1.010) = 149335dce4bee14145c4f3d563d9a7f9
 MD5 (vim/6.1.011) = 7b2ce911d7f47bf4a1e0bc8de98b3e18
 MD5 (vim/6.1.012) = 242d3d264064af7eb798d609ce631e8a
 MD5 (vim/6.1.013) = 61558b5cd2c06d1bb286461588ed82ea
 MD5 (vim/6.1.014) = 9bb6eb1e884453390343e7d2a1ac6f7a
 MD5 (vim/6.1.015) = 2f58ccb2587a4618978306104026baf7
 MD5 (vim/6.1.017) = 75c41038ed5b12b79b806a065e4dba31
 MD5 (vim/6.1.018) = ec1f70263932bf5ca28c90e72502e3fd
 MD5 (vim/6.1.020) = 382b0248a866c410bec2bc387aaee620
 MD5 (vim/6.1.021) = 698af2583867dab3e4d98252033c1865
 MD5 (vim/6.1.022) = d3a8ba370ec646f3d65da1a62f599fbb
 MD5 (vim/6.1.024) = e086691d1b6e33480c6c1c64ba017b9b
 MD5 (vim/6.1.025) = a5f159d0ef1eeea1ecf6f4a0b0bfd027
 MD5 (vim/6.1.026) = 863837c6dc02dacd8cb598e35c91b22a
 MD5 (vim/6.1.027) = b04c8fdf185328cedfd49e48bdffdaa5
 MD5 (vim/6.1.028) = 3e791accb2209d8ce48e9ace0f6cdb9d
 MD5 (vim/6.1.029) = fc7e0672fbd10d20602181b5c0fcf2c6
 MD5 (vim/6.1.030) = 8d752dbeb970859924f2fbd44f983056
 MD5 (vim/6.1.031) = e53b71e78fb14d90574a07eb66f58f83
 MD5 (vim/6.1.032) = 839a304568b18d40034eedbffa41bab8
 MD5 (vim/6.1.033) = 557b9dcf13233cb2c37dc97b14d6c546
 MD5 (vim/6.1.034) = 70a86431b905bf904de7dc177d63a526
 MD5 (vim/6.1.036) = 519325b9881c442c3f84de3bd2a5c448
 MD5 (vim/6.1.037) = d764f06c42cafec4b0e6354208b8ad38
 MD5 (vim/6.1.038) = 6d39e87602eb6a49aed1dbd1af2bf5ed
 MD5 (vim/6.1.039) = 7915aae4d491e1b4bb2280031824661e
 MD5 (vim/6.1.040) = 60b7c9d432b95e46cdf1f8cdecb70720
 MD5 (vim/6.1.041) = 41f712bcf76d23c7aeaaa979de1d6b93
 MD5 (vim/6.1.042) = e7e3bcd6580eda022c324557494f1e21
 MD5 (vim/6.1.043) = 777ebc4a2516ba42c0857a7398f32ace
 MD5 (vim/6.1.045) = 1341f6d749735641edf70c7976cc4c6e
 MD5 (vim/6.1.046) = c380e03f7e0fee051de9dc2b66cac0fd
 MD5 (vim/6.1.047) = aaf76d8b46138c1d3f3515ec5442ddc2
 MD5 (vim/6.1.048) = a2061652ca90e243c9777eb374903ef4
 MD5 (vim/6.1.051) = 035aa4cb435e35ccd5e36d499f85f6c3
 MD5 (vim/6.1.052) = 717ebc772d3e9516fb677f451fa471ec
 MD5 (vim/6.1.053) = 97951301e079e7a6cc4d2319aaa3f545
 MD5 (vim/6.1.054) = 18c6d7b15f8c304159f435560a9fcebd
 MD5 (vim/6.1.055) = 71ce4db1090b775ba02e45df6029c49a
 MD5 (vim/6.1.056) = a61fa3897c6efe618df02d26317e84fc
 MD5 (vim/6.1.057) = dfd91847ffb46138f80be7ca13188f2b
 MD5 (vim/6.1.058) = edeb0baed6ca8f53db2e9052c7bbd720
 MD5 (vim/6.1.059) = 9fc93f1b8bf72113027a3c393856107d
 MD5 (vim/6.1.060) = 72fc3474e49d0f7bae4813f229dc501c
 MD5 (vim/6.1.061) = 95c51f6475bd0346108f5f916f215e29
 MD5 (vim/6.1.062) = 3b1eb1dd0ad766021d0f706f9fc20f9d
 MD5 (vim/6.1.063) = 7360dc74a34d5fea5f1a1e6067ef3780
 MD5 (vim/6.1.064) = 18ae430a2b517d7fee3661b888c5c1e4
 MD5 (vim/6.1.065) = c0ebfab88294514253371189277a50f6
 MD5 (vim/6.1.067) = dff761d97bd28e080a3b3e712600687f
 MD5 (vim/6.1.068) = 6bfb7201b1464e27060080b280311790
 MD5 (vim/6.1.069) = 77ea2a4c051429dff36825d1535efe29
 MD5 (vim/6.1.070) = 4228de05c25bc7f55c1de0e0549c945b
 MD5 (vim/6.1.071) = 420453d95409b23db053eb670dcbb06d
 MD5 (vim/6.1.072) = e65ed677b414574ba0bfd003c2a619cc
 MD5 (vim/6.1.074) = fb9bd961f0708e6594201a4de18e6114
 MD5 (vim/6.1.075) = bb7c77c7ec2b2ed09b4f87dfdfdc8d8e
 MD5 (vim/6.1.077) = e56f0c8f004af3b06224b348a771b09e
 MD5 (vim/6.1.078) = ed809e58ab3f81c4e7123fc0d9502729
 MD5 (vim/6.1.079) = 4cd4822862fc11943be93cefe14c7668
 MD5 (vim/6.1.080) = c9f7232899d96622a4423d185dadc651
 MD5 (vim/6.1.081) = c5f4752910b2bbff320beebedc1c1836
 MD5 (vim/6.1.082) = b2b27db9fb714e7ff5282118618832e7
 MD5 (vim/6.1.083) = 758f5a323c970cc4cf7a085a74357afc
 MD5 (vim/6.1.084) = 34f661bae9012170c9874ecb0077dfee
 MD5 (vim/6.1.085) = 03dfa8a3dab59890f3f0a4b6df8b51d4
 MD5 (vim/6.1.087) = b2aafce11024a2e15dee5beffbcb99fd
 MD5 (vim/6.1.089) = 1e84a1e50b61518f1111cb77403b496d
 MD5 (vim/6.1.090) = d714ce9cda37367367e14c86c8f2c67b
 MD5 (vim/6.1.091) = 0c5045bb8166dd7a92640b6e765f3895
 MD5 (vim/6.1.092) = 7fb8421cad7ddba898892f78159dbf30
 MD5 (vim/6.1.094) = 71c91f971cf276aa453b2be9530b372e
 MD5 (vim/6.1.095) = 1d56f8538c375062f68bb3ecbe11fcbf
 MD5 (vim/6.1.096) = 12737607c31b8d6a69e67ccc93e0ca6e
 MD5 (vim/6.1.097) = f39902a0aa7cd7275bb180f908012eda
 MD5 (vim/6.1.098) = c40bc9debe2b53fcf98cb026fd84bbf1
 MD5 (vim/6.1.099) = 1fc332e621af1d998372fd8b3fb2cc83
 MD5 (vim/6.1.101) = 4afe897bc7a439f3853c27b054eaef32
 MD5 (vim/6.1.102) = 75e33f6efb888f398785ff63eabe1f66
 MD5 (vim/6.1.103) = 4f7c09448cef9cec1c51ceccb8d703b4
 MD5 (vim/6.1.104) = e4d5571ab18b9ad8f1a6f35b3b6b4366
 MD5 (vim/6.1.105) = 92694e29c72997cc1479932e7ada4f45
 MD5 (vim/6.1.106) = 28e571b92ab50a6eb803dcc96cf6f810
 MD5 (vim/6.1.107) = 1cdf3587f2064fce1742bbb30c1c16f3
 MD5 (vim/6.1.108) = 27b896e0874f85ed31aa19a803d794f6
 MD5 (vim/6.1.109) = 9c5375da2b6ec30b7d90903aae91cf18
 MD5 (vim/6.1.110) = c39d87b1c8c0bb817c17c3df1ca2b76c
 MD5 (vim/6.1.111) = 322df676e1123a96e34bfb04b0266628
 MD5 (vim/6.1.112) = 0ca23195034d23de060250e68b77efae
 MD5 (vim/6.1.113) = c7408499dc8ce8ab6488fa17d65e9ba1
 MD5 (vim/6.1.114) = b0a126aa010fd79400c9c142a6f16fb1
 MD5 (vim/6.1.115) = ddc68c6b07c0c10ea1b9d55a4fe530b9
 MD5 (vim/6.1.116) = c48358f5ea01a2c1d6c64ab48e792c6b
 MD5 (vim/6.1.117) = cd6b59cf28cca272b2b6167febe4f3e3
 MD5 (vim/6.1.118) = e2661701fefd6cf3a8414a7a0f36db44
 MD5 (vim/6.1.120) = 5c892ab9569985f50eb55d1d1ad3970d
 MD5 (vim/6.1.121) = 1a94b21b663192c95117236f77af7318
 MD5 (vim/6.1.122) = b00b44822ae45ba53329b70b4bac2293
 MD5 (vim/6.1.123) = 609f84be3e9f26d42b59f2977d3d54cf
 MD5 (vim/6.1.124) = 3186ba24f650e91650eb103f4dc81e39
 MD5 (vim/6.1.125) = 399c7a97202a8bc10bccb54cd9617eb9
 MD5 (vim/6.1.126) = 479616ea196b182b60c2e9d996ab2fab
 MD5 (vim/6.1.127) = a272b844622d4abcc7cfd83471cce542
 MD5 (vim/6.1.128) = 8128e0edb5671aca2f94f5658bf2d2e1
 MD5 (vim/6.1.129) = 2e39fcd501cff0c7466693e9e69b87d5
 MD5 (vim/6.1.130) = 09782a0f3e737f79d0040fb870ded1c2
 MD5 (vim/6.1.131) = a9a49142167f304e8422f995ee73c975
 MD5 (vim/6.1.132) = 55476fd3ca0cf4f904b1b188c036f8ef
 MD5 (vim/6.1.133) = 86f24b884939348d8ab1578e64e9c436
 MD5 (vim/6.1.134) = baee6296c3374d3fbeff8d65c2d13c77
 MD5 (vim/6.1.135) = 1c4f5903e3f46db387d94fd741884aee
 MD5 (vim/6.1.136) = 3ec93d2bdc887bb0fd98506d59d63dca
 MD5 (vim/6.1.137) = cde5be1b00b3bdab5cbc18306ca6ccf7
 MD5 (vim/6.1.138) = 72884c375248120adb38b872d32ad86f
 MD5 (vim/6.1.139) = c824b88cb8feffa7f316543cdd7982bb
 MD5 (vim/6.1.140) = 33047e7ed82ecd2c43e16d4adad41743
 MD5 (vim/6.1.141) = 26b9256a80071b81ff2dfafcf05d2024
 MD5 (vim/6.1.142) = 31c2ac0cd059913cca1362bbf96ec61d
 MD5 (vim/6.1.143) = d3a4d3e260a3d9860e78451970b47b1e
 MD5 (vim/6.1.144) = 454fd71f129ac375f571535d0645a982
 MD5 (vim/6.1.145) = 414b1700e44ada5a2c6dc4a5156f9c3a
 MD5 (vim/6.1.146) = 8f9fa0da359e0b9e1b088b7b1e44f72f
 MD5 (vim/6.1.150) = d27962df10a7e6ee094ce41af03e71eb
 MD5 (vim/6.1.152) = f101f9ee1a3aa46599ba7b4ab2c65eae
 MD5 (vim/6.1.153) = bca6a3e77a042ab30cf1a2043c31d298
 MD5 (vim/6.1.155) = aad8258b174ec6b267fe969b2d818843
 MD5 (vim/6.1.156) = eb2895529332d0c39911e433a53ce900
 MD5 (vim/6.1.157) = 64cf5536b684ce77e2c37383d7f4f1cd
 MD5 (vim/6.1.158) = 7c8110de5413d096ab886fde03686bd2
 MD5 (vim/6.1.159) = 6dc53b724caf54eaf7174a1d7e80a451
 MD5 (vim/6.1.160) = de82e4a89242e63e9e95dcd46c162442
 MD5 (vim/6.1.161) = 91173f79829bceda4586516d00d44eb4
 MD5 (vim/6.1.162) = 1344208b85bdaa8a7511205dbce55c99
 MD5 (vim/6.1.163) = 7aad9fde657feb09dc114b21bd69a340
 MD5 (vim/6.1.164) = 3a5eaa52c3b6587c6f3a917fe80ad4a3
 MD5 (vim/6.1.165) = 204a2fdecbc4a30fd51b8ae2bc7774a0
 MD5 (vim/6.1.166) = 506f1f5c296409733bedaa69ba7f583b
 MD5 (vim/6.1.167) = cf1e88ec7faf5a1a090b141a4f12c70c
 MD5 (vim/6.1.168) = 5337cb9af0a50340c9795d126fd5fa92
 MD5 (vim/6.1.169) = 3a2737d7be79850994757e77d3040fad
 MD5 (vim/6.1.170) = 0e2ceb935b3bd5bd4d94d26fb43e4527
 MD5 (vim/6.1.171) = b7032553656f3735515f0bcfd5e94149
 MD5 (vim/6.1.172) = a2501b6a93d3fb4e43038dcef7b7f562
 MD5 (vim/6.1.174) = dfac5c07f6ac4451b91fab00c4d71888
 MD5 (vim/6.1.175) = 649a0390f23a04b1b26f2e24903dd674
 MD5 (vim/6.1.176) = d200de21f101bb2af9b2559acba213cd
 MD5 (vim/6.1.177) = 064600595c1224e260054900a5311780
 MD5 (vim/6.1.178) = 295257d98ddde1ab01bd6a1e4c52eb46
 MD5 (vim/6.1.179) = e2a7f93f1f5a21beeda25888682364e9
 MD5 (vim/6.1.180) = dfcd207ccf239e0bc7d1aa6578c0e1fd
 MD5 (vim/6.1.181) = 66174367ef97d5046736de9c6a453344
 MD5 (vim/6.1.182) = af284570e8fa86a5cf2bf55ed378d20e
 MD5 (vim/6.1.183) = 6c7d082b20a6ab231a3e77177b2c944a
 MD5 (vim/6.1.185) = 46d96c649b98b2b7565e135d5f5a2122
 MD5 (vim/6.1.186) = 24ce2e9f3ee1030b5352b36446edfe2d
 MD5 (vim/6.1.187) = 5f2db57a4c169e64a81d3d837d6b28e0
 MD5 (vim/6.1.189) = 05723980da725159df83ce5ceb58f5ca
 MD5 (vim/6.1.191) = 6ea9d234e8d3c3f90f83159ee19a852a
 MD5 (vim/6.1.192) = 44a78e0724bd394a208903d30e97b0bc
 MD5 (vim/6.1.193) = 0bf298afb9dc9614e566d2be5ae6bbda
 MD5 (vim/6.1.194) = 71e1484c2ec4a34be133a16012fd2a60
 MD5 (vim/6.1.195) = 7d578dd59848fc78df073efa20aef9d0
 MD5 (vim/6.1.196) = a1da02cb25c0be1281489cd0b1218925
 MD5 (vim/6.1.197) = 91c6933c9496df013a75b6330410a17e
 MD5 (vim/6.1.199) = 8e00d052070dc4bcadc2ffd20ab17bdb
 MD5 (vim/6.1.200) = f488b119b5f44c318dfefba12e7ab306
 MD5 (vim/6.1.201) = 68610a2e6f6068d8e912c4137d1bf234
 MD5 (vim/6.1.203) = 7ad8ad19ed93a6601c35b920844758bc
 MD5 (vim/6.1.204) = c5d63d21612e018fa5bd75ec48429c82
 MD5 (vim/6.1.205) = d6aba97ef04064e6f52101e0f45651c0
 MD5 (vim/6.1.206) = f88b54ba4be0263aee5a1c6b8c1bc629
 MD5 (vim/6.1.207) = 19ddd1f62388d241519786d164badba8
 MD5 (vim/6.1.208) = 808804b52477d6c08ca67f60f11a07de
 MD5 (vim/6.1.209) = 9252be39a277334c276ea1955808e0a0
 MD5 (vim/6.1.210) = ec9c2fe2542218c57bfa34d8cd8384c0
 MD5 (vim/6.1.211) = 9187dde7f58c72b1d48fcf07616a72d4
 MD5 (vim/6.1.212) = eadd2f29a7344865c16d65eade6683de
 MD5 (vim/6.1.213) = ce2688188fee34b8917e9db0be6459f3
 MD5 (vim/6.1.214) = 12159a747ad60d14a7a8014b8978b88b
 MD5 (vim/6.1.215) = dcb659810a99dc144b994da0fd1d43c4
 MD5 (vim/6.1.216) = 284c135708c0a75aec6df579e56455b7
 MD5 (vim/6.1.217) = 91b6638e12435ca6cfa2b0c3eaa91dd1
 MD5 (vim/6.1.218) = b66b074927fdf38792395549bb381c94
 MD5 (vim/6.1.219) = 46a3a02de469f7a6af49770548b5edba
 MD5 (vim/6.1.220) = 1154f1215e86a73d37e6fc04f1762f7b
 MD5 (vim/6.1.222) = 0472201fbddc295bc0689610ef80782a
 MD5 (vim/6.1.224) = 891f90667774c0ad1eeb72fa308550c7
 MD5 (vim/6.1.225) = dbfc681e6923e598dcccb5eca26c65a7
 MD5 (vim/6.1.226) = d9aa4ea75ffb37ece20fcbac918e821e
 MD5 (vim/6.1.227) = 549fd5e0248ccd3d2fc759c1fd77ef1a
 MD5 (vim/6.1.229) = 250b2033dc8efcdbbb6266e7f4b42dd1
 MD5 (vim/6.1.231) = 27fdab04d21a84a5d366102e10dcc3c9
 MD5 (vim/6.1.232) = 5543b8644238a0b5607fde6c9d7645aa
 MD5 (vim/6.1.233) = 54502cc0ddd79ddd3991a8a96aa6528c
 MD5 (vim/6.1.234) = a89d66800987fa2ec2015ab0801827c5
 MD5 (vim/6.1.236) = a30958ed51325f0b9180dc1150e7bed1
 MD5 (vim/6.1.237) = fcc9f48929e7af21e60846960d331e7b
 MD5 (vim/6.1.239) = 6061a8e11872f0a326e4f4c1fdc94dd3
 MD5 (vim/6.1.241) = ec09c3f8abd2671201f3bfb6619d9490
 MD5 (vim/6.1.242) = c38b8114a49ebba9016d330fd67a67e1
 MD5 (vim/6.1.244) = 29b450a98e71d566692ef503ec576c6c
 MD5 (vim/6.1.246) = bc1c45d51aea10fd14ec73314489e7a7
 MD5 (vim/6.1.247) = a5dba5bce69918c040703e9b8eb35f1d
 MD5 (vim/6.1.248) = c625eded70121364a017e419229d5588
 MD5 (vim/6.1.249) = dd4ab2bcd4a4585a477f8e0244fe1b83
 MD5 (vim/6.1.250) = 96c564709eadebee9a2e0d65a753ba3f
 MD5 (vim/6.1.251) = 72b9d00067e822819c9d7f70b4c9370c
 MD5 (vim/6.1.252) = fdeedc2e0367e631ec91587fa646b2c8
 MD5 (vim/6.1.254) = 860178440b7fa701750a90a5aa2f923b
 MD5 (vim/6.1.255) = 49e35d260c0f4782ecc0f75c91be8ca9
 MD5 (vim/6.1.256) = 7a4ada058d2bf19c0bdd1bb34509ee6f
 MD5 (vim/6.1.257) = 844749c255b9450b177a63f7d6d9ead0
 MD5 (vim/6.1.258) = c519a94c4dd5af72f98033abfeb82e49
 MD5 (vim/6.1.260) = d31bbbbdbc9a3d361751c3455f89e1e9
 MD5 (vim/6.1.261) = 78b34fe0a9486243de610b83adfbb4de
 MD5 (vim/6.1.262) = 984d10d8ae199e38a159367a130ad55c
 MD5 (vim/6.1.263) = 062d0a4985750a27535e5210e253d670
 MD5 (vim/6.1.264) = f368f77a900192d293a4e35cb84ef822
 MD5 (vim/6.1.265) = adb27a46c63970ad3e8fc1f085c24c28
 MD5 (vim/6.1.266) = 2c7c2d156d92aaee876c4edd46057bcd
 MD5 (vim/6.1.267) = 374a8a85af1986813eabf4bed96e5ea0
 MD5 (vim/6.1.268) = 066b32833b4fb26d333c180bd5763ca6
 MD5 (vim/6.1.269) = a1ba114d18ffb39d4475ccb550834c35
 MD5 (vim/6.1.270) = 8d37b75413200d327af7f39502eb5f9a
 MD5 (vim/6.1.271) = 5953c2c2467f098ed6c03dfbd85e4142
 MD5 (vim/6.1.272) = 3b21d18d1db0d4f6db3030d5bc499e14
 MD5 (vim/6.1.273) = d7dda7be4484c84853354431a98f9dd5
 MD5 (vim/6.1.274) = 6f4d0c49602f518184dc2bfa725aa9d9
 MD5 (vim/6.1.275) = 3859f1fabd784be20083f1711fa11fb5
 MD5 (vim/6.1.276) = d61fe2aeb23fa8a5217fba78644db620
 MD5 (vim/6.1.277) = 9cd2a1440911c8e98a61e820e628ee51
 MD5 (vim/6.1.278) = 5d99614d96a71fcd350d2d56e4ba3c13
 MD5 (vim/6.1.279) = b8aadca08ac9dae82222cbc3209e7d48
 MD5 (vim/6.1.280) = 9651c53b0400b10cb8c4a6818d94c6dc
 MD5 (vim/6.1.281) = 241455ccf323b43bc1fae6465d8816e3
 MD5 (vim/6.1.282) = 1a614d2db10dc6ba7c82e05bd4d6b1e7
 MD5 (vim/6.1.283) = e8ae977bfda86032350c4cf618b3d3df
 MD5 (vim/6.1.284) = ddfa1002ed31425bda36ab97eff5252a
 MD5 (vim/6.1.286) = 0d07fb101c5d637e74ef3286e1d1f6d8
 MD5 (vim/6.1.288) = 9fc6f8b07c426c72d747f93969fb0aef
 MD5 (vim/6.1.289) = bc48b3c35635574ded10b955a57778e0
 MD5 (vim/6.1.293) = 890a40436de4303d00b9428a536a15f0
 MD5 (vim/6.1.294) = 1d40cd84ac3a20d3953e8fa49578a140
 MD5 (vim/6.1.296) = 8ee4588bf30c5c1c26252b9bb4355978
 MD5 (vim/6.1.297) = 08aa449fff39a51fc42325b1afa52ee5
 MD5 (vim/6.1.298) = 7a55f65bfc44e23910eb586d5acb2c91
 MD5 (vim/6.1.299) = 89710e4dae60368a1466d9afe592b088
 MD5 (vim/6.1.302) = c20560a218d335eee405ef7de315c90a
 MD5 (vim/6.1.305) = 2501f6aef28fc8bc1df8a4036863d4a0
 MD5 (vim/6.1.306) = 07b663b3430d47eb87d14ce8cca1b29f
 MD5 (vim/6.1.307) = c8adb611cb27255704308c1480ef531e
 MD5 (vim/6.1.308) = 139ea1c0a98d85f6d256b09abff705df
 MD5 (vim/6.1.309) = c8cf5beb13fab2a8d4ecf3ce759cdb83
 MD5 (vim/6.1.310) = 86ec86abbadb79e2278b5483c66070c6
 MD5 (vim/6.1.312) = ac0de90f215984e968d5be3758a6fdd3
 MD5 (vim/6.1.314) = 7182ef672d8be1657d0d5601efc426e2
+MD5 (vim/6.1.316) = c186e1417c4d4bbd8193f54afc8d1f49
+MD5 (vim/6.1.317) = 61c208ce762a05463dca05f98e68ca86
+MD5 (vim/6.1.318) = c29912cfd60e9af67f63be612f25e0e7
+MD5 (vim/6.1.319) = 64432e8640f14454d9bd3a1eb37f6014
diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01
index d81da2bab293..5ad164430b91 100644
--- a/editors/vim/files/patch-01
+++ b/editors/vim/files/patch-01
@@ -1,107 +1,101 @@
 --- Makefile.orig	Sun Mar 24 02:41:30 2002
 +++ Makefile	Mon Jun 10 17:18:07 2002
 @@ -282,2 +282,3 @@
  # CONFIGURE - configure arguments {{{1
 +CONF_ARGS = --prefix=$(PREFIX)
  # You can give a lot of options to configure.
 @@ -1651,3 +1652,3 @@
  	if test -d $(LANGSOURCE); then \
 -	   $(INSTALL_DATA) $(LANGSOURCE)/README.txt $(LANGSOURCE)/*.vim $(DEST_LANG); \
 +	   $(INSTALL_DATA)                          $(LANGSOURCE)/*.vim $(DEST_LANG); \
  	   chmod $(FILEMOD) $(DEST_LANG)/*.vim; \
 @@ -1712,36 +1713,36 @@
  $(DEST_BIN)/$(EXTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET)
 +	#cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EXTARGET)
  
  $(DEST_BIN)/$(VIEWTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIEWTARGET)
 +	#cd $(DEST_BIN); ln -sf $(VIMTARGET) $(VIEWTARGET)
  
  $(DEST_BIN)/$(GVIMTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMTARGET)
 +	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIMTARGET)
  
  $(DEST_BIN)/$(GVIEWTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET)
 +	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIEWTARGET)
  
  $(DEST_BIN)/$(RVIMTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET)
 +	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RVIMTARGET)
  
  $(DEST_BIN)/$(RVIEWTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIEWTARGET)
 +	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RVIEWTARGET)
  
  $(DEST_BIN)/$(RGVIMTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIMTARGET)
 +	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RGVIMTARGET)
  
  $(DEST_BIN)/$(RGVIEWTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET)
 +	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
  
  $(DEST_BIN)/$(VIMDIFFTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET)
 +	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(VIMDIFFTARGET)
  
  $(DEST_BIN)/$(GVIMDIFFTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET)
 +	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIMDIFFTARGET)
  
  $(DEST_BIN)/$(EVIMTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET)
 +	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EVIMTARGET)
  
  $(DEST_BIN)/$(EVIEWTARGET):
 -	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIEWTARGET)
 +	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EVIEWTARGET)
  
 @@ -1763,30 +1764,30 @@
  $(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
  
-@@ -1951,3 +1952,4 @@
- 	-@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' >> $@
--	-@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' >>  $@
-+	-@echo 'char_u *all_cflags = (char_u *)' >> $@
-+	-@echo '$(CC) -c -I$(srcdir) $(ALL_CFLAGS)' | sed -e 's/\"/\\"/g' -e 's/\(^.*\)/	"\1";/' >> $@
- 	-@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' >>  $@