Make tcm compile with lesstif and new toolchain.

Closes pkg/14897.

6 files changed, 63 insertions, 18 deletions

diff --git a/graphics/tcm/distinfo b/graphics/tcm/distinfo
index 88bca4b883d..243309b2467 100644
--- a/graphics/tcm/distinfo
+++ b/graphics/tcm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/06/28 09:29:01 agc Exp $
+$NetBSD: distinfo,v 1.6 2002/07/08 02:48:17 wiz Exp $
 
 SHA1 (tcm-2.01.src.tar.gz) = ce63d4310f43c89984cfcf2fc3da38eb55907c0f
 Size (tcm-2.01.src.tar.gz) = 3624778 bytes
@@ -13,9 +13,9 @@ SHA1 (patch-ah) = 095886753437f5b0c2d65333d846635abdddd81c
 SHA1 (patch-ai) = 5ac6114b5a2b1f72e7c03bc6ec722a1626e4a3ec
 SHA1 (patch-aj) = d8c2af60833f0316f37130b2e83be26efe3b6e86
 SHA1 (patch-ak) = a5258112b0635f410265911017909dc089670cc1
-SHA1 (patch-al) = db5a5f564c42396bdaab423b8e94905550b36dfb
+SHA1 (patch-al) = 49b18674873b9e4556f39013dd6677722f04eb64
 SHA1 (patch-am) = 7aa052825735b055f622c3917e14529ef5d808a5
-SHA1 (patch-an) = bf4ca485a46805b90a1c7c060764d83d79a71c92
+SHA1 (patch-an) = 1c33207bb1e29caef8c592542c347e9916745fcc
 SHA1 (patch-ao) = 3581a8395b2ad1a861781f12f1a2fe05b3970cf4
 SHA1 (patch-ap) = 8470d73a87c586989dedd9391ba511f3d4941dce
 SHA1 (patch-aq) = ed86083b7e02a235c84ffab3acbaffa8146f0945
@@ -32,3 +32,6 @@ SHA1 (patch-ba) = 198f12f68fd58ce09127d435334b1db718f8b969
 SHA1 (patch-bb) = 00aa951e4de26aec458bb1435d2d68a116380f3a
 SHA1 (patch-bc) = 04ffc44017cb7c5a9bf1aaf0936a522c0d0271ad
 SHA1 (patch-bd) = 858598fa54a61f1e136f59556eda5eb49423569e
+SHA1 (patch-be) = 897d196188906b0030ef0c91ed4d7bf9fb6e0229
+SHA1 (patch-bf) = 9a229f7fd2d9b20dc5ff0ae62bb88eccf9be394c
+SHA1 (patch-bg) = 0862580c3f4bf9fdde0dedfbf9cc2401f7f95249
diff --git a/graphics/tcm/patches/patch-al b/graphics/tcm/patches/patch-al
index c7dad198bc9..543d0f9b39d 100644
--- a/graphics/tcm/patches/patch-al
+++ b/graphics/tcm/patches/patch-al
@@ -1,14 +1,14 @@
-$NetBSD: patch-al,v 1.2 2001/09/12 07:35:57 jlam Exp $
+$NetBSD: patch-al,v 1.3 2002/07/08 02:48:18 wiz Exp $
 
---- ui/error.c.orig	Fri Jun 18 04:29:04 1999
-+++ ui/error.c
-@@ -23,6 +23,9 @@
- #include "application.h"
- #include "messagelogdialog.h"
- #include <stdarg.h>
+--- ed/startupwindow.c.orig	Fri Feb  9 15:44:45 2001
++++ ed/startupwindow.c
+@@ -38,6 +38,9 @@
+ #include "liteclue.h"
+ #include "grafport.h"
+ #include "Teapot2a.xbm"
 +#ifdef LESSTIF
-+#include <iostdio.h>
++#include <stdio.h>
 +#endif
+ #include <stdlib.h>
+ #include <Xm/XmAll.h>
  
- void error(const char *fmt ...) {
- 	// we're not getting huge strings
diff --git a/graphics/tcm/patches/patch-an b/graphics/tcm/patches/patch-an
index 6e8120f9942..63f04cb0b88 100644
--- a/graphics/tcm/patches/patch-an
+++ b/graphics/tcm/patches/patch-an
@@ -1,17 +1,17 @@
-$NetBSD: patch-an,v 1.2 2001/09/12 07:35:58 jlam Exp $
+$NetBSD: patch-an,v 1.3 2002/07/08 02:48:18 wiz Exp $
 
 --- ui/application.c.orig	Fri Nov 10 04:52:16 2000
 +++ ui/application.c
-@@ -29,6 +29,9 @@
+@@ -28,6 +28,9 @@
+ #include "inputfile.h"
  #include "system.h"
  #include "color.h"
- #include <stdlib.h>
 +#ifdef LESSTIF
-+#include <iostdio.h>
++#include <stdio.h>
 +#endif
+ #include <stdlib.h>
  #include <string.h>
  #include <Xm/XmStrDefs.h>
- #ifdef USE_XMIM
 @@ -41,7 +44,7 @@
  	return Application::XErrorHandler(dpy, err_event);
  }
diff --git a/graphics/tcm/patches/patch-be b/graphics/tcm/patches/patch-be
new file mode 100644
index 00000000000..38d79b686ee
--- /dev/null
+++ b/graphics/tcm/patches/patch-be
@@ -0,0 +1,14 @@
+$NetBSD: patch-be,v 1.1 2002/07/08 02:48:18 wiz Exp $
+
+--- ui/textviewdialog.c.orig	Tue Apr  4 18:25:17 2000
++++ ui/textviewdialog.c
+@@ -30,6 +30,9 @@
+ #include "printeroptions.h"
+ #include "application.h"
+ #include <Xm/XmAll.h>
++#ifdef LESSTIF
++#include <stdio.h>
++#endif
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <ctype.h>
diff --git a/graphics/tcm/patches/patch-bf b/graphics/tcm/patches/patch-bf
new file mode 100644
index 00000000000..b340f3c7b0c
--- /dev/null
+++ b/graphics/tcm/patches/patch-bf
@@ -0,0 +1,14 @@
+$NetBSD: patch-bf,v 1.1 2002/07/08 02:48:18 wiz Exp $
+
+--- ui/error.c.orig	Fri Jun 18 10:29:04 1999
++++ ui/error.c
+@@ -23,6 +23,9 @@
+ #include "application.h"
+ #include "messagelogdialog.h"
+ #include <stdarg.h>
++#ifdef LESSTIF
++#include <stdio.h>
++#endif
+ 
+ void error(const char *fmt ...) {
+ 	// we're not getting huge strings
diff --git a/graphics/tcm/patches/patch-bg b/graphics/tcm/patches/patch-bg
new file mode 100644
index 00000000000..f0e1a03faa3
--- /dev/null
+++ b/graphics/tcm/patches/patch-bg
@@ -0,0 +1,14 @@
+$NetBSD: patch-bg,v 1.1 2002/07/08 02:48:18 wiz Exp $
+
+--- ui/colorchooserdialog.c.orig	Mon Mar 20 16:27:05 2000
++++ ui/colorchooserdialog.c
+@@ -22,6 +22,9 @@
+ #include "colorchooserdialog.h"
+ #include "application.h"
+ #include "mstring.h"
++#ifdef LESSTIF
++#include <stdio.h>
++#endif
+ #include <Xm/XmAll.h>
+ #include <stdlib.h>
+