CVS commit: pkgsrc/textproc/texi2roff

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar 16 13:57:33 UTC 2026

Modified Files:
        pkgsrc/textproc/texi2roff: distinfo
        pkgsrc/textproc/texi2roff/patches: patch-af patch-aj

Log Message:
texi2roff: ANSIfy to build with newer gcc

(which no longer allows K&R-style behaviour)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/texi2roff/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/textproc/texi2roff/patches/patch-af \
    pkgsrc/textproc/texi2roff/patches/patch-aj

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

Modified files:

Index: pkgsrc/textproc/texi2roff/distinfo
diff -u pkgsrc/textproc/texi2roff/distinfo:1.6 pkgsrc/textproc/texi2roff/distinfo:1.7
--- pkgsrc/textproc/texi2roff/distinfo:1.6      Tue Oct 26 11:23:35 2021
+++ pkgsrc/textproc/texi2roff/distinfo  Mon Mar 16 13:57:32 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:23:35 nia Exp $
+$NetBSD: distinfo,v 1.7 2026/03/16 13:57:32 nia Exp $
 
 BLAKE2s (texi2roff-2.0.tar.gz) = 3c752f3cd45c05b49d34c428088c07a98e252aa581ef5e7a20d428c4441a927f
 SHA512 (texi2roff-2.0.tar.gz) = 749dc564c77c8429ca4fdd72f84ea15c959ae8c40e04f5b8eb5eb7c5d6813e433fa7655330ffef47539b133b659fba5e60734e1a0c89be6510f72119d332dcaf
@@ -8,9 +8,9 @@ SHA1 (patch-ab) = 51247760c874f5e90eda28
 SHA1 (patch-ac) = 00c26fae8707f2246767fb772ec2d54d97f50780
 SHA1 (patch-ad) = f41275060ea862a44b1c8dd2828ea0f2a2b4dbd0
 SHA1 (patch-ae) = e71ab16bbda0c9b9af874c4d8b98fc957f5c249b
-SHA1 (patch-af) = b5e249c70ffce47df4e0835d8b78b74221bb2e17
+SHA1 (patch-af) = edbfb2da7f89883f2fb122be8fc7855b7d984f33
 SHA1 (patch-ag) = 69433277dba428b693b92c0131baecf48a50ea8f
 SHA1 (patch-ah) = afd0be8af817268282ef019c4a8bd80da1496daa
 SHA1 (patch-ai) = 61f095c7d912d3b6f1789f9b7124e5d510e52b3c
-SHA1 (patch-aj) = b4109e2b7238f8c07236010fad97780e4eedf126
+SHA1 (patch-aj) = 0669c29a6ee1353d9a743c388e630f3c95bd067e
 SHA1 (patch-ak) = 09759964e9e35c78ce629832ff93246054be54b3

Index: pkgsrc/textproc/texi2roff/patches/patch-af
diff -u pkgsrc/textproc/texi2roff/patches/patch-af:1.1.1.1 pkgsrc/textproc/texi2roff/patches/patch-af:1.2
--- pkgsrc/textproc/texi2roff/patches/patch-af:1.1.1.1  Wed May 30 11:45:41 2001
+++ pkgsrc/textproc/texi2roff/patches/patch-af  Mon Mar 16 13:57:32 2026
@@ -1,9 +1,12 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/05/30 11:45:41 agc Exp $
+$NetBSD: patch-af,v 1.2 2026/03/16 13:57:32 nia Exp $
 
---- translate.c.orig   Mon May 28 11:39:14 2001
-+++ translate.c        Mon May 28 12:18:03 2001
-@@ -11,6 +11,10 @@
+--- translate.c.orig   1992-02-20 18:16:40.000000000 +0000
++++ translate.c
+@@ -9,8 +9,13 @@
+  */
+ 
  #include <stdio.h>
++#include <stdlib.h>
  #include "texi2roff.h"
  
 +#ifndef TDEBUG
@@ -13,7 +16,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/30 1
  extern int transparent;               /* -t flag: dont discard things    */
  int   displaylevel = 0;       /* nesting level of 'display' text */
  int   inmacroarg = NO;        /* protect roff macro args flag */
-@@ -78,6 +82,9 @@
+@@ -78,6 +83,9 @@ translate(in, inname)
  
      while (fgets(input, MAXLINELEN, in) != NULL) {
        ++linecount;
@@ -23,7 +26,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/30 1
        inp = input;
        *output = 0;
        if (*inp == '.')                /* protect leading '.' in input */
-@@ -118,13 +125,99 @@
+@@ -118,13 +126,99 @@ translate(in, inname)
  }
  
  /*
@@ -124,7 +127,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/30 1
      if (++stackptr == MAXDEPTH) {                                     \
        errormsg("stack overflow - commands nested too deeply", "");    \
        return NULL;                                                    \
-@@ -160,6 +253,13 @@
+@@ -160,6 +254,13 @@ char      *outstring;
      FILE          *fp;        /* for @include files */
      extern int            process();  /* for @include files */
  
@@ -138,7 +141,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/30 1
      if (init == NO) {
        (void) strcpy(fontstack[0], defaultfont);
        (void) strcpy(curfont, defaultfont);
-@@ -169,12 +269,17 @@
+@@ -169,12 +270,17 @@ char     *outstring;
      s = inp;
      if (stackptr > 0 && STREQ(token, stack[stackptr]->texend)) {
      /* have fetched closing token of current Texinfo command */
@@ -159,7 +162,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/30 1
            }
        }
        if (!discarding)
-@@ -209,6 +314,9 @@
+@@ -209,6 +315,9 @@ char       *outstring;
            return "";                  /* flush rest of line if any */
        }
      } else if (*token != '@') {       /* ordinary piece of text */
@@ -169,7 +172,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/30 1
        if (!discarding)
            (void) strcat(outstring, token);
        if (*token == '\n') {
-@@ -220,10 +328,23 @@
+@@ -220,10 +329,23 @@ char     *outstring;
            if (!discarding)
                errormsg("unrecognized Texinfo command ", token);
        } else {
@@ -195,7 +198,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/30 1
                break;
            case DISPLAY:
                ++displaylevel;
-@@ -249,6 +370,16 @@
+@@ -249,6 +371,16 @@ char      *outstring;
                if (!discarding && !transparent) {
                    discarding = YES;
                    discardlevel = stackptr;
@@ -212,7 +215,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/30 1
                }
                break;
            case ITEMIZING:
-@@ -277,8 +408,7 @@
+@@ -277,8 +409,7 @@ char       *outstring;
                break;
            case END:
                s = gettoken(eatwhitespace(s),tempstr);
@@ -222,7 +225,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/30 1
                break;
            case FOOTNOTE:
                PUSH(tptr);
-@@ -297,11 +427,56 @@
+@@ -297,11 +428,56 @@ char     *outstring;
                for (cp = tempstr; strchr(" \t\n",*s) == NULL; *cp++ = *s++)
                        ;
                *cp = '\0';
@@ -284,7 +287,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/30 1
                }
                break;
            default:
-@@ -406,6 +581,13 @@
+@@ -406,6 +582,13 @@ gettoken(s, token)
                ++s;
            break;
        case '@':
Index: pkgsrc/textproc/texi2roff/patches/patch-aj
diff -u pkgsrc/textproc/texi2roff/patches/patch-aj:1.1.1.1 pkgsrc/textproc/texi2roff/patches/patch-aj:1.2
--- pkgsrc/textproc/texi2roff/patches/patch-aj:1.1.1.1  Wed May 30 11:45:41 2001
+++ pkgsrc/textproc/texi2roff/patches/patch-aj  Mon Mar 16 13:57:32 2026
@@ -1,8 +1,29 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/05/30 11:45:41 agc Exp $
+$NetBSD: patch-aj,v 1.2 2026/03/16 13:57:32 nia Exp $
 
---- texi2roff.c.orig   Mon May 28 12:51:54 2001
-+++ texi2roff.c        Mon May 28 12:53:48 2001
-@@ -70,6 +70,9 @@
+--- texi2roff.c.orig   1992-05-06 20:13:22.000000000 +0000
++++ texi2roff.c
+@@ -9,6 +9,8 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #ifndef __TURBOC__
+ #include <sys/types.h>
+ #endif
+@@ -27,9 +29,8 @@ int transparent = NO;        /* for -t flag */
+  *    - initialize tables and other strings
+  *    - open files and pass them to process().
+  */
+-main(argc, argv)
+-int argc;
+-char *argv[];
++int
++main(int argc, char *argv[])
+ {
+     int c, errflg = 0;
+     FILE *in;
+@@ -70,6 +71,9 @@ char *argv[];
                case 'e':
                    macropkg = ME;
                    break;
@@ -12,7 +33,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2001/05/30 1
                default:
                    errflg++;
                    break;
-@@ -86,7 +89,7 @@
+@@ -86,7 +90,7 @@ char *argv[];
        }
      if (errflg) {
        (void) fprintf(stderr,