CVS commit: pkgsrc/textproc/uni2ascii

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb 19 15:19:19 UTC 2026

Modified Files:
        pkgsrc/textproc/uni2ascii: Makefile distinfo
Added Files:
        pkgsrc/textproc/uni2ascii/patches: patch-enttbl.c patch-uni2ascii.c

Log Message:
uni2ascii: update to 4.20.

Provided by Bartosz Kuzma in PR 60017.

2022-08-21  Bill Poser  <poser@khunekyaz>
        * uni2ascii.c:
        Fixed bug in which in certain formats input from stdin worked
        input directly from a file caused a hang.

2013-08-18  Bill Poser  <poser@khunekyaz>
        * uni2ascii.c (ExpandToAscii):
        Added expansion of trademark sign U+2122 -> (tm)

2011-08-24  Bill Poser  <poser@khunekcho>
        * ascii2uni.c (main):
        Fixed bug in handling of L (WWW) format. \uXXXX is now handled correctly
        even if immediately followed by a possible hex digit. \U
        followed by fewer than 8 hex digits is not treated as an escape.
        A warning is issued if the \U format encodes a character within
        the BMP.

2011-07-01  Bill Poser  <poser@khunekcho>
        * uni2ascii.c (ShowUsage):
        Added -A flag to usage message.

2011-06-30  Bill Poser  <poser@khunekcho>
        * uni2ascii.c (AscifyEquiv):
        Added conversion of U+2032 prime to single quote.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/uni2ascii/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/uni2ascii/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/uni2ascii/patches/patch-enttbl.c \
    pkgsrc/textproc/uni2ascii/patches/patch-uni2ascii.c

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

Modified files:

Index: pkgsrc/textproc/uni2ascii/Makefile
diff -u pkgsrc/textproc/uni2ascii/Makefile:1.5 pkgsrc/textproc/uni2ascii/Makefile:1.6
--- pkgsrc/textproc/uni2ascii/Makefile:1.5      Sun Jan 26 17:32:18 2020
+++ pkgsrc/textproc/uni2ascii/Makefile  Thu Feb 19 15:19:19 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2020/01/26 17:32:18 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2026/02/19 15:19:19 wiz Exp $
 #
 
-DISTNAME=      uni2ascii-4.18
+DISTNAME=      uni2ascii-4.20
 CATEGORIES=    textproc
 MASTER_SITES=  http://billposer.org/Software/Downloads/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/textproc/uni2ascii/distinfo
diff -u pkgsrc/textproc/uni2ascii/distinfo:1.6 pkgsrc/textproc/uni2ascii/distinfo:1.7
--- pkgsrc/textproc/uni2ascii/distinfo:1.6      Tue Oct 26 11:23:37 2021
+++ pkgsrc/textproc/uni2ascii/distinfo  Thu Feb 19 15:19:19 2026
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:23:37 nia Exp $
+$NetBSD: distinfo,v 1.7 2026/02/19 15:19:19 wiz Exp $
 
-BLAKE2s (uni2ascii-4.18.tar.bz2) = daca3d826ea59745e5dc2830a8f63d25bd19104b3729aeeb893c85c5ebfe698a
-SHA512 (uni2ascii-4.18.tar.bz2) = 7ec94576b4ad794e3d4a080551b0cbed8c4e9084eda6505bb5974c06f2e043ba20d293abed5b744fb1abff7897b4719ca2b43e5214dbd897ea44dfae8778eb21
-Size (uni2ascii-4.18.tar.bz2) = 127125 bytes
+BLAKE2s (uni2ascii-4.20.tar.bz2) = 6daaac9d59206b9851dabe2d201dab5ef8ae264780fbe8b91300bca0fa428c0c
+SHA512 (uni2ascii-4.20.tar.bz2) = fca5251ef8ab6817d602f2049113d362dbac3b01cda98cc0fe2831f5502d77599659898b1f4fcfc7f29cb274ef7cc2d05568589ab0cde2c3eb11192de27c45c9
+Size (uni2ascii-4.20.tar.bz2) = 166554 bytes
+SHA1 (patch-enttbl.c) = eb11bceb8fc438d3ed41b8c1994823077ebc77b8
+SHA1 (patch-uni2ascii.c) = 30592178afd96088c7889bbb3fee1dfa1356417b

Added files:

Index: pkgsrc/textproc/uni2ascii/patches/patch-enttbl.c
diff -u /dev/null pkgsrc/textproc/uni2ascii/patches/patch-enttbl.c:1.1
--- /dev/null   Thu Feb 19 15:19:19 2026
+++ pkgsrc/textproc/uni2ascii/patches/patch-enttbl.c    Thu Feb 19 15:19:19 2026
@@ -0,0 +1,12 @@
+$NetBSD: patch-enttbl.c,v 1.1 2026/02/19 15:19:19 wiz Exp $
+
+--- enttbl.c.orig      2026-02-19 15:02:51.405490605 +0000
++++ enttbl.c
+@@ -21,6 +21,7 @@
+ #include "config.h"
+ #include <stdlib.h>
+ #include "unicode.h"
++#include <string.h>
+ 
+ struct ent {
+   char *name;
Index: pkgsrc/textproc/uni2ascii/patches/patch-uni2ascii.c
diff -u /dev/null pkgsrc/textproc/uni2ascii/patches/patch-uni2ascii.c:1.1
--- /dev/null   Thu Feb 19 15:19:19 2026
+++ pkgsrc/textproc/uni2ascii/patches/patch-uni2ascii.c Thu Feb 19 15:19:19 2026
@@ -0,0 +1,30 @@
+$NetBSD: patch-uni2ascii.c,v 1.1 2026/02/19 15:19:19 wiz Exp $
+
+--- uni2ascii.c.orig   2026-02-19 15:03:42.107970203 +0000
++++ uni2ascii.c
+@@ -2689,7 +2689,7 @@ int SubsAvailable = 0;
+  * search may be advisable. For the time being we just do a linear search.
+  */
+ 
+-SubstituteChar(UTF32 c) {
++int SubstituteChar(UTF32 c) {
+   int i;
+   for(i = 0; i < SubCnt; i++) {
+     if(c == SubList[i].u) {
+@@ -2703,7 +2703,7 @@ SubstituteChar(UTF32 c) {
+   return 0;
+ }
+ 
+-AddCustomSubstitution(char *str){
++void AddCustomSubstitution(char *str){
+   char *Left;
+   char *Right;
+   char *Delim;
+@@ -2798,6 +2798,7 @@ int main (int ac, char *av[])
+   extern int optopt;
+   extern UTF32 UTF8in(int,int *,unsigned char **);
+ 
++  extern void putu8 (unsigned long);
+   extern int CountSlots(char *);
+   extern void ListFormatArguments(short);
+   extern void SetFormat(char *, int *, short *,int *, short *, short *);