Port to using tcl/tk 8.4.

9 files changed, 101 insertions, 31 deletions

diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 4cb8aec2c3b..eb7b9bcb504 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2009/06/30 00:07:20 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2010/01/25 21:07:48 is Exp $
 #
 
 DISTNAME=		vatsrc-4.0b2
 PKGNAME=		${DISTNAME:S/src//}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mbone
 MASTER_SITES=		ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
 
@@ -32,5 +32,5 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../audio/gsm/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/tk83/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/vat/distinfo b/mbone/vat/distinfo
index 03b9f339af1..7140bce1131 100644
--- a/mbone/vat/distinfo
+++ b/mbone/vat/distinfo
@@ -1,19 +1,21 @@
-$NetBSD: distinfo,v 1.9 2008/06/20 01:09:25 joerg Exp $
+$NetBSD: distinfo,v 1.10 2010/01/25 21:07:48 is Exp $
 
 SHA1 (vatsrc-4.0b2.tar.gz) = 92390be72438647bef422c7a493ee520e82e33b3
 RMD160 (vatsrc-4.0b2.tar.gz) = 3540a371f2d4bbd388561157009dc744bec24a0a
 Size (vatsrc-4.0b2.tar.gz) = 263799 bytes
 SHA1 (patch-aa) = 58021f5a9accc06efb168374036f9c737fb9cbe6
 SHA1 (patch-ab) = f1ba1d4877de8ab3650ba5e19f1197ac756560af
-SHA1 (patch-ac) = 192236d6703b6ff05ea4da0331a59e6eccaa8094
+SHA1 (patch-ac) = 86158c57f63fee031ffb60dc417411f47e1cf097
 SHA1 (patch-ad) = 29288eba884ba9ef59c0eac2d92d50ca9336a101
 SHA1 (patch-af) = 1cfe73e1a1e7f179d6293c451cd55f0fd558e8d3
 SHA1 (patch-ag) = cee2e711190a0d33ed7ff95e87f00e811c7d8286
 SHA1 (patch-ai) = 72b94bfaa14daabb07c65194c9068c23157307f8
-SHA1 (patch-aj) = e9cf021b38735ab4737b5050502a9199b5e846bc
+SHA1 (patch-aj) = 2550e3d666b7fc04ffbde0518f9ae20480d75984
 SHA1 (patch-ak) = e79273c0b7d101bf9cbdc7ad8e6348bda8fa2e45
 SHA1 (patch-al) = 1e135bf818a4b35901ecabe8442aa57414fa46d1
 SHA1 (patch-am) = 3513e9495e460b9d2923f6dfdfa048c0e5872b3f
 SHA1 (patch-an) = 2793bea8c9a9a4c73c82c20da65d549252144eb3
-SHA1 (patch-ao) = 99b5945339b30b62709784358af316d8185dd445
-SHA1 (patch-ap) = 2d651ec7bb05115ae655239716bde8856bab7ff2
+SHA1 (patch-ao) = 45deb302ecf01a688332008194fbbf35441947f1
+SHA1 (patch-ap) = 439cc24d945d72c447bd4285fafea50cccd558d2
+SHA1 (patch-aq) = 8e97d1c239567c66515169b2bfec62c58102f1a2
+SHA1 (patch-ar) = cb1f4f24f9d4303e8cf18c0ab0b951f995af4767
diff --git a/mbone/vat/patches/patch-ac b/mbone/vat/patches/patch-ac
index ab4e928e9dd..32864067fa5 100644
--- a/mbone/vat/patches/patch-ac
+++ b/mbone/vat/patches/patch-ac
@@ -1,7 +1,17 @@
-$NetBSD: patch-ac,v 1.4 2003/10/18 13:20:32 cjep Exp $
---- main.cc.orig	1996-05-03 23:27:22.000000000 +1000
-+++ main.cc	2003-10-08 23:03:15.000000000 +1000
-@@ -132,13 +132,13 @@
+$NetBSD: patch-ac,v 1.5 2010/01/25 21:07:48 is Exp $
+
+--- /pkg_comp/obj/pkgsrc/mbone/vat/netbsd5/vat-4.0b2/main.cc.orig	1996-05-03 13:27:22.000000000 +0000
++++ /pkg_comp/obj/pkgsrc/mbone/vat/netbsd5/vat-4.0b2/main.cc
+@@ -63,7 +63,7 @@ extern "C" {
+ #include "inet.h"
+ #include "Tcl.h"
+ 
+-extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, char** av);
++extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, const char** av);
+ #ifdef WIN32
+ extern "C" int WinPutsCmd(ClientData, Tcl_Interp*, int ac, char** av);
+ extern "C" int WinGetUserName(ClientData, Tcl_Interp*, int ac, char** av);
+@@ -132,13 +132,13 @@ static SIGRET DoQuit(SIGARGS)
  
  void initcatchers()
  {
@@ -19,7 +29,7 @@ $NetBSD: patch-ac,v 1.4 2003/10/18 13:20:32 cjep Exp $
  #endif
  }
  
-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ public:
  		else {
  			Tk_Window tk = t.tkmain();
  			Tk_Uid uid = Tk_GetUid((char*)argv[1]);
diff --git a/mbone/vat/patches/patch-aj b/mbone/vat/patches/patch-aj
index 884375d2f76..bdda87f8060 100644
--- a/mbone/vat/patches/patch-aj
+++ b/mbone/vat/patches/patch-aj
@@ -1,10 +1,8 @@
-$NetBSD: patch-aj,v 1.1 1999/05/23 22:23:02 he Exp $
+$NetBSD: patch-aj,v 1.2 2010/01/25 21:07:48 is Exp $
 
---- Tcl.cc.old	Mon May 24 00:18:47 1999
-+++ Tcl.cc	Mon May 24 00:17:27 1999
-@@ -63,10 +63,11 @@
- 
- void Tcl::init(Tcl_Interp* tcl, const char* application)
+--- /pkg_comp/obj/pkgsrc/mbone/vat/netbsd5/vat-4.0b2/Tcl.cc.orig	1996-04-03 04:53:27.000000000 +0000
++++ /pkg_comp/obj/pkgsrc/mbone/vat/netbsd5/vat-4.0b2/Tcl.cc
+@@ -65,6 +65,7 @@ void Tcl::init(Tcl_Interp* tcl, const ch
  {
  	instance_.tcl_ = tcl;
  	instance_.application_ = application;
@@ -12,5 +10,12 @@ $NetBSD: patch-aj,v 1.1 1999/05/23 22:23:02 he Exp $
  }
  
  void Tcl::evalc(const char* s)
+@@ -210,7 +211,7 @@ void TclObject::setproc(const char* s)
+ 	}
+ }
+ 
+-int TclObject::callback(ClientData cd, Tcl_Interp*, int ac, char** av)
++int TclObject::callback(ClientData cd, Tcl_Interp*, int ac, const char** av)
  {
- 	u_int n = strlen(s) + 1;
+ 	TclObject* tc = (TclObject*)cd;
+ 	return (tc->command(ac, (const char*const*)av));
diff --git a/mbone/vat/patches/patch-ao b/mbone/vat/patches/patch-ao
index 6645ddce068..6030a702f92 100644
--- a/mbone/vat/patches/patch-ao
+++ b/mbone/vat/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1 2002/10/02 22:57:15 wiz Exp $
+$NetBSD: patch-ao,v 1.2 2010/01/25 21:07:48 is Exp $
 
 --- configure.orig	Thu May 16 10:03:58 1996
 +++ configure
@@ -6,8 +6,8 @@ $NetBSD: patch-ao,v 1.1 2002/10/02 22:57:15 wiz Exp $
    d=""
  fi
  
-+tcldir=tcl8.3
-+tcllib=tcl83
++tcldir=tcl8.4
++tcllib=tcl84
  if test "$d" != "" ; then 
  	if test ! -d $d ; then 
  		echo "'$d' is not a directory"
@@ -180,8 +180,8 @@ $NetBSD: patch-ao,v 1.1 2002/10/02 22:57:15 wiz Exp $
    d=""
  fi
  
-+tkdir=tk8.3
-+tklib=tk83
++tkdir=tk8.4
++tklib=tk84
  if test "$d" != "" ; then 
  	if test ! -d $d ; then 
  		echo "'$d' is not a directory"
diff --git a/mbone/vat/patches/patch-ap b/mbone/vat/patches/patch-ap
index d0193971b0f..39a7bede144 100644
--- a/mbone/vat/patches/patch-ap
+++ b/mbone/vat/patches/patch-ap
@@ -1,12 +1,12 @@
-$NetBSD: patch-ap,v 1.1 2005/09/03 23:05:14 rillig Exp $
+$NetBSD: patch-ap,v 1.2 2010/01/25 21:07:48 is Exp $
 
 --- configure.in.tk.orig	Thu May 16 04:06:05 1996
 +++ configure.in.tk	Wed Jan 26 16:03:04 2000
 @@ -3,5 +3,7 @@
  
  AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="")
-+tcldir=tcl8.3
-+tcllib=tcl83
++tcldir=tcl8.4
++tcllib=tcl84
  if test "$d" != "" ; then 
  	if test ! -d $d ; then 
  		echo "'$d' is not a directory"
@@ -130,8 +130,8 @@ $NetBSD: patch-ap,v 1.1 2005/09/03 23:05:14 rillig Exp $
  AC_SUBST(V_LIBRARY_TCL)
  
  AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="")
-+tkdir=tk8.3
-+tklib=tk83
++tkdir=tk8.4
++tklib=tk84
  if test "$d" != "" ; then 
  	if test ! -d $d ; then 
  		echo "'$d' is not a directory"
diff --git a/mbone/vat/patches/patch-aq b/mbone/vat/patches/patch-aq
new file mode 100644
index 00000000000..7e2ca4507c5
--- /dev/null
+++ b/mbone/vat/patches/patch-aq
@@ -0,0 +1,22 @@
+$NetBSD: patch-aq,v 1.1 2010/01/25 21:07:48 is Exp $
+
+--- /pkg_comp/obj/pkgsrc/mbone/vat/netbsd5/vat-4.0b2/Tcl.h.orig	1996-03-16 21:14:34.000000000 +0000
++++ /pkg_comp/obj/pkgsrc/mbone/vat/netbsd5/vat-4.0b2/Tcl.h
+@@ -73,7 +73,7 @@ class Tcl {
+ 			error(file);
+ 	}
+ 	inline char* var(const char* varname, int flags = TCL_GLOBAL_ONLY) {
+-		return (Tcl_GetVar(tcl_, (char*)varname, flags));
++		return ((char *)Tcl_GetVar(tcl_, (char*)varname, flags));
+ 	}
+ 	/*
+ 	 * Hooks for invoking the tcl interpreter:
+@@ -123,7 +123,7 @@ class TclObject {
+ 	virtual void reset();
+ 	void class_name(const char*);
+ 	/* make this public for Sun's compiler */
+-	static int callback(ClientData, Tcl_Interp*, int ac, char** av);
++	static int callback(ClientData, Tcl_Interp*, int ac, const char** av);
+ 	static void reset_all();
+     protected:
+ 	TclObject(const char* name = 0);
diff --git a/mbone/vat/patches/patch-ar b/mbone/vat/patches/patch-ar
new file mode 100644
index 00000000000..17e49dc0580
--- /dev/null
+++ b/mbone/vat/patches/patch-ar
@@ -0,0 +1,30 @@
+$NetBSD: patch-ar,v 1.1 2010/01/25 21:07:48 is Exp $
+
+--- /pkg_comp/obj/pkgsrc/mbone/vat/netbsd5/vat-4.0b2/rate-variable.cc.orig	1996-03-16 21:13:57.000000000 +0000
++++ /pkg_comp/obj/pkgsrc/mbone/vat/netbsd5/vat-4.0b2/rate-variable.cc
+@@ -61,13 +61,13 @@ class RateVariable : public TclObject {
+ public:
+ 	RateVariable(const char* name) : TclObject(name) { }
+ protected:
+-	static char* update_rate_var(ClientData, Tcl_Interp*, char* name1,
+-				     char* name2, int flags);
++	static char* update_rate_var(ClientData, Tcl_Interp*, const char* name1,
++				     const char* name2, int flags);
+ 	int command(int argc, const char*const* argv);
+ } rate_variable_cmd("rate_variable");
+ 
+ char* RateVariable::update_rate_var(ClientData clientData, Tcl_Interp* tcl,
+-				    char* name1, char* name2, int flags)
++				    const char* name1, const char* name2, int flags)
+ {
+ 	rv_data* rv = (rv_data*)clientData;
+ 	if (rv == NULL)
+@@ -80,7 +80,7 @@ char* RateVariable::update_rate_var(Clie
+ 		 */
+ 		char res[128];
+ 		flags &= TCL_GLOBAL_ONLY;
+-		char* cv = Tcl_GetVar2(tcl, name1, name2, flags);
++		const char* cv = Tcl_GetVar2(tcl, name1, name2, flags);
+ 		if (cv == NULL)
+ 			return (tcl->result);
+ 		int curval = atoi(cv);
diff --git a/mbone/wbd/Makefile b/mbone/wbd/Makefile
index 4706615bb03..8834a237c40 100644
--- a/mbone/wbd/Makefile
+++ b/mbone/wbd/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/01/25 20:55:45 is Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/25 21:01:03 is Exp $
 #
 
 DISTNAME=		wbd-1.0ucl4
 PKGNAME=		wbd-1.0p4
+PKGREVISION=		1
 CATEGORIES=		mbone tk
 MASTER_SITES=		http://www-mice.cs.ucl.ac.uk/multimedia/software/wbd/1.0ucl4/