Regenerate patches, fix build

6 files changed, 31 insertions, 30 deletions

diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index d823ffcf032..e40550c1ca7 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.133 2012/08/27 22:10:34 morr Exp $
+$NetBSD: distinfo,v 1.134 2012/08/28 05:59:38 morr Exp $
 
 SHA1 (vim7.3/7.3.001) = c2f6dc2df273d2653f17e5ad63ae20ec9119a245
 RMD160 (vim7.3/7.3.001) = 4c3d57c6f064f9849bc2f24b3c583c79051ed936
@@ -1842,8 +1842,8 @@ Size (vim7.3/7.3.638) = 1783 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
-SHA1 (patch-aa) = fd0f0e5df1ed3df15eced39009689bc1a8664a43
-SHA1 (patch-ab) = 6d27ed09cb741313e57b3550e62977797f7b285e
-SHA1 (patch-ad) = c75cdf6f60781a9827a8fce06704dd75ada26a9b
-SHA1 (patch-af) = 0b43a34040bd0ce29f358119b2eaa777914ed6b6
-SHA1 (patch-zb) = 3a4daf47e709cf5a882a0b0a947a3a44f48b0ed6
+SHA1 (patch-Makefile) = 55c75f6d3cc8ec204f2585b21d44b64b7700103e
+SHA1 (patch-auto_configure) = e25c8821182231074033132d70dab077c273d5f8
+SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56
+SHA1 (patch-feature.h) = 7fc572f7d94e5342b32b9395c2632fa7ae528c39
+SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd
diff --git a/editors/vim-share/patches/patch-ad b/editors/vim-share/patches/patch-Makefile
index 9f0756f8a8f..c0ce938aafd 100644
--- a/editors/vim-share/patches/patch-ad
+++ b/editors/vim-share/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.14 2008/08/11 12:14:10 martti Exp $
+$NetBSD: patch-Makefile,v 1.1 2012/08/28 05:59:39 morr Exp $
 
---- src/Makefile.orig	2008-08-09 17:50:04.000000000 +0300
-+++ src/Makefile	2008-08-11 12:58:51.000000000 +0300
-@@ -1152,26 +1152,31 @@
+--- src/Makefile.orig	2012-05-25 09:26:31.000000000 +0000
++++ src/Makefile
+@@ -1192,26 +1192,31 @@ MOTIF_BUNDLE	=
  ### Athena GUI
  ### Use Xaw3d to make the menus look a little bit nicer
  #XAW_LIB = -lXaw3d
@@ -42,7 +42,7 @@ $NetBSD: patch-ad,v 1.14 2008/08/11 12:14:10 martti Exp $
  ATHENA_LIBS2	= -lXt
  ATHENA_INSTALL  = install_normal install_gui_extra
  ATHENA_TARGETS	= installglinks
-@@ -1800,7 +1805,7 @@
+@@ -1912,7 +1917,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.
@@ -51,7 +51,7 @@ $NetBSD: patch-ad,v 1.14 2008/08/11 12:14:10 martti Exp $
  	cd $(HELPSOURCE); \
  		files=`ls *.txt tags`; \
  		files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
-@@ -1927,25 +1932,25 @@
+@@ -2041,25 +2046,25 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_
  	      fi
  	-chmod $(FILEMOD) $(DEST_TOOLS)/*
  # replace the path in some tools
diff --git a/editors/vim-share/patches/patch-aa b/editors/vim-share/patches/patch-auto_configure
index 2409ef21605..61a90e392d4 100644
--- a/editors/vim-share/patches/patch-aa
+++ b/editors/vim-share/patches/patch-auto_configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.16 2009/10/28 01:20:33 joerg Exp $
+$NetBSD: patch-auto_configure,v 1.1 2012/08/28 05:59:39 morr Exp $
 
 Buildlink takes care of include files.
 
---- src/auto/configure.orig	2008-07-24 15:40:36.000000000 +0300
-+++ src/auto/configure	2008-08-11 12:58:28.000000000 +0300
-@@ -8966,7 +8966,7 @@
+--- src/auto/configure.orig	2012-05-25 09:26:29.000000000 +0000
++++ src/auto/configure
+@@ -8198,7 +8198,7 @@ fi
  
  
  if test -z "$SKIP_MOTIF"; then
@@ -12,4 +12,4 @@ Buildlink takes care of include files.
 +  gui_XXX="${MOTIFBASE}/include"
      GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
  
-   { $as_echo "$as_me:$LINENO: checking for location of Motif GUI includes" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI includes" >&5
diff --git a/editors/vim-share/patches/patch-ab b/editors/vim-share/patches/patch-configure
index 8521c02c675..d8cb2d43420 100644
--- a/editors/vim-share/patches/patch-ab
+++ b/editors/vim-share/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.7 2007/06/19 14:19:03 dmcmahill Exp $
+$NetBSD: patch-configure,v 1.1 2012/08/28 05:59:39 morr Exp $
 
 use the right shell and avoid a non-portable construct
 Needed to configure on SunOS-5.9/sparc.
 
---- src/configure.orig	2007-06-15 13:31:37.404435000 -0400
-+++ src/configure	2007-06-15 13:41:16.409314000 -0400
-@@ -1,6 +1,7 @@
+--- src/configure.orig	2010-08-15 13:02:25.000000000 +0000
++++ src/configure
+@@ -1,7 +1,8 @@
  #! /bin/sh
  # run the automatically generated configure script
 -CONFIG_STATUS=auto/config.status \
@@ -15,3 +15,4 @@ Needed to configure on SunOS-5.9/sparc.
 +$CONFIG_SHELL auto/configure "$@" --srcdir="${srcdir:-.}" --cache-file=auto/config.cache
  result=$?
  
+ # Stupid autoconf 2.5x causes this file to be left behind.
diff --git a/editors/vim-share/patches/patch-zb b/editors/vim-share/patches/patch-feature.h
index c01834cbb21..7fd572bdeaf 100644
--- a/editors/vim-share/patches/patch-zb
+++ b/editors/vim-share/patches/patch-feature.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-zb,v 1.7 2008/08/11 12:14:10 martti Exp $
+$NetBSD: patch-feature.h,v 1.1 2012/08/28 05:59:39 morr Exp $
 
---- src/feature.h.orig	2008-08-06 14:00:39.000000000 +0300
-+++ src/feature.h	2008-08-11 12:59:23.000000000 +0300
-@@ -552,7 +552,7 @@
+--- src/feature.h.orig	2012-05-25 09:26:32.000000000 +0000
++++ src/feature.h
+@@ -559,7 +559,7 @@
   *			(used only with NO_BUILTIN_TCAPS not defined).
   */
  #ifdef HAVE_TGETENT
diff --git a/editors/vim-share/patches/patch-af b/editors/vim-share/patches/patch-link.sh
index 6c0c68051f7..913d3936c24 100644
--- a/editors/vim-share/patches/patch-af
+++ b/editors/vim-share/patches/patch-link.sh
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2008/03/02 16:01:32 jlam Exp $
+$NetBSD: patch-link.sh,v 1.1 2012/08/28 05:59:39 morr Exp $
 
---- src/link.sh.orig	2006-09-26 05:22:11.000000000 -0400
+--- src/link.sh.orig	2012-05-25 09:25:48.000000000 +0000
 +++ src/link.sh
-@@ -41,7 +41,7 @@ else
+@@ -53,7 +53,7 @@ else
    if sh link.cmd; then
      touch auto/link.sed
      cp link.cmd linkit.sh
--    for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w dl pthread thread readline m perl crypt attr; do
-+    for libname in SM ICE nsl dnet dnet_stub inet socket dir elf Xt Xmu Xp Xpm X11 Xdmcp x w dl pthread thread readline m perl crypt attr; do
+-    for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w perl dl pthread thread readline m crypt attr; do
++    for libname in SM ICE nsl dnet dnet_stub inet socket dir elf Xt Xmu Xp Xpm X11 Xdmcp x w perl dl pthread thread readline m crypt attr; do
        cont=yes
        while test -n "$cont"; do
          if grep "l$libname " linkit.sh >/dev/null; then