Mon Jan 25 21:14:45 2010 UTC ()
Convert to use tcl/tk 8.4.


(is)
diff -r1.38 -r1.39 pkgsrc/mbone/vic/Makefile
diff -r1.11 -r1.12 pkgsrc/mbone/vic/distinfo
diff -r1.5 -r1.6 pkgsrc/mbone/vic/patches/patch-ad
diff -r1.3 -r1.4 pkgsrc/mbone/vic/patches/patch-ae
diff -r1.3 -r1.4 pkgsrc/mbone/vic/patches/patch-ai
diff -r1.1 -r1.2 pkgsrc/mbone/vic/patches/patch-ah
diff -r1.2 -r1.3 pkgsrc/mbone/vic/patches/patch-ay
diff -r0 -r1.1 pkgsrc/mbone/vic/patches/patch-ba
diff -r0 -r1.1 pkgsrc/mbone/vic/patches/patch-bb
cvs diff -r1.38 -r1.39 pkgsrc/mbone/vic/Makefile (expand / switch to unified diff)

--- pkgsrc/mbone/vic/Makefile 2009/06/29 15:53:35 1.38
+++ pkgsrc/mbone/vic/Makefile 2010/01/25 21:14:45 1.39
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.38 2009/06/29 15:53:35 joerg Exp $ 1# $NetBSD: Makefile,v 1.39 2010/01/25 21:14:45 is Exp $
2 2
3DISTNAME= vicsrc-2.8 3DISTNAME= vicsrc-2.8
4PKGNAME= ${DISTNAME:S/src//} 4PKGNAME= ${DISTNAME:S/src//}
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= mbone tk 6CATEGORIES= mbone tk
7MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/ 7MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/
8 8
9MAKE_JOBS_SAFE= no 9MAKE_JOBS_SAFE= no
10 10
11.include "../../mk/bsd.prefs.mk" 11.include "../../mk/bsd.prefs.mk"
12 12
13.if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) || !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*) 13.if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) || !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*)
14PATCH_SITES= ftp://tink.ims.ac.jp/pub/NetBSD/vic/ 14PATCH_SITES= ftp://tink.ims.ac.jp/pub/NetBSD/vic/
@@ -22,15 +22,15 @@ COMMENT= MBONE video conferencing tool @@ -22,15 +22,15 @@ COMMENT= MBONE video conferencing tool
22WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 22WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
23GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
24 24
25USE_LANGUAGES= c c++ 25USE_LANGUAGES= c c++
26 26
27CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} 27CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
28CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} 28CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}
29 29
30BUILDLINK_DEPMETHOD.libXt?= build 30BUILDLINK_DEPMETHOD.libXt?= build
31 31
32.include "../../x11/libXext/buildlink3.mk" 32.include "../../x11/libXext/buildlink3.mk"
33.include "../../x11/libXt/buildlink3.mk" 33.include "../../x11/libXt/buildlink3.mk"
34.include "../../x11/xextproto/buildlink3.mk" 34.include "../../x11/xextproto/buildlink3.mk"
35.include "../../x11/tk83/buildlink3.mk" 35.include "../../x11/tk/buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/mbone/vic/distinfo (expand / switch to unified diff)

--- pkgsrc/mbone/vic/distinfo 2009/06/29 15:53:35 1.11
+++ pkgsrc/mbone/vic/distinfo 2010/01/25 21:14:45 1.12
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1$NetBSD: distinfo,v 1.11 2009/06/29 15:53:35 joerg Exp $ 1$NetBSD: distinfo,v 1.12 2010/01/25 21:14:45 is Exp $
2 2
3SHA1 (vic-2.8_ov511p0.diff.gz) = 780116733fb52058429ca7d006667e13623d008e 3SHA1 (vic-2.8_ov511p0.diff.gz) = 780116733fb52058429ca7d006667e13623d008e
4RMD160 (vic-2.8_ov511p0.diff.gz) = 26a9c80697f3fe2650b2ed76875b9a51dd1a01d9 4RMD160 (vic-2.8_ov511p0.diff.gz) = 26a9c80697f3fe2650b2ed76875b9a51dd1a01d9
5Size (vic-2.8_ov511p0.diff.gz) = 8836 bytes 5Size (vic-2.8_ov511p0.diff.gz) = 8836 bytes
6SHA1 (vicsrc-2.8.tar.gz) = ec58bf10aed99301f1e0e0828d0f2f32acdafe1d 6SHA1 (vicsrc-2.8.tar.gz) = ec58bf10aed99301f1e0e0828d0f2f32acdafe1d
7RMD160 (vicsrc-2.8.tar.gz) = 1c102bfb4effd54bb3ac90e8d86213c392f3e10f 7RMD160 (vicsrc-2.8.tar.gz) = 1c102bfb4effd54bb3ac90e8d86213c392f3e10f
8Size (vicsrc-2.8.tar.gz) = 605136 bytes 8Size (vicsrc-2.8.tar.gz) = 605136 bytes
9SHA1 (patch-aa) = 6029ae5ee56452e2a4303a34a5ffa258e266dffb 9SHA1 (patch-aa) = 6029ae5ee56452e2a4303a34a5ffa258e266dffb
10SHA1 (patch-ab) = 8a9f5fbacc8e90b62cbb4dc7335fab2c23512ef4 10SHA1 (patch-ab) = 8a9f5fbacc8e90b62cbb4dc7335fab2c23512ef4
11SHA1 (patch-ac) = e95936892d83876c90edb5e81963350c60e56866 11SHA1 (patch-ac) = e95936892d83876c90edb5e81963350c60e56866
12SHA1 (patch-ad) = 4604ae7077aee9e3165532a9a7947ed1875ae810 12SHA1 (patch-ad) = 6662b51c5c35fde0df990f1f7c3c529c605d8ade
13SHA1 (patch-ae) = 05b45b8ac88a0c86d39b53cc1f2c4499411745da 13SHA1 (patch-ae) = 206093cf5df5ccac43c2c9d8fe5cd655bf617262
14SHA1 (patch-af) = 4a82bb5322d16c8269923cd65c0e776a2570de90 14SHA1 (patch-af) = 4a82bb5322d16c8269923cd65c0e776a2570de90
15SHA1 (patch-ag) = 75fdeba7082c220cd105250f72e7899047c0d28a 15SHA1 (patch-ag) = 75fdeba7082c220cd105250f72e7899047c0d28a
16SHA1 (patch-ah) = b5ed0c03955ee1f60c18ea71a142a365947a4962 16SHA1 (patch-ah) = d934007ab2c6a298bf292a4438931cbe86074fa5
17SHA1 (patch-ai) = 2d651ec7bb05115ae655239716bde8856bab7ff2 17SHA1 (patch-ai) = 439cc24d945d72c447bd4285fafea50cccd558d2
18SHA1 (patch-aj) = 148d183345c159e4f02a0ea10648406eb733545a 18SHA1 (patch-aj) = 148d183345c159e4f02a0ea10648406eb733545a
19SHA1 (patch-ak) = 764766b60d93e3525bea01b65a43b6b9092e55d1 19SHA1 (patch-ak) = 764766b60d93e3525bea01b65a43b6b9092e55d1
20SHA1 (patch-al) = ae870102e3badc8705ff517189b24766f5e13737 20SHA1 (patch-al) = ae870102e3badc8705ff517189b24766f5e13737
21SHA1 (patch-am) = b9a9e31d58eaddd57394dd7b4546f3668076333c 21SHA1 (patch-am) = b9a9e31d58eaddd57394dd7b4546f3668076333c
22SHA1 (patch-an) = 2f9e09c6da4d7800df43d0bb885ab293fa61e0b1 22SHA1 (patch-an) = 2f9e09c6da4d7800df43d0bb885ab293fa61e0b1
23SHA1 (patch-ao) = fd7409267aaaaa2d64f036b92c963a0fc85675df 23SHA1 (patch-ao) = fd7409267aaaaa2d64f036b92c963a0fc85675df
24SHA1 (patch-ap) = a1e8efe7df75c428c09593e93d60b61584b06d50 24SHA1 (patch-ap) = a1e8efe7df75c428c09593e93d60b61584b06d50
25SHA1 (patch-aq) = 89b9441d6b713cd86d76411732b5f436f5d18dbd 25SHA1 (patch-aq) = 89b9441d6b713cd86d76411732b5f436f5d18dbd
26SHA1 (patch-ar) = 3386286e5bb2b0528fa20d6458f752d35381dff5 26SHA1 (patch-ar) = 3386286e5bb2b0528fa20d6458f752d35381dff5
27SHA1 (patch-as) = 03c868e0f38ad590bee8ae9504404f05c6db5cef 27SHA1 (patch-as) = 03c868e0f38ad590bee8ae9504404f05c6db5cef
28SHA1 (patch-at) = 416ca3e5125dc0b405268a7ab87572fa90b386eb 28SHA1 (patch-at) = 416ca3e5125dc0b405268a7ab87572fa90b386eb
29SHA1 (patch-au) = 46f3bee25bc2d9b983d29022ec3a86966ca07bbe 29SHA1 (patch-au) = 46f3bee25bc2d9b983d29022ec3a86966ca07bbe
30SHA1 (patch-av) = 8811a912a1f166a5576ce0efdb1284941b62fa16 30SHA1 (patch-av) = 8811a912a1f166a5576ce0efdb1284941b62fa16
31SHA1 (patch-aw) = 735e7cda5f1cabe312decdcf992258ac8a895f63 31SHA1 (patch-aw) = 735e7cda5f1cabe312decdcf992258ac8a895f63
32SHA1 (patch-ax) = 9f7ab611dc426a4f317b46803dbca218be903b10 32SHA1 (patch-ax) = 9f7ab611dc426a4f317b46803dbca218be903b10
33SHA1 (patch-ay) = 78cbf2e981efa40a21bcd9295670cae98bfe3ea3 33SHA1 (patch-ay) = c3622d5170c12ea0a0c32010ca04469b5f392201
34SHA1 (patch-az) = dabc8adce970fda55127e6667b250b5fa5d09bdb 34SHA1 (patch-az) = dabc8adce970fda55127e6667b250b5fa5d09bdb
 35SHA1 (patch-ba) = ba23fc04060ae58cf6fadac96761c91dad5b8d13
 36SHA1 (patch-bb) = c64ac258d110df702653198027784d80300ea496
cvs diff -r1.5 -r1.6 pkgsrc/mbone/vic/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/mbone/vic/patches/patch-ad 2003/10/18 13:20:32 1.5
+++ pkgsrc/mbone/vic/patches/patch-ad 2010/01/25 21:14:45 1.6
@@ -1,26 +1,36 @@ @@ -1,26 +1,36 @@
1$NetBSD: patch-ad,v 1.5 2003/10/18 13:20:32 cjep Exp $ 1$NetBSD: patch-ad,v 1.6 2010/01/25 21:14:45 is Exp $
2--- main.cc.orig 1996-07-23 06:12:22.000000000 +1000 2
3+++ main.cc 2003-10-08 23:12:31.000000000 +1000 3--- /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/main.cc.orig 1996-07-22 20:12:22.000000000 +0000
4@@ -177,7 +177,7 @@ 4+++ /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/main.cc
 5@@ -177,7 +177,7 @@ public:
5 else { 6 else {
6 Tk_Window tk = t.tkmain(); 7 Tk_Window tk = t.tkmain();
7 Tk_Uid uid = Tk_GetUid((char*)argv[1]); 8 Tk_Uid uid = Tk_GetUid((char*)argv[1]);
8- XFontStruct* p = Tk_GetFontStruct(t.interp(), tk, uid); 9- XFontStruct* p = Tk_GetFontStruct(t.interp(), tk, uid);
9+ Tk_Font p = Tk_GetFont(t.interp(), tk, uid); 10+ Tk_Font p = Tk_GetFont(t.interp(), tk, uid);
10 t.result(p != 0 ? "1" : "0"); 11 t.result(p != 0 ? "1" : "0");
11 } 12 }
12 return (TCL_OK); 13 return (TCL_OK);
13@@ -421,10 +421,13 @@ 14@@ -391,7 +391,7 @@ void loadbitmaps(Tcl_Interp* tcl)
 15 Tk_DefineBitmap(tcl, Tk_GetUid("fwd"), fwd, 7, 10);
 16 }
 17
 18-extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, char** av);
 19+extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, const char** av);
 20 #ifdef WIN32
 21 extern "C" int WinPutsCmd(ClientData, Tcl_Interp*, int ac, char** av);
 22 extern "C" int WinGetUserName(ClientData, Tcl_Interp*, int ac, char** av);
 23@@ -421,10 +421,13 @@ main(int argc, const char** argv)
14 srandom(heuristic_random()); 24 srandom(heuristic_random());
15  25
16 #ifdef SIGHUP 26 #ifdef SIGHUP
17- signal(SIGHUP, ciao); 27- signal(SIGHUP, ciao);
18+ signal(SIGHUP, (void (*)(int))ciao); 28+ signal(SIGHUP, (void (*)(int))ciao);
19+#endif 29+#endif
20+ signal(SIGINT, (void (*)(int))ciao); 30+ signal(SIGINT, (void (*)(int))ciao);
21+ signal(SIGTERM, (void (*)(int))ciao); 31+ signal(SIGTERM, (void (*)(int))ciao);
22+#ifdef __FreeBSD__ 32+#ifdef __FreeBSD__
23+ signal(SIGSYS, (sig_t)noXShm); 33+ signal(SIGSYS, (sig_t)noXShm);
24 #endif 34 #endif
25- signal(SIGINT, ciao); 35- signal(SIGINT, ciao);
26- signal(SIGTERM, ciao); 36- signal(SIGTERM, ciao);
cvs diff -r1.3 -r1.4 pkgsrc/mbone/vic/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/mbone/vic/patches/patch-ae 1998/08/07 11:10:07 1.3
+++ pkgsrc/mbone/vic/patches/patch-ae 2010/01/25 21:14:45 1.4
@@ -1,138 +1,138 @@ @@ -1,138 +1,138 @@
1$NetBSD: patch-ae,v 1.3 1998/08/07 11:10:07 agc Exp $ 1$NetBSD: patch-ae,v 1.4 2010/01/25 21:14:45 is Exp $
2 2
3--- /usr/local/pkgsrc//mbone/vic/work/vic-2.8/tkStripchart.c Sat Mar 16 22:14:00 1996 3--- /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/tkStripchart.c.orig 1996-03-16 21:14:00.000000000 +0000
4+++ tkStripchart.c Tue Nov 18 13:16:26 1997 4+++ /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/tkStripchart.c
5@@ -148,7 +148,7 @@ 5@@ -148,7 +148,7 @@ struct strip_struct {
6 int scrollrequired; 6 int scrollrequired;
7 int guarantee_draw; 7 int guarantee_draw;
8 int grow_up; 8 int grow_up;
9- XFontStruct *fontPtr; /* Information about text font, or NULL. */ 9- XFontStruct *fontPtr; /* Information about text font, or NULL. */
10+ Tk_Font tkfont; /* Information about text font, or NULL. */ 10+ Tk_Font tkfont; /* Information about text font, or NULL. */
11 XColor *textColorPtr; /* Color for drawing text. */ 11 XColor *textColorPtr; /* Color for drawing text. */
12 GC textGC; /* GC for drawing text. */ 12 GC textGC; /* GC for drawing text. */
13 XColor *tickColorPtr; /* Color for drawing ticks. */ 13 XColor *tickColorPtr; /* Color for drawing ticks. */
14@@ -257,7 +257,7 @@ 14@@ -257,7 +257,7 @@ static Tk_ConfigSpec configSpecs[] =
15 {TK_CONFIG_SYNONYM, "-fg", "stripcolor", 0, 15 {TK_CONFIG_SYNONYM, "-fg", "stripcolor", 0,
16 0, 0, 0}, 16 0, 0, 0},
17 {TK_CONFIG_FONT, "-font", "font", "Font", 17 {TK_CONFIG_FONT, "-font", "font", "Font",
18- DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, fontPtr), 18- DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, fontPtr),
19+ DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, tkfont), 19+ DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, tkfont),
20 0}, 20 0},
21 {TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing", 21 {TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing",
22 "Guaranteedrawing", DEF_GUARANTEE_DRAW, 22 "Guaranteedrawing", DEF_GUARANTEE_DRAW,
23@@ -570,8 +570,8 @@ 23@@ -570,8 +570,8 @@ DestroyStripchart(ClientData clientData)
24 if (StripchartPtr->value != NULL) 24 if (StripchartPtr->value != NULL)
25 free(StripchartPtr->value); 25 free(StripchartPtr->value);
26  26
27- if (StripchartPtr->fontPtr != NULL) 27- if (StripchartPtr->fontPtr != NULL)
28- Tk_FreeFontStruct(StripchartPtr->fontPtr); 28- Tk_FreeFontStruct(StripchartPtr->fontPtr);
29+ if (StripchartPtr->tkfont != NULL) 29+ if (StripchartPtr->tkfont != NULL)
30+ Tk_FreeFont(StripchartPtr->tkfont); 30+ Tk_FreeFont(StripchartPtr->tkfont);
31  31
32 if (StripchartPtr->textColorPtr != NULL) 32 if (StripchartPtr->textColorPtr != NULL)
33 Tk_FreeColor(StripchartPtr->textColorPtr); 33 Tk_FreeColor(StripchartPtr->textColorPtr);
34@@ -631,7 +631,7 @@ 34@@ -631,7 +631,7 @@ ConfigureStripchart(Tcl_Interp *interp,
35  35
36 Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border); 36 Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border);
37  37
38- gcValues.font = StripchartPtr->fontPtr->fid; 38- gcValues.font = StripchartPtr->fontPtr->fid;
39+ gcValues.font = Tk_FontId(StripchartPtr->tkfont); 39+ gcValues.font = Tk_FontId(StripchartPtr->tkfont);
40 gcValues.foreground = StripchartPtr->textColorPtr->pixel; 40 gcValues.foreground = StripchartPtr->textColorPtr->pixel;
41 newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues); 41 newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues);
42 if (StripchartPtr->textGC != None && StripchartPtr->tkwin) { 42 if (StripchartPtr->textGC != None && StripchartPtr->tkwin) {
43@@ -692,8 +692,11 @@ 43@@ -692,8 +692,11 @@ ComputeStripchartGeometry(Stripchart* St
44 { 44 {
45 int tt = hasatitle(StripchartPtr); 45 int tt = hasatitle(StripchartPtr);
46 int bd = StripchartPtr->borderWidth; 46 int bd = StripchartPtr->borderWidth;
47- int lineHeight = StripchartPtr->fontPtr->ascent + 47- int lineHeight = StripchartPtr->fontPtr->ascent +
48- StripchartPtr->fontPtr->descent; 48- StripchartPtr->fontPtr->descent;
49+ Tk_FontMetrics fm; 49+ Tk_FontMetrics fm;
50+ int lineHeight; 50+ int lineHeight;
51+ 51+
52+ Tk_GetFontMetrics(StripchartPtr->tkfont, &fm); 52+ Tk_GetFontMetrics(StripchartPtr->tkfont, &fm);
53+ lineHeight = fm.ascent + fm.descent; 53+ lineHeight = fm.ascent + fm.descent;
54  54
55 Tk_GeometryRequest(StripchartPtr->tkwin, 55 Tk_GeometryRequest(StripchartPtr->tkwin,
56 2 * (bd + PADDING) + StripchartPtr->num_strips * 56 2 * (bd + PADDING) + StripchartPtr->num_strips *
57@@ -726,11 +729,13 @@ 57@@ -726,11 +729,13 @@ DisplayStripchart(ClientData clientData)
58 /* 58 /*
59 * Variable declarations used in the title drawing routines 59 * Variable declarations used in the title drawing routines
60 */ 60 */
61- XFontStruct *fp = StripchartPtr->fontPtr; 61- XFontStruct *fp = StripchartPtr->fontPtr;
62- XCharStruct bbox; 62- XCharStruct bbox;
63- int x, dummy; 63- int x, dummy;
64- int lineHeight = StripchartPtr->fontPtr->ascent + 64- int lineHeight = StripchartPtr->fontPtr->ascent +
65- StripchartPtr->fontPtr->descent; 65- StripchartPtr->fontPtr->descent;
66+ Tk_Font tkf = StripchartPtr->tkfont; 66+ Tk_Font tkf = StripchartPtr->tkfont;
67+ int x; 67+ int x;
68+ Tk_FontMetrics fm; 68+ Tk_FontMetrics fm;
69+ int lineHeight; 69+ int lineHeight;
70+ 70+
71+ Tk_GetFontMetrics(tkf, &fm); 71+ Tk_GetFontMetrics(tkf, &fm);
72+ lineHeight = fm.ascent + fm.descent; 72+ lineHeight = fm.ascent + fm.descent;
73  73
74 StripchartPtr->displaybits &= ~REDRAW_PENDING; 74 StripchartPtr->displaybits &= ~REDRAW_PENDING;
75 if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) 75 if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin))
76@@ -747,18 +752,17 @@ 76@@ -747,18 +752,17 @@ DisplayStripchart(ClientData clientData)
77 * space. Otherwise left justified and clipped on the right. 77 * space. Otherwise left justified and clipped on the right.
78 */ 78 */
79 if (tt && StripchartPtr->displaybits & DISPLAY_TITLE) { 79 if (tt && StripchartPtr->displaybits & DISPLAY_TITLE) {
80- XTextExtents(fp, StripchartPtr->title, 80- XTextExtents(fp, StripchartPtr->title,
81- strlen(StripchartPtr->title), 81- strlen(StripchartPtr->title),
82- &dummy, &dummy, &dummy, &bbox); 82- &dummy, &dummy, &dummy, &bbox);
83- if (bbox.lbearing + bbox.rbearing < Tk_Width(tkwin) - 2 * bd) 83- if (bbox.lbearing + bbox.rbearing < Tk_Width(tkwin) - 2 * bd)
84- x = (Tk_Width(tkwin) - bbox.lbearing - bbox.rbearing)/2; 84- x = (Tk_Width(tkwin) - bbox.lbearing - bbox.rbearing)/2;
85+ int width = Tk_TextWidth(tkf, StripchartPtr->title, 85+ int width = Tk_TextWidth(tkf, StripchartPtr->title,
86+ strlen(StripchartPtr->title)); 86+ strlen(StripchartPtr->title));
87+ if (width < Tk_Width(tkwin) - 2 * bd) 87+ if (width < Tk_Width(tkwin) - 2 * bd)
88+ x = (Tk_Width(tkwin) - width)/2; 88+ x = (Tk_Width(tkwin) - width)/2;
89 else 89 else
90 x = bd + PADDING; 90 x = bd + PADDING;
91  91
92 XClearArea(Tk_Display(tkwin), Tk_WindowId(tkwin), bd, bd, 92 XClearArea(Tk_Display(tkwin), Tk_WindowId(tkwin), bd, bd,
93 Tk_Width(tkwin) - 2 * bd, lineHeight + PADDING, False); 93 Tk_Width(tkwin) - 2 * bd, lineHeight + PADDING, False);
94 XDrawString(Tk_Display(tkwin), Tk_WindowId(tkwin), 94 XDrawString(Tk_Display(tkwin), Tk_WindowId(tkwin),
95- StripchartPtr->textGC, x, fp->max_bounds.ascent + bd, 95- StripchartPtr->textGC, x, fp->max_bounds.ascent + bd,
96+ StripchartPtr->textGC, x, fm.ascent + bd, /*XXX no max_bounds */ 96+ StripchartPtr->textGC, x, fm.ascent + bd, /*XXX no max_bounds */
97 StripchartPtr->title, strlen(StripchartPtr->title)); 97 StripchartPtr->title, strlen(StripchartPtr->title));
98 } 98 }
99 /* 99 /*
100@@ -1057,7 +1061,8 @@ 100@@ -1057,7 +1061,8 @@ static void
101 DrawStripi(Stripchart* SPtr, int i) 101 DrawStripi(Stripchart* SPtr, int i)
102 { 102 {
103 Tk_Window tkwin = SPtr->tkwin; 103 Tk_Window tkwin = SPtr->tkwin;
104- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; 104- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent;
105+ Tk_FontMetrics fm; 105+ Tk_FontMetrics fm;
106+ int lineHeight; 106+ int lineHeight;
107 int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width; 107 int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width;
108 int y = SPtr->borderWidth + PADDING + 108 int y = SPtr->borderWidth + PADDING +
109 hasatitle(SPtr) * (lineHeight + PADDING); 109 hasatitle(SPtr) * (lineHeight + PADDING);
110@@ -1066,6 +1071,9 @@ 110@@ -1066,6 +1071,9 @@ DrawStripi(Stripchart* SPtr, int i)
111 double maxv = SPtr->max_value; 111 double maxv = SPtr->max_value;
112 double minv = SPtr->min_value; 112 double minv = SPtr->min_value;
113  113
114+ Tk_GetFontMetrics(SPtr->tkfont, &fm); 114+ Tk_GetFontMetrics(SPtr->tkfont, &fm);
115+ lineHeight = fm.ascent + fm.descent; 115+ lineHeight = fm.ascent + fm.descent;
116+ 116+
117 if (i < 1 || i > SPtr->num_strips) 117 if (i < 1 || i > SPtr->num_strips)
118 return; 118 return;
119  119
120@@ -1136,7 +1144,8 @@ 120@@ -1136,7 +1144,8 @@ static void
121 ScrollStrips(Stripchart* SPtr) 121 ScrollStrips(Stripchart* SPtr)
122 { 122 {
123 Tk_Window tkwin = SPtr->tkwin; 123 Tk_Window tkwin = SPtr->tkwin;
124- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; 124- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent;
125+ Tk_FontMetrics fm; 125+ Tk_FontMetrics fm;
126+ int lineHeight; 126+ int lineHeight;
127 int src_x = SPtr->borderWidth + PADDING + SPtr->strip_width; 127 int src_x = SPtr->borderWidth + PADDING + SPtr->strip_width;
128 int src_y = SPtr->borderWidth + PADDING + 128 int src_y = SPtr->borderWidth + PADDING +
129 hasatitle(SPtr) * (lineHeight + PADDING); 129 hasatitle(SPtr) * (lineHeight + PADDING);
130@@ -1144,6 +1153,8 @@ 130@@ -1145,6 +1154,8 @@ ScrollStrips(Stripchart* SPtr)
131 int dest_y = src_y; 
132 int w = (SPtr->num_strips - 1) * SPtr->strip_width; 131 int w = (SPtr->num_strips - 1) * SPtr->strip_width;
133 int h = SPtr->max_height; 132 int h = SPtr->max_height;
134+ 
135+ Tk_GetFontMetrics(SPtr->tkfont, &fm); 
136  133
 134+ Tk_GetFontMetrics(SPtr->tkfont, &fm);
 135+
137 XCopyArea(Tk_Display(tkwin), Tk_WindowId(tkwin), Tk_WindowId(tkwin), 136 XCopyArea(Tk_Display(tkwin), Tk_WindowId(tkwin), Tk_WindowId(tkwin),
138 Tk_GetGC(tkwin, 0, NULL), src_x, src_y, w, h, dest_x, dest_y); 137 Tk_GetGC(tkwin, 0, NULL), src_x, src_y, w, h, dest_x, dest_y);
 138 }
cvs diff -r1.3 -r1.4 pkgsrc/mbone/vic/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/mbone/vic/patches/patch-ai 2000/09/08 00:48:16 1.3
+++ pkgsrc/mbone/vic/patches/patch-ai 2010/01/25 21:14:45 1.4
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ai,v 1.3 2000/09/08 00:48:16 jwise Exp $ 1$NetBSD: patch-ai,v 1.4 2010/01/25 21:14:45 is Exp $
2 2
3--- configure.in.tk.orig Thu May 16 04:06:05 1996 3--- configure.in.tk.orig Thu May 16 04:06:05 1996
4+++ configure.in.tk Wed Jan 26 16:03:04 2000 4+++ configure.in.tk Wed Jan 26 16:03:04 2000
5@@ -3,5 +3,7 @@ 5@@ -3,5 +3,7 @@
6  6
7 AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="") 7 AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="")
8+tcldir=tcl8.3 8+tcldir=tcl8.4
9+tcllib=tcl83 9+tcllib=tcl84
10 if test "$d" != "" ; then  10 if test "$d" != "" ; then
11 if test ! -d $d ; then  11 if test ! -d $d ; then
12 echo "'$d' is not a directory" 12 echo "'$d' is not a directory"
13@@ -12,8 +14,8 @@ 13@@ -12,8 +14,8 @@
14 echo "can't find tcl.h in $d/include" 14 echo "can't find tcl.h in $d/include"
15 exit 1 15 exit 1
16 fi 16 fi
17- places="$d/lib/libtcl7.5.so \ 17- places="$d/lib/libtcl7.5.so \
18- $d/lib/libtcl7.5.a \ 18- $d/lib/libtcl7.5.a \
19+ places="$d/lib/lib${tcllib}.so \ 19+ places="$d/lib/lib${tcllib}.so \
20+ $d/lib/lib${tcllib}.a \ 20+ $d/lib/lib${tcllib}.a \
21 $d/lib/libtcl.so \ 21 $d/lib/libtcl.so \
22 $d/lib/libtcl.a" 22 $d/lib/libtcl.a"
@@ -120,28 +120,28 @@ $NetBSD: patch-ai,v 1.3 2000/09/08 00:48 @@ -120,28 +120,28 @@ $NetBSD: patch-ai,v 1.3 2000/09/08 00:48
120+ /usr/contrib/lib/${tcldir} \ 120+ /usr/contrib/lib/${tcldir} \
121+ /usr/lib/${tcldir} \ 121+ /usr/lib/${tcldir} \
122+ /usr/lib/tk/${tcldir} \ 122+ /usr/lib/tk/${tcldir} \
123+ /import/tcl/lib/${tcldir} \ 123+ /import/tcl/lib/${tcldir} \
124+ $prefix/lib/${tcldir} \ 124+ $prefix/lib/${tcldir} \
125+ $x_libraries/${tcldir} \ 125+ $x_libraries/${tcldir} \
126 /usr/local/lib/tcl \ 126 /usr/local/lib/tcl \
127 /usr/lib/tcl \ 127 /usr/lib/tcl \
128 /usr/lib/tk/tcl \ 128 /usr/lib/tk/tcl \
129@@ -128,6 +127,8 @@ 129@@ -128,6 +127,8 @@
130 AC_SUBST(V_LIBRARY_TCL) 130 AC_SUBST(V_LIBRARY_TCL)
131  131
132 AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="") 132 AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="")
133+tkdir=tk8.3 133+tkdir=tk8.4
134+tklib=tk83 134+tklib=tk84
135 if test "$d" != "" ; then  135 if test "$d" != "" ; then
136 if test ! -d $d ; then  136 if test ! -d $d ; then
137 echo "'$d' is not a directory" 137 echo "'$d' is not a directory"
138@@ -138,8 +139,8 @@ 138@@ -138,8 +139,8 @@
139 echo "can't find tk.h in $d/include" 139 echo "can't find tk.h in $d/include"
140 exit 1 140 exit 1
141 fi 141 fi
142- places="$d/lib/libtk4.1.so \ 142- places="$d/lib/libtk4.1.so \
143- $d/lib/libtk4.1.a \ 143- $d/lib/libtk4.1.a \
144+ places="$d/lib/lib${tklib}.so \ 144+ places="$d/lib/lib${tklib}.so \
145+ $d/lib/lib${tklib}.a \ 145+ $d/lib/lib${tklib}.a \
146 $d/lib/libtk.so \ 146 $d/lib/libtk.so \
147 $d/lib/libtk.a" 147 $d/lib/libtk.a"
cvs diff -r1.1 -r1.2 pkgsrc/mbone/vic/patches/patch-ah (expand / switch to unified diff)

--- pkgsrc/mbone/vic/patches/patch-ah 1999/05/31 17:11:22 1.1
+++ pkgsrc/mbone/vic/patches/patch-ah 2010/01/25 21:14:45 1.2
@@ -1,16 +1,21 @@ @@ -1,16 +1,21 @@
1$NetBSD: patch-ah,v 1.1 1999/05/31 17:11:22 he Exp $ 1$NetBSD: patch-ah,v 1.2 2010/01/25 21:14:45 is Exp $
2 2
3--- Tcl.cc.old Wed Apr 3 06:53:27 1996 3--- /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/Tcl.cc.orig 1996-04-03 04:53:27.000000000 +0000
4+++ Tcl.cc Mon May 31 18:39:24 1999 4+++ /pkg_comp/obj/pkgsrc/mbone/vic/netbsd5/vic-2.8/Tcl.cc
5@@ -63,10 +63,11 @@ 5@@ -65,6 +65,7 @@ void Tcl::init(Tcl_Interp* tcl, const ch
6  
7 void Tcl::init(Tcl_Interp* tcl, const char* application) 
8 { 6 {
9 instance_.tcl_ = tcl; 7 instance_.tcl_ = tcl;
10 instance_.application_ = application; 8 instance_.application_ = application;
11+ Tcl_Init(tcl); 9+ Tcl_Init(tcl);
12 } 10 }
13  11
14 void Tcl::evalc(const char* s) 12 void Tcl::evalc(const char* s)
 13@@ -210,7 +211,7 @@ void TclObject::setproc(const char* s)
 14 }
 15 }
 16
 17-int TclObject::callback(ClientData cd, Tcl_Interp*, int ac, char** av)
 18+int TclObject::callback(ClientData cd, Tcl_Interp*, int ac, const char** av)
15 { 19 {
16 u_int n = strlen(s) + 1; 20 TclObject* tc = (TclObject*)cd;
 21 return (tc->command(ac, (const char*const*)av));
cvs diff -r1.2 -r1.3 pkgsrc/mbone/vic/patches/patch-ay (expand / switch to unified diff)

--- pkgsrc/mbone/vic/patches/patch-ay 2007/01/13 11:27:03 1.2
+++ pkgsrc/mbone/vic/patches/patch-ay 2010/01/25 21:14:45 1.3
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ay,v 1.2 2007/01/13 11:27:03 joerg Exp $ 1$NetBSD: patch-ay,v 1.3 2010/01/25 21:14:45 is Exp $
2 2
3--- configure.orig 1996-06-24 00:59:45.000000000 +0000 3--- configure.orig 1996-06-24 00:59:45.000000000 +0000
4+++ configure 4+++ configure
5@@ -1468,6 +1468,8 @@ else 5@@ -1468,6 +1468,8 @@ else
6 d="" 6 d=""
7 fi 7 fi
8  8
9+tcldir=tcl8.3 9+tcldir=tcl8.4
10+tcllib=tcl83 10+tcllib=tcl84
11 if test "$d" != "" ; then  11 if test "$d" != "" ; then
12 if test ! -d $d ; then  12 if test ! -d $d ; then
13 echo "'$d' is not a directory" 13 echo "'$d' is not a directory"
14@@ -1478,8 +1480,8 @@ if test "$d" != "" ; then  14@@ -1478,8 +1480,8 @@ if test "$d" != "" ; then
15 echo "can't find tcl.h in $d/include" 15 echo "can't find tcl.h in $d/include"
16 exit 1 16 exit 1
17 fi 17 fi
18- places="$d/lib/libtcl7.5.so \ 18- places="$d/lib/libtcl7.5.so \
19- $d/lib/libtcl7.5.a \ 19- $d/lib/libtcl7.5.a \
20+ places="$d/lib/lib${tcllib}.so \ 20+ places="$d/lib/lib${tcllib}.so \
21+ $d/lib/lib${tcllib}.a \ 21+ $d/lib/lib${tcllib}.a \
22 $d/lib/libtcl.so \ 22 $d/lib/libtcl.so \
23 $d/lib/libtcl.a" 23 $d/lib/libtcl.a"
@@ -172,28 +172,28 @@ $NetBSD: patch-ay,v 1.2 2007/01/13 11:27 @@ -172,28 +172,28 @@ $NetBSD: patch-ay,v 1.2 2007/01/13 11:27
172+ /usr/contrib/lib/${tcldir} \ 172+ /usr/contrib/lib/${tcldir} \
173+ /usr/lib/${tcldir} \ 173+ /usr/lib/${tcldir} \
174+ /usr/lib/tk/${tcldir} \ 174+ /usr/lib/tk/${tcldir} \
175+ /import/tcl/lib/${tcldir} \ 175+ /import/tcl/lib/${tcldir} \
176+ $prefix/lib/${tcldir} \ 176+ $prefix/lib/${tcldir} \
177+ $x_libraries/${tcldir} \ 177+ $x_libraries/${tcldir} \
178 /usr/local/lib/tcl \ 178 /usr/local/lib/tcl \
179 /usr/lib/tcl \ 179 /usr/lib/tcl \
180 /usr/lib/tk/tcl \ 180 /usr/lib/tk/tcl \
181@@ -1651,6 +1618,8 @@ else 181@@ -1651,6 +1618,8 @@ else
182 d="" 182 d=""
183 fi 183 fi
184  184
185+tkdir=tk8.3 185+tkdir=tk8.4
186+tklib=tk83 186+tklib=tk84
187 if test "$d" != "" ; then  187 if test "$d" != "" ; then
188 if test ! -d $d ; then  188 if test ! -d $d ; then
189 echo "'$d' is not a directory" 189 echo "'$d' is not a directory"
190@@ -1661,8 +1630,8 @@ if test "$d" != "" ; then  190@@ -1661,8 +1630,8 @@ if test "$d" != "" ; then
191 echo "can't find tk.h in $d/include" 191 echo "can't find tk.h in $d/include"
192 exit 1 192 exit 1
193 fi 193 fi
194- places="$d/lib/libtk4.1.so \ 194- places="$d/lib/libtk4.1.so \
195- $d/lib/libtk4.1.a \ 195- $d/lib/libtk4.1.a \
196+ places="$d/lib/lib${tklib}.so \ 196+ places="$d/lib/lib${tklib}.so \
197+ $d/lib/lib${tklib}.a \ 197+ $d/lib/lib${tklib}.a \
198 $d/lib/libtk.so \ 198 $d/lib/libtk.so \
199 $d/lib/libtk.a" 199 $d/lib/libtk.a"
File Added: pkgsrc/mbone/vic/patches/patch-ba
$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);
File Added: pkgsrc/mbone/vic/patches/patch-bb
$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);