Update to patchlevel 7.4.141.

Upstream changes:

7.4.053  test75 has a wrong header
7.4.054  reading past end of the 'stl' string
7.4.055  Mac: Where macros are defined depends on the system
7.4.056  Mac: Compilation problem with OS X 10.9 Mavericks
7.4.057  byteidx() does not work for composing characters
7.4.058  warnings on 64 bit Windows
7.4.059  set_last_cursor() may encounter w_buffer being NULL
7.4.060  declaration has wrong return type for PyObject_SetAttrString()
7.4.061  (after 7.4.056) configure check in the wrong place
7.4.062  (after 7.4.061) wrong configure check for AvailabilityMacros.h
7.4.063  crash when using invalid key in Python dictionary
7.4.064  in Visual block mode replacing with CR does not break lines
7.4.065  the character typed at the hit-enter prompt is recorded twice
7.4.066  MS-Windows: swap file name wrong if colon in file name
7.4.067  CTRL-\ CTRL-O moves the cursor after inserting comment leader
7.4.068  cannot build Vim on Mac with non-Apple compilers
7.4.069  cannot right shift comment lines starting with #
7.4.070  (after 7.4.069) can't compile with tiny features
7.4.071  (after 7.4.069) passing limits around too often
7.4.072  crash when using Insert mode completion
7.4.073  setting undolevels for one buffer changes undo in another
7.4.074  when undo'ing all and making a change, undo structure is wrong
7.4.075  locally setting 'undolevels' is not tested
7.4.076  "cgn" does not wrap around the end of the file
7.4.077  DOS installer creates shortcut without a path
7.4.078  MSVC 2013 is not supported
7.4.079  a script cannot detect whether 'hlsearch' highlighting is on
7.4.080  (after 7.4.079) missing documentation for v:hlsearch
7.4.081  (after 7.4.078) wrong logic when ANALYZE is "yes"
7.4.082  using "gf" in a changed buffer suggests adding "!"
7.4.083  hard to avoid adding a used pattern to the search history
7.4.084  Python: interrupt not being properly discarded
7.4.085  can't move cursor when inserting text in Visual block mode
7.4.086  can't skip over expression when not evaluating for dict member
7.4.087  compiler warning on 64 bit Windows systems
7.4.088  Asian characters are always marked as spell errors
7.4.089  Vim doesn't set the security context on a renamed file
7.4.090  Win32: no completion if dir name contains an exclamation mark
7.4.091  (after 7.4.089) missing semicolon
7.4.092  (after 7.4.088) can't build small version
7.4.093  configure can't use LuaJIT on ubuntu 12.04
7.4.094  configure may not find that -lint is needed for gettext()
7.4.095  (after 7.4.093) regexp for LuaJIT version doesn't work on BSD
7.4.096  can't change directory to an UNC path
7.4.097  unexpected behavior change related to 'virtualedit'
7.4.098  error for line numbers out of range when using ":'<,'>del"
7.4.099  append in blockwise Visual mode with "$" is wrong
7.4.100  NFA regexp doesn't handle backreference correctly
7.4.101  using \1 in pattern goes one line too far
7.4.102  crash when interrupting "z="
7.4.103  dos installer escapes spaces in the diff command wrong
7.4.104  ":help s/\_" reports an internal error
7.4.105  completing a tag pattern may give an error for invalid pattern
7.4.106  can't build with Ruby using Cygwin
7.4.107  Python try/catch doesn't catch Vim error in vim.eval()
7.4.108  "zG" and "zW" leave temp files around on MS-Windows
7.4.109  ColorScheme autocommand matches with the current buffer name
7.4.110  "gUgn" cannot be repeeated
7.4.111  memory leak in Python OptionsAssItem
7.4.112  MS-Windows: defaults for 'dir' and 'bdir' do not include $TEMP
7.4.113  MSVC static analysis gives warnings
7.4.114  new GNU make directory change messages are different
7.4.115  Zsh: expanding ~abc fails when the result contains a space
7.4.116  'showcmd' does not show a typed space
7.4.117  can't build with Cygwin/MingW and Perl 5.18
7.4.118  redrawing status lines may causes recursive call
7.4.119  Vim doesn't work well on OpenVMS
7.4.120  (after 7.4.117) can't build with Perl 5.18 on Linux
7.4.121  completion doesn't work for ":py3d" and ":py3f"
7.4.122  Win32: :grep doesn't work when 'encoding' and ACP differ
7.4.123  Win32: Getting user name does not use wide function
7.4.124  Win32: Getting host name does not use wide function
7.4.125  Win32: Dealing with messages may not work for multi-byte chars
7.4.126  compiler warnings for "const" and incompatible types
7.4.127  Perl 5.18 on Unix doesn't work
7.4.128  Perl 5.18 for MSVC doesn't work
7.4.129  getline(-1) returns zero
7.4.130  relative line numbers mix up windows when using folds
7.4.131  syncbind causes E315 errors in some situations
7.4.132  (after 7.4.122) Win32: flags/inherit_handles args mixed up
7.4.133  Clang warns for using NUL
7.4.134  spurious space in MingW Makefile
7.4.135  missing dot in MingW test Makefile
7.4.136  (after 7.4.096) Windows: readonly when saving UNC path file
7.4.137  cannot use IME with Windows 8 console
7.4.138  (after 7.4.114) directory change messages are not recognized
7.4.139  crash when using :cd in autocommand
7.4.140  crash when autocommand wipes out only other buffer
7.4.141  problems when building with Borland

pkgsrc changes:
remove patches/patch-os__mac.h, it is included upstream.

4 files changed, 10 insertions, 24 deletions

diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST
index 95e3f992ae2..ce52de019fd 100644
--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2013/10/07 19:26:28 morr Exp $
+@comment $NetBSD: PLIST,v 1.22 2014/01/11 23:24:03 morr Exp $
 bin/xxd
 man/man1/evim.1
 man/man1/vim.1
@@ -339,6 +339,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/ishd.vim
 share/vim/${VIM_SUBDIR}/ftplugin/j.vim
 share/vim/${VIM_SUBDIR}/ftplugin/java.vim
 share/vim/${VIM_SUBDIR}/ftplugin/javascript.vim
+share/vim/${VIM_SUBDIR}/ftplugin/jproperties.vim
 share/vim/${VIM_SUBDIR}/ftplugin/jsp.vim
 share/vim/${VIM_SUBDIR}/ftplugin/kconfig.vim
 share/vim/${VIM_SUBDIR}/ftplugin/kwt.vim
@@ -667,6 +668,7 @@ share/vim/${VIM_SUBDIR}/syntax/apache.vim
 share/vim/${VIM_SUBDIR}/syntax/apachestyle.vim
 share/vim/${VIM_SUBDIR}/syntax/aptconf.vim
 share/vim/${VIM_SUBDIR}/syntax/arch.vim
+share/vim/${VIM_SUBDIR}/syntax/arduino.vim
 share/vim/${VIM_SUBDIR}/syntax/art.vim
 share/vim/${VIM_SUBDIR}/syntax/asciidoc.vim
 share/vim/${VIM_SUBDIR}/syntax/asm.vim
@@ -937,6 +939,7 @@ share/vim/${VIM_SUBDIR}/syntax/mf.vim
 share/vim/${VIM_SUBDIR}/syntax/mgl.vim
 share/vim/${VIM_SUBDIR}/syntax/mgp.vim
 share/vim/${VIM_SUBDIR}/syntax/mib.vim
+share/vim/${VIM_SUBDIR}/syntax/mix.vim
 share/vim/${VIM_SUBDIR}/syntax/mma.vim
 share/vim/${VIM_SUBDIR}/syntax/mmix.vim
 share/vim/${VIM_SUBDIR}/syntax/mmp.vim
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index b4a8eae3540..cb09045c7d6 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.141 2014/01/01 14:44:59 schmonz Exp $
+$NetBSD: distinfo,v 1.142 2014/01/11 23:24:03 morr Exp $
 
-SHA1 (vim-7.4.052.tar.bz2) = 33c193320f5671b18fd140d69bf6e1c8a84f7037
-RMD160 (vim-7.4.052.tar.bz2) = e6fb8205e2a310b2d78f6a336e8be3e499cd6a91
-Size (vim-7.4.052.tar.bz2) = 9386499 bytes
+SHA1 (vim-7.4.141.tar.bz2) = 23f7844950671f08768f2bc6bc1b97908cd01dfc
+RMD160 (vim-7.4.141.tar.bz2) = 7c67da719b2093d08c702b1706fc4cb72097bf13
+Size (vim-7.4.141.tar.bz2) = 9404354 bytes
 SHA1 (patch-Makefile) = 741f2b59d843094dbc1677aef9df93cf97c8d5a1
 SHA1 (patch-auto_configure) = e25c8821182231074033132d70dab077c273d5f8
 SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56
 SHA1 (patch-feature.h) = 7fc572f7d94e5342b32b9395c2632fa7ae528c39
 SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd
-SHA1 (patch-os__mac.h) = df310394096a6753821bdecc602708109480629b
diff --git a/editors/vim-share/patches/patch-os__mac.h b/editors/vim-share/patches/patch-os__mac.h
deleted file mode 100644
index b3b43daf7fa..00000000000
--- a/editors/vim-share/patches/patch-os__mac.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-os__mac.h,v 1.1 2014/01/01 14:44:59 schmonz Exp $
-
-Avoid conflicting sigaltstack types on OS X 10.9.
-
---- src/os_mac.h.orig	2013-05-21 21:24:07.000000000 +0000
-+++ src/os_mac.h
-@@ -16,6 +16,9 @@
- # define OPAQUE_TOOLBOX_STRUCTS 0
- #endif
- 
-+/* Include MAC_OS_X_VERSION_* macros */
-+#include <AvailabilityMacros.h>
-+
- /*
-  * Macintosh machine-dependent things.
-  *
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
index de3f5231331..201d56e5289 100644
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@@ -1,5 +1,5 @@
-# $NetBSD: version.mk,v 1.91 2013/10/07 19:26:28 morr Exp $
+# $NetBSD: version.mk,v 1.92 2014/01/11 23:24:03 morr Exp $
 
 VIM_VERSION=		7.4
-VIM_PATCHLEVEL=		052
+VIM_PATCHLEVEL=		141
 VIM_SUBDIR=		vim74