Patches to compile DWB3.3 on macOS 10.13.6

dwb-darwin.patch

diff --git a/text/eqn/e.h b/text/eqn/e.h
index 881354b..bf5ad3c 100644
--- a/text/eqn/e.h
+++ b/text/eqn/e.h
@@ -21,6 +21,7 @@ extern int class[LAST][LAST];
 
 extern	char	errbuf[200];
 extern	char	*cmdname;
+#undef	sprintf
 #define	ERROR	sprintf(errbuf,
 #define	FATAL	), error(1, errbuf)
 #define	WARNING	), error(0, errbuf)
diff --git a/text/grap/grap.h b/text/grap/grap.h
index 221dec8..a710b94 100644
--- a/text/grap/grap.h
+++ b/text/grap/grap.h
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 extern	char	errbuf[200];
+#undef	sprintf
 #define	ERROR	sprintf(errbuf,
 #define	FATAL	), yyerror(errbuf), exit(1)
 #define	WARNING	), yyerror(errbuf)
@@ -96,6 +97,7 @@ typedef union {		/* the yacc stack type */
 	Attr	*ap;
 } YYSTYPE;
 
+#define	YYSTYPE_IS_DECLARED 1
 extern	YYSTYPE	yylval, yyval;
 
 extern	int	dbg;
diff --git a/text/pic/pic.h b/text/pic/pic.h
index 726dda8..88ee477 100644
--- a/text/pic/pic.h
+++ b/text/pic/pic.h
@@ -6,9 +6,11 @@
 #define	MAXWID	8.5	/* default limits max picture to 8.5 x 11; */
 #define	MAXHT	11	/* change to taste without peril */
 
+#undef	printf
 #define	dprintf	if(dbg)printf
 
 extern	char	errbuf[200];
+#undef	sprintf
 #define	ERROR	sprintf(errbuf,
 #define	FATAL	), yyerror(errbuf), exit(1)
 #define	WARNING	), yyerror(errbuf)
@@ -83,6 +85,7 @@ typedef union {		/* the yacc stack type */
 	struct symtab *st;
 } YYSTYPE;
 
+#define	YYSTYPE_IS_DECLARED 1
 extern	YYSTYPE	yylval, yyval;
 
 struct symtab {
diff --git a/text/picasso/picasso.h b/text/picasso/picasso.h
index 43bf119..717d7ec 100644
--- a/text/picasso/picasso.h
+++ b/text/picasso/picasso.h
@@ -112,6 +112,7 @@ struct	objattr	{			/* common attributes of objects */
 		valtype	a_dashpat;
 };
 
+#define	YYSTYPE_IS_DECLARED 1
 typedef	valtype	YYSTYPE;			/* the yacc stack type	*/
 
 extern	YYSTYPE	yylval, yyval;
diff --git a/text/troff/tdef.h b/text/troff/tdef.h
index 61a4f05..bea5baf 100644
--- a/text/troff/tdef.h
+++ b/text/troff/tdef.h
@@ -62,6 +62,7 @@ typedef	struct	Wcache	Wcache;
 #define	oput(c)		( *obufp++ = (c), obufp > obuf+BUFSIZ ? flusho() : 1 )
 
 extern	char	errbuf[];
+#undef	sprintf
 #define	ERROR	sprintf(errbuf,
 #define	WARN	), errprint()
 #define	FATAL	), errprint(), exit(1)
diff --git a/tests/tests.mk b/tests/tests.mk
index 7f643df..1fd87c9 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -2,7 +2,7 @@
 # Runs troff, preprocessor, and macro tests.
 #
 
-MAKE=/bin/make
+#MAKE=/bin/make
 MAKEFILE=tests.mk
 
 SYSTEM=SYSV

dwb-rename.patch

diff --git a/doc/picasso/ex3A.ps b/doc/picasso/ex3A.ps
deleted file mode 100644
index e69de29..0000000
diff --git a/misc/col/col.c b/misc/col/col.c
index 5f1f788..57732a5 100644
--- a/misc/col/col.c
+++ b/misc/col/col.c
@@ -36,7 +36,9 @@ int cp, lp;
 int ll, llh, mustwr;
 int pcp = 0;
 char *pgmname;
+#ifndef strcpy
 char *strcpy();
+#endif
 
 int
 main (int argc, char **argv)
diff --git a/postscript/devLatin1/Hb b/postscript/devLatin1/Hc
similarity index 99%
rename from postscript/devLatin1/Hb
rename to postscript/devLatin1/Hc
index ac4ea48..a02baf1 100644
--- a/postscript/devLatin1/Hb
+++ b/postscript/devLatin1/Hc
@@ -1,4 +1,4 @@
-name Hb
+name Hc
 fontname Helvetica-Narrow-Bold
 named in prologue
 spacewidth 23
diff --git a/postscript/devLatin1/Hi b/postscript/devLatin1/Hj
similarity index 99%
rename from postscript/devLatin1/Hi
rename to postscript/devLatin1/Hj
index 4622003..0f2c9bb 100644
--- a/postscript/devLatin1/Hi
+++ b/postscript/devLatin1/Hj
@@ -1,4 +1,4 @@
-name Hi
+name Hj
 fontname Helvetica-Narrow-Oblique
 named in prologue
 spacewidth 23
diff --git a/postscript/devLatin1/Hx b/postscript/devLatin1/Hy
similarity index 99%
rename from postscript/devLatin1/Hx
rename to postscript/devLatin1/Hy
index f42095b..0acc639 100644
--- a/postscript/devLatin1/Hx
+++ b/postscript/devLatin1/Hy
@@ -1,4 +1,4 @@
-name Hx
+name Hy
 fontname Helvetica-Narrow-BoldOblique
 named in prologue
 spacewidth 23
diff --git a/postscript/devLatin1/charlib/lh b/postscript/devLatin1/charlib/li
similarity index 100%
rename from postscript/devLatin1/charlib/lh
rename to postscript/devLatin1/charlib/li
diff --git a/postscript/devLatin1/charlib/lH b/postscript/devLatin1/charlib/mH
similarity index 100%
rename from postscript/devLatin1/charlib/lH
rename to postscript/devLatin1/charlib/mH
diff --git a/postscript/devLatin1/charlib/rc b/postscript/devLatin1/charlib/rd
similarity index 100%
rename from postscript/devLatin1/charlib/rc
rename to postscript/devLatin1/charlib/rd
diff --git a/postscript/devLatin1/charlib/rh b/postscript/devLatin1/charlib/ri
similarity index 100%
rename from postscript/devLatin1/charlib/rh
rename to postscript/devLatin1/charlib/ri
diff --git a/postscript/devLatin1/shell.lib b/postscript/devLatin1/shell.lib
index caa50b4..b011a3f 100644
--- a/postscript/devLatin1/shell.lib
+++ b/postscript/devLatin1/shell.lib
@@ -36,10 +36,10 @@ BuiltinTables() {
 		Proportional	HB	Helvetica-Bold
 		Proportional	HI	Helvetica-Oblique
 		Proportional	HX	Helvetica-BoldOblique
-		Proportional	Hb	Helvetica-Narrow-Bold
-		Proportional	Hi	Helvetica-Narrow-Oblique
+		Proportional	Hc	Helvetica-Narrow-Bold
+		Proportional	Hj	Helvetica-Narrow-Oblique
 		Proportional	Hr	Helvetica-Narrow
-		Proportional	Hx	Helvetica-Narrow-BoldOblique
+		Proportional	Hy	Helvetica-Narrow-BoldOblique
 		Proportional	KB	Bookman-Demi
 		Proportional	KI	Bookman-LightItalic
 		Proportional	KR	Bookman-Light
diff --git a/postscript/devLatin1/shell.lib.last b/postscript/devLatin1/shell.lib.last
index 7d0f751..66b9436 100644
--- a/postscript/devLatin1/shell.lib.last
+++ b/postscript/devLatin1/shell.lib.last
@@ -36,10 +36,10 @@ BuiltinTables() {
 		Proportional	HB	Helvetica-Bold
 		Proportional	HI	Helvetica-Oblique
 		Proportional	HX	Helvetica-BoldOblique
-		Proportional	Hb	Helvetica-Narrow-Bold
-		Proportional	Hi	Helvetica-Narrow-Oblique
+		Proportional	Hc	Helvetica-Narrow-Bold
+		Proportional	Hj	Helvetica-Narrow-Oblique
 		Proportional	Hr	Helvetica-Narrow
-		Proportional	Hx	Helvetica-Narrow-BoldOblique
+		Proportional	Hy	Helvetica-Narrow-BoldOblique
 		Proportional	KB	Bookman-Demi
 		Proportional	KI	Bookman-LightItalic
 		Proportional	KR	Bookman-Light
diff --git a/postscript/devLatin1/shell.lib.old b/postscript/devLatin1/shell.lib.old
index 15bd586..cde916b 100644
--- a/postscript/devLatin1/shell.lib.old
+++ b/postscript/devLatin1/shell.lib.old
@@ -36,10 +36,10 @@ BuiltinTables() {
 		Proportional	HB	Helvetica-Bold
 		Proportional	HI	Helvetica-Oblique
 		Proportional	HX	Helvetica-BoldOblique
-		Proportional	Hb	Helvetica-Narrow-Bold
-		Proportional	Hi	Helvetica-Narrow-Oblique
+		Proportional	Hc	Helvetica-Narrow-Bold
+		Proportional	Hj	Helvetica-Narrow-Oblique
 		Proportional	Hr	Helvetica-Narrow
-		Proportional	Hx	Helvetica-Narrow-BoldOblique
+		Proportional	Hy	Helvetica-Narrow-BoldOblique
 		Proportional	KB	Bookman-Demi
 		Proportional	KI	Bookman-LightItalic
 		Proportional	KR	Bookman-Light
diff --git a/postscript/devopost/Hb b/postscript/devopost/Hc
similarity index 99%
rename from postscript/devopost/Hb
rename to postscript/devopost/Hc
index 7edad8c..714c145 100644
--- a/postscript/devopost/Hb
+++ b/postscript/devopost/Hc
@@ -1,5 +1,5 @@
 # Helvetica-Narrow-Bold
-name Hb
+name Hc
 internalname 19
 ligatures fi fl 0
 charset
diff --git a/postscript/devopost/Hi b/postscript/devopost/Hj
similarity index 99%
rename from postscript/devopost/Hi
rename to postscript/devopost/Hj
index 3261bc7..5aef873 100644
--- a/postscript/devopost/Hi
+++ b/postscript/devopost/Hj
@@ -1,5 +1,5 @@
 # Helvetica-Narrow-Oblique
-name Hi
+name Hj
 internalname 18
 ligatures fi fl 0
 charset
diff --git a/postscript/devopost/Hx b/postscript/devopost/Hy
similarity index 99%
rename from postscript/devopost/Hx
rename to postscript/devopost/Hy
index c804e01..533adab 100644
--- a/postscript/devopost/Hx
+++ b/postscript/devopost/Hy
@@ -1,5 +1,5 @@
 # Helvetica-Narrow-BoldOblique
-name Hx
+name Hy
 internalname 20
 ligatures fi fl 0
 charset
diff --git a/postscript/devopost/charlib/lh b/postscript/devopost/charlib/li
similarity index 100%
rename from postscript/devopost/charlib/lh
rename to postscript/devopost/charlib/li
diff --git a/postscript/devpost.add/C1 b/postscript/devpost.add/D1
similarity index 99%
rename from postscript/devpost.add/C1
rename to postscript/devpost.add/D1
index 19be6b2..9f19f14 100644
--- a/postscript/devpost.add/C1
+++ b/postscript/devpost.add/D1
@@ -1,4 +1,4 @@
-name C1
+name D1
 fontname CenturyOldStyle-Regular
 ligatures fi fl 0
 spacewidth 25
diff --git a/postscript/devpost.add/C2 b/postscript/devpost.add/D2
similarity index 99%
rename from postscript/devpost.add/C2
rename to postscript/devpost.add/D2
index 359341a..2498412 100644
--- a/postscript/devpost.add/C2
+++ b/postscript/devpost.add/D2
@@ -1,4 +1,4 @@
-name C2
+name D2
 fontname CenturyOldStyle-Italic
 ligatures fi fl 0
 spacewidth 27
diff --git a/postscript/devpost.add/C3 b/postscript/devpost.add/D3
similarity index 99%
rename from postscript/devpost.add/C3
rename to postscript/devpost.add/D3
index eef7eef..3e0487a 100644
--- a/postscript/devpost.add/C3
+++ b/postscript/devpost.add/D3
@@ -1,4 +1,4 @@
-name C3
+name D3
 fontname CenturyOldStyle-Bold
 ligatures fi fl 0
 spacewidth 33
diff --git a/postscript/devpost/Hb b/postscript/devpost/Hc
similarity index 99%
rename from postscript/devpost/Hb
rename to postscript/devpost/Hc
index e9fc5a1..a8744f6 100644
--- a/postscript/devpost/Hb
+++ b/postscript/devpost/Hc
@@ -1,4 +1,4 @@
-name Hb
+name Hc
 fontname Helvetica-Narrow-Bold
 named in prologue
 ligatures fi fl 0
diff --git a/postscript/devpost/Hi b/postscript/devpost/Hj
similarity index 99%
rename from postscript/devpost/Hi
rename to postscript/devpost/Hj
index eb34b7c..52d2c8a 100644
--- a/postscript/devpost/Hi
+++ b/postscript/devpost/Hj
@@ -1,4 +1,4 @@
-name Hi
+name Hj
 fontname Helvetica-Narrow-Oblique
 named in prologue
 ligatures fi fl 0
diff --git a/postscript/devpost/Hx b/postscript/devpost/Hy
similarity index 99%
rename from postscript/devpost/Hx
rename to postscript/devpost/Hy
index 6b40ad0..76e5147 100644
--- a/postscript/devpost/Hx
+++ b/postscript/devpost/Hy
@@ -1,4 +1,4 @@
-name Hx
+name Hy
 fontname Helvetica-Narrow-BoldOblique
 named in prologue
 ligatures fi fl 0
diff --git a/postscript/devpost/charlib/lh b/postscript/devpost/charlib/li
similarity index 100%
rename from postscript/devpost/charlib/lh
rename to postscript/devpost/charlib/li
diff --git a/postscript/devpost/charlib/lH b/postscript/devpost/charlib/mH
similarity index 100%
rename from postscript/devpost/charlib/lH
rename to postscript/devpost/charlib/mH
diff --git a/postscript/devpost/charlib/rc b/postscript/devpost/charlib/rd
similarity index 100%
rename from postscript/devpost/charlib/rc
rename to postscript/devpost/charlib/rd
diff --git a/postscript/devpost/charlib/rh b/postscript/devpost/charlib/ri
similarity index 100%
rename from postscript/devpost/charlib/rh
rename to postscript/devpost/charlib/ri
diff --git a/postscript/devpost/shell.lib b/postscript/devpost/shell.lib
index ddf5c5b..8f1d244 100644
--- a/postscript/devpost/shell.lib
+++ b/postscript/devpost/shell.lib
@@ -28,10 +28,10 @@ BuiltinTables() {
 		Proportional	HB	Helvetica-Bold
 		Proportional	HI	Helvetica-Oblique
 		Proportional	HX	Helvetica-BoldOblique
-		Proportional	Hb	Helvetica-Narrow-Bold
-		Proportional	Hi	Helvetica-Narrow-Oblique
+		Proportional	Hc	Helvetica-Narrow-Bold
+		Proportional	Hj	Helvetica-Narrow-Oblique
 		Proportional	Hr	Helvetica-Narrow
-		Proportional	Hx	Helvetica-Narrow-BoldOblique
+		Proportional	Hy	Helvetica-Narrow-BoldOblique
 		Proportional	KB	Bookman-Demi
 		Proportional	KI	Bookman-LightItalic
 		Proportional	KR	Bookman-Light
diff --git a/postscript/devpost/shell.lib.bak b/postscript/devpost/shell.lib.bak
index 553cc1b..614e7e2 100644
--- a/postscript/devpost/shell.lib.bak
+++ b/postscript/devpost/shell.lib.bak
@@ -28,10 +28,10 @@ BuiltinTables() {
 		Proportional	HB	Helvetica-Bold
 		Proportional	HI	Helvetica-Oblique
 		Proportional	HX	Helvetica-BoldOblique
-		Proportional	Hb	Helvetica-Narrow-Bold
-		Proportional	Hi	Helvetica-Narrow-Oblique
+		Proportional	Hc	Helvetica-Narrow-Bold
+		Proportional	Hj	Helvetica-Narrow-Oblique
 		Proportional	Hr	Helvetica-Narrow
-		Proportional	Hx	Helvetica-Narrow-BoldOblique
+		Proportional	Hy	Helvetica-Narrow-BoldOblique
 		Proportional	KB	Bookman-Demi
 		Proportional	KI	Bookman-LightItalic
 		Proportional	KR	Bookman-Light