Updated editors/vim-share to 7.1.330

Add CHECK_INTERPRETER_SKIP for pkg/38710

Apply the following patches:

  1480  7.1.316  when 'cscopetag' is set ":tag" gives an error message
  5203  7.1.317  compiler warnings in Motif calls
  5428  7.1.318  mem leak when closing xsmp conn.; crash on exit with Lesstif
  1514  7.1.319  illegal memory access when pasting illegal utf-8 on cmd line
 28763  7.1.320  Win64: Warnings while compiling Python interface
  2603  7.1.321  (extra) Win32 / Win64: Install file is outdated
  2677  7.1.322  can't get start of Visual area in an <expr> mapping
  1734  7.1.323  test 19 and 38 fail with some termcaps
  1847  7.1.324  file name path length on Unix is limited to 1024
  3559  7.1.325  editing a command line that doesn't fit reverses char order
  1641  7.1.326  ":smagic!from!to!" doesn't work, it sees the "!" as a flag
  5454  7.1.327  gvimtutor is also installed when not building a GUI version
  1859  7.1.328  crash when using Cygwin and non-posix path name in tags file
  2172  7.1.329  right halve of double-wide char under popup menu not redrawn
  1905  7.1.330  reading uninitialized memory when using Del in replace mode

4 files changed, 63 insertions, 13 deletions

diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 44396a34b3a..58d459c4175 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.109 2008/06/19 05:55:44 martti Exp $
+# $NetBSD: Makefile.common,v 1.110 2008/06/23 05:07:56 martti Exp $
 
 # used by editors/vim/Makefile
 # used by editors/vim-gtk/Makefile
@@ -30,7 +30,9 @@ PATCH_SITES+=		ftp://ftp.fu-berlin.de/misc/editors/vim/patches/${VIM_VERSION}/
 PATCHFILES+=		7.1.001-100.gz 7.1.101-200.gz 7.1.201-300.gz
 PATCHFILES+=		7.1.301 7.1.302 7.1.303 7.1.304 7.1.305 7.1.306 7.1.307
 PATCHFILES+=		7.1.308 7.1.309 7.1.310 7.1.311 7.1.312 7.1.313 7.1.314
-PATCHFILES+=		7.1.315
+PATCHFILES+=		7.1.315 7.1.316 7.1.317 7.1.318 7.1.319 7.1.320 7.1.321
+PATCHFILES+=		7.1.322 7.1.323 7.1.324 7.1.325 7.1.326 7.1.327 7.1.328
+PATCHFILES+=		7.1.329 7.1.330
 
 MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.vim.org/
@@ -42,6 +44,9 @@ WRKSRC=			${WRKDIR}/${VIM_SUBDIR}/src
 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/vim71/tools/vim132
+
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=	--with-modified-by="${MAINTAINER}"
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 06e9f4fb1fe..b420901e27d 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.98 2008/06/19 05:55:44 martti Exp $
+$NetBSD: distinfo,v 1.99 2008/06/23 05:07:56 martti Exp $
 
 SHA1 (vim/7.1.001-100.gz) = 6571772fb45d8b5a28fa7cdee5c131555ac3bb48
 RMD160 (vim/7.1.001-100.gz) = 65aebf5446773169d077f49dcee1e29ea0457cc4
@@ -54,6 +54,51 @@ Size (vim/7.1.314) = 1915 bytes
 SHA1 (vim/7.1.315) = e39355ed13ee5dc05e516fb3abdb56368502dc72
 RMD160 (vim/7.1.315) = d21f91cef4fbc9e92c1a21eae34becb70a31b913
 Size (vim/7.1.315) = 3287 bytes
+SHA1 (vim/7.1.316) = 1e6b958d95e5fe2840ae62defaf374a90baedc1b
+RMD160 (vim/7.1.316) = 71f923f2d363acc0a4db4be5b9262e0df95823d1
+Size (vim/7.1.316) = 1480 bytes
+SHA1 (vim/7.1.317) = cef43caa719434bf88bfbe2df8f117597ceeb2c3
+RMD160 (vim/7.1.317) = fb0612029c3d35ab8cc22520282fa6eae52fa41b
+Size (vim/7.1.317) = 5203 bytes
+SHA1 (vim/7.1.318) = b1cc9111b1e2fddbfd8e6e17e8d8f5f29b64ecb7
+RMD160 (vim/7.1.318) = a09f826c2ae79993da7085beb501bf568f1c2054
+Size (vim/7.1.318) = 5428 bytes
+SHA1 (vim/7.1.319) = 5822bdaf3bb48686064e58d98728b8280367fc64
+RMD160 (vim/7.1.319) = 607cc541a5228f20080363134e7352f1a2f7b0c9
+Size (vim/7.1.319) = 1514 bytes
+SHA1 (vim/7.1.320) = c4ed4301499a4ac35d02fc09fcbebad8af436495
+RMD160 (vim/7.1.320) = 25ca7fb66ae34ad9fdf17e4c690afcadf7929d55
+Size (vim/7.1.320) = 28763 bytes
+SHA1 (vim/7.1.321) = 7f79276ba8f4d28b65a76786979a8906c710706d
+RMD160 (vim/7.1.321) = 75c6dde8900df172e97d751b240abbeb03ba7aa2
+Size (vim/7.1.321) = 2603 bytes
+SHA1 (vim/7.1.322) = cde9cf8db53bf82e652ad37320caf5b0d398a5ad
+RMD160 (vim/7.1.322) = 105e01f8b99d11426889b8756ad76d43454cf27f
+Size (vim/7.1.322) = 2677 bytes
+SHA1 (vim/7.1.323) = ea4b2b577d8004f6321078c7701022869d707538
+RMD160 (vim/7.1.323) = 51925283c976ea350e1bfb7b4b3abd438227e4fb
+Size (vim/7.1.323) = 1734 bytes
+SHA1 (vim/7.1.324) = 0d0969f2b16906112ecd15222f1cf4651222a8b7
+RMD160 (vim/7.1.324) = 688d579899d4c7535e329ff0e305f2d5b3f4d57f
+Size (vim/7.1.324) = 1847 bytes
+SHA1 (vim/7.1.325) = a4e50220c4ca7ad76c71167e698d387d3081fad6
+RMD160 (vim/7.1.325) = 948b5a8339269326326d7ad6a1521f0bf5aac430
+Size (vim/7.1.325) = 3559 bytes
+SHA1 (vim/7.1.326) = 35d324d9a9343d12e742504e9e6ab7efbeed6f21
+RMD160 (vim/7.1.326) = 8c5fd29bd9a4a255d3727410606f5114d6fa747a
+Size (vim/7.1.326) = 1641 bytes
+SHA1 (vim/7.1.327) = 2982c316b716332f6431e8139ca2eb45b1801aba
+RMD160 (vim/7.1.327) = f947fa32147331d374795da4b83b615521a9ae6b
+Size (vim/7.1.327) = 5454 bytes
+SHA1 (vim/7.1.328) = 367b4dab38a1d5b2dee482c6084b1d9847701627
+RMD160 (vim/7.1.328) = 251953d6b30c89f32a054aff5d835e42edff3da5
+Size (vim/7.1.328) = 1859 bytes
+SHA1 (vim/7.1.329) = f6a4455fc570b5d37e545c8127bdba8814d63af8
+RMD160 (vim/7.1.329) = 147d11398dca72485dff2c970adaee13cad1593e
+Size (vim/7.1.329) = 2172 bytes
+SHA1 (vim/7.1.330) = 8bc9d35077db2efdbe4a0fcebe59267d644fda0d
+RMD160 (vim/7.1.330) = ee0841877f878e14628d6f86a69f2e4ba0779493
+Size (vim/7.1.330) = 1905 bytes
 SHA1 (vim/vim-7.1-extra.tar.gz) = 65581f63ff3c665e0513ba578d9e80e9e9512aa3
 RMD160 (vim/vim-7.1-extra.tar.gz) = e44bde407fb42233a8fbcc74d96a03650bf863d1
 Size (vim/vim-7.1-extra.tar.gz) = 713842 bytes
@@ -65,6 +110,6 @@ RMD160 (vim/vim-7.1.tar.bz2) = 470775e0d0219cafe7e04dd91199ed7441882456
 Size (vim/vim-7.1.tar.bz2) = 6876053 bytes
 SHA1 (patch-aa) = 30fe8e0b6b117c0d14f7e272b28f3100f3e7bc01
 SHA1 (patch-ab) = 6d27ed09cb741313e57b3550e62977797f7b285e
-SHA1 (patch-ad) = 64a58a538f8f48b4db7416b4ffec081ed6625329
+SHA1 (patch-ad) = 65c921487f4f66e3f36126b9f190b0e63de4f649
 SHA1 (patch-af) = 0b43a34040bd0ce29f358119b2eaa777914ed6b6
 SHA1 (patch-zb) = d52bdc3b77c30c804e78c2c6a4182fad8096c9f0
diff --git a/editors/vim-share/patches/patch-ad b/editors/vim-share/patches/patch-ad
index 291571b8fa0..eb3d2f8bf69 100644
--- a/editors/vim-share/patches/patch-ad
+++ b/editors/vim-share/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.12 2007/05/16 04:56:27 martti Exp $
+$NetBSD: patch-ad,v 1.13 2008/06/23 05:07:56 martti Exp $
 
---- src/Makefile.orig	2007-05-12 14:57:13.000000000 +0300
-+++ src/Makefile	2007-05-14 12:21:50.000000000 +0300
-@@ -1137,26 +1137,31 @@
+--- src/Makefile.orig	2008-06-23 07:54:04.000000000 +0300
++++ src/Makefile	2008-06-23 07:55:37.000000000 +0300
+@@ -1139,26 +1139,31 @@
  ### Athena GUI
  ### Use Xaw3d to make the menus look a little bit nicer
  #XAW_LIB = -lXaw3d
@@ -40,9 +40,9 @@ $NetBSD: patch-ad,v 1.12 2007/05/16 04:56:27 martti Exp $
 -ATHENA_LIBS1	= $(XAW_LIB)
 +ATHENA_LIBS1	= $(LIBXAW)
  ATHENA_LIBS2	= -lXt
- ATHENA_INSTALL  = install_normal
+ ATHENA_INSTALL  = install_normal install_gui_extra
  ATHENA_TARGETS	= installglinks
-@@ -1779,7 +1784,7 @@
+@@ -1786,7 +1791,7 @@
  	-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
  	@echo generating help tags
  # Generate the help tags with ":helptags" to handle all languages.
@@ -51,7 +51,7 @@ $NetBSD: patch-ad,v 1.12 2007/05/16 04:56:27 martti Exp $
  	cd $(HELPSOURCE); \
  		files=`ls *.txt tags`; \
  		files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
-@@ -1902,25 +1907,25 @@
+@@ -1913,25 +1918,25 @@
  	      fi
  	-chmod $(FILEMOD) $(DEST_TOOLS)/*
  # replace the path in some tools
diff --git a/editors/vim-share/version.mk b/editors/vim-share/version.mk
index 40bb0b26d2d..1047231b7c5 100644
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@@ -1,5 +1,5 @@
-# $NetBSD: version.mk,v 1.53 2008/06/19 05:55:44 martti Exp $
+# $NetBSD: version.mk,v 1.54 2008/06/23 05:07:56 martti Exp $
 
 VIM_VERSION=		7.1
-VIM_PATCHLEVEL=		315
+VIM_PATCHLEVEL=		330
 VIM_SUBDIR=		vim71