Make this package compile on 1.6 and later

5 files changed, 65 insertions, 3 deletions

diff --git a/mbone/vat/distinfo b/mbone/vat/distinfo
index 05b5f7109e1..38d9d1f76b3 100644
--- a/mbone/vat/distinfo
+++ b/mbone/vat/distinfo
@@ -1,14 +1,17 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:33:57 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/08/16 16:25:13 agc Exp $
 
 SHA1 (vatsrc-4.0b2.tar.gz) = 92390be72438647bef422c7a493ee520e82e33b3
 Size (vatsrc-4.0b2.tar.gz) = 263799 bytes
 SHA1 (patch-aa) = 58021f5a9accc06efb168374036f9c737fb9cbe6
 SHA1 (patch-ab) = f1ba1d4877de8ab3650ba5e19f1197ac756560af
 SHA1 (patch-ac) = 7b8f4b56819e64ae9b1ca6e41b8b4f7fbb1cdb3f
-SHA1 (patch-ad) = 52d77ff3071ea506cc01bc53227b911a6cce0a29
+SHA1 (patch-ad) = 29288eba884ba9ef59c0eac2d92d50ca9336a101
 SHA1 (patch-af) = 840141bc62f5bc713e33b3b1a0c199402f51926c
 SHA1 (patch-ag) = cee2e711190a0d33ed7ff95e87f00e811c7d8286
 SHA1 (patch-ah) = 06a80c7eb41b1d4f7cc8cba63551b45e07e4a56f
 SHA1 (patch-ai) = 72b94bfaa14daabb07c65194c9068c23157307f8
 SHA1 (patch-aj) = e9cf021b38735ab4737b5050502a9199b5e846bc
 SHA1 (patch-ak) = 779f4d8724dac84c9dcc964545004b75bb9eafc5
+SHA1 (patch-al) = 1e135bf818a4b35901ecabe8442aa57414fa46d1
+SHA1 (patch-am) = 3513e9495e460b9d2923f6dfdfa048c0e5872b3f
+SHA1 (patch-an) = 2793bea8c9a9a4c73c82c20da65d549252144eb3
diff --git a/mbone/vat/patches/patch-ad b/mbone/vat/patches/patch-ad
index 7a71e5d96cd..845472ac3c2 100644
--- a/mbone/vat/patches/patch-ad
+++ b/mbone/vat/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:10:03 agc Exp $
+$NetBSD: patch-ad,v 1.3 2002/08/16 16:25:14 agc Exp $
 
 --- sitebox.cc.orig	Tue Sep  9 11:24:41 1997
 +++ sitebox.cc	Tue Sep  9 11:24:43 1997
@@ -70,3 +70,14 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 11:10:03 agc Exp $
  		fg_[0] = raw_gc(fid, fc_, bc_, pixmap_);
  		fg_[2] = raw_gc(fid, dc_, bc_, pixmap_);
  		bg_[0] = raw_gc(fid, bc_, bc_, pixmap_);
+@@ -636,8 +638,8 @@
+ 	need_sort_ = 0;
+ 
+ 	Tcl& tcl = Tcl::instance();
+-	Tk_Uid fg = mono()? "black" : (char*)tcl.attr("foreground");
+-	Tk_Uid bg = mono()? "white" : (char*)tcl.attr("background");
++	Tk_Uid fg = mono()? strdup("black") : (char*)tcl.attr("foreground");
++	Tk_Uid bg = mono()? strdup("white") : (char*)tcl.attr("background");
+ 	fg_ = lookup_gc(0, fg, bg);
+ 	bg_ = lookup_gc(0, bg, bg);
+ }
diff --git a/mbone/vat/patches/patch-al b/mbone/vat/patches/patch-al
new file mode 100644
index 00000000000..a5681a3326b
--- /dev/null
+++ b/mbone/vat/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1 2002/08/16 16:25:14 agc Exp $
+
+--- iohandler.cc	2002/08/16 16:12:48	1.1
++++ iohandler.cc	2002/08/16 16:15:23
+@@ -132,7 +132,7 @@
+ 	    
+         }
+ #else
+-	Tk_CreateFileHandler((ClientData)fd, mask, callback, (ClientData)this);
++	Tk_CreateFileHandler(fd, mask, callback, (ClientData)this);
+ #endif
+ }
+ 
+@@ -151,7 +151,7 @@
+ 	}
+ #else
+ 	if (fd_ >= 0) {
+-		Tk_DeleteFileHandler((ClientData)fd_);
++		Tk_DeleteFileHandler(fd_);
+ 		fd_ = -1;
+ 	}
+ #endif
diff --git a/mbone/vat/patches/patch-am b/mbone/vat/patches/patch-am
new file mode 100644
index 00000000000..f8d85197c29
--- /dev/null
+++ b/mbone/vat/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2002/08/16 16:25:15 agc Exp $
+
+--- net.cc	2002/08/16 16:16:29	1.1
++++ net.cc	2002/08/16 16:17:05
+@@ -297,7 +297,7 @@
+ int Network::dorecv(u_char* buf, int len, u_int32_t& from, int fd)
+ {
+ 	sockaddr_in sfrom;
+-	int fromlen = sizeof(sfrom);
++	socklen_t fromlen = sizeof(sfrom);
+ 	int cc = ::recvfrom(fd, (char*)buf, len, 0,
+ 			    (sockaddr*)&sfrom, &fromlen);
+ 	if (cc < 0) {
diff --git a/mbone/vat/patches/patch-an b/mbone/vat/patches/patch-an
new file mode 100644
index 00000000000..1edab760416
--- /dev/null
+++ b/mbone/vat/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2002/08/16 16:25:15 agc Exp $
+
+--- net-ip.cc	2002/08/16 16:18:16	1.1
++++ net-ip.cc	2002/08/16 16:18:38
+@@ -203,7 +203,7 @@
+ {
+ 	memset((char *)p, 0, sizeof(*p));
+ 	p->sin_family = AF_INET;
+-	int len = sizeof(*p);
++	socklen_t len = sizeof(*p);
+ 	if (getsockname(ssock_, (struct sockaddr *)p, &len) < 0) {
+ 		perror("getsockname");
+ 		p->sin_addr.s_addr = 0;