[pkgsrc/trunk]: pkgsrc/editors/nvi-m17n nvi-m17n: successfully detect file en...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/03094057a7e4
branches:  trunk
changeset: 356909:03094057a7e4
user:      maya <maya%pkgsrc.org@localhost>
date:      Sat Jan 07 19:00:55 2017 +0000

description:
nvi-m17n: successfully detect file encoding also in the case where more
than one encoding matches, by comparing with 'and bitmask' rather than
equality to bitmask.

Bump PKGREVISION for functional change.

Patch from Yasuhito FUTATSUKI in PR pkg/51792

diffstat:

 editors/nvi-m17n/Makefile                         |   4 ++--
 editors/nvi-m17n/distinfo                         |   3 ++-
 editors/nvi-m17n/patches/patch-common_multibyte.c |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r 480b0772a55f -r 03094057a7e4 editors/nvi-m17n/Makefile
--- a/editors/nvi-m17n/Makefile Sat Jan 07 18:49:16 2017 +0000
+++ b/editors/nvi-m17n/Makefile Sat Jan 07 19:00:55 2017 +0000
@@ -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 -r 480b0772a55f -r 03094057a7e4 editors/nvi-m17n/distinfo
--- a/editors/nvi-m17n/distinfo Sat Jan 07 18:49:16 2017 +0000
+++ b/editors/nvi-m17n/distinfo Sat Jan 07 19:00:55 2017 +0000
@@ -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-aj) = bc8698e2d12a88fe7024d38188723cb058ab240a
 SHA1 (patch-ak) = 2c5069a892a5204fcd3a607e6b383e8a503092f8
 SHA1 (patch-al) = 96a625d1eb906390beca232b129711b869ab3026
+SHA1 (patch-common_multibyte.c) = 111259c43679b474145c71989ac62aebe1b282d2
 SHA1 (patch-regex_regex2.h) = c9f6f28b8b7cc1d4515edcae07ff0b5c011c3a9e
diff -r 480b0772a55f -r 03094057a7e4 editors/nvi-m17n/patches/patch-common_multibyte.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi-m17n/patches/patch-common_multibyte.c Sat Jan 07 19:00:55 2017 +0000
@@ -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];
+               }
+       }