Apply more fixes from NetBSD src/dist/nvi:

* Fix :ESC
* Fix #+ #- in multibyte configuration
* Update reported version to nvi-1.81.6nb5

Update package revisiion to nb5 to suite.

6 files changed, 109 insertions, 8 deletions

diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index c493f86ed7e..08fdf982415 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2009/08/07 16:39:20 lukem Exp $
+# $NetBSD: Makefile,v 1.38 2009/08/16 08:34:34 lukem Exp $
 #
 
 DISTNAME=	nvi-1.81.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/editors/nvi/distinfo b/editors/nvi/distinfo
index 74a7cff284a..9a28a9a4a16 100644
--- a/editors/nvi/distinfo
+++ b/editors/nvi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/08/07 16:39:20 lukem Exp $
+$NetBSD: distinfo,v 1.12 2009/08/16 08:34:34 lukem Exp $
 
 SHA1 (nvi-1.81.6.tar.bz2) = d3445ed69166102735335a2ff60d092d9a9143c6
 RMD160 (nvi-1.81.6.tar.bz2) = 0db8568bea96392d9a027044177c60317c8ade36
@@ -25,8 +25,10 @@ SHA1 (patch-as) = ca88e0416999ad81098a41d041e51031092d2f4d
 SHA1 (patch-at) = 1fc5d51b90d282de9a8c2ed13ff85498167e98f3
 SHA1 (patch-au) = c34912b6d07acf95973426b352f55110c936a66f
 SHA1 (patch-av) = 218174e98f01ed8344aae44dcc28db77cc0fdc60
-SHA1 (patch-aw) = 678945c18fbbd9c5908aee4b1348ddfc2a3bda00
+SHA1 (patch-aw) = e77239863df8c89b9b1b3fc8b3f8569466a4e884
 SHA1 (patch-ax) = a93cc5271ff924d561b7d532dec280093637f42d
 SHA1 (patch-ay) = db7c5d05a28bb14fb351645de9426b34b659ed4b
 SHA1 (patch-az) = ba04f94a768c0c9d72f9810689c2f0c46e2e4e92
-SHA1 (patch-ba) = 3249565cb20d4b73acce2cc27945bddb0f9ab0da
+SHA1 (patch-ba) = 7c292f358fca845c478dbedae88cafe2c9155c9c
+SHA1 (patch-bb) = 2b5b91418fdcbe36c17b4cb8f635846ca408b4eb
+SHA1 (patch-bc) = 49bf2469b6d22b190a7ed41f222ea80b8721e663
diff --git a/editors/nvi/patches/patch-aw b/editors/nvi/patches/patch-aw
index 9e2fdd934a9..28268a086d1 100644
--- a/editors/nvi/patches/patch-aw
+++ b/editors/nvi/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-aw,v 1.2 2009/08/16 08:34:34 lukem Exp $
 
 --- ../vi/v_ex.c.orig	2007-11-19 03:41:42.000000000 +1100
 +++ ../vi/v_ex.c
@@ -12,3 +12,11 @@ $NetBSD: patch-aw,v 1.1 2009/08/07 16:39:21 lukem Exp $
  	ex_cinit(sp, &cmd, C_TAG, 0, OOBLNO, 0, 0);
  	argv_exp0(sp, &cmd, VIP(sp)->keyw, STRLEN(VIP(sp)->keyw) + 1);
  	return (v_exec_ex(sp, vp, &cmd));
+@@ -521,6 +524,7 @@ v_ecl(SCR *sp)
+ 
+ 	new->frp = wp->ccl_sp->frp;
+ 	new->frp->flags = sp->frp->flags;
++	new->conv = wp->ccl_sp->conv;
+ 
+ 	/* Move the cursor to the end. */
+ 	(void)db_last(new, &new->lno);
diff --git a/editors/nvi/patches/patch-ba b/editors/nvi/patches/patch-ba
index 596109dd703..9530b9c57da 100644
--- a/editors/nvi/patches/patch-ba
+++ b/editors/nvi/patches/patch-ba
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.1 2009/08/07 16:39:21 lukem Exp $
+$NetBSD: patch-ba,v 1.2 2009/08/16 08:34:34 lukem Exp $
 
 --- ../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.6nb4 (2009-08-07)"
++#define VI_VERSION "nvi-1.81.6nb5 (2009-08-11)"
diff --git a/editors/nvi/patches/patch-bb b/editors/nvi/patches/patch-bb
new file mode 100644
index 00000000000..d016aa21c61
--- /dev/null
+++ b/editors/nvi/patches/patch-bb
@@ -0,0 +1,20 @@
+$NetBSD: patch-bb,v 1.1 2009/08/16 08:34:34 lukem Exp $
+
+--- ../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
+ #define STRSET		wmemset
++#define STRCHR		wcschr
+ 
+ #define L(ch)		L ## ch
+ 
+@@ -39,6 +40,7 @@ typedef	u_char		UCHAR_T;
+ #define STRPBRK		strpbrk
+ #define TOUPPER		toupper
+ #define STRSET		memset
++#define STRCHR		strchr
+ 
+ #define L(ch)		ch
+ 
diff --git a/editors/nvi/patches/patch-bc b/editors/nvi/patches/patch-bc
new file mode 100644
index 00000000000..fd56ec824e8
--- /dev/null
+++ b/editors/nvi/patches/patch-bc
@@ -0,0 +1,71 @@
+$NetBSD: patch-bc,v 1.1 2009/08/16 08:34:34 lukem Exp $
+
+--- ../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
++
+  *	The Regents of the University of California.  All rights reserved.
+  * Copyright (c) 1992, 1993, 1994, 1995, 1996
+  *	Keith Bostic.  All rights reserved.
+@@ -28,17 +28,17 @@ static const char sccsid[] = "$Id: v_inc
+ #include "../common/common.h"
+ #include "vi.h"
+ 
+-static char * const fmt[] = {
++static CHAR_T * const fmt[] = {
+ #define	DEC	0
+-	"%ld",
++	L("%ld"),
+ #define	SDEC	1
+-	"%+ld",
++	L("%+ld"),
+ #define	HEXC	2
+-	"0X%0*lX",
++	L("0X%0*lX"),
+ #define	HEXL	3
+-	"0x%0*lx",
++	L("0x%0*lx"),
+ #define	OCTAL	4
+-	"%#0*lo",
++	L("%#0*lo"),
+ };
+ 
+ static void inc_err __P((SCR *, enum nresult));
+@@ -57,7 +57,7 @@ v_increment(SCR *sp, VICMD *vp)
+ 	long change, ltmp, lval;
+ 	size_t beg, blen, end, len, nlen, wlen;
+ 	int base, isempty, rval;
+-	char *ntype, nbuf[100];
++	CHAR_T *ntype, nbuf[100];
+ 	CHAR_T *bp, *p, *t;
+ 
+ 	/* Validate the operator. */
+@@ -99,7 +99,7 @@ v_increment(SCR *sp, VICMD *vp)
+ 	}
+ 
+ #undef	ishex
+-#define	ishex(c)	(isdigit(c) || strchr("abcdefABCDEF", c))
++#define	ishex(c)	(isdigit(c) || STRCHR(L("abcdefABCDEF"), c))
+ #undef	isoctal
+ #define	isoctal(c)	(isdigit(c) && (c) != '8' && (c) != '9')
+ 
+@@ -202,7 +202,7 @@ nonum:			msgq(sp, M_ERR, "181|Cursor not
+ 		/* If we cross 0, signed numbers lose their sign. */
+ 		if (lval == 0 && ntype == fmt[SDEC])
+ 			ntype = fmt[DEC];
+-		nlen = snprintf(nbuf, sizeof(nbuf), ntype, lval);
++		nlen = SPRINTF(nbuf, sizeof(nbuf), ntype, lval);
+ 	} else {
+ 		if ((nret = nget_uslong(sp, &ulval, t, NULL, base)) != NUM_OK)
+ 			goto err;
+@@ -224,7 +224,7 @@ nonum:			msgq(sp, M_ERR, "181|Cursor not
+ 		if (base == 16)
+ 			wlen -= 2;
+ 
+-		nlen = snprintf(nbuf, sizeof(nbuf), ntype, wlen, ulval);
++		nlen = SPRINTF(nbuf, sizeof(nbuf), ntype, wlen, ulval);
+ 	}
+ 
+ 	/* Build the new line. */