From cc9b8f411e3aae5d654a5a1fb07ec678197a7872 Mon Sep 17 00:00:00 2001
From: is <is@pkgsrc.org>
Date: Mon, 25 Jan 2010 21:14:45 +0000
Subject: Convert to use tcl/tk 8.4.

---
 mbone/vic/patches/patch-ad | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'mbone/vic/patches/patch-ad')

diff --git a/mbone/vic/patches/patch-ad b/mbone/vic/patches/patch-ad
index 8510710964f..efbd1f50065 100644
--- a/mbone/vic/patches/patch-ad
+++ b/mbone/vic/patches/patch-ad
@@ -1,7 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2003/10/18 13:20:32 cjep Exp $
---- main.cc.orig	1996-07-23 06:12:22.000000000 +1000
-+++ main.cc	2003-10-08 23:12:31.000000000 +1000
-@@ -177,7 +177,7 @@
+$NetBSD: patch-ad,v 1.6 2010/01/25 21:14:45 is Exp $
+
+--- /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/main.cc.orig	1996-07-22 20:12:22.000000000 +0000
++++ /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/main.cc
+@@ -177,7 +177,7 @@ public:
  		else {
  			Tk_Window tk = t.tkmain();
  			Tk_Uid uid = Tk_GetUid((char*)argv[1]);
@@ -10,7 +11,16 @@ $NetBSD: patch-ad,v 1.5 2003/10/18 13:20:32 cjep Exp $
  			t.result(p != 0 ? "1" : "0");
  		}
  		return (TCL_OK);
-@@ -421,10 +421,13 @@
+@@ -391,7 +391,7 @@ void loadbitmaps(Tcl_Interp* tcl)
+ 	Tk_DefineBitmap(tcl, Tk_GetUid("fwd"), fwd, 7, 10);
+ }
+ 
+-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);
+@@ -421,10 +421,13 @@ main(int argc, const char** argv)
  	srandom(heuristic_random());
  
  #ifdef SIGHUP
-- 
cgit v1.2.3