Fix build with automake-1.13.

While here, use a better WRKSRC and rebase patches.

35 files changed, 149 insertions, 137 deletions

diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index 339136ad6c3..98c4ed5fd6c 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2012/10/03 11:43:39 asau Exp $
+# $NetBSD: Makefile,v 1.45 2013/01/23 17:26:07 wiz Exp $
 
 DISTNAME=	nvi-1.81.6
 PKGREVISION=	7
@@ -12,7 +12,7 @@ COMMENT=	Berkeley nvi with additional features
 
 .include "options.mk"
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/build.unix
+CONFIGURE_DIRS=		build.unix
 USE_LIBTOOL=		yes
 USE_TOOLS+=		sh aclocal automake autoheader autoconf
 GNU_CONFIGURE=		yes
@@ -48,7 +48,7 @@ BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
 .endif
 
 pre-configure:
-	${RUN} cd ${WRKSRC}/../dist && \
+	${RUN} cd ${WRKSRC}/dist && \
 	${CHMOD} 755 configure && \
 	aclocal -I m4 && autoheader && autoconf
 
diff --git a/editors/nvi/distinfo b/editors/nvi/distinfo
index f2e3c4ce27d..c26d001b6bd 100644
--- a/editors/nvi/distinfo
+++ b/editors/nvi/distinfo
@@ -1,38 +1,38 @@
-$NetBSD: distinfo,v 1.16 2012/05/22 05:55:59 joerg Exp $
+$NetBSD: distinfo,v 1.17 2013/01/23 17:26:07 wiz Exp $
 
 SHA1 (nvi-1.81.6.tar.bz2) = d3445ed69166102735335a2ff60d092d9a9143c6
 RMD160 (nvi-1.81.6.tar.bz2) = 0db8568bea96392d9a027044177c60317c8ade36
 Size (nvi-1.81.6.tar.bz2) = 1758309 bytes
-SHA1 (patch-.._dist_Makefile.am) = bc506e1701dcde6cb30762b3d4b88304e81c7355
-SHA1 (patch-.._dist_configure.in) = 0341e7579b123b59f7ac8ecf1b2c4e8695f12118
-SHA1 (patch-.._ex_ex__script.c) = f294a079a4d830604cbf24bb31e89ceeb0f8f354
-SHA1 (patch-aa) = 05b8dedd194b09ed5af1fb62273e771ebd7f4326
-SHA1 (patch-ab) = 3687d1006015e84c1f9746b84e167602ae37b7fb
-SHA1 (patch-ac) = 3c345cb8871cb887a07ce83bbd43b1c49ebe4b33
-SHA1 (patch-ad) = d940a8c748c087aaf131817902d1f51d48b752c6
-SHA1 (patch-ae) = ad1f45c2feb26ab68626825cd5a1be1b33c30afb
-SHA1 (patch-af) = 69b9fff85c852df143eb1ff99a9d45aa7d83d2c4
-SHA1 (patch-ag) = 01df157bd10e03fe28dad7cbb06205c2cfc75691
-SHA1 (patch-ah) = c76390627309fecc852fd4fe7b73fc83aedeb060
-SHA1 (patch-ai) = 0a08e7f24adb0e6f2868e62cf6016d69ae728bb6
-SHA1 (patch-aj) = b81d2f3c320910b11dbb487fff8cd33aa2c23c04
-SHA1 (patch-ak) = 1e83a5f50fdb97c37e93536ac90e58513e81f77d
-SHA1 (patch-al) = 3d48b2af0f8651b100b82044e267b4d81b6c2772
-SHA1 (patch-am) = 65fb052102c91991af9326defeac7c729ba560b5
-SHA1 (patch-an) = a6535dfdaceb41209261d729d8b8c2da813149ea
-SHA1 (patch-ao) = 5dde6860125272f0687f5156485f3d1f43f6d93b
-SHA1 (patch-ap) = f7d23b584a9ea29cf62abf6a1a2e19e6ed120b34
-SHA1 (patch-aq) = 88b7c21c564fc817d615f3ae72fbc0dd517bc5f6
-SHA1 (patch-ar) = c2f139cc92e8a815345ae81e7cb57d2109ad4564
-SHA1 (patch-as) = ca88e0416999ad81098a41d041e51031092d2f4d
-SHA1 (patch-at) = 1fc5d51b90d282de9a8c2ed13ff85498167e98f3
-SHA1 (patch-au) = c34912b6d07acf95973426b352f55110c936a66f
-SHA1 (patch-av) = 218174e98f01ed8344aae44dcc28db77cc0fdc60
-SHA1 (patch-aw) = e77239863df8c89b9b1b3fc8b3f8569466a4e884
-SHA1 (patch-ax) = a93cc5271ff924d561b7d532dec280093637f42d
-SHA1 (patch-ay) = db7c5d05a28bb14fb351645de9426b34b659ed4b
-SHA1 (patch-az) = ba04f94a768c0c9d72f9810689c2f0c46e2e4e92
-SHA1 (patch-ba) = 7c292f358fca845c478dbedae88cafe2c9155c9c
-SHA1 (patch-bb) = 2b5b91418fdcbe36c17b4cb8f635846ca408b4eb
-SHA1 (patch-bc) = 49bf2469b6d22b190a7ed41f222ea80b8721e663
-SHA1 (patch-bd) = ac328bc7b7a5f3c9efa7530383710f253cae5c7f
+SHA1 (patch-.._dist_Makefile.am) = ebae821ce659df003f5f2043f754e325c0863aff
+SHA1 (patch-.._dist_configure.in) = 0834b7680d520937eb5a1503128ddb64297edadb
+SHA1 (patch-.._ex_ex__script.c) = ac745c0481718ed8c769fb43ee990152902fa54e
+SHA1 (patch-aa) = 2c0aed037da3860f6010e97de47c192f1575508b
+SHA1 (patch-ab) = a36357d5578fb7f05325891301c47f5416f00e90
+SHA1 (patch-ac) = 06c8da262250d0fb6783123cb081dfd69df6ea96
+SHA1 (patch-ad) = fea5ba6ceef11da3f35f248966c8a9911f6ad205
+SHA1 (patch-ae) = 9a7e121b5aa5786ff0d8cc95998aa3832ea996a5
+SHA1 (patch-af) = 35c106272fa184f7eb5a6f1e1db5e97d20186ea0
+SHA1 (patch-ag) = 3aeae4d24116b49fd34a96c9ba24e38fe49f62d2
+SHA1 (patch-ah) = 8a62c8c7140410982d83ccc20e62c1325794a287
+SHA1 (patch-ai) = 1083f5a7a50c818ad8f593ad57b4af248f573fd9
+SHA1 (patch-aj) = 3510e708046279950d91ff42883ea2eea98da71b
+SHA1 (patch-ak) = 4ec5ee3c1ba1e8599b19ac2762f636b9c625e1c5
+SHA1 (patch-al) = 4cf826551536e516ba4057efe2331a636f34befd
+SHA1 (patch-am) = 6df8b1db41291eb1c86bafc4733f540882d5dcc9
+SHA1 (patch-an) = 46b34fe7af11e7233aa2cd2453f0bef319db2be4
+SHA1 (patch-ao) = 21e744fbff5b28528b5061559fe949fd5a3cd958
+SHA1 (patch-ap) = 3d55b440c6df8ebeae27c7c5ad936ae04baa644c
+SHA1 (patch-aq) = 64d2631afafea1fcabb9e3f02be7965fcf6a69dd
+SHA1 (patch-ar) = 89df4c07c0834dea61db21ffee8017e6979e633d
+SHA1 (patch-as) = 8a35b69663b38cbfacd87611a052bbb652e6c4d1
+SHA1 (patch-at) = 4c0bbc37ea48364ebdba6badef1c6c3f4efe5be2
+SHA1 (patch-au) = e2e8e474b27e2ef2373e0650d06300a1634139fd
+SHA1 (patch-av) = d93bf60219c98824831c0a0fbf5bc98a2e6e4eda
+SHA1 (patch-aw) = 759f4f526bc67311db20818a5fb4d8f0583f069b
+SHA1 (patch-ax) = 990005c4f97dff9bd8ab3c9ab5f5b368bdb5f08c
+SHA1 (patch-ay) = 469a43094f14c777ae688df9930ceb12a29f436d
+SHA1 (patch-az) = 3b091fd1cf725460e9e446eefe1cb53338d753d9
+SHA1 (patch-ba) = 57edce2dafc630d7e948a5b528242bdcff334228
+SHA1 (patch-bb) = 5110c239cd1cc82cdd1eaeba6ceedb11ee797b26
+SHA1 (patch-bc) = 6ac8377ae6f2fc513c058c0bf7f5ad18e97141a8
+SHA1 (patch-bd) = 9a04f7a247fe6bf800469e81f7a83ffddd45b4b5
diff --git a/editors/nvi/patches/patch-.._dist_Makefile.am b/editors/nvi/patches/patch-.._dist_Makefile.am
index d4a035f5056..11d6b9526a1 100644
--- a/editors/nvi/patches/patch-.._dist_Makefile.am
+++ b/editors/nvi/patches/patch-.._dist_Makefile.am
@@ -1,7 +1,7 @@
-$NetBSD: patch-.._dist_Makefile.am,v 1.1 2012/05/22 05:55:59 joerg Exp $
+$NetBSD: patch-.._dist_Makefile.am,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../dist/Makefile.am.orig	2012-05-21 13:09:39.000000000 +0000
-+++ ../dist/Makefile.am
+--- dist/Makefile.am.orig	2012-05-21 13:09:39.000000000 +0000
++++ dist/Makefile.am
 @@ -242,7 +242,7 @@ vi_motif_LDADD = @MOTIFLIBS@ @LIBOBJS@
  vi_motif_CFLAGS = @XINCS@
  
diff --git a/editors/nvi/patches/patch-.._dist_configure.in b/editors/nvi/patches/patch-.._dist_configure.in
index 23788c0d959..e250e496d3b 100644
--- a/editors/nvi/patches/patch-.._dist_configure.in
+++ b/editors/nvi/patches/patch-.._dist_configure.in
@@ -1,8 +1,20 @@
-$NetBSD: patch-.._dist_configure.in,v 1.1 2011/12/26 01:54:39 sbd Exp $
+$NetBSD: patch-.._dist_configure.in,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../dist/configure.in.orig	2007-11-18 16:41:42.000000000 +0000
-+++ ../dist/configure.in
-@@ -787,6 +787,8 @@ if test "$vi_cv_gettimeofday" = broken;
+First chunk: automake-1.13 compat.
+Rest: ?
+
+--- dist/configure.in.orig	2007-11-18 16:41:42.000000000 +0000
++++ dist/configure.in
+@@ -4,7 +4,7 @@ dnl Process this file with autoconf to p
+ AC_INIT(../common/main.c)
+ AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE(vi, 1.81.6)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ dnl Configure setup.
+ AC_PROG_INSTALL()
+@@ -787,6 +787,8 @@ if test "$vi_cv_gettimeofday" = broken; 
  fi
  AC_MSG_RESULT($vi_cv_gettimeofday)
  
diff --git a/editors/nvi/patches/patch-.._ex_ex__script.c b/editors/nvi/patches/patch-.._ex_ex__script.c
index 1c0c12d6441..c0c3127f5f8 100644
--- a/editors/nvi/patches/patch-.._ex_ex__script.c
+++ b/editors/nvi/patches/patch-.._ex_ex__script.c
@@ -1,7 +1,7 @@
-$NetBSD: patch-.._ex_ex__script.c,v 1.1 2011/12/26 01:54:39 sbd Exp $
+$NetBSD: patch-.._ex_ex__script.c,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../ex/ex_script.c.orig	2007-11-18 16:41:42.000000000 +0000
-+++ ../ex/ex_script.c
+--- ex/ex_script.c.orig	2007-11-18 16:41:42.000000000 +0000
++++ ex/ex_script.c
 @@ -23,8 +23,10 @@ static const char sccsid[] = "$Id: ex_sc
  #include <sys/select.h>
  #endif
diff --git a/editors/nvi/patches/patch-aa b/editors/nvi/patches/patch-aa
index c3af045f01e..9c09cb4980d 100644
--- a/editors/nvi/patches/patch-aa
+++ b/editors/nvi/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2009/08/07 16:39:20 lukem Exp $
+$NetBSD: patch-aa,v 1.5 2013/01/23 17:26:07 wiz Exp $
 
 BDB 4.4 and up requires DB_CREATE or it will spew "DB_CREATE must be
 specified to create databases." when nvi edits a file.
 
---- ../common/db.h.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../common/db.h
+--- common/db.h.orig	2007-11-19 03:41:42.000000000 +1100
++++ common/db.h
 @@ -16,7 +16,10 @@
      (env)->remove(env, path, NULL, flags)
  #endif
diff --git a/editors/nvi/patches/patch-ab b/editors/nvi/patches/patch-ab
index 34e6ac88598..8c236249935 100644
--- a/editors/nvi/patches/patch-ab
+++ b/editors/nvi/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ab,v 1.4 2013/01/23 17:26:07 wiz Exp $
 
---- ../common/exf.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../common/exf.c
+--- common/exf.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ common/exf.c
 @@ -184,7 +184,7 @@ file_init(SCR *sp, FREF *frp, char *rcv_
  	CALLOC_RET(sp, ep, EXF *, 1, sizeof(EXF));
  	CIRCLEQ_INIT(&ep->scrq);
diff --git a/editors/nvi/patches/patch-ac b/editors/nvi/patches/patch-ac
index ec13931602b..5fb4c478d71 100644
--- a/editors/nvi/patches/patch-ac
+++ b/editors/nvi/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ac,v 1.4 2013/01/23 17:26:07 wiz Exp $
 
---- ../catalog/dutch.base.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../catalog/dutch.base
+--- catalog/dutch.base.orig	2007-11-19 03:41:42.000000000 +1100
++++ catalog/dutch.base
 @@ -43,8 +43,7 @@
  044 "De lisp optie is niet ondersteund"
  045 "messages niet uitgeschakeld: %s"
diff --git a/editors/nvi/patches/patch-ad b/editors/nvi/patches/patch-ad
index a4a103fca7d..5c60b6f1b98 100644
--- a/editors/nvi/patches/patch-ad
+++ b/editors/nvi/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ad,v 1.4 2013/01/23 17:26:07 wiz Exp $
 
---- ../catalog/french.base.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../catalog/french.base
+--- catalog/french.base.orig	2007-11-19 03:41:42.000000000 +1100
++++ catalog/french.base
 @@ -43,8 +43,7 @@
  044 "L'option lisp n'est pas implémentée"
  045 "Les messages ne sont pas désactivés : %s"
diff --git a/editors/nvi/patches/patch-ae b/editors/nvi/patches/patch-ae
index 05fe280a22b..c2e763bfef7 100644
--- a/editors/nvi/patches/patch-ae
+++ b/editors/nvi/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.5 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ae,v 1.6 2013/01/23 17:26:07 wiz Exp $
 
---- ../catalog/german.base.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../catalog/german.base
+--- catalog/german.base.orig	2007-11-19 03:41:42.000000000 +1100
++++ catalog/german.base
 @@ -43,8 +43,7 @@
  044 "Die lisp-Option ist nicht implementiert"
  045 "Meldungen nicht abgeschaltet: %s"
diff --git a/editors/nvi/patches/patch-af b/editors/nvi/patches/patch-af
index b8593a6cc3f..b19596e5063 100644
--- a/editors/nvi/patches/patch-af
+++ b/editors/nvi/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-af,v 1.4 2013/01/23 17:26:07 wiz Exp $
 
---- ../catalog/spanish.base.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../catalog/spanish.base
+--- catalog/spanish.base.orig	2007-11-19 03:41:42.000000000 +1100
++++ catalog/spanish.base
 @@ -43,8 +43,7 @@
  044 "La opci¢n lisp no est  implementada"
  045 "mensajes no desconectados: %s"
diff --git a/editors/nvi/patches/patch-ag b/editors/nvi/patches/patch-ag
index 24ba381100f..948efafe266 100644
--- a/editors/nvi/patches/patch-ag
+++ b/editors/nvi/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ag,v 1.4 2013/01/23 17:26:07 wiz Exp $
 
---- ../catalog/swedish.base.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../catalog/swedish.base
+--- catalog/swedish.base.orig	2007-11-19 03:41:42.000000000 +1100
++++ catalog/swedish.base
 @@ -43,8 +43,7 @@
  044 "Lisp flaggan är inte implementerad"
  045 "meddelanden är inte avslagna: %s"
diff --git a/editors/nvi/patches/patch-ah b/editors/nvi/patches/patch-ah
index 40385b2916c..66b56672cc3 100644
--- a/editors/nvi/patches/patch-ah
+++ b/editors/nvi/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.3 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ah,v 1.4 2013/01/23 17:26:07 wiz Exp $
 
---- ../common/options.awk.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../common/options.awk
+--- common/options.awk.orig	2007-11-19 03:41:42.000000000 +1100
++++ common/options.awk
 @@ -2,6 +2,18 @@
   
  /^\/\* O_[0-9A-Z_]*/ {
diff --git a/editors/nvi/patches/patch-ai b/editors/nvi/patches/patch-ai
index d2da35ddd56..4fcce3c95e3 100644
--- a/editors/nvi/patches/patch-ai
+++ b/editors/nvi/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.3 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ai,v 1.4 2013/01/23 17:26:07 wiz Exp $
 
---- ../common/options.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../common/options.c
+--- common/options.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ common/options.c
 @@ -48,6 +48,8 @@ static int	 	 opts_print __P((SCR *, OPT
   *
   * HPUX noted options and abbreviations are from "The Ultimate Guide to the
diff --git a/editors/nvi/patches/patch-aj b/editors/nvi/patches/patch-aj
index ccff4b1ec9f..105a3f93fa3 100644
--- a/editors/nvi/patches/patch-aj
+++ b/editors/nvi/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.3 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-aj,v 1.4 2013/01/23 17:26:07 wiz Exp $
 
---- ../common/options.h.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../common/options.h
+--- common/options.h.orig	2007-11-19 03:41:42.000000000 +1100
++++ common/options.h
 @@ -89,6 +89,7 @@ struct _optlist {
  #define	OPT_NOSET	0x010		/* Option may not be set. */
  #define	OPT_NOUNSET	0x020		/* Option may not be unset. */
diff --git a/editors/nvi/patches/patch-ak b/editors/nvi/patches/patch-ak
index 988cae610f5..19f8141036e 100644
--- a/editors/nvi/patches/patch-ak
+++ b/editors/nvi/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.3 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ak,v 1.4 2013/01/23 17:26:07 wiz Exp $
 
---- ../common/options_def.h.orig	2007-11-19 03:43:54.000000000 +1100
-+++ ../common/options_def.h
+--- common/options_def.h.orig	2007-11-19 03:43:54.000000000 +1100
++++ common/options_def.h
 @@ -1,4 +1,3 @@
 -/* Do not edit: automatically built by build/distrib. */
  #define O_ALTWERASE 0
diff --git a/editors/nvi/patches/patch-al b/editors/nvi/patches/patch-al
index e7fcaad25ac..936ddcdad5b 100644
--- a/editors/nvi/patches/patch-al
+++ b/editors/nvi/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-al,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../common/options_f.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../common/options_f.c
+--- common/options_f.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ common/options_f.c
 @@ -60,7 +60,7 @@ f_columns(SCR *sp, OPTION *op, char *str
  	 * number of lines/columns for the screen, but at least we don't drop
  	 * core.
diff --git a/editors/nvi/patches/patch-am b/editors/nvi/patches/patch-am
index 0f2751cbb06..528293f1482 100644
--- a/editors/nvi/patches/patch-am
+++ b/editors/nvi/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-am,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../docs/vi.man/vi.1.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../docs/vi.man/vi.1
+--- docs/vi.man/vi.1.orig	2007-11-19 03:41:42.000000000 +1100
++++ docs/vi.man/vi.1
 @@ -17,7 +17,7 @@ ex, vi, view \- text editors
  .SH SYNOPSIS
  .B ex
diff --git a/editors/nvi/patches/patch-an b/editors/nvi/patches/patch-an
index d325441868a..818f544be1b 100644
--- a/editors/nvi/patches/patch-an
+++ b/editors/nvi/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-an,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../docs/vi.ref/set.opt.texi.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../docs/vi.ref/set.opt.texi
+--- docs/vi.ref/set.opt.texi.orig	2007-11-19 03:41:42.000000000 +1100
++++ docs/vi.ref/set.opt.texi
 @@ -97,7 +97,10 @@ the first nonblank character of the line
  Lines are indented using tab characters to the extent possible (based on
  the value of the
diff --git a/editors/nvi/patches/patch-ao b/editors/nvi/patches/patch-ao
index 33a95e94bab..7c367e2bee7 100644
--- a/editors/nvi/patches/patch-ao
+++ b/editors/nvi/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ao,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../docs/vi.ref/vi.cmd.texi.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../docs/vi.ref/vi.cmd.texi
+--- docs/vi.ref/vi.cmd.texi.orig	2007-11-19 03:41:42.000000000 +1100
++++ docs/vi.ref/vi.cmd.texi
 @@ -1044,13 +1044,23 @@ None.
  @deftypefn Command {} {%}
  
diff --git a/editors/nvi/patches/patch-ap b/editors/nvi/patches/patch-ap
index 26e1b8ab72e..4b40cf0726b 100644
--- a/editors/nvi/patches/patch-ap
+++ b/editors/nvi/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ap,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../vi/v_match.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../vi/v_match.c
+--- vi/v_match.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ vi/v_match.c
 @@ -39,6 +39,19 @@ v_match(SCR *sp, VICMD *vp)
  	size_t cno, len, off;
  	int cnt, isempty, matchc, startc, (*gc)__P((SCR *, VCS *));
diff --git a/editors/nvi/patches/patch-aq b/editors/nvi/patches/patch-aq
index 60da9e2179b..8a3ab8b448b 100644
--- a/editors/nvi/patches/patch-aq
+++ b/editors/nvi/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-aq,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../common/main.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../common/main.c
+--- common/main.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ common/main.c
 @@ -62,6 +62,7 @@ editor(WIN *wp, int argc, char **argv)
  	size_t len;
  	u_int flags;
diff --git a/editors/nvi/patches/patch-ar b/editors/nvi/patches/patch-ar
index 1e6749e029f..a83d9bc9031 100644
--- a/editors/nvi/patches/patch-ar
+++ b/editors/nvi/patches/patch-ar
@@ -1,7 +1,7 @@
-$NetBSD: patch-ar,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ar,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../ex/ex.h.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../ex/ex.h
+--- ex/ex.h.orig	2007-11-19 03:41:42.000000000 +1100
++++ ex/ex.h
 @@ -152,6 +152,7 @@ struct _excmd {
  #define	E_SEARCH_WMSG	0x01000000	/* Display search-wrapped message. */
  #define	E_USELASTCMD	0x02000000	/* Use the last command. */
diff --git a/editors/nvi/patches/patch-as b/editors/nvi/patches/patch-as
index d748863c0de..afeb2b75eb7 100644
--- a/editors/nvi/patches/patch-as
+++ b/editors/nvi/patches/patch-as
@@ -1,7 +1,7 @@
-$NetBSD: patch-as,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-as,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../ex/ex_cmd.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../ex/ex_cmd.c
+--- ex/ex_cmd.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ ex/ex_cmd.c
 @@ -302,6 +302,11 @@ EXCMDLIST const cmds[] = {
  	    "!",
  	    "rew[ind][!]",
diff --git a/editors/nvi/patches/patch-at b/editors/nvi/patches/patch-at
index e7a011e60e7..7122fc9d481 100644
--- a/editors/nvi/patches/patch-at
+++ b/editors/nvi/patches/patch-at
@@ -1,7 +1,7 @@
-$NetBSD: patch-at,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-at,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../ex/ex_def.h.orig	2007-11-19 03:43:54.000000000 +1100
-+++ ../ex/ex_def.h
+--- ex/ex_def.h.orig	2007-11-19 03:43:54.000000000 +1100
++++ ex/ex_def.h
 @@ -48,33 +48,34 @@
  #define C_RECOVER 46
  #define C_RESIZE 47
diff --git a/editors/nvi/patches/patch-au b/editors/nvi/patches/patch-au
index 18491a35cc7..83a7a3d6459 100644
--- a/editors/nvi/patches/patch-au
+++ b/editors/nvi/patches/patch-au
@@ -1,7 +1,7 @@
-$NetBSD: patch-au,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-au,v 1.2 2013/01/23 17:26:07 wiz Exp $
 
---- ../ex/ex_tag.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../ex/ex_tag.c
+--- ex/ex_tag.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ ex/ex_tag.c
 @@ -46,6 +46,8 @@ static char	*binary_search __P((char *, 
  static int	 compare __P((char *, char *, char *));
  static void	 ctag_file __P((SCR *, TAGF *, char *, char **, size_t *));
diff --git a/editors/nvi/patches/patch-av b/editors/nvi/patches/patch-av
index 057f1349a21..017ac821858 100644
--- a/editors/nvi/patches/patch-av
+++ b/editors/nvi/patches/patch-av
@@ -1,7 +1,7 @@
-$NetBSD: patch-av,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-av,v 1.2 2013/01/23 17:26:08 wiz Exp $
 
---- ../ex/extern.h.orig	2007-11-19 03:43:54.000000000 +1100
-+++ ../ex/extern.h
+--- ex/extern.h.orig	2007-11-19 03:43:54.000000000 +1100
++++ ex/extern.h
 @@ -91,6 +91,7 @@ int re_compile __P((SCR *,
      CHAR_T *, size_t, CHAR_T **, size_t *, regex_t *, u_int));
  void re_error __P((SCR *, int, regex_t *));
diff --git a/editors/nvi/patches/patch-aw b/editors/nvi/patches/patch-aw
index 28268a086d1..02eb2f983d1 100644
--- a/editors/nvi/patches/patch-aw
+++ b/editors/nvi/patches/patch-aw
@@ -1,7 +1,7 @@
-$NetBSD: patch-aw,v 1.2 2009/08/16 08:34:34 lukem Exp $
+$NetBSD: patch-aw,v 1.3 2013/01/23 17:26:08 wiz Exp $
 
---- ../vi/v_ex.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../vi/v_ex.c
+--- vi/v_ex.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ vi/v_ex.c
 @@ -209,6 +209,9 @@ v_tagpush(SCR *sp, VICMD *vp)
  {
  	EXCMD cmd;
diff --git a/editors/nvi/patches/patch-ax b/editors/nvi/patches/patch-ax
index 52f219dde9e..216386e8b6f 100644
--- a/editors/nvi/patches/patch-ax
+++ b/editors/nvi/patches/patch-ax
@@ -1,7 +1,7 @@
-$NetBSD: patch-ax,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ax,v 1.2 2013/01/23 17:26:08 wiz Exp $
 
---- ../ex/ex_shift.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../ex/ex_shift.c
+--- ex/ex_shift.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ ex/ex_shift.c
 @@ -131,10 +131,13 @@ shift(SCR *sp, EXCMD *cmdp, enum which r
  		 * Build a new indent string and count the number of
  		 * characters it uses.
diff --git a/editors/nvi/patches/patch-ay b/editors/nvi/patches/patch-ay
index bf1b6bd6e3b..6055d9a614b 100644
--- a/editors/nvi/patches/patch-ay
+++ b/editors/nvi/patches/patch-ay
@@ -1,7 +1,7 @@
-$NetBSD: patch-ay,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ay,v 1.2 2013/01/23 17:26:08 wiz Exp $
 
---- ../ex/ex_txt.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../ex/ex_txt.c
+--- ex/ex_txt.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ ex/ex_txt.c
 @@ -403,8 +403,12 @@ txt_dent(SCR *sp, TEXT *tp)
  	 *
  	 * Count up spaces/tabs needed to get to the target.
diff --git a/editors/nvi/patches/patch-az b/editors/nvi/patches/patch-az
index 00b01cfa370..de418c43847 100644
--- a/editors/nvi/patches/patch-az
+++ b/editors/nvi/patches/patch-az
@@ -1,7 +1,7 @@
-$NetBSD: patch-az,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-az,v 1.2 2013/01/23 17:26:08 wiz Exp $
 
---- ../vi/v_txt.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../vi/v_txt.c
+--- vi/v_txt.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ vi/v_txt.c
 @@ -948,7 +948,7 @@ k_escape:	LINE_RESOLVE;
  
  		switch (carat) {
diff --git a/editors/nvi/patches/patch-ba b/editors/nvi/patches/patch-ba
index 9530b9c57da..f7c05af29af 100644
--- a/editors/nvi/patches/patch-ba
+++ b/editors/nvi/patches/patch-ba
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.2 2009/08/16 08:34:34 lukem Exp $
+$NetBSD: patch-ba,v 1.3 2013/01/23 17:26:08 wiz Exp $
 
---- ../ex/version.h.orig	2007-11-19 03:43:55.000000000 +1100
-+++ ../ex/version.h
+--- ex/version.h.orig	2007-11-19 03:43:55.000000000 +1100
++++ ex/version.h
 @@ -1 +1 @@
 -#define VI_VERSION "nvi-1.81.6 (2007-11-18)"
 +#define VI_VERSION "nvi-1.81.6nb5 (2009-08-11)"
diff --git a/editors/nvi/patches/patch-bb b/editors/nvi/patches/patch-bb
index d016aa21c61..38a50f6bd00 100644
--- a/editors/nvi/patches/patch-bb
+++ b/editors/nvi/patches/patch-bb
@@ -1,7 +1,7 @@
-$NetBSD: patch-bb,v 1.1 2009/08/16 08:34:34 lukem Exp $
+$NetBSD: patch-bb,v 1.2 2013/01/23 17:26:08 wiz Exp $
 
---- ../common/multibyte.h.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../common/multibyte.h
+--- common/multibyte.h.orig	2007-11-19 03:41:42.000000000 +1100
++++ common/multibyte.h
 @@ -20,6 +20,7 @@ typedef	u_int		UCHAR_T;
  #define STRPBRK		wcspbrk
  #define TOUPPER		towupper
diff --git a/editors/nvi/patches/patch-bc b/editors/nvi/patches/patch-bc
index fd56ec824e8..036bdaf9114 100644
--- a/editors/nvi/patches/patch-bc
+++ b/editors/nvi/patches/patch-bc
@@ -1,7 +1,7 @@
-$NetBSD: patch-bc,v 1.1 2009/08/16 08:34:34 lukem Exp $
+$NetBSD: patch-bc,v 1.2 2013/01/23 17:26:08 wiz Exp $
 
---- ../vi/v_increment.c.orig	2007-11-19 03:41:42.000000000 +1100
-+++ ../vi/v_increment.c
+--- vi/v_increment.c.orig	2007-11-19 03:41:42.000000000 +1100
++++ vi/v_increment.c
 @@ -1,5 +1,5 @@
  /*-
 - * Copyright (c) 1992, 1993, 1994
diff --git a/editors/nvi/patches/patch-bd b/editors/nvi/patches/patch-bd
index 13794ca42e1..1a971af2eda 100644
--- a/editors/nvi/patches/patch-bd
+++ b/editors/nvi/patches/patch-bd
@@ -1,7 +1,7 @@
-$NetBSD: patch-bd,v 1.2 2012/03/26 14:00:40 joerg Exp $
+$NetBSD: patch-bd,v 1.3 2013/01/23 17:26:08 wiz Exp $
 
---- ../dist/Makefile.in.orig	2010-06-01 08:47:30.000000000 +0000
-+++ ../dist/Makefile.in
+--- dist/Makefile.in.orig	2010-06-01 08:47:30.000000000 +0000
++++ dist/Makefile.in
 @@ -165,7 +165,7 @@ AUTOMAKE = @AUTOMAKE@
  AWK = @AWK@
  CC = @CC@