textproc/DWB: fix macro calls with wrong number of arguments

The package still doesn't build since it is not DESTDIR-ready. It embeds
the full path including DESTDIR into the manual pages.

6 files changed, 93 insertions, 1 deletions

diff --git a/textproc/DWB/distinfo b/textproc/DWB/distinfo
index d874d2d2882..87244e4c22b 100644
--- a/textproc/DWB/distinfo
+++ b/textproc/DWB/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:59:17 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/04/26 20:23:39 rillig Exp $
 
 SHA1 (DWB3.3-20150517.tar.gz) = 31f7655cb6aa688e9fe11e58a5c2f7ae12b28381
 RMD160 (DWB3.3-20150517.tar.gz) = f2e58caea367c4acf74fd5c989444caf8c9bd15b
@@ -11,6 +11,7 @@ SHA1 (patch-index_subj_parts.sh) = 6e2ce1c2c57957ddd6abea7a25cbb176e5e18f06
 SHA1 (patch-index_subj_subj.sh) = fc7750bd98b9ec8b63f91329e196a00cbff528e4
 SHA1 (patch-laserjet_laserjet.mk) = 2c808e6b21883e44c44ca7b30ebf972e5fc27ec5
 SHA1 (patch-macros_macros.mk) = e2e25a5211256a3f4c86af49961d21ea25c5d763
+SHA1 (patch-misc_col_col.c) = ecebf2808e9d8228f86ff84f4dfdc8debbdeb459
 SHA1 (patch-misc_diffmk_diffmk.sh) = 626f8f8e4e9f81998091476bcf47c5bb83c30f46
 SHA1 (patch-misc_dwbv_dwbv.mk) = 835b22e45e9aabb7dedbd4727939847e09361d47
 SHA1 (patch-misc_misc.mk) = ca9e51bb10e22beb070be552e2fa2a38fc89ac99
@@ -25,5 +26,9 @@ SHA1 (patch-postscript_printfont_printfont.sh) = 1a50e6c9aa2501f88b3fcbb27be0126
 SHA1 (patch-postscript_psencoding_psencoding.sh) = 42113e2ef48dcffee3ccdc6a8b5eba95dcde6336
 SHA1 (patch-postscript_trofftable_trofftable.sh) = 4be944139d7ac2464e5276f04336d7cdd87e8988
 SHA1 (patch-tests_tests.mk) = 52ea6ac02adba3ff32ba5d51e4a81b6deae71cf7
+SHA1 (patch-text_eqn_e.h) = d53eac32b352ebbdc8fc5e49510508bb20bf788d
+SHA1 (patch-text_grap_grap.h) = 9fb07882aaef49be29cc13d0282fd2674d578024
+SHA1 (patch-text_pic_pic.h) = c31e727e7804f70fcf3da0b650b3bd742b7e4dcc
 SHA1 (patch-text_pm_pm.mk) = 0b365bf76d2659e16e66eaa47ae38570433caafb
 SHA1 (patch-text_text.mk) = 6ff26db2855e585dae3aec2e2282120e7618e112
+SHA1 (patch-text_troff_tdef.h) = ca36a7105faa3225ba093fe80fbf86a3abb2e6aa
diff --git a/textproc/DWB/patches/patch-misc_col_col.c b/textproc/DWB/patches/patch-misc_col_col.c
new file mode 100644
index 00000000000..73898404157
--- /dev/null
+++ b/textproc/DWB/patches/patch-misc_col_col.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-misc_col_col.c,v 1.1 2020/04/26 20:23:39 rillig Exp $
+
+Fix error message about the macro strcpy being called with wrong number
+of arguments.  Further above, <string.h> is already included.
+
+--- misc/col/col.c.orig	2015-05-17 16:28:51.000000000 +0000
++++ misc/col/col.c
+@@ -29,7 +29,6 @@ int cp, lp;
+ int ll, llh, mustwr;
+ int pcp = 0;
+ char *pgmname;
+-char *strcpy();
+ 
+ main (argc, argv)
+ 	int argc; char **argv;
diff --git a/textproc/DWB/patches/patch-text_eqn_e.h b/textproc/DWB/patches/patch-text_eqn_e.h
new file mode 100644
index 00000000000..61a20eb0713
--- /dev/null
+++ b/textproc/DWB/patches/patch-text_eqn_e.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-text_eqn_e.h,v 1.1 2020/04/26 20:23:39 rillig Exp $
+
+Fix error message about unfinished macro argument to sprintf.
+
+--- text/eqn/e.h.orig	2015-05-17 16:28:51.000000000 +0000
++++ text/eqn/e.h
+@@ -21,7 +21,7 @@ extern int class[LAST][LAST];
+ 
+ extern	char	errbuf[200];
+ extern	char	*cmdname;
+-#define	ERROR	sprintf(errbuf,
++#define	ERROR	(sprintf)(errbuf,
+ #define	FATAL	), error(1, errbuf)
+ #define	WARNING	), error(0, errbuf)
+ #define	SYNTAX	), yyerror(errbuf)
diff --git a/textproc/DWB/patches/patch-text_grap_grap.h b/textproc/DWB/patches/patch-text_grap_grap.h
new file mode 100644
index 00000000000..6852d2ee633
--- /dev/null
+++ b/textproc/DWB/patches/patch-text_grap_grap.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-text_grap_grap.h,v 1.1 2020/04/26 20:23:39 rillig Exp $
+
+Fix error message about unfinished macro argument to sprintf.
+
+--- text/grap/grap.h.orig	2015-05-17 16:28:51.000000000 +0000
++++ text/grap/grap.h
+@@ -1,6 +1,6 @@
+ #include <stdlib.h>
+ extern	char	errbuf[200];
+-#define	ERROR	sprintf(errbuf,
++#define	ERROR	(sprintf)(errbuf,
+ #define	FATAL	), yyerror(errbuf), exit(1)
+ #define	WARNING	), yyerror(errbuf)
+ 
diff --git a/textproc/DWB/patches/patch-text_pic_pic.h b/textproc/DWB/patches/patch-text_pic_pic.h
new file mode 100644
index 00000000000..e90fe623076
--- /dev/null
+++ b/textproc/DWB/patches/patch-text_pic_pic.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-text_pic_pic.h,v 1.1 2020/04/26 20:23:39 rillig Exp $
+
+Fix error message about unfinished macro argument to sprintf.
+
+--- text/pic/pic.h.orig	2015-05-17 16:28:51.000000000 +0000
++++ text/pic/pic.h
+@@ -9,7 +9,7 @@
+ #define	dprintf	if(dbg)printf
+ 
+ extern	char	errbuf[200];
+-#define	ERROR	sprintf(errbuf,
++#define	ERROR	(sprintf)(errbuf,
+ #define	FATAL	), yyerror(errbuf), exit(1)
+ #define	WARNING	), yyerror(errbuf)
+ 
diff --git a/textproc/DWB/patches/patch-text_troff_tdef.h b/textproc/DWB/patches/patch-text_troff_tdef.h
new file mode 100644
index 00000000000..aa7838cf250
--- /dev/null
+++ b/textproc/DWB/patches/patch-text_troff_tdef.h
@@ -0,0 +1,28 @@
+$NetBSD: patch-text_troff_tdef.h,v 1.1 2020/04/26 20:23:39 rillig Exp $
+
+Fix error message about unfinished macro argument to sprintf.
+
+--- text/troff/tdef.h.orig	2015-05-17 16:28:51.000000000 +0000
++++ text/troff/tdef.h
+@@ -51,10 +51,10 @@ typedef	struct	Wcache	Wcache;
+ /* the BSD goo is because SunOS sprintf doesn't return anything useful */
+ 
+ #if 0 /* def BSD4_2 */
+-#define	OUT		(obufp += strlen((char *)sprintf(obufp,
++#define	OUT		(obufp += strlen((char *)(sprintf)(obufp,
+ #define	PUT		))) > obuf+BUFSIZ ? flusho() : 1
+ #else
+-#define	OUT		(obufp += sprintf(obufp,
++#define	OUT		(obufp += (sprintf)(obufp,
+ #define	PUT		)) > obuf+BUFSIZ ? flusho() : 1
+ #endif
+ 
+@@ -62,7 +62,7 @@ typedef	struct	Wcache	Wcache;
+ #define	oput(c)		( *obufp++ = (c), obufp > obuf+BUFSIZ ? flusho() : 1 )
+ 
+ extern	char	errbuf[];
+-#define	ERROR	sprintf(errbuf,
++#define	ERROR	(sprintf)(errbuf,
+ #define	WARN	), errprint()
+ #define	FATAL	), errprint(), exit(1)
+