- Update to 7.4.229

- Adjust variables:
  - POSTPONED_PATCHES: patch files postponed to apply in post-patch:
  - SKIPPED_PATCHES: patch files to be skipped

Changes:	https://code.google.com/p/vim/source/list

2 files changed, 55 insertions, 6 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 299019f1f8f1..aa4872164131 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -37,11 +37,14 @@ REINPLACE_ARGS=	-i ''
 USES=		iconv pkgconfig shebangfix tar:bzip2
 WANT_GNOME=	yes
 
-PATCHLEVEL=	205
+PATCHLEVEL=	229
 PATCHFILES!=	/usr/bin/jot -s " " -w "%03d" ${PATCHLEVEL} 1 ${PATCHLEVEL}
-BADPATCHES=	064 087 147 # empty
-.for p in ${BADPATCHES}
+POSTPONED_PATCHES=	064 087 147	# patch files postponed to apply in post-patch:
+SKIPPED_PATCHES=	208		# patch files to be skipped
+.for p in ${POSTPONED_PATCHES}
 DISTFILES+=	${PORTVERSION:R}.${p}:patch
+.endfor
+.for p in ${POSTPONED_PATCHES} ${SKIPPED_PATCHES}
 PATCHFILES:=	${PATCHFILES:N${p}}
 .endfor
 PATCHFILES:=	${PATCHFILES:C/^/${PORTVERSION:R}./g}
@@ -139,9 +142,9 @@ MAKE_ARGS+=	CONF_OPT_PYTHON="--enable-python3interp --disable-pythoninterp"
 post-patch:
 	@${REINPLACE_CMD} -e '/^install_normal: / s|install-icons|# &|; /cd $$(DEST_BIN); ln -s/d' ${WRKSRC}/src/Makefile
 	@${FIND} ${WRKSRC}/runtime/ -name menu\*.vim -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's,ctags -R \\.,${CTAGS_CMD},g'
-.for badpatch in ${BADPATCHES}
-	@${ECHO_MSG} "===>   Applying distribution patch ${badpatch}"
-	@${PATCH} ${PATCH_DIST_ARGS} -i ${_DISTDIR}/${PORTVERSION:R}.${badpatch}
+.for p in ${POSTPONED_PATCHES}
+	@${ECHO_MSG} "===>   Applying distribution patch ${p}"
+	@${PATCH} ${PATCH_DIST_ARGS} -i ${_DISTDIR}/${PORTVERSION:R}.${p}
 .endfor
 
 pre-configure:
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 6892f5cb09a7..d9e839019e0b 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -410,3 +410,49 @@ SHA256 (vim/7.4.204) = e381c396cf175f60281289bf9c0c25055f7b29830a1f351a12a0119c2
 SIZE (vim/7.4.204) = 3446
 SHA256 (vim/7.4.205) = 6e91efff0c282e41afe10f3cd984048eb74b3e12a65a6549dbde1a21487f5202
 SIZE (vim/7.4.205) = 2953
+SHA256 (vim/7.4.206) = a9405a42e7e4329d25e316515f197eff143425a65f3326873dfed6ccd5060040
+SIZE (vim/7.4.206) = 2217
+SHA256 (vim/7.4.207) = 263524b612dcba43cf4f20502a3e600bcf3073bd6c3bbbd4b9234d779953c4d4
+SIZE (vim/7.4.207) = 4843
+SHA256 (vim/7.4.209) = bebc4536677dac11deda93563077b6fb6051eef44a500bcf2608dc375e655459
+SIZE (vim/7.4.209) = 1924
+SHA256 (vim/7.4.210) = 4a8a4bb421c13d09220e38aeb4600e80695b1506b977b7955e169946773eca9d
+SIZE (vim/7.4.210) = 3995
+SHA256 (vim/7.4.211) = 0f942cd96950a21df1edbfe37156f351166ca2fb0bf881a0a93b3e8036f30327
+SIZE (vim/7.4.211) = 2404
+SHA256 (vim/7.4.212) = 0b37e841d0e7f08ba1e89ea4b98bcf5db04842a0e22baeb03160f0e2c0fdfa9d
+SIZE (vim/7.4.212) = 137444
+SHA256 (vim/7.4.213) = d2e911c1128739ede50cc27f827c547ee50660488921b506d0281d681788ba19
+SIZE (vim/7.4.213) = 6508
+SHA256 (vim/7.4.214) = 3dac4c71984da3327e7a2b1dec2fa3f99436784d17fd33c4894494296a433d89
+SIZE (vim/7.4.214) = 1523
+SHA256 (vim/7.4.215) = aa65b4f1eb4ba3d99241e5869f1a023c2f63bc0ace9d4c99d967acfafe14f2e2
+SIZE (vim/7.4.215) = 3488
+SHA256 (vim/7.4.216) = 078fdbbce4242f705a6d0eb40264836348b5c9d519c445ce443cf4224e99a93b
+SIZE (vim/7.4.216) = 1922
+SHA256 (vim/7.4.217) = 82e86f2a73a4dc158a7e90778d586f430c05486c0a5a2a8171967a7f8f65e0ab
+SIZE (vim/7.4.217) = 3225
+SHA256 (vim/7.4.218) = c5ab26af717557ff0381fa1a7cc3901c4974ae3f353bf125ec3954591909a8a9
+SIZE (vim/7.4.218) = 19321
+SHA256 (vim/7.4.219) = f18607155fec19cd9ba4903a6770d62845fa804b1c529690bd544c2a0d4e8beb
+SIZE (vim/7.4.219) = 2890
+SHA256 (vim/7.4.220) = 2a636ea475109f877cf1fab088254b38779f5869d69eaff1fea02a0b1d5244c7
+SIZE (vim/7.4.220) = 4640
+SHA256 (vim/7.4.221) = 51d764f0ffa6412d28a9fd7960f0b2ed8ef44d9c4460c64478637ec1c23cd4f3
+SIZE (vim/7.4.221) = 1755
+SHA256 (vim/7.4.222) = 7d6d45af2a8d492c2c7c56815f6e6f06a93b20f239d04043bf4a9799b57781c9
+SIZE (vim/7.4.222) = 3882
+SHA256 (vim/7.4.223) = f3d687eeb429d80ea6e4e32b0baafec539250b0cafba9573b2c9549ab045931c
+SIZE (vim/7.4.223) = 220004
+SHA256 (vim/7.4.224) = 8b6d1f8dd515a6a2fad85bfeeccc5a9986d7019292c0119275dca33f373914db
+SIZE (vim/7.4.224) = 7317
+SHA256 (vim/7.4.225) = 3faed160e159d301c51ada483cb4377dbd21eadc30a13ee034883829f650669f
+SIZE (vim/7.4.225) = 2702
+SHA256 (vim/7.4.226) = e7b2de64cc65ca71c2876438257e587554cf3a8b2a84786969d46c086dce42f3
+SIZE (vim/7.4.226) = 3535
+SHA256 (vim/7.4.227) = 5140a75aa5148cc35f563e66d8fb3e56b884852f6b3576c09cc39f647be7dd66
+SIZE (vim/7.4.227) = 2832
+SHA256 (vim/7.4.228) = bf8ce77b714d6de70801fe5137021c691d268792d2fdfb19a721cb65e89b830d
+SIZE (vim/7.4.228) = 6200
+SHA256 (vim/7.4.229) = c9522ea3114120b61f882dc21339ceaec12adc8bed73e7fa3af91355829fec0c
+SIZE (vim/7.4.229) = 3782