diff options
| -rw-r--r-- | mbone/Makefile | 1 | ||||
| -rw-r--r-- | mbone/rtpmon/Makefile | 37 | ||||
| -rw-r--r-- | mbone/rtpmon/distinfo | 3 | ||||
| -rw-r--r-- | mbone/rtpmon/files/patch-Tcl.cc | 10 | ||||
| -rw-r--r-- | mbone/rtpmon/files/patch-aa | 268 | ||||
| -rw-r--r-- | mbone/rtpmon/files/patch-ab | 15 | ||||
| -rw-r--r-- | mbone/rtpmon/files/patch-ac | 245 | ||||
| -rw-r--r-- | mbone/rtpmon/files/patch-ad | 11 | ||||
| -rw-r--r-- | mbone/rtpmon/files/patch-ae | 10 | ||||
| -rw-r--r-- | mbone/rtpmon/files/patch-config.h | 23 | ||||
| -rw-r--r-- | mbone/rtpmon/pkg-descr | 6 |
11 files changed, 0 insertions, 629 deletions
diff --git a/mbone/Makefile b/mbone/Makefile index 06ec87bb26bf..20da6c6a82f7 100644 --- a/mbone/Makefile +++ b/mbone/Makefile @@ -10,7 +10,6 @@ SUBDIR += rat30 SUBDIR += relate SUBDIR += rqm - SUBDIR += rtpmon SUBDIR += rtptools SUBDIR += sdr SUBDIR += speak_freely diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile deleted file mode 100644 index c4d261c0de6c..000000000000 --- a/mbone/rtpmon/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# New ports collection makefile for: rtpmon -# Date created: 1 November 1996 -# Whom: Bill Fenner <fenner@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= rtpmon -PORTVERSION= 1.0a7 -PORTREVISION= 5 -CATEGORIES= mbone tk -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= fenner - -MAINTAINER= ports@FreeBSD.org -COMMENT= A program to monitor loss in multicast sessions - -LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 - -DEPRECATED= abandoned upstream, needs gcc32 which is going to be removed -EXPIRATION_DATE=2008-08-15 - -USE_AUTOTOOLS= autoconf:261:env -GNU_CONFIGURE= yes -USE_GCC= 3.2 -MAN1= rtpmon.1 -PLIST_FILES= bin/rtpmon - -.include <bsd.port.pre.mk> - -pre-configure: - @cd ${WRKSRC}; ${CHMOD} +w configure; ${AUTOCONF} - -post-install: - ${STRIP_CMD} ${PREFIX}/bin/rtpmon - -.include <bsd.port.post.mk> diff --git a/mbone/rtpmon/distinfo b/mbone/rtpmon/distinfo deleted file mode 100644 index fe106d9cd539..000000000000 --- a/mbone/rtpmon/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rtpmon-1.0a7.tar.gz) = 23790f683c7b237078e9c3c67e3ec85d -SHA256 (rtpmon-1.0a7.tar.gz) = f36563ade70a1967db1f6ea365c60ed288939323ddb6cdef4c7801f202b5ffed -SIZE (rtpmon-1.0a7.tar.gz) = 81978 diff --git a/mbone/rtpmon/files/patch-Tcl.cc b/mbone/rtpmon/files/patch-Tcl.cc deleted file mode 100644 index 558a417c31d5..000000000000 --- a/mbone/rtpmon/files/patch-Tcl.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- Tcl.cc-- Mon Jun 10 16:59:27 2002 -+++ Tcl.cc Mon Jun 10 16:59:31 2002 -@@ -66,6 +66,7 @@ - { - instance_.tcl_ = tcl; - instance_.application_ = application; -+ Tcl_Init(tcl); - } - - void Tcl::evalf(const char* fmt, ...) diff --git a/mbone/rtpmon/files/patch-aa b/mbone/rtpmon/files/patch-aa deleted file mode 100644 index 086f814a5657..000000000000 --- a/mbone/rtpmon/files/patch-aa +++ /dev/null @@ -1,268 +0,0 @@ ---- configure.in.orig Wed Jan 15 16:44:04 1997 -+++ configure.in Tue Nov 2 17:36:27 1999 -@@ -89,35 +89,8 @@ - found_tcl_h="no" - libtcl="no" - --AC_ARG_WITH(tcl, --with-tcl=path Specify a path for Tcl, dir=$withval, dir="none") -- --if test "$dir" = "none" ; then -- AC_CHECK_HEADER(tcl.h, found_tcl_h="yes", found_tcl_h="no") -- AC_CHECK_LIB(tcl7.6, Tcl_Init, libtcl="-ltcl7.6", libtcl="no") -- if test "$libtcl" = "no" ; then -- AC_CHECK_LIB(tcl7.5, Tcl_Init, libtcl="-ltcl7.5", libtcl="no") -- fi -- if test "$libtcl" = "no" ; then -- AC_CHECK_LIB(tcl, Tcl_Init, libtcl="-ltcl", libtcl="no") -- fi --fi -- --if test "$found_tcl_h" = "no" ; then - AC_MSG_CHECKING(for tcl.h) -- places="$dir/include \ -- ../tcl7.6/generic \ -- /usr/src/tcl7.6/generic \ -- /usr/local/src/tcl7.6/generic \ -- /usr/src/local/tcl7.6/generic \ -- ../tcl7.5/generic \ -- /usr/src/tcl7.5/generic \ -- /usr/local/src/tcl7.5/generic \ -- /usr/src/local/tcl7.5/generic \ -- /usr/include \ -- /usr/local/include \ -- /usr/contrib/include \ -- $prefix/include \ -- $x_includes" -+ places="/usr/local/include/tcl8.3" - - for place in $places ; do - if test -r $place/tcl.h ; then -@@ -136,22 +109,10 @@ - AC_MSG_RESULT(nope) - AC_MSG_ERROR([Can't find tcl.h. Try the --with-tcl option.]) - fi --fi - --if test "$libtcl" = "no" ; then - AC_MSG_CHECKING(for libtcl) - places="$dir/lib \ -- ../tcl7.6/unix \ -- /usr/src/tcl7.6/unix \ -- /usr/local/src/tcl7.6/unix \ -- /usr/src/local/tcl7.6/unix \ -- ../tcl7.5/unix \ -- /usr/src/tcl7.5/unix \ -- /usr/local/src/tcl7.5/unix \ -- /usr/src/local/tcl7.5/unix \ -- /usr/lib \ - /usr/local/lib \ -- /usr/contrib/lib \ - $prefix/lib \ - $x_libraries" - -@@ -185,18 +146,10 @@ - fi - - if test "$libtcl" = "no" ; then -- if test -r $place/libtcl7.6.a ; then -- AC_MSG_RESULT($place/libtcl7.6.a) -- LDFLAGS="$LDFLAGS -L$place" -- libtcl="-ltcl7.6" -- elif test -r $place/libtcl7.5.a ; then -- AC_MSG_RESULT($place/libtcl7.5.a) -- LDFLAGS="$LDFLAGS -L$place" -- libtcl="-ltcl7.5" -- elif test -r $place/libtcl.a ; then -- AC_MSG_RESULT($place/libtcl.a) -+ if test -r $place/libtcl83.a ; then -+ AC_MSG_RESULT($place/libtcl83.a) - LDFLAGS="$LDFLAGS -L$place" -- libtcl="-ltcl" -+ libtcl="-ltcl83" - fi - fi - -@@ -209,40 +162,10 @@ - AC_MSG_RESULT(nope) - AC_MSG_ERROR([Can't find libtcl. Try the --with-tcl option.]) - fi --fi - - found_init_tcl="no" - AC_MSG_CHECKING(for Tcl runtime libraries) --places="$dir/lib/tcl7.6 \ -- $dir/share/lib/tcl7.6 \ -- ../tcl7.6/library \ -- /usr/src/tcl7.6/library \ -- /usr/local/src/tcl7.6/library \ -- /usr/src/local/tcl7.6/library \ -- /usr/lib/tcl7.6 \ -- /usr/share/lib/tcl7.6 \ -- /usr/local/lib/tcl7.6 \ -- /usr/local/share/lib/tcl7.6 \ -- /usr/contrib/lib/tcl7.6 \ -- /usr/contrib/share/lib/tcl7.6 \ -- $prefix/lib/tcl7.6 \ -- $prefix/share/lib/tcl7.6 \ -- $x_libraries/tcl7.6 \ -- $dir/lib/tcl7.5 \ -- $dir/share/lib/tcl7.5 \ -- ../tcl7.5/library \ -- /usr/src/tcl7.5/library \ -- /usr/local/src/tcl7.5/library \ -- /usr/src/local/tcl7.5/library \ -- /usr/lib/tcl7.5 \ -- /usr/share/lib/tcl7.5 \ -- /usr/local/lib/tcl7.5 \ -- /usr/local/share/lib/tcl7.5 \ -- /usr/contrib/lib/tcl7.5 \ -- /usr/contrib/share/lib/tcl7.5 \ -- $prefix/lib/tcl7.5 \ -- $prefix/share/lib/tcl7.5 \ -- $x_libraries/tcl7.5" -+places="/usr/local/lib/tcl8.3" - - for place in $places; do - if test -r $place/init.tcl ; then -@@ -263,39 +186,8 @@ - found_tk_h="no" - libtk="no" - --AC_ARG_WITH(tk, --with-tk=path Specify a path for Tk, dir=$withval, dir="none") -- --if test "$dir" = "none" ; then -- AC_CHECK_HEADER(tk.h, found_tk_h="yes", found_tk_h="no") -- if test "$sunos" = 1 ; then -- AC_CHECK_LIB(tk42, Tk_Init, libtk="-ltk42", libtk="no") -- if test "$libtk" = "no" ; then -- AC_CHECK_LIB(tk41, Tk_Init, libtk="-ltk41", libtk="no") -- fi -- else -- AC_CHECK_LIB(tk4.2, Tk_init, libtk="-ltk4.2", libtk="no") -- if test "$libtk" = "no" ; then -- AC_CHECK_LIB(tk4.1, Tk_Init, libtk="-ltk4.1", libtk="no") -- fi -- fi -- -- if test "$libtk" = "no" ; then -- AC_CHECK_LIB(tk, Tk_Init, libtk="-ltk", libtk="no") -- fi --fi -- --if test "$found_tk_h" = "no" ; then - AC_MSG_CHECKING(for tk.h) -- places="$dir/include \ -- ../tk4.1/generic \ -- /usr/src/tk4.1/generic \ -- /usr/local/src/tk4.1/generic \ -- /usr/src/local/tk4.1/generic \ -- /usr/include \ -- /usr/local/include \ -- /usr/contrib/include \ -- $prefix/include \ -- $x_includes" -+ places="/usr/local/include/tk8.3" - - for place in $places; do - if test -r $place/tk.h ; then -@@ -310,55 +202,19 @@ - AC_MSG_RESULT(nope) - AC_MSG_ERROR([Can't find tk.h. Try the --with-tk option.]) - fi --fi - --if test "$libtk" = "no" ; then - AC_MSG_CHECKING(for libtk) - places="$dir/lib \ -- ../tk4.1/unix \ -- /usr/src/tk4.1/unix \ -- /usr/local/src/tk4.1/unix \ -- /usr/src/local/tk4.1/unix \ -- /usr/lib \ - /usr/local/lib \ -- /usr/contrib/lib \ - $prefix/lib \ - $x_libraries" - - for place in $places; do -- if test "$solaris" = 1 ; then -- if test -r $place/libtk4.1.so ; then -- AC_MSG_RESULT($place/libtk4.1.so) -- LDFLAGS="$LDFLAGS -R$place -L$place" -- libtk="-ltk4.1" -- elif test -r $place/libtk.so ; then -- AC_MSG_RESULT($place/libtk.so) -- LDFLAGS="$LDFLAGS -R$place -L$place" -- libtk="-ltk" -- fi -- fi -- -- if test "$sunos" = 1 -a -r $place/libtk41.a ; then -- AC_MSG_RESULT($place/libtk41.a) -- LDFLAGS="$LDFLAGS -L$place" -- libtk="-ltk41" -- fi -- -- if test "$libtk" = "no" ; then -- if test -r $place/libtk4.2.a ; then -- AC_MSG_RESULT($place/libtk4.2.a) -+ if test -r $place/libtk83.a ; then -+ AC_MSG_RESULT($place/libtk83.a) - LDFLAGS="$LDFLAGS -L$place" -- libtk="-ltk4.2" -- elif test -r $place/libtk4.1.a ; then -- AC_MSG_RESULT($place/libtk4.1.a) -- LDFLAGS="$LDFLAGS -L$place" -- libtk="-ltk4.1" -- elif test -r $place/libtk.a ; then -- AC_MSG_RESULT($place/libtk.a) -- LDFLAGS="$LDFLAGS -L$place" -- libtk="-ltk" -+ libtk="-ltk83" - fi -- fi - - if test "$libtk" != "no" ; then - break -@@ -373,40 +229,10 @@ - AC_MSG_RESULT(nope) - AC_MSG_ERROR([Can't find libtk. Try the --with-tk option.]) - fi --fi - - found_tk_tcl="no" - AC_MSG_CHECKING(for Tk runtime libraries) --places="$dir/lib/tk4.2 \ -- $dir/share/lib/tk4.2 \ -- ../tk4.2/library \ -- /usr/src/tk4.2/library \ -- /usr/local/src/tk4.2/library \ -- /usr/src/local/tk4.2/library \ -- /usr/lib/tk4.2 \ -- /usr/share/lib/tk4.2 \ -- /usr/local/lib/tk4.2 \ -- /usr/local/share/lib/tk4.2 \ -- /usr/contrib/lib/tk4.2 \ -- /usr/contrib/share/lib/tk4.2 \ -- $prefix/lib/tk4.2 \ -- $prefix/share/lib/tk4.2 \ -- $x_libraries/tk4.2 \ -- $dir/lib/tk4.1 \ -- $dir/share/lib/tk4.1 \ -- ../tk4.1/library \ -- /usr/src/tk4.1/library \ -- /usr/local/src/tk4.1/library \ -- /usr/src/local/tk4.1/library \ -- /usr/lib/tk4.1 \ -- /usr/share/lib/tk4.1 \ -- /usr/local/lib/tk4.1 \ -- /usr/local/share/lib/tk4.1 \ -- /usr/contrib/lib/tk4.1 \ -- /usr/contrib/share/lib/tk4.1 \ -- $prefix/lib/tk4.1 \ -- $prefix/share/lib/tk4.1 \ -- $x_libraries/tk4.1" -+places="/usr/local/lib/tk8.3" - - for place in $places; do - if test -r $place/tk.tcl ; then diff --git a/mbone/rtpmon/files/patch-ab b/mbone/rtpmon/files/patch-ab deleted file mode 100644 index 2a653b26e713..000000000000 --- a/mbone/rtpmon/files/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.in.orig Wed Nov 6 18:18:43 1996 -+++ Makefile.in Wed Nov 6 18:20:40 1996 -@@ -112,5 +112,12 @@ - rtpmon: $(OBJS) - $(C++) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) - -+install: rtpmon -+ cp rtpmon @prefix@/bin -+ chown bin @prefix@/bin/rtpmon -+ chgrp bin @prefix@/bin/rtpmon -+ chmod 555 @prefix@/bin/rtpmon -+ cp rtpmon.1 @prefix@/man/man1 -+ - clean: - rm -f *.o rtpmon config.cache config.log diff --git a/mbone/rtpmon/files/patch-ac b/mbone/rtpmon/files/patch-ac deleted file mode 100644 index f47d4bf8103a..000000000000 --- a/mbone/rtpmon/files/patch-ac +++ /dev/null @@ -1,245 +0,0 @@ ---- iohandler.cc.orig Wed Jan 15 16:44:05 1997 -+++ iohandler.cc Tue Nov 2 17:06:47 1999 -@@ -37,13 +37,13 @@ - void IOHandler::link(int fd, int mask) - { - fd_ = fd; -- Tk_CreateFileHandler((ClientData) fd, mask, callback, (ClientData)this); -+ Tk_CreateFileHandler(fd, mask, callback, (ClientData)this); - } - - void IOHandler::unlink() - { - if (fd_ >= 0) { -- Tk_DeleteFileHandler((ClientData) fd_); -+ Tk_DeleteFileHandler(fd_); - fd_ = -1; - } - } ---- main.cc.orig Wed Jan 15 16:44:05 1997 -+++ main.cc Tue Nov 2 17:07:41 1999 -@@ -28,10 +28,8 @@ - #endif - #include <X11/Xlib.h> - --#ifdef _AIX - #include <stdlib.h> - #include <unistd.h> --#endif - - /* Get FD_SETSIZE */ - #if defined(linux) -@@ -79,7 +77,7 @@ - else { - Tk_Window tk = t.tkmain(); - Tk_Uid uid = Tk_GetUid((char*)argv[1]); -- XFontStruct* p = Tk_GetFontStruct(t.interp(), tk, uid); -+ Tk_Font p = Tk_GetFont(t.interp(), tk, uid); - t.result(p != 0 ? "1" : "0"); - } - return (TCL_OK); ---- member.cc.orig Wed Jan 15 16:44:05 1997 -+++ member.cc Tue Nov 2 17:08:40 1999 -@@ -31,6 +31,8 @@ - #include "Tcl.h" - #include "member.h" - -+#include <stdlib.h> -+ - #ifndef HAVE_SNPRINTF - extern "C" { - int snprintf(char* buf, int s, const char* fmt, ...); ---- monitor.cc.orig Wed Jan 15 16:44:05 1997 -+++ monitor.cc Tue Nov 2 17:09:04 1999 -@@ -922,7 +922,7 @@ - sprintf(val, "%u ms", j); - break; - } -- Tcl_SetVar2(interp, "median", s->name(), val, TCL_GLOBAL_ONLY); -+ Tcl_SetVar2(interp, "median", (char*)s->name(), val, TCL_GLOBAL_ONLY); - } - } - ---- tkStripchart.c.orig Wed Jan 15 16:44:06 1997 -+++ tkStripchart.c Tue Nov 2 17:18:48 1999 -@@ -30,10 +30,6 @@ - #include <math.h> - #include "tk.h" - --#if TK_MINOR_VERSION<1 --#define Tk_Cursor Cursor --#endif -- - #define BLACK "Black" - #define WHITE "White" - #define GRAY "#b0b0b0" -@@ -145,7 +141,7 @@ - int scrollrequired; - int guarantee_draw; - int grow_up; -- XFontStruct *fontPtr; /* Information about text font, or NULL. */ -+ Tk_Font font; /* TK font */ - XColor *textColorPtr; /* Color for drawing text. */ - GC textGC; /* GC for drawing text. */ - XColor *tickColorPtr; /* Color for drawing ticks. */ -@@ -254,7 +250,7 @@ - {TK_CONFIG_SYNONYM, "-fg", "stripcolor", 0, - 0, 0, 0}, - {TK_CONFIG_FONT, "-font", "font", "Font", -- DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, fontPtr), -+ DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, font), - 0}, - {TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing", - "Guaranteedrawing", DEF_GUARANTEE_DRAW, -@@ -567,8 +563,8 @@ - if (StripchartPtr->value != NULL) - free(StripchartPtr->value); - -- if (StripchartPtr->fontPtr != NULL) -- Tk_FreeFontStruct(StripchartPtr->fontPtr); -+ if (StripchartPtr->font != NULL) -+ Tk_FreeFont(StripchartPtr->font); - - if (StripchartPtr->textColorPtr != NULL) - Tk_FreeColor(StripchartPtr->textColorPtr); -@@ -628,7 +624,7 @@ - - Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border); - -- gcValues.font = StripchartPtr->fontPtr->fid; -+ gcValues.font = Tk_FontId(StripchartPtr->font); - gcValues.foreground = StripchartPtr->textColorPtr->pixel; - newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues); - if (StripchartPtr->textGC != None && StripchartPtr->tkwin) { -@@ -689,9 +685,11 @@ - { - int tt = hasatitle(StripchartPtr); - int bd = StripchartPtr->borderWidth; -- int lineHeight = StripchartPtr->fontPtr->ascent + -- StripchartPtr->fontPtr->descent; -+ int lineHeight; -+ Tk_FontMetrics metrics; - -+ Tk_GetFontMetrics(StripchartPtr->font, &metrics); -+ lineHeight = metrics.ascent + metrics.descent; - Tk_GeometryRequest(StripchartPtr->tkwin, - 2 * (bd + PADDING) + StripchartPtr->num_strips * - StripchartPtr->strip_width, -@@ -723,11 +721,14 @@ - /* - * Variable declarations used in the title drawing routines - */ -- XFontStruct *fp = StripchartPtr->fontPtr; - XCharStruct bbox; - int x, dummy; -- int lineHeight = StripchartPtr->fontPtr->ascent + -- StripchartPtr->fontPtr->descent; -+ Tk_Font tkf = StripchartPtr->font; -+ int lineHeight; -+ Tk_FontMetrics fm; -+ -+ Tk_GetFontMetrics(tkf, &fm); -+ lineHeight = fm.ascent + fm.descent; - - StripchartPtr->displaybits &= ~REDRAW_PENDING; - if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) -@@ -744,19 +745,20 @@ - * space. Otherwise left justified and clipped on the right. - */ - if (tt && StripchartPtr->displaybits & DISPLAY_TITLE) { -- XTextExtents(fp, StripchartPtr->title, -- strlen(StripchartPtr->title), -- &dummy, &dummy, &dummy, &bbox); -- if (bbox.lbearing + bbox.rbearing < Tk_Width(tkwin) - 2 * bd) -- x = (Tk_Width(tkwin) - bbox.lbearing - bbox.rbearing)/2; -+ int width = Tk_TextWidth(tkf, StripchartPtr->title, -+ strlen(StripchartPtr->title)); -+ if (width < Tk_Width(tkwin) - 2 * bd) -+ x = (Tk_Width(tkwin) - width)/2; - else -- x = bd + PADDING; -- -+ x = bd + PADDING; - XClearArea(Tk_Display(tkwin), Tk_WindowId(tkwin), bd, bd, -- Tk_Width(tkwin) - 2 * bd, lineHeight + PADDING, False); -+ Tk_Width(tkwin) - 2*bd, -+ lineHeight + PADDING, False); -+ /* XXX In the absence of max_bounds, approximate... */ - XDrawString(Tk_Display(tkwin), Tk_WindowId(tkwin), -- StripchartPtr->textGC, x, fp->max_bounds.ascent + bd, -- StripchartPtr->title, strlen(StripchartPtr->title)); -+ StripchartPtr->textGC, x, fm.ascent + bd, -+ StripchartPtr->title, -+ strlen(StripchartPtr->title)); - } - /* - * draw the strips -@@ -827,7 +829,8 @@ - Tk_CancelIdleCall(DisplayStripchart, - (ClientData)StripchartPtr); - } -- Tk_EventuallyFree((ClientData)StripchartPtr, DestroyStripchart); -+ Tk_EventuallyFree((ClientData)StripchartPtr, -+ (Tcl_FreeProc*)DestroyStripchart); - } else if (eventPtr->type == ConfigureNotify) { - int n = eventPtr->xconfigure.width; - n -= 2 * (StripchartPtr->borderWidth + PADDING); -@@ -1056,14 +1059,20 @@ - DrawStripi(Stripchart* SPtr, int i) - { - Tk_Window tkwin = SPtr->tkwin; -- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; -+ int lineHeight; - int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width; -- int y = SPtr->borderWidth + PADDING + -- hasatitle(SPtr) * (lineHeight + PADDING); -+ int y; - int w = SPtr->strip_width; - int h; - double maxv = SPtr->max_value; - double minv = SPtr->min_value; -+ Tk_FontMetrics metrics; -+ -+ Tk_GetFontMetrics(SPtr->font, &metrics); -+ lineHeight = metrics.ascent + metrics.descent; -+ -+ y = SPtr->borderWidth + PADDING + -+ hasatitle(SPtr) * (lineHeight + PADDING); - - if (i < 1 || i > SPtr->num_strips) - return; -@@ -1135,14 +1144,20 @@ - ScrollStrips(Stripchart* SPtr) - { - Tk_Window tkwin = SPtr->tkwin; -- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; -+ int lineHeight; - int src_x = SPtr->borderWidth + PADDING + SPtr->strip_width; -- int src_y = SPtr->borderWidth + PADDING + -- hasatitle(SPtr) * (lineHeight + PADDING); -+ int src_y; - int dest_x = src_x - SPtr->strip_width; - int dest_y = src_y; - int w = (SPtr->num_strips - 1) * SPtr->strip_width; - int h = SPtr->max_height; -+ Tk_FontMetrics metrics; -+ -+ Tk_GetFontMetrics(SPtr->font, &metrics); -+ lineHeight = metrics.ascent = metrics.descent; -+ -+ src_y = SPtr->borderWidth + PADDING + -+ hasatitle(SPtr) * (lineHeight + PADDING); - - 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); ---- ui-display.tcl.orig Wed Jan 15 16:44:06 1997 -+++ ui-display.tcl Tue Nov 2 17:19:30 1999 -@@ -307,7 +307,7 @@ - bind $b <Leave> "$b conf -bg [option get . background Rtpmon]" - bind $b <Button-1> "CreateInfoWindow $s" - -- menu $b.menu -transient yes -+ menu $b.menu - $b.menu add command -label "Site Info" -font [resource smallfont] \ - -command "CreateInfoWindow $s" - $b.menu add command -label "Ignore" -font [resource smallfont] \ diff --git a/mbone/rtpmon/files/patch-ad b/mbone/rtpmon/files/patch-ad deleted file mode 100644 index 50584fae6407..000000000000 --- a/mbone/rtpmon/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Thu Jan 27 19:01:25 2000 -+++ Makefile.in Thu Jan 27 19:01:36 2000 -@@ -43,7 +43,7 @@ - all: rtpmon - - .cc.o: -- $(C++) -o $@ -c $(CXXFLAGS) $*.cc -+ $(C++) -pedantic -o $@ -c $(CXXFLAGS) $*.cc - - .c.o: - $(CC) -o $@ -c $(CFLAGS) $*.c diff --git a/mbone/rtpmon/files/patch-ae b/mbone/rtpmon/files/patch-ae deleted file mode 100644 index 1133c136c8bb..000000000000 --- a/mbone/rtpmon/files/patch-ae +++ /dev/null @@ -1,10 +0,0 @@ ---- net-ip.cc.orig Thu Jan 27 19:03:25 2000 -+++ net-ip.cc Thu Jan 27 19:03:34 2000 -@@ -38,6 +38,7 @@ - #include <stdlib.h> - #include <errno.h> - #include <string.h> -+#include <time.h> - #include <unistd.h> - #include <sys/param.h> - #include <sys/socket.h> diff --git a/mbone/rtpmon/files/patch-config.h b/mbone/rtpmon/files/patch-config.h deleted file mode 100644 index bf3829c2236d..000000000000 --- a/mbone/rtpmon/files/patch-config.h +++ /dev/null @@ -1,23 +0,0 @@ ---- config.h.orig Sun Sep 29 10:53:58 2002 -+++ config.h Sun Sep 29 10:54:13 2002 -@@ -43,20 +43,6 @@ - # include <sys/bitypes.h> - #endif - --#ifndef __BIT_TYPES_DEFINED__ --/*XXX*/ --# ifdef sco --typedef char int8_t; --# else --typedef signed char int8_t; --# endif --typedef unsigned char u_int8_t; --typedef short int16_t; --typedef unsigned short u_int16_t; --typedef unsigned int u_int32_t; --typedef int int32_t; --#endif -- - #ifdef _AIX41 - typedef int bool; - #define true 1 diff --git a/mbone/rtpmon/pkg-descr b/mbone/rtpmon/pkg-descr deleted file mode 100644 index 48020dc00c1a..000000000000 --- a/mbone/rtpmon/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Rtpmon is a third-party RTCP monitor. It can be used to monitor -the control information exchanged between applications that implement -RTP, the Real-Time Transport Protocol. Feedback from receivers, -including the loss rate and jitter, are displayed in a table that -can be sorted in various ways to help isolate and diagnose multicast -distribution problems. |