CVS commit: pkgsrc/editors/nvi-m17n

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Jan  7 19:00:55 UTC 2017

Modified Files:
        pkgsrc/editors/nvi-m17n: Makefile distinfo
Added Files:
        pkgsrc/editors/nvi-m17n/patches: patch-common_multibyte.c

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/editors/nvi-m17n/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/editors/nvi-m17n/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/nvi-m17n/patches/patch-common_multibyte.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/nvi-m17n/Makefile
diff -u pkgsrc/editors/nvi-m17n/Makefile:1.53 pkgsrc/editors/nvi-m17n/Makefile:1.54
--- pkgsrc/editors/nvi-m17n/Makefile:1.53       Sat Jul  9 06:38:15 2016
+++ pkgsrc/editors/nvi-m17n/Makefile    Sat Jan  7 19:00:55 2017
@@ -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/
 

Index: pkgsrc/editors/nvi-m17n/distinfo
diff -u pkgsrc/editors/nvi-m17n/distinfo:1.14 pkgsrc/editors/nvi-m17n/distinfo:1.15
--- pkgsrc/editors/nvi-m17n/distinfo:1.14       Tue Nov  3 03:32:19 2015
+++ pkgsrc/editors/nvi-m17n/distinfo    Sat Jan  7 19:00:55 2017
@@ -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) = a6da171a13f01615ad4c83
 SHA1 (patch-aj) = bc8698e2d12a88fe7024d38188723cb058ab240a
 SHA1 (patch-ak) = 2c5069a892a5204fcd3a607e6b383e8a503092f8
 SHA1 (patch-al) = 96a625d1eb906390beca232b129711b869ab3026
+SHA1 (patch-common_multibyte.c) = 111259c43679b474145c71989ac62aebe1b282d2
 SHA1 (patch-regex_regex2.h) = c9f6f28b8b7cc1d4515edcae07ff0b5c011c3a9e

Added files:

Index: pkgsrc/editors/nvi-m17n/patches/patch-common_multibyte.c
diff -u /dev/null pkgsrc/editors/nvi-m17n/patches/patch-common_multibyte.c:1.1
--- /dev/null   Sat Jan  7 19:00:55 2017
+++ pkgsrc/editors/nvi-m17n/patches/patch-common_multibyte.c    Sat Jan  7 19:00:55 2017
@@ -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];
+               }
+       }