From c6c89520e670037f1561c487a5b705315ea730c9 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Sat, 12 Feb 2011 02:52:34 +0000
Subject: Add an patch to fix multibyte char search on 64bit environment.
 PR#42832 by Atsushi Onoe.

Bump PKGREVISION.
---
 editors/nvi-m17n/Makefile                     |  4 ++--
 editors/nvi-m17n/distinfo                     |  3 ++-
 editors/nvi-m17n/patches/patch-regex_regex2.h | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 editors/nvi-m17n/patches/patch-regex_regex2.h

(limited to 'editors')

diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index efbb2017554..0101c3946a1 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2010/03/03 09:18:14 obache Exp $
+# $NetBSD: Makefile,v 1.44 2011/02/12 02:52:34 obache Exp $
 
 DISTNAME=	nvi-1.79
 PKGNAME=	nvi-m17n-1.79.20040401
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.sleepycat.com/pub/ \
 		ftp://ftp.foretune.co.jp/pub/tools/nvi/
diff --git a/editors/nvi-m17n/distinfo b/editors/nvi-m17n/distinfo
index 926d200570a..8273fdfc13b 100644
--- a/editors/nvi-m17n/distinfo
+++ b/editors/nvi-m17n/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2007/01/18 16:52:34 joerg Exp $
+$NetBSD: distinfo,v 1.12 2011/02/12 02:52:34 obache Exp $
 
 SHA1 (nvi-1.79.m17n-20040401.diff.gz) = 10fa772dad4368727a7ddc740d85cdfda3062414
 RMD160 (nvi-1.79.m17n-20040401.diff.gz) = 1b1790448d38a4f92f3b2df5f6aa566f1d8efff0
@@ -18,3 +18,4 @@ SHA1 (patch-ai) = a6da171a13f01615ad4c831aad8c26ea9d2ed315
 SHA1 (patch-aj) = bc8698e2d12a88fe7024d38188723cb058ab240a
 SHA1 (patch-ak) = 2c5069a892a5204fcd3a607e6b383e8a503092f8
 SHA1 (patch-al) = 96a625d1eb906390beca232b129711b869ab3026
+SHA1 (patch-regex_regex2.h) = c9f6f28b8b7cc1d4515edcae07ff0b5c011c3a9e
diff --git a/editors/nvi-m17n/patches/patch-regex_regex2.h b/editors/nvi-m17n/patches/patch-regex_regex2.h
new file mode 100644
index 00000000000..37310873efe
--- /dev/null
+++ b/editors/nvi-m17n/patches/patch-regex_regex2.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-regex_regex2.h,v 1.1 2011/02/12 02:52:34 obache Exp $
+
+* PR#42832: Fixes for 64bit envronment
+
+--- regex/regex2.h.orig	2011-02-12 02:44:39.000000000 +0000
++++ regex/regex2.h
+@@ -80,8 +80,8 @@ typedef int sopno;
+ #define	OPRMASK	0xf8000000
+ #define	OPDMASK	0x07ffffff
+ #define	OPSHIFT	((unsigned)27)
+-#define	OP(n)	((n)&OPRMASK)
+-#define	OPND(n)	((n)&OPDMASK)
++#define	OP(n)	((unsigned)((n)&OPRMASK))
++#define	OPND(n)	((unsigned)((n)&OPDMASK))
+ #define	SOP(op, opnd)	((op)|(opnd))
+ /* operators			   meaning	operand			*/
+ /*						(back, fwd are offsets)	*/
-- 
cgit v1.2.3