--- a/components/vim/Makefile	Thu May 17 12:20:33 2012 -0700
+++ b/components/vim/Makefile	Tue May 01 09:59:48 2012 -0700
@@ -34,9 +34,10 @@
 COMPONENT_PROJECT_URL=	http://www.vim.org/
 COMPONENT_ARCHIVE=	vim-$(COMPONENT_HG_REV).tar.bz2
 COMPONENT_ARCHIVE_URL=	$(EXTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE)
-COMPONENT_ARCHIVE_HASH=	sha256:a4d1345af9f8d56d3e2c0537e6f037e8f33a395f25e0cdd9e6a45ec57a603c98
+COMPONENT_ARCHIVE_HASH=	sha256:11f5179b41ce84c7221e8126463b211d9511188423f5f955274f2198e987f427
 COMPONENT_HG_URL=	https://vim.googlecode.com/hg
-COMPONENT_HG_REV=	v7-3-421
+COMPONENT_HG_REV=	v7-3-515
+COMPONENT_HG_REV_OLD=	v7-3-515
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
@@ -62,10 +63,12 @@
 	hg clone -u $(COMPONENT_HG_REV) $(HGREPODIR) $(TARBALLDIR)
 	rm -rf $(TARBALLDIR)/.hg
 	tar jcf $(COMPONENT_ARCHIVE) $(TARBALLDIR)
+	hg --cwd $(HGREPODIR) stat -ar --rev $(COMPONENT_HG_REV_OLD):tip runtime src/po
 	digest=$$(digest -a sha256 $(COMPONENT_ARCHIVE)); \
 		/usr/gnu/bin/sed -i \
 			-e "s/^COMPONENT_ARCHIVE_HASH=.*/COMPONENT_ARCHIVE_HASH=	sha256:$$digest/" \
 			-e "s/^COMPONENT_HG_REV=.*/COMPONENT_HG_REV=	$(COMPONENT_HG_REV)/" \
+			-e "s/^COMPONENT_HG_REV_OLD=.*/COMPONENT_HG_REV_OLD=	$(COMPONENT_HG_REV)/" \
 			Makefile
 
 PATCH_LEVEL =	0
@@ -114,8 +117,6 @@
 $(X_VARIANT)/.configured:	CONFIGURE_OPTIONS += --enable-gui=gtk2
 $(X_VARIANT)/.configured:	CONFIGURE_OPTIONS += --enable-gtk2-check
 
-COMPONENT_PREP_ACTION = (cd $(@D)/src; autoconf)
-
 # Vim's build is too smart for itself and configure can't run outside of a
 # complete source tree.
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/vim/patches/7031620.patch	Tue May 01 09:59:48 2012 -0700
@@ -0,0 +1,11 @@
+--- src/os_unix.c	Tue May  1 09:52:21 2012
++++ src/os_unix.c	Tue May  1 09:52:24 2012
+@@ -2509,7 +2509,7 @@
+ 	}
+ 
+ 	l = STRLEN(buf);
+-	if (l >= len)
++	if (l >= len - 1)
+ 	    retval = FAIL;
+ #ifndef VMS
+ 	else

--- a/components/vim/patches/zfs-acl.patch	Thu May 17 12:20:33 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
---- src/configure.in	Tue Jan 10 16:13:35 2012
-+++ src/configure.in	Fri Jan 13 14:10:21 2012
-@@ -3106,6 +3106,7 @@
- 
- dnl Link with -lposix1e for ACL stuff; if not found, try -lacl for SGI
- dnl when -lacl works, also try to use -lattr (required for Debian).
-+dnl On Solaris, use the acl_get/set functions in libsec, if present.
- AC_MSG_CHECKING(--disable-acl argument)
- AC_ARG_ENABLE(acl,
- 	[  --disable-acl           Don't check for ACL support.],
-@@ -3128,7 +3129,8 @@
- 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_POSIX_ACL),
- 	AC_MSG_RESULT(no))
- 
--AC_MSG_CHECKING(for Solaris ACL support)
-+AC_CHECK_LIB(sec, acl_get, [LIBS="$LIBS -lsec"; AC_DEFINE(HAVE_SOLARIS_ZFS_ACL)],
-+AC_MSG_CHECKING(for Solaris ACL support)
- AC_TRY_LINK([
- #ifdef HAVE_SYS_ACL_H
- # include <sys/acl.h>
-@@ -3135,7 +3137,7 @@
- #endif], [acl("foo", GETACLCNT, 0, NULL);
- 	],
- 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOLARIS_ACL),
--	AC_MSG_RESULT(no))
-+	AC_MSG_RESULT(no)))
- 
- AC_MSG_CHECKING(for AIX ACL support)
- AC_TRY_LINK([
---- src/config.h.in	Fri Jan 13 13:29:05 2012
-+++ src/config.h.in	Fri Jan 13 13:29:13 2012
-@@ -363,6 +363,7 @@
- 
- /* Define if you want to add support for ACL */
- #undef HAVE_POSIX_ACL
-+#undef HAVE_SOLARIS_ZFS_ACL
- #undef HAVE_SOLARIS_ACL
- #undef HAVE_AIX_ACL
- 
---- src/os_unix.c	Tue Jan 10 16:13:35 2012
-+++ src/os_unix.c	Fri Jan 13 15:57:08 2012
-@@ -2746,6 +2746,13 @@
- #ifdef HAVE_POSIX_ACL
-     ret = (vim_acl_T)acl_get_file((char *)fname, ACL_TYPE_ACCESS);
- #else
-+#ifdef HAVE_SOLARIS_ZFS_ACL
-+    acl_t *aclent;
-+
-+    if (acl_get((char *)fname, 0, &aclent) < 0)
-+	return NULL;
-+    ret = (vim_acl_T)aclent;
-+#else
- #ifdef HAVE_SOLARIS_ACL
-     vim_acl_solaris_T   *aclent;
- 
-@@ -2791,6 +2798,7 @@
-     ret = (vim_acl_T)aclent;
- #endif /* HAVE_AIX_ACL */
- #endif /* HAVE_SOLARIS_ACL */
-+#endif /* HAVE_SOLARIS_ZFS_ACL */
- #endif /* HAVE_POSIX_ACL */
-     return ret;
- }
-@@ -2808,6 +2816,9 @@
- #ifdef HAVE_POSIX_ACL
-     acl_set_file((char *)fname, ACL_TYPE_ACCESS, (acl_t)aclent);
- #else
-+#ifdef HAVE_SOLARIS_ZFS_ACL
-+    acl_set((char *)fname, (acl_t *)aclent);
-+#else
- #ifdef HAVE_SOLARIS_ACL
-     acl((char *)fname, SETACL, ((vim_acl_solaris_T *)aclent)->acl_cnt,
- 	    ((vim_acl_solaris_T *)aclent)->acl_entry);
-@@ -2816,6 +2827,7 @@
-     chacl((char *)fname, aclent, ((struct acl *)aclent)->acl_len);
- #endif /* HAVE_AIX_ACL */
- #endif /* HAVE_SOLARIS_ACL */
-+#endif /* HAVE_SOLARIS_ZFS_ACL */
- #endif /* HAVE_POSIX_ACL */
- }
- 
-@@ -2828,6 +2840,9 @@
- #ifdef HAVE_POSIX_ACL
-     acl_free((acl_t)aclent);
- #else
-+#ifdef HAVE_SOLARIS_ZFS_ACL
-+    acl_free((acl_t *)aclent);
-+#else
- #ifdef HAVE_SOLARIS_ACL
-     free(((vim_acl_solaris_T *)aclent)->acl_entry);
-     free(aclent);
-@@ -2836,6 +2851,7 @@
-     free(aclent);
- #endif /* HAVE_AIX_ACL */
- #endif /* HAVE_SOLARIS_ACL */
-+#endif /* HAVE_SOLARIS_ZFS_ACL */
- #endif /* HAVE_POSIX_ACL */
- }
- #endif

--- a/components/vim/vim.p5m	Thu May 17 12:20:33 2012 -0700
+++ b/components/vim/vim.p5m	Tue May 01 09:59:48 2012 -0700
@@ -107,6 +107,8 @@
 dir path=usr/share/vim/$(VIMVER)/lang/ko.UTF-8/LC_MESSAGES
 dir path=usr/share/vim/$(VIMVER)/lang/nb
 dir path=usr/share/vim/$(VIMVER)/lang/nb/LC_MESSAGES
+dir path=usr/share/vim/$(VIMVER)/lang/nl
+dir path=usr/share/vim/$(VIMVER)/lang/nl/LC_MESSAGES
 dir path=usr/share/vim/$(VIMVER)/lang/no
 dir path=usr/share/vim/$(VIMVER)/lang/no/LC_MESSAGES
 dir path=usr/share/vim/$(VIMVER)/lang/pl
@@ -936,6 +938,7 @@
 file path=usr/share/vim/$(VIMVER)/lang/menu_zh_tw.cp950.vim
 file path=usr/share/vim/$(VIMVER)/lang/menu_zh_tw.utf-8.vim
 file path=usr/share/vim/$(VIMVER)/lang/nb/LC_MESSAGES/vim.mo
+file path=usr/share/vim/$(VIMVER)/lang/nl/LC_MESSAGES/vim.mo
 file path=usr/share/vim/$(VIMVER)/lang/no/LC_MESSAGES/vim.mo
 file path=usr/share/vim/$(VIMVER)/lang/pl/LC_MESSAGES/vim.mo
 file path=usr/share/vim/$(VIMVER)/lang/pt_BR/LC_MESSAGES/vim.mo