summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/nvi-m17n/Makefile4
-rw-r--r--editors/nvi-m17n/distinfo3
-rw-r--r--editors/nvi-m17n/patches/patch-common_multibyte.c15
3 files changed, 19 insertions, 3 deletions
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index fa9f78f1616..c204d9bf187 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2016/07/09 06:38:15 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2017/01/07 19:00:55 maya Exp $
DISTNAME= nvi-1.79
PKGNAME= nvi-m17n-1.79.20040608
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= editors
MASTER_SITES= http://www.bostic.com/files/
diff --git a/editors/nvi-m17n/distinfo b/editors/nvi-m17n/distinfo
index 4de702c5e00..218b1b46d21 100644
--- a/editors/nvi-m17n/distinfo
+++ b/editors/nvi-m17n/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2015/11/03 03:32:19 agc Exp $
+$NetBSD: distinfo,v 1.15 2017/01/07 19:00:55 maya Exp $
SHA1 (nvi-1.79.tar.gz) = 65b49768783372609278ecedd63caa8c1547aa2a
RMD160 (nvi-1.79.tar.gz) = 1c39d480e0d30a87fc061c3219354b50011a8621
@@ -20,4 +20,5 @@ SHA1 (patch-ai) = a6da171a13f01615ad4c831aad8c26ea9d2ed315
SHA1 (patch-aj) = bc8698e2d12a88fe7024d38188723cb058ab240a
SHA1 (patch-ak) = 2c5069a892a5204fcd3a607e6b383e8a503092f8
SHA1 (patch-al) = 96a625d1eb906390beca232b129711b869ab3026
+SHA1 (patch-common_multibyte.c) = 111259c43679b474145c71989ac62aebe1b282d2
SHA1 (patch-regex_regex2.h) = c9f6f28b8b7cc1d4515edcae07ff0b5c011c3a9e
diff --git a/editors/nvi-m17n/patches/patch-common_multibyte.c b/editors/nvi-m17n/patches/patch-common_multibyte.c
new file mode 100644
index 00000000000..504487b9e40
--- /dev/null
+++ b/editors/nvi-m17n/patches/patch-common_multibyte.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_multibyte.c,v 1.1 2017/01/07 19:00:55 maya Exp $
+
+Match an encoding in the case where more than one encoding works.
+
+--- common/multibyte.c.orig 2017-01-07 18:20:05.869132249 +0000
++++ common/multibyte.c
+@@ -1455,7 +1455,7 @@ multi_predict_region(sp, mstart, mend, e
+ return ename;
+
+ for (i = 0; i < maxfunc; i++) {
+- if (maybe == (1 << i))
++ if (maybe & (1 << i))
+ return dt->name[i];
+ }
+ }