From cc9b8f411e3aae5d654a5a1fb07ec678197a7872 Mon Sep 17 00:00:00 2001 From: is Date: Mon, 25 Jan 2010 21:14:45 +0000 Subject: Convert to use tcl/tk 8.4. --- mbone/vic/Makefile | 4 ++-- mbone/vic/distinfo | 14 ++++++++------ mbone/vic/patches/patch-ad | 20 +++++++++++++++----- mbone/vic/patches/patch-ae | 34 +++++++++++++++++----------------- mbone/vic/patches/patch-ah | 19 ++++++++++++------- mbone/vic/patches/patch-ai | 10 +++++----- mbone/vic/patches/patch-ay | 10 +++++----- mbone/vic/patches/patch-ba | 22 ++++++++++++++++++++++ mbone/vic/patches/patch-bb | 30 ++++++++++++++++++++++++++++++ 9 files changed, 116 insertions(+), 47 deletions(-) create mode 100644 mbone/vic/patches/patch-ba create mode 100644 mbone/vic/patches/patch-bb diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index ce06483a72a..6e5bb455f9e 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2009/06/29 15:53:35 joerg Exp $ +# $NetBSD: Makefile,v 1.39 2010/01/25 21:14:45 is Exp $ DISTNAME= vicsrc-2.8 PKGNAME= ${DISTNAME:S/src//} @@ -32,5 +32,5 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/tk83/buildlink3.mk" +.include "../../x11/tk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mbone/vic/distinfo b/mbone/vic/distinfo index 0f44bf40fe8..6d488fed33d 100644 --- a/mbone/vic/distinfo +++ b/mbone/vic/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2009/06/29 15:53:35 joerg Exp $ +$NetBSD: distinfo,v 1.12 2010/01/25 21:14:45 is Exp $ SHA1 (vic-2.8_ov511p0.diff.gz) = 780116733fb52058429ca7d006667e13623d008e RMD160 (vic-2.8_ov511p0.diff.gz) = 26a9c80697f3fe2650b2ed76875b9a51dd1a01d9 @@ -9,12 +9,12 @@ Size (vicsrc-2.8.tar.gz) = 605136 bytes SHA1 (patch-aa) = 6029ae5ee56452e2a4303a34a5ffa258e266dffb SHA1 (patch-ab) = 8a9f5fbacc8e90b62cbb4dc7335fab2c23512ef4 SHA1 (patch-ac) = e95936892d83876c90edb5e81963350c60e56866 -SHA1 (patch-ad) = 4604ae7077aee9e3165532a9a7947ed1875ae810 -SHA1 (patch-ae) = 05b45b8ac88a0c86d39b53cc1f2c4499411745da +SHA1 (patch-ad) = 6662b51c5c35fde0df990f1f7c3c529c605d8ade +SHA1 (patch-ae) = 206093cf5df5ccac43c2c9d8fe5cd655bf617262 SHA1 (patch-af) = 4a82bb5322d16c8269923cd65c0e776a2570de90 SHA1 (patch-ag) = 75fdeba7082c220cd105250f72e7899047c0d28a -SHA1 (patch-ah) = b5ed0c03955ee1f60c18ea71a142a365947a4962 -SHA1 (patch-ai) = 2d651ec7bb05115ae655239716bde8856bab7ff2 +SHA1 (patch-ah) = d934007ab2c6a298bf292a4438931cbe86074fa5 +SHA1 (patch-ai) = 439cc24d945d72c447bd4285fafea50cccd558d2 SHA1 (patch-aj) = 148d183345c159e4f02a0ea10648406eb733545a SHA1 (patch-ak) = 764766b60d93e3525bea01b65a43b6b9092e55d1 SHA1 (patch-al) = ae870102e3badc8705ff517189b24766f5e13737 @@ -30,5 +30,7 @@ SHA1 (patch-au) = 46f3bee25bc2d9b983d29022ec3a86966ca07bbe SHA1 (patch-av) = 8811a912a1f166a5576ce0efdb1284941b62fa16 SHA1 (patch-aw) = 735e7cda5f1cabe312decdcf992258ac8a895f63 SHA1 (patch-ax) = 9f7ab611dc426a4f317b46803dbca218be903b10 -SHA1 (patch-ay) = 78cbf2e981efa40a21bcd9295670cae98bfe3ea3 +SHA1 (patch-ay) = c3622d5170c12ea0a0c32010ca04469b5f392201 SHA1 (patch-az) = dabc8adce970fda55127e6667b250b5fa5d09bdb +SHA1 (patch-ba) = ba23fc04060ae58cf6fadac96761c91dad5b8d13 +SHA1 (patch-bb) = c64ac258d110df702653198027784d80300ea496 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 diff --git a/mbone/vic/patches/patch-ae b/mbone/vic/patches/patch-ae index f97e6c37c73..cd2ea2c99ee 100644 --- a/mbone/vic/patches/patch-ae +++ b/mbone/vic/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ +$NetBSD: patch-ae,v 1.4 2010/01/25 21:14:45 is Exp $ ---- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/tkStripchart.c Sat Mar 16 22:14:00 1996 -+++ tkStripchart.c Tue Nov 18 13:16:26 1997 -@@ -148,7 +148,7 @@ +--- /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/tkStripchart.c.orig 1996-03-16 21:14:00.000000000 +0000 ++++ /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/tkStripchart.c +@@ -148,7 +148,7 @@ struct strip_struct { int scrollrequired; int guarantee_draw; int grow_up; @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ XColor *textColorPtr; /* Color for drawing text. */ GC textGC; /* GC for drawing text. */ XColor *tickColorPtr; /* Color for drawing ticks. */ -@@ -257,7 +257,7 @@ +@@ -257,7 +257,7 @@ static Tk_ConfigSpec configSpecs[] = {TK_CONFIG_SYNONYM, "-fg", "stripcolor", 0, 0, 0, 0}, {TK_CONFIG_FONT, "-font", "font", "Font", @@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ 0}, {TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing", "Guaranteedrawing", DEF_GUARANTEE_DRAW, -@@ -570,8 +570,8 @@ +@@ -570,8 +570,8 @@ DestroyStripchart(ClientData clientData) if (StripchartPtr->value != NULL) free(StripchartPtr->value); @@ -31,7 +31,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ if (StripchartPtr->textColorPtr != NULL) Tk_FreeColor(StripchartPtr->textColorPtr); -@@ -631,7 +631,7 @@ +@@ -631,7 +631,7 @@ ConfigureStripchart(Tcl_Interp *interp, Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border); @@ -40,7 +40,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ gcValues.foreground = StripchartPtr->textColorPtr->pixel; newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues); if (StripchartPtr->textGC != None && StripchartPtr->tkwin) { -@@ -692,8 +692,11 @@ +@@ -692,8 +692,11 @@ ComputeStripchartGeometry(Stripchart* St { int tt = hasatitle(StripchartPtr); int bd = StripchartPtr->borderWidth; @@ -54,7 +54,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ Tk_GeometryRequest(StripchartPtr->tkwin, 2 * (bd + PADDING) + StripchartPtr->num_strips * -@@ -726,11 +729,13 @@ +@@ -726,11 +729,13 @@ DisplayStripchart(ClientData clientData) /* * Variable declarations used in the title drawing routines */ @@ -73,7 +73,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ StripchartPtr->displaybits &= ~REDRAW_PENDING; if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) -@@ -747,18 +752,17 @@ +@@ -747,18 +752,17 @@ DisplayStripchart(ClientData clientData) * space. Otherwise left justified and clipped on the right. */ if (tt && StripchartPtr->displaybits & DISPLAY_TITLE) { @@ -97,7 +97,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ StripchartPtr->title, strlen(StripchartPtr->title)); } /* -@@ -1057,7 +1061,8 @@ +@@ -1057,7 +1061,8 @@ static void DrawStripi(Stripchart* SPtr, int i) { Tk_Window tkwin = SPtr->tkwin; @@ -107,7 +107,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width; int y = SPtr->borderWidth + PADDING + hasatitle(SPtr) * (lineHeight + PADDING); -@@ -1066,6 +1071,9 @@ +@@ -1066,6 +1071,9 @@ DrawStripi(Stripchart* SPtr, int i) double maxv = SPtr->max_value; double minv = SPtr->min_value; @@ -117,7 +117,7 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ if (i < 1 || i > SPtr->num_strips) return; -@@ -1136,7 +1144,8 @@ +@@ -1136,7 +1144,8 @@ static void ScrollStrips(Stripchart* SPtr) { Tk_Window tkwin = SPtr->tkwin; @@ -127,12 +127,12 @@ $NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ int src_x = SPtr->borderWidth + PADDING + SPtr->strip_width; int src_y = SPtr->borderWidth + PADDING + hasatitle(SPtr) * (lineHeight + PADDING); -@@ -1144,6 +1153,8 @@ - int dest_y = src_y; +@@ -1145,6 +1154,8 @@ ScrollStrips(Stripchart* SPtr) int w = (SPtr->num_strips - 1) * SPtr->strip_width; int h = SPtr->max_height; -+ -+ Tk_GetFontMetrics(SPtr->tkfont, &fm); ++ Tk_GetFontMetrics(SPtr->tkfont, &fm); ++ XCopyArea(Tk_Display(tkwin), Tk_WindowId(tkwin), Tk_WindowId(tkwin), Tk_GetGC(tkwin, 0, NULL), src_x, src_y, w, h, dest_x, dest_y); + } diff --git a/mbone/vic/patches/patch-ah b/mbone/vic/patches/patch-ah index 3f19b7f54bb..219058029d6 100644 --- a/mbone/vic/patches/patch-ah +++ b/mbone/vic/patches/patch-ah @@ -1,10 +1,8 @@ -$NetBSD: patch-ah,v 1.1 1999/05/31 17:11:22 he Exp $ +$NetBSD: patch-ah,v 1.2 2010/01/25 21:14:45 is Exp $ ---- Tcl.cc.old Wed Apr 3 06:53:27 1996 -+++ Tcl.cc Mon May 31 18:39:24 1999 -@@ -63,10 +63,11 @@ - - void Tcl::init(Tcl_Interp* tcl, const char* application) +--- /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/Tcl.cc.orig 1996-04-03 04:53:27.000000000 +0000 ++++ /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/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-ah,v 1.1 1999/05/31 17:11:22 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/vic/patches/patch-ai b/mbone/vic/patches/patch-ai index 0ae1f7561b1..342352df3bc 100644 --- a/mbone/vic/patches/patch-ai +++ b/mbone/vic/patches/patch-ai @@ -1,12 +1,12 @@ -$NetBSD: patch-ai,v 1.3 2000/09/08 00:48:16 jwise Exp $ +$NetBSD: patch-ai,v 1.4 2010/01/25 21:14:45 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-ai,v 1.3 2000/09/08 00:48:16 jwise 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/vic/patches/patch-ay b/mbone/vic/patches/patch-ay index 7c1ce40cc72..71bd7204004 100644 --- a/mbone/vic/patches/patch-ay +++ b/mbone/vic/patches/patch-ay @@ -1,4 +1,4 @@ -$NetBSD: patch-ay,v 1.2 2007/01/13 11:27:03 joerg Exp $ +$NetBSD: patch-ay,v 1.3 2010/01/25 21:14:45 is Exp $ --- configure.orig 1996-06-24 00:59:45.000000000 +0000 +++ configure @@ -6,8 +6,8 @@ $NetBSD: patch-ay,v 1.2 2007/01/13 11:27:03 joerg 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" @@ -182,8 +182,8 @@ $NetBSD: patch-ay,v 1.2 2007/01/13 11:27:03 joerg 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/vic/patches/patch-ba b/mbone/vic/patches/patch-ba new file mode 100644 index 00000000000..487eeb41cd2 --- /dev/null +++ b/mbone/vic/patches/patch-ba @@ -0,0 +1,22 @@ +$NetBSD: patch-ba,v 1.1 2010/01/25 21:14:45 is Exp $ + +--- /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/Tcl.h.orig 1996-03-16 21:14:34.000000000 +0000 ++++ /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/Tcl.h +@@ -72,7 +72,7 @@ class Tcl { + if (Tcl_EvalFile(tcl_, (char*)file) != TCL_OK) + error(file); + } +- inline char* var(const char* varname, int flags = TCL_GLOBAL_ONLY) { ++ inline const char* var(const char* varname, int flags = TCL_GLOBAL_ONLY) { + return (Tcl_GetVar(tcl_, (char*)varname, flags)); + } + /* +@@ -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/vic/patches/patch-bb b/mbone/vic/patches/patch-bb new file mode 100644 index 00000000000..d4a05161dc6 --- /dev/null +++ b/mbone/vic/patches/patch-bb @@ -0,0 +1,30 @@ +$NetBSD: patch-bb,v 1.1 2010/01/25 21:14:45 is Exp $ + +--- /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/rate-variable.cc.orig 1996-03-16 21:13:57.000000000 +0000 ++++ /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/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); -- cgit v1.2.3