Update to version 7.4.052.

Patches for vim 7.4:

7.4.001  'ic' doesn't work for patterns such as [a-z]
7.4.002  pattern with two alternative look-behind matches doesn't match
7.4.003  memory access error in Ruby syntax highlighting
7.4.004  when closing a window fails ":bwipe" may hang
7.4.005  "vaB" while 'virtualedit' is set selects the wrong area
7.4.006  mkdir("foo/bar/", "p") gives an error message
7.4.007  creating a preview window on startup messes up the screen
7.4.008  new regexp engine can't be interrupted
7.4.009  too easy to write a file was not decrypted (yet)
7.4.010  (after 7.4.006) crash with invalid argument to mkdir()
7.4.011  cannot find out if "acl" and "xpm" features are supported
7.4.012  MS-Windows: resolving multi-bye shortcut does not work
7.4.013  MS-Windows: File name buffer too small for utf-8
7.4.014  MS-Windows: check for writing to device does not work
7.4.015  MS-Windows: Detecting node type fails for multi-byte chars
7.4.016  MS-Windows: File name completion has problem with Chinese
7.4.017  ":help !!" does not find the "!!" tag in the help file
7.4.018  when completing item becomes unselected
7.4.019  file name completion fails with Chinese characters
7.4.020  NFA engine matches too much with \@>
7.4.021  NFA regexp: Using \ze may result in wrong end
7.4.022  deadlock while exiting, because of allocating memory
7.4.023  MS-Windows: warning for 64 bit type
7.4.024  current user cannot always use the undo file he created
7.4.025  reading before start of a string
7.4.026  clang warning for int shift overflow
7.4.027  valgrind error when using CTRL-X CTRL-F at start of the line
7.4.028  equivalence classes are not working for multi-byte characters
7.4.029  an error in a pattern is reported twice
7.4.030  the -mno-cygwin argument is no longer supported by Cygwin
7.4.031  ":diffoff!" resets options even when 'diff' is not set
7.4.032  NFA engine does not match the NUL character
7.4.033  if terminal has 20 lines test 92 and 93 overwrite input file
7.4.034  using "p" in Visual block mode only changes the first line
7.4.035  MS-Windows: mouse pointer flickers when going to Normal mode
7.4.036  NFA engine does not capture group correctly when using \@>
7.4.037  "\ze" in a sub-pattern does set the end of the match
7.4.038  Using "zw" and "zg" when 'spell' is off give confusing error
7.4.039  MS-Windows: < MSCV10 can't handle symlinks to a directory
7.4.040  error on exit when variable holds reference to a script scope
7.4.041  Visual selection does not remain after being copied over
7.4.042  after ":setlocal" 'spell'/'spellang' :spelldump doesn't work
7.4.043  VMS can't handle long function names
7.4.044  can't build with old MSVC
7.4.045  substitute() has a problem with pattern starting with "\ze".
7.4.046  can't use Tcl 8.6
7.4.047  input() does not work in a function invoked by a mapping
7.4.048  recent clang version complains about -fno-strength-reduce
7.4.049  in Ex mode substitute prompt is wrong with line numbers
7.4.050  "gn" may select too much when there are two matching lines
7.4.051  syntax highlighting a Yaml file causes a crash
7.4.052  cursor may end up in the wrong position when auto-formatting

7 files changed, 45 insertions, 22 deletions

diff --git a/editors/vim-lang/PLIST b/editors/vim-lang/PLIST
index fe536878459..a259314445c 100644
--- a/editors/vim-lang/PLIST
+++ b/editors/vim-lang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2013/06/13 21:41:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2013/10/07 19:26:28 morr Exp $
 man/fr.ISO8859-1/man1/evim.1
 man/fr.ISO8859-1/man1/ex.1
 man/fr.ISO8859-1/man1/rview.1
@@ -47,6 +47,14 @@ man/it/man1/view.1
 man/it/man1/vim.1
 man/it/man1/vimdiff.1
 man/it/man1/vimtutor.1
+man/ja/man1/evim.1
+man/ja/man1/ex.1
+man/ja/man1/rview.1
+man/ja/man1/rvim.1
+man/ja/man1/view.1
+man/ja/man1/vim.1
+man/ja/man1/vimdiff.1
+man/ja/man1/vimtutor.1
 man/pl.ISO8859-2/man1/evim.1
 man/pl.ISO8859-2/man1/ex.1
 man/pl.ISO8859-2/man1/rview.1
diff --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile
index 726d8c6c8e8..c6d8474834d 100644
--- a/editors/vim-share/Makefile
+++ b/editors/vim-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2012/10/03 11:43:46 asau Exp $
+# $NetBSD: Makefile,v 1.31 2013/10/07 19:26:28 morr Exp $
 
 PKGNAME=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
@@ -16,7 +16,7 @@ INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} TOOLS_AWK=${TOOLS_AWK} TOOLS_SETENV=${TOOLS_S
 
 PLIST_SUBST+=		VIM_SUBDIR=${VIM_SUBDIR}
 
-CHECK_INTERPRETER_SKIP+=	share/vim/vim73/doc/*.pl
-CHECK_INTERPRETER_SKIP+=	share/vim/vim73/tools/*.pl
+CHECK_INTERPRETER_SKIP+=	share/vim/vim74/doc/*.pl
+CHECK_INTERPRETER_SKIP+=	share/vim/vim74/tools/*.pl
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 48c9beb4d33..a654e7342a3 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.148 2012/10/30 22:39:07 morr Exp $
+# $NetBSD: Makefile.common,v 1.149 2013/10/07 19:26:28 morr Exp $
 
 # used by editors/vim/Makefile
 # used by editors/vim-gtk/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE=		yes
 MAKE_JOBS_SAFE=		no	# At least on Solaris
 
 # http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=38710
-CHECK_INTERPRETER_SKIP=	share/vim/vim73/tools/vim132
+CHECK_INTERPRETER_SKIP=	share/vim/vim74/tools/vim132
 
 .include "options.mk"
 
diff --git a/editors/vim-share/PLIST b/editors/vim-share/PLIST
index 63725bafaab..95e3f992ae2 100644
--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2013/06/12 14:53:56 morr Exp $
+@comment $NetBSD: PLIST,v 1.21 2013/10/07 19:26:28 morr Exp $
 bin/xxd
 man/man1/evim.1
 man/man1/vim.1
@@ -103,11 +103,13 @@ share/vim/${VIM_SUBDIR}/compiler/modelsim_vcom.vim
 share/vim/${VIM_SUBDIR}/compiler/msbuild.vim
 share/vim/${VIM_SUBDIR}/compiler/msvc.vim
 share/vim/${VIM_SUBDIR}/compiler/neato.vim
+share/vim/${VIM_SUBDIR}/compiler/ocaml.vim
 share/vim/${VIM_SUBDIR}/compiler/onsgmls.vim
 share/vim/${VIM_SUBDIR}/compiler/pbx.vim
 share/vim/${VIM_SUBDIR}/compiler/perl.vim
 share/vim/${VIM_SUBDIR}/compiler/php.vim
 share/vim/${VIM_SUBDIR}/compiler/pyunit.vim
+share/vim/${VIM_SUBDIR}/compiler/rake.vim
 share/vim/${VIM_SUBDIR}/compiler/rspec.vim
 share/vim/${VIM_SUBDIR}/compiler/rst.vim
 share/vim/${VIM_SUBDIR}/compiler/ruby.vim
@@ -334,6 +336,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/htmldjango.vim
 share/vim/${VIM_SUBDIR}/ftplugin/indent.vim
 share/vim/${VIM_SUBDIR}/ftplugin/initex.vim
 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/jsp.vim
@@ -422,6 +425,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/tcsh.vim
 share/vim/${VIM_SUBDIR}/ftplugin/terminfo.vim
 share/vim/${VIM_SUBDIR}/ftplugin/tex.vim
 share/vim/${VIM_SUBDIR}/ftplugin/treetop.vim
+share/vim/${VIM_SUBDIR}/ftplugin/tt2html.vim
 share/vim/${VIM_SUBDIR}/ftplugin/udevconf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/udevperm.vim
 share/vim/${VIM_SUBDIR}/ftplugin/udevrules.vim
@@ -489,6 +493,7 @@ share/vim/${VIM_SUBDIR}/indent/html.vim
 share/vim/${VIM_SUBDIR}/indent/htmldjango.vim
 share/vim/${VIM_SUBDIR}/indent/idlang.vim
 share/vim/${VIM_SUBDIR}/indent/ishd.vim
+share/vim/${VIM_SUBDIR}/indent/j.vim
 share/vim/${VIM_SUBDIR}/indent/java.vim
 share/vim/${VIM_SUBDIR}/indent/javascript.vim
 share/vim/${VIM_SUBDIR}/indent/jsp.vim
@@ -866,6 +871,7 @@ share/vim/${VIM_SUBDIR}/syntax/ipfilter.vim
 share/vim/${VIM_SUBDIR}/syntax/ishd.vim
 share/vim/${VIM_SUBDIR}/syntax/iss.vim
 share/vim/${VIM_SUBDIR}/syntax/ist.vim
+share/vim/${VIM_SUBDIR}/syntax/j.vim
 share/vim/${VIM_SUBDIR}/syntax/jal.vim
 share/vim/${VIM_SUBDIR}/syntax/jam.vim
 share/vim/${VIM_SUBDIR}/syntax/jargon.vim
@@ -992,6 +998,7 @@ share/vim/${VIM_SUBDIR}/syntax/pilrc.vim
 share/vim/${VIM_SUBDIR}/syntax/pine.vim
 share/vim/${VIM_SUBDIR}/syntax/pinfo.vim
 share/vim/${VIM_SUBDIR}/syntax/plaintex.vim
+share/vim/${VIM_SUBDIR}/syntax/pli.vim
 share/vim/${VIM_SUBDIR}/syntax/plm.vim
 share/vim/${VIM_SUBDIR}/syntax/plp.vim
 share/vim/${VIM_SUBDIR}/syntax/plsql.vim
@@ -1008,6 +1015,7 @@ share/vim/${VIM_SUBDIR}/syntax/procmail.vim
 share/vim/${VIM_SUBDIR}/syntax/progress.vim
 share/vim/${VIM_SUBDIR}/syntax/prolog.vim
 share/vim/${VIM_SUBDIR}/syntax/promela.vim
+share/vim/${VIM_SUBDIR}/syntax/proto.vim
 share/vim/${VIM_SUBDIR}/syntax/protocols.vim
 share/vim/${VIM_SUBDIR}/syntax/psf.vim
 share/vim/${VIM_SUBDIR}/syntax/ptcap.vim
@@ -1153,6 +1161,11 @@ share/vim/${VIM_SUBDIR}/syntax/udevrules.vim
 share/vim/${VIM_SUBDIR}/syntax/uil.vim
 share/vim/${VIM_SUBDIR}/syntax/updatedb.vim
 share/vim/${VIM_SUBDIR}/syntax/upstart.vim
+share/vim/${VIM_SUBDIR}/syntax/upstreamdat.vim
+share/vim/${VIM_SUBDIR}/syntax/upstreaminstalllog.vim
+share/vim/${VIM_SUBDIR}/syntax/upstreamlog.vim
+share/vim/${VIM_SUBDIR}/syntax/usserverlog.vim
+share/vim/${VIM_SUBDIR}/syntax/usw2kagtlog.vim
 share/vim/${VIM_SUBDIR}/syntax/valgrind.vim
 share/vim/${VIM_SUBDIR}/syntax/vb.vim
 share/vim/${VIM_SUBDIR}/syntax/vera.vim
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 4a3fe837a17..e2df7a757e7 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.139 2013/06/12 14:53:56 morr Exp $
+$NetBSD: distinfo,v 1.140 2013/10/07 19:26:28 morr Exp $
 
-SHA1 (vim-7.3.1140.tar.bz2) = 5c53a0ad130754c148fa99efa8cfb53c40be04d9
-RMD160 (vim-7.3.1140.tar.bz2) = ebdb50b960d5cd093ec4d90eb6a3c1fc311a0c9a
-Size (vim-7.3.1140.tar.bz2) = 9348496 bytes
-SHA1 (patch-Makefile) = 6b859d3ec6ff06c91516e05416b413d4e9cdb4b2
+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 (patch-Makefile) = 741f2b59d843094dbc1677aef9df93cf97c8d5a1
 SHA1 (patch-auto_configure) = e25c8821182231074033132d70dab077c273d5f8
 SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56
 SHA1 (patch-feature.h) = 7fc572f7d94e5342b32b9395c2632fa7ae528c39
diff --git a/editors/vim-share/patches/patch-Makefile b/editors/vim-share/patches/patch-Makefile
index 747a4737ece..2d3e2faa39e 100644
--- a/editors/vim-share/patches/patch-Makefile
+++ b/editors/vim-share/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $
+$NetBSD: patch-Makefile,v 1.3 2013/10/07 19:26:28 morr Exp $
 
---- src/Makefile.orig	2012-11-22 15:18:52.000000000 +0100
-+++ src/Makefile	2013-01-14 23:51:58.000000000 +0100
-@@ -1196,22 +1196,27 @@
+--- src/Makefile.orig	2013-08-10 15:07:12.000000000 +0000
++++ src/Makefile
+@@ -1201,22 +1201,27 @@ MOTIF_BUNDLE	=
  ### Athena GUI
  ### Use Xaw3d to make the menus look a little bit nicer
  #XAW_LIB = -lXaw3d
@@ -37,7 +37,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $
  
  ATHENA_IPATH	= $(GUI_INC_LOC)
  ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
-@@ -1917,7 +1922,7 @@
+@@ -1947,7 +1952,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES
  	-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
  	@echo generating help tags
  # Generate the help tags with ":helptags" to handle all languages.
@@ -46,7 +46,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $
  	cd $(HELPSOURCE); \
  		files=`ls *.txt tags`; \
  		files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
-@@ -2046,25 +2051,25 @@
+@@ -2076,26 +2081,26 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
  	      fi
  	-chmod $(FILEMOD) $(DEST_TOOLS)/*
  # replace the path in some tools
@@ -66,6 +66,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $
 -	-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
 -	-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
 -	-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_JA_U) "-ja.UTF-8" $(INSTALLMANARGS)
 -	-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
 -	-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
 -	-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
@@ -77,6 +78,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_JA_U) "-ja.UTF-8" $(INSTALLMANARGS)
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
index 8598b8695b3..de3f5231331 100644
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@@ -1,5 +1,5 @@
-# $NetBSD: version.mk,v 1.90 2013/06/12 14:53:56 morr Exp $
+# $NetBSD: version.mk,v 1.91 2013/10/07 19:26:28 morr Exp $
 
-VIM_VERSION=		7.3
-VIM_PATCHLEVEL=		1140
-VIM_SUBDIR=		vim73
+VIM_VERSION=		7.4
+VIM_PATCHLEVEL=		052
+VIM_SUBDIR=		vim74