Update to almost newest patchlevel.

 31440  7.3.639  it's not easy to build Vim on Windows with XPM support
  2219  7.3.641  ":mkview" uses ":normal" instead of ":normal!" for folds
  1810  7.3.642  segfault with specific autocommands
  2060  7.3.643  MS-Windows: 'lines' is wrong when starting up maximized
  1925  7.3.644  dead code for BeOS GUI
  2910  7.3.645  no tests for patch 7.3.625 and 7.3.637
  2353  7.3.646  undo file unusable after reloading a buffer
  5213  7.3.647  "gnd" doesn't work correctly in Visual mode
  3831  7.3.648  crash when using a very long file name
  2256  7.3.649  with 'clipboard' set to "unnamed" small deletes go to "1
  3120  7.3.651  Completing ":help \{-" gives error message
  2304  7.3.652  workaround for Python crash isn't perfect
  7986  7.3.653  lacking XPM support for MingW, 32 and 64 objects mixed up

XXX
There are newer patches, but they won't apply cleanly. I'll investigate it later.

3 files changed, 48 insertions, 7 deletions

diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 087a0dad0d2..5b111cf996c 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.146 2012/08/27 22:10:34 morr Exp $
+# $NetBSD: Makefile.common,v 1.147 2012/09/06 08:13:39 morr Exp $
 
 # used by editors/vim/Makefile
 # used by editors/vim-gtk/Makefile
@@ -12,19 +12,21 @@
 DISTNAME=		vim-${VIM_VERSION}
 DISTFILES=		vim-${VIM_VERSION}${EXTRACT_SUFX}
 CATEGORIES=		editors
-MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/
+MASTER_SITES=		http://ftp.vim.org/pub/vim/unix/
+MASTER_SITES+=		ftp://ftp.vim.org/pub/editors/vim/unix/
 MASTER_SITES+=		ftp://ftp.fu-berlin.de/misc/editors/vim/unix/
 DIST_SUBDIR=		vim${VIM_VERSION}
 EXTRACT_SUFX=		.tar.bz2
 
-PATCH_SITES=		ftp://ftp.vim.org/pub/editors/vim/patches/${VIM_VERSION}/
+PATCH_SITES=		http://ftp.vim.org/pub/vim/patches/${VIM_VERSION}/
+PATCH_SITES+=		ftp://ftp.vim.org/pub/editors/vim/patches/${VIM_VERSION}/
 PATCH_SITES+=		ftp://ftp.fu-berlin.de/misc/editors/vim/patches/${VIM_VERSION}/
 
 .include "../../mk/bsd.prefs.mk"
 
 PATCHFILES!=		${AWK} 'BEGIN {for (i=1; i<=${VIM_PATCHLEVEL}; i++) printf "7.3.%03d\n", i; exit}'
 
-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
 
 .for p in ${BADPATCHES}
 PATCHFILES:= ${PATCHFILES:N7.3.${p}}
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index e40550c1ca7..d80398e90fc 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.134 2012/08/28 05:59:38 morr Exp $
+$NetBSD: distinfo,v 1.135 2012/09/06 08:13:39 morr Exp $
 
 SHA1 (vim7.3/7.3.001) = c2f6dc2df273d2653f17e5ad63ae20ec9119a245
 RMD160 (vim7.3/7.3.001) = 4c3d57c6f064f9849bc2f24b3c583c79051ed936
@@ -1839,6 +1839,45 @@ Size (vim7.3/7.3.637) = 3117 bytes
 SHA1 (vim7.3/7.3.638) = 0f6da4a27a2b40013e5302603c89a4e2c10f7190
 RMD160 (vim7.3/7.3.638) = fb33cba14be7bfc0b230a2ceccf058aa2fc9653f
 Size (vim7.3/7.3.638) = 1783 bytes
+SHA1 (vim7.3/7.3.639) = 02c4d9df652ebf78477c3296fa9dd97877991d0e
+RMD160 (vim7.3/7.3.639) = 8854ee4ff7d3529fad5cd983e8a3b08a63525c6d
+Size (vim7.3/7.3.639) = 31440 bytes
+SHA1 (vim7.3/7.3.641) = 18696e979d88a22fadfb2590093cdcb3e4ac80fc
+RMD160 (vim7.3/7.3.641) = abe654d9ce4b0020fdf9c22ff3e9bb5b6fefaec2
+Size (vim7.3/7.3.641) = 2219 bytes
+SHA1 (vim7.3/7.3.642) = b4f518667f832fa15a3b8478ff8303068e3f0c96
+RMD160 (vim7.3/7.3.642) = eecb23fb915eae80bad60eea3b4834c086ca1190
+Size (vim7.3/7.3.642) = 1810 bytes
+SHA1 (vim7.3/7.3.643) = accfd71a338c909907a515893aa2cb2002c3ac37
+RMD160 (vim7.3/7.3.643) = 2f8ba78e765309d3f9825f35e82bcbf46ff0d7f8
+Size (vim7.3/7.3.643) = 2060 bytes
+SHA1 (vim7.3/7.3.644) = 6ecef2f713f72b78d038fd2a403527b9d46946d7
+RMD160 (vim7.3/7.3.644) = 0e1d7c1cbe43fbdf50f308c4481e858c15b8d7b8
+Size (vim7.3/7.3.644) = 1925 bytes
+SHA1 (vim7.3/7.3.645) = 09ed579cadf47e593cfd9fc48fcc0ca08fabc66d
+RMD160 (vim7.3/7.3.645) = 1598ed87541d80c4cc4661c37e18a3cc591cb5c9
+Size (vim7.3/7.3.645) = 2910 bytes
+SHA1 (vim7.3/7.3.646) = fd79d2be3502be002c700f06d3ab0a6f0a09ab68
+RMD160 (vim7.3/7.3.646) = 886eace5ac6475d0257240a948e2a39defcbaec5
+Size (vim7.3/7.3.646) = 2353 bytes
+SHA1 (vim7.3/7.3.647) = 5c04dd5d7dd0731b8930f0e6700db4df0fb0f438
+RMD160 (vim7.3/7.3.647) = 3c60976759593c997f05d689565fc89bdea27389
+Size (vim7.3/7.3.647) = 5213 bytes
+SHA1 (vim7.3/7.3.648) = 357839d8933b17cad84918e8f33c7a6f636b017d
+RMD160 (vim7.3/7.3.648) = 4bd0d43069ccc5ae13e05594a30d330849792892
+Size (vim7.3/7.3.648) = 3831 bytes
+SHA1 (vim7.3/7.3.649) = 9bd8b89e940eab3d28414263c97289b6525c5216
+RMD160 (vim7.3/7.3.649) = 733cc78a9d502b3f3df151fc773749e70a526f46
+Size (vim7.3/7.3.649) = 2256 bytes
+SHA1 (vim7.3/7.3.651) = b1768fcf665951bd337b0ecde1ef72a3ee7eda66
+RMD160 (vim7.3/7.3.651) = 8eb49fdcbd69128e3a787073a53f2992bf98944d
+Size (vim7.3/7.3.651) = 3120 bytes
+SHA1 (vim7.3/7.3.652) = 1dbb17d4b8060e18f229eb53778007b2f3d500e5
+RMD160 (vim7.3/7.3.652) = 17263f14bae6b79621655357027fac1aee753714
+Size (vim7.3/7.3.652) = 2304 bytes
+SHA1 (vim7.3/7.3.653) = 36baa76465008e8e1d0fbbba2420befbbe834aed
+RMD160 (vim7.3/7.3.653) = 1c9f44660b9dcb65a5584627b31ae409d4f8f11c
+Size (vim7.3/7.3.653) = 7986 bytes
 SHA1 (vim7.3/vim-7.3.tar.bz2) = 46faa96c5fab639899b1c655c23d8755b62f036f
 RMD160 (vim7.3/vim-7.3.tar.bz2) = 1846e7f4aa8e0a329d8360a9e05d7e93da23b4b5
 Size (vim7.3/vim-7.3.tar.bz2) = 9080692 bytes
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
index b296310251f..179ae7e7ef0 100644
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@@ -1,5 +1,5 @@
-# $NetBSD: version.mk,v 1.85 2012/08/27 21:35:56 morr Exp $
+# $NetBSD: version.mk,v 1.86 2012/09/06 08:13:39 morr Exp $
 
 VIM_VERSION=		7.3
-VIM_PATCHLEVEL=		638
+VIM_PATCHLEVEL=		653
 VIM_SUBDIR=		vim73