pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/textproc/cawf
Module Name: pkgsrc
Committed By: nia
Date: Sun Mar 22 10:31:53 UTC 2026
Modified Files:
pkgsrc/textproc/cawf: distinfo
pkgsrc/textproc/cawf/patches: patch-aa
Added Files:
pkgsrc/textproc/cawf/patches: patch-bsfilt.c patch-cawf.c patch-expr.c
patch-macsup.c patch-string.c
Log Message:
cawf: Fix build with recent GCC
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/cawf/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/textproc/cawf/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/cawf/patches/patch-bsfilt.c \
pkgsrc/textproc/cawf/patches/patch-cawf.c \
pkgsrc/textproc/cawf/patches/patch-expr.c \
pkgsrc/textproc/cawf/patches/patch-macsup.c \
pkgsrc/textproc/cawf/patches/patch-string.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/cawf/distinfo
diff -u pkgsrc/textproc/cawf/distinfo:1.6 pkgsrc/textproc/cawf/distinfo:1.7
--- pkgsrc/textproc/cawf/distinfo:1.6 Tue Oct 26 11:21:46 2021
+++ pkgsrc/textproc/cawf/distinfo Sun Mar 22 10:31:53 2026
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:21:46 nia Exp $
+$NetBSD: distinfo,v 1.7 2026/03/22 10:31:53 nia Exp $
BLAKE2s (cawf-4.10/cawf.zip) = 4cf311409090f4d9894b8ceac57bc53f6c199f484bd09219566c8f5183c01db5
SHA512 (cawf-4.10/cawf.zip) = d36b6f0c6411c6d01f153d68044e693fa5d05f9145d56995fb656171fe1eb0402b6e2f8ea5f45bdce570b0993f42099dd8a051700904121b9df806562da82d07
Size (cawf-4.10/cawf.zip) = 287677 bytes
-SHA1 (patch-aa) = 21ff1ae5d3fb3a32cb855c2b4353ffbe62ebcd17
+SHA1 (patch-aa) = d305540447e96a6115f5570283ed1d0258eea599
SHA1 (patch-ab) = 52fa93c4903539f5cf56e2c904b7ffea3610899f
+SHA1 (patch-bsfilt.c) = aa7d48adadb234a6b61764155067d6075c3be6de
+SHA1 (patch-cawf.c) = d632e82b4c234ef5bd825cb57c3a24dc02060014
+SHA1 (patch-expr.c) = ffe12c124f475b4352593c38d80be8c1c95ea12f
+SHA1 (patch-macsup.c) = db14ec8a74e7cece0c2418fe108af8d64c2918f5
+SHA1 (patch-string.c) = aa5dcb75022d7633af6b7b8e8c560a2cd3380f29
Index: pkgsrc/textproc/cawf/patches/patch-aa
diff -u pkgsrc/textproc/cawf/patches/patch-aa:1.1.1.1 pkgsrc/textproc/cawf/patches/patch-aa:1.2
--- pkgsrc/textproc/cawf/patches/patch-aa:1.1.1.1 Thu Jan 20 17:59:13 2005
+++ pkgsrc/textproc/cawf/patches/patch-aa Sun Mar 22 10:31:53 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/20 17:59:13 tv Exp $
+$NetBSD: patch-aa,v 1.2 2026/03/22 10:31:53 nia Exp $
---- Makefile.orig 2005-01-20 12:32:21.000000000 -0500
+--- Makefile.orig 1997-02-22 08:26:18.000000000 +0000
+++ Makefile
-@@ -34,10 +34,6 @@
+@@ -34,25 +34,21 @@
#
#DEFS = -DUNIX -DMALLOCH
@@ -12,8 +12,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/01/20 1
-
HDR = ansi.h cawf.h cawflib.h proto.h regexp.h regmagic.h
- SRC = cawf.c device.c error.c expand.c expr.c getopt.c macsup.c nreq.c \
-@@ -49,10 +45,10 @@ OBJ = cawf.o device.o error.o expand.o e
+-SRC = cawf.c device.c error.c expand.c expr.c getopt.c macsup.c nreq.c \
++SRC = cawf.c device.c error.c expand.c expr.c macsup.c nreq.c \
+ output.c pass2.c pass3.c regerror.c regexp.c store.c string.c
+
+-OBJ = cawf.o device.o error.o expand.o expr.o getopt.o macsup.o nreq.o \
++OBJ = cawf.o device.o error.o expand.o expr.o macsup.o nreq.o \
+ output.o pass2.o pass3.o regerror.o regexp.o store.o string.o
+
all: bsfilt cawf
bsfilt: bsfilt.c
Added files:
Index: pkgsrc/textproc/cawf/patches/patch-bsfilt.c
diff -u /dev/null pkgsrc/textproc/cawf/patches/patch-bsfilt.c:1.1
--- /dev/null Sun Mar 22 10:31:53 2026
+++ pkgsrc/textproc/cawf/patches/patch-bsfilt.c Sun Mar 22 10:31:53 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-bsfilt.c,v 1.1 2026/03/22 10:31:53 nia Exp $
+
+Modern GCC no longer likes implicit int.
+
+--- bsfilt.c.orig 2026-03-22 10:00:27.919793184 +0000
++++ bsfilt.c
+@@ -59,6 +59,7 @@ int Ulx = 0; /* underline buffer inde
+
+ _PROTOTYPE(void Putchar,(int ch));
+
++int
+ main(argc, argv)
+ int argc;
+ char *argv[];
Index: pkgsrc/textproc/cawf/patches/patch-cawf.c
diff -u /dev/null pkgsrc/textproc/cawf/patches/patch-cawf.c:1.1
--- /dev/null Sun Mar 22 10:31:53 2026
+++ pkgsrc/textproc/cawf/patches/patch-cawf.c Sun Mar 22 10:31:53 2026
@@ -0,0 +1,25 @@
+$NetBSD: patch-cawf.c,v 1.1 2026/03/22 10:31:53 nia Exp $
+
+Include <unistd.h> so we use the system getopt(3).
+
+Modern GCC no longer likes implicit int.
+
+--- cawf.c.orig 1997-02-22 08:26:16.000000000 +0000
++++ cawf.c
+@@ -36,6 +36,7 @@ static char Version[] = "4.10";
+ #include "cawf.h"
+
+ #include <time.h>
++#include <unistd.h>
+
+ #include <sys/stat.h>
+
+@@ -60,7 +61,7 @@ static char *Month[] =
+ { "January", "February", "March", "April", "May", "June", "July",
+ "August", "September", "October", "November", "December" };
+
+-
++int
+ main(argc, argv)
+ int argc;
+ char *argv[];
Index: pkgsrc/textproc/cawf/patches/patch-expr.c
diff -u /dev/null pkgsrc/textproc/cawf/patches/patch-expr.c:1.1
--- /dev/null Sun Mar 22 10:31:53 2026
+++ pkgsrc/textproc/cawf/patches/patch-expr.c Sun Mar 22 10:31:53 2026
@@ -0,0 +1,33 @@
+$NetBSD: patch-expr.c,v 1.1 2026/03/22 10:31:53 nia Exp $
+
+Modern GCC no longer likes implicit int.
+
+--- expr.c.orig 2026-03-22 10:02:38.635698881 +0000
++++ expr.c
+@@ -81,7 +81,7 @@ Delnum(nx)
+ /*
+ * Findnum(n, v, e) - find or optionally enter number value
+ */
+-
++int
+ Findnum(n, v, e)
+ unsigned char *n; /* register name */
+ int v; /* value */
+@@ -129,7 +129,7 @@ Findnum(n, v, e)
+ /*
+ * Findparms(n) - find parameter registers
+ */
+-
++int
+ Findparms(n)
+ unsigned char *n; /* parameter name */
+ {
+@@ -150,7 +150,7 @@ Findparms(n)
+ /*
+ * Findscale(n, v, e) - find and optionally enter scaling factor value
+ */
+-
++int
+ Findscale(n, v, e)
+ int n; /* scaling factor name */
+ double v; /* value */
Index: pkgsrc/textproc/cawf/patches/patch-macsup.c
diff -u /dev/null pkgsrc/textproc/cawf/patches/patch-macsup.c:1.1
--- /dev/null Sun Mar 22 10:31:53 2026
+++ pkgsrc/textproc/cawf/patches/patch-macsup.c Sun Mar 22 10:31:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-macsup.c,v 1.1 2026/03/22 10:31:53 nia Exp $
+
+Modern GCC no longer likes implicit int.
+
+--- macsup.c.orig 2026-03-22 10:02:23.298568206 +0000
++++ macsup.c
+@@ -101,7 +101,7 @@ Field(n, p, c)
+ * return = Macrotab[] index or -1 if not found
+ */
+
+-
++int
+ Findmacro(p, e)
+ unsigned char *p; /* pointer to 2 character macro name */
+ int e; /* 0 = find, don't enter
Index: pkgsrc/textproc/cawf/patches/patch-string.c
diff -u /dev/null pkgsrc/textproc/cawf/patches/patch-string.c:1.1
--- /dev/null Sun Mar 22 10:31:53 2026
+++ pkgsrc/textproc/cawf/patches/patch-string.c Sun Mar 22 10:31:53 2026
@@ -0,0 +1,42 @@
+$NetBSD: patch-string.c,v 1.1 2026/03/22 10:31:53 nia Exp $
+
+Modern GCC no longer likes implicit int.
+
+--- string.c.orig 2026-03-22 10:01:14.968205414 +0000
++++ string.c
+@@ -37,7 +37,7 @@ _PROTOTYPE(static void Setroman,(void));
+ /*
+ * Asmname(s, c) - assemble name
+ */
+-
++int
+ Asmname(s, c)
+ unsigned char *s; /* pointer to name */
+ unsigned char *c; /* code destination (c[3]) */
+@@ -92,7 +92,7 @@ Endword()
+ * Findchar(nm, l, s, e) - find special character definition and
+ * optionally enter it
+ */
+-
++int
+ Findchar(nm, l, s, e)
+ unsigned char *nm; /* character name */
+ int l; /* effective length */
+@@ -146,7 +146,7 @@ new_char:
+ /*
+ * Findhy(s, l, e) - find and optionally enter hyphen
+ */
+-
++int
+ Findhy(s, l, e)
+ unsigned char *s; /* value string */
+ int l; /* equivalent length */
+@@ -270,7 +270,7 @@ Setroman()
+ /*
+ * Str2word(s, len) - copy len characters from string to Word[]
+ */
+-
++int
+ Str2word(s, len)
+ unsigned char *s;
+ int len;
Home |
Main Index |
Thread Index |
Old Index