Sun Apr 26 20:23:39 2020 UTC ()
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.


(rillig)
diff -r1.2 -r1.3 pkgsrc/textproc/DWB/distinfo
diff -r0 -r1.1 pkgsrc/textproc/DWB/patches/patch-misc_col_col.c
diff -r0 -r1.1 pkgsrc/textproc/DWB/patches/patch-text_eqn_e.h
diff -r0 -r1.1 pkgsrc/textproc/DWB/patches/patch-text_grap_grap.h
diff -r0 -r1.1 pkgsrc/textproc/DWB/patches/patch-text_pic_pic.h
diff -r0 -r1.1 pkgsrc/textproc/DWB/patches/patch-text_troff_tdef.h
cvs diff -r1.2 -r1.3 pkgsrc/textproc/DWB/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/DWB/distinfo 2015/11/04 01:59:17 1.2
+++ pkgsrc/textproc/DWB/distinfo 2020/04/26 20:23:39 1.3
@@ -1,29 +1,34 @@ @@ -1,29 +1,34 @@
1$NetBSD: distinfo,v 1.2 2015/11/04 01:59:17 agc Exp $ 1$NetBSD: distinfo,v 1.3 2020/04/26 20:23:39 rillig Exp $
2 2
3SHA1 (DWB3.3-20150517.tar.gz) = 31f7655cb6aa688e9fe11e58a5c2f7ae12b28381 3SHA1 (DWB3.3-20150517.tar.gz) = 31f7655cb6aa688e9fe11e58a5c2f7ae12b28381
4RMD160 (DWB3.3-20150517.tar.gz) = f2e58caea367c4acf74fd5c989444caf8c9bd15b 4RMD160 (DWB3.3-20150517.tar.gz) = f2e58caea367c4acf74fd5c989444caf8c9bd15b
5SHA512 (DWB3.3-20150517.tar.gz) = 547472d5682de2ea249c657ec9c6a2bb5e053bd3a9afede03041911746f7711f884d703a745315b6a1c1bc0c40fbe21c1adedc64ddcea095dd00e0e1cbea847e 5SHA512 (DWB3.3-20150517.tar.gz) = 547472d5682de2ea249c657ec9c6a2bb5e053bd3a9afede03041911746f7711f884d703a745315b6a1c1bc0c40fbe21c1adedc64ddcea095dd00e0e1cbea847e
6Size (DWB3.3-20150517.tar.gz) = 2847814 bytes 6Size (DWB3.3-20150517.tar.gz) = 2847814 bytes
7SHA1 (patch-doc_doc.mk) = 768fbbf587ce6cfbdd7a5fb820673c70c5bbddda 7SHA1 (patch-doc_doc.mk) = 768fbbf587ce6cfbdd7a5fb820673c70c5bbddda
8SHA1 (patch-index_index.mk) = 428ff5f966378d69257c9e8c3916795c01300723 8SHA1 (patch-index_index.mk) = 428ff5f966378d69257c9e8c3916795c01300723
9SHA1 (patch-index_ndx_ndx.sh) = d9d749425e71e27e6ed265f9df6265b60ed115e5 9SHA1 (patch-index_ndx_ndx.sh) = d9d749425e71e27e6ed265f9df6265b60ed115e5
10SHA1 (patch-index_subj_parts.sh) = 6e2ce1c2c57957ddd6abea7a25cbb176e5e18f06 10SHA1 (patch-index_subj_parts.sh) = 6e2ce1c2c57957ddd6abea7a25cbb176e5e18f06
11SHA1 (patch-index_subj_subj.sh) = fc7750bd98b9ec8b63f91329e196a00cbff528e4 11SHA1 (patch-index_subj_subj.sh) = fc7750bd98b9ec8b63f91329e196a00cbff528e4
12SHA1 (patch-laserjet_laserjet.mk) = 2c808e6b21883e44c44ca7b30ebf972e5fc27ec5 12SHA1 (patch-laserjet_laserjet.mk) = 2c808e6b21883e44c44ca7b30ebf972e5fc27ec5
13SHA1 (patch-macros_macros.mk) = e2e25a5211256a3f4c86af49961d21ea25c5d763 13SHA1 (patch-macros_macros.mk) = e2e25a5211256a3f4c86af49961d21ea25c5d763
 14SHA1 (patch-misc_col_col.c) = ecebf2808e9d8228f86ff84f4dfdc8debbdeb459
14SHA1 (patch-misc_diffmk_diffmk.sh) = 626f8f8e4e9f81998091476bcf47c5bb83c30f46 15SHA1 (patch-misc_diffmk_diffmk.sh) = 626f8f8e4e9f81998091476bcf47c5bb83c30f46
15SHA1 (patch-misc_dwbv_dwbv.mk) = 835b22e45e9aabb7dedbd4727939847e09361d47 16SHA1 (patch-misc_dwbv_dwbv.mk) = 835b22e45e9aabb7dedbd4727939847e09361d47
16SHA1 (patch-misc_misc.mk) = ca9e51bb10e22beb070be552e2fa2a38fc89ac99 17SHA1 (patch-misc_misc.mk) = ca9e51bb10e22beb070be552e2fa2a38fc89ac99
17SHA1 (patch-misc_mm_mm.sh) = afad8a77c67706e50b60d4a3092f583fa6739724 18SHA1 (patch-misc_mm_mm.sh) = afad8a77c67706e50b60d4a3092f583fa6739724
18SHA1 (patch-misc_mmt_mmt.sh) = 56c88774a0ea9476a750f030e45b201db9880b09 19SHA1 (patch-misc_mmt_mmt.sh) = 56c88774a0ea9476a750f030e45b201db9880b09
19SHA1 (patch-postscript_buildtables_buildtables.sh) = f6eeeeca304ca2ff03a427ac42dd64c90e8dfa03 20SHA1 (patch-postscript_buildtables_buildtables.sh) = f6eeeeca304ca2ff03a427ac42dd64c90e8dfa03
20SHA1 (patch-postscript_cropmarks_cropmarks.sh) = c1a8310332dcec05753c9070e57cef483c627563 21SHA1 (patch-postscript_cropmarks_cropmarks.sh) = c1a8310332dcec05753c9070e57cef483c627563
21SHA1 (patch-postscript_grabit_grabit.sh) = 1b8dda978b0f56039334039d51488cb8851c809c 22SHA1 (patch-postscript_grabit_grabit.sh) = 1b8dda978b0f56039334039d51488cb8851c809c
22SHA1 (patch-postscript_hardcopy_hardcopy.sh) = bfde4fafce3bc04d5cdcf32b0bd68b99f644d6c7 23SHA1 (patch-postscript_hardcopy_hardcopy.sh) = bfde4fafce3bc04d5cdcf32b0bd68b99f644d6c7
23SHA1 (patch-postscript_postscript.mk) = c1075557baca7a5c8e91be827fbc538513c2bbe7 24SHA1 (patch-postscript_postscript.mk) = c1075557baca7a5c8e91be827fbc538513c2bbe7
24SHA1 (patch-postscript_printfont_printfont.sh) = 1a50e6c9aa2501f88b3fcbb27be0126aa52ee4b5 25SHA1 (patch-postscript_printfont_printfont.sh) = 1a50e6c9aa2501f88b3fcbb27be0126aa52ee4b5
25SHA1 (patch-postscript_psencoding_psencoding.sh) = 42113e2ef48dcffee3ccdc6a8b5eba95dcde6336 26SHA1 (patch-postscript_psencoding_psencoding.sh) = 42113e2ef48dcffee3ccdc6a8b5eba95dcde6336
26SHA1 (patch-postscript_trofftable_trofftable.sh) = 4be944139d7ac2464e5276f04336d7cdd87e8988 27SHA1 (patch-postscript_trofftable_trofftable.sh) = 4be944139d7ac2464e5276f04336d7cdd87e8988
27SHA1 (patch-tests_tests.mk) = 52ea6ac02adba3ff32ba5d51e4a81b6deae71cf7 28SHA1 (patch-tests_tests.mk) = 52ea6ac02adba3ff32ba5d51e4a81b6deae71cf7
 29SHA1 (patch-text_eqn_e.h) = d53eac32b352ebbdc8fc5e49510508bb20bf788d
 30SHA1 (patch-text_grap_grap.h) = 9fb07882aaef49be29cc13d0282fd2674d578024
 31SHA1 (patch-text_pic_pic.h) = c31e727e7804f70fcf3da0b650b3bd742b7e4dcc
28SHA1 (patch-text_pm_pm.mk) = 0b365bf76d2659e16e66eaa47ae38570433caafb 32SHA1 (patch-text_pm_pm.mk) = 0b365bf76d2659e16e66eaa47ae38570433caafb
29SHA1 (patch-text_text.mk) = 6ff26db2855e585dae3aec2e2282120e7618e112 33SHA1 (patch-text_text.mk) = 6ff26db2855e585dae3aec2e2282120e7618e112
 34SHA1 (patch-text_troff_tdef.h) = ca36a7105faa3225ba093fe80fbf86a3abb2e6aa
File Added: pkgsrc/textproc/DWB/patches/patch-misc_col_col.c
$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;
File Added: pkgsrc/textproc/DWB/patches/patch-text_eqn_e.h
$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)
File Added: pkgsrc/textproc/DWB/patches/patch-text_grap_grap.h
$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)
File Added: pkgsrc/textproc/DWB/patches/patch-text_pic_pic.h
$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)
File Added: pkgsrc/textproc/DWB/patches/patch-text_troff_tdef.h
$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)