cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

...and remove old patches

Browse Source
This commit is contained in:
espie 2001-07-30 15:38:41 +00:00
parent 27ba84b0d1
commit 9092e73fa6
17 changed files with 0 additions and 1135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

249
mbone/vat/patches/patch-aa
View File

@ -1,249 +0,0 @@
--- configure.in.tk.orig Thu May 16 01:06:05 1996
+++ configure.in.tk Tue Sep 9 11:35:45 1997
@@ -2,6 +2,7 @@
dnl $Header: /home/cvs/ports/mbone/vat/patches/Attic/patch-aa,v 1.1.1.1 1999/08/05 00:45:50 niklas Exp $ (LBL)
AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="")
+tclposs="tcl8.0 tcl80 tcl"
if test "$d" != "" ; then
if test ! -d $d ; then
echo "'$d' is not a directory"
@@ -12,22 +13,22 @@
echo "can't find tcl.h in $d/include"
exit 1
fi
- places="$d/lib/libtcl7.5.so \
- $d/lib/libtcl7.5.a \
- $d/lib/libtcl.so \
- $d/lib/libtcl.a"
V_LIB_TCL=FAIL
- for dir in $places; do
- if test -r $dir ; then
- V_LIB_TCL=$dir
+ for p in $tclposs; do
+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
+ V_LIB_TCL="-L$d/lib -l$p"
+ break
+ fi
+ if test -r $d/lib/lib$p.a ; then
+ V_LIB_TCL="-L$d/lib -l$p"
break
fi
done
- if test $V_LIB_TCL = FAIL ; then
+ if test "$V_LIB_TCL" = FAIL ; then
echo "can't find libtcl.a in $d/lib"
exit 1
fi
- places="$d/lib/tcl7.5 \
+ places="$d/lib/tcl8.0 \
$d/lib/tcl"
V_LIBRARY_TCL=FAIL
for dir in $places; do
@@ -44,13 +45,14 @@
AC_TEST_CPP([#include <tcl.h>], V_INCLUDE_TCL="", V_INCLUDE_TCL=FAIL)
if test "$V_INCLUDE_TCL" = FAIL; then
echo "checking for tcl.h"
- places="$PWD/../tcl7.5 \
- /usr/src/local/tcl7.5 \
- /import/tcl/include/tcl7.5 \
+ places="$PWD/../tcl8.0 \
+ /usr/src/local/tcl8.0 \
+ /import/tcl/include/tcl8.0 \
$prefix/include \
$x_includes/tk \
$x_includes \
/usr/local/include \
+ /usr/local/include/tcl8.0 \
/usr/contrib/include \
/usr/include"
for dir in $places; do
@@ -64,7 +66,7 @@
exit 1
fi
fi
- AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL")
+ AC_CHECK_LIB(tcl8.0, main, V_LIB_TCL="-ltcl8.0", V_LIB_TCL="FAIL")
if test "$V_LIB_TCL" = FAIL; then
echo "checking for libtcl.a"
places="\
@@ -73,17 +75,22 @@
/usr/contrib/lib \
/usr/local/lib \
/usr/lib \
- $PWD/../tcl7.5 \
- /usr/src/local/tcl7.5 \
- /import/tcl/lib/tcl7.5 \
+ $PWD/../tcl8.0 \
+ /usr/src/local/tcl8.0 \
+ /import/tcl/lib/tcl8.0 \
"
for dir in $places; do
- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then
- V_LIB_TCL="-L$dir -ltcl7.5"
- break
- fi
- if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
- V_LIB_TCL="-L$dir -ltcl"
+ for p in $tclposs; do
+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
+ V_LIB_TCL="-L$dir -l$p"
+ break
+ fi
+ if test -r $dir/lib$p.a ; then
+ V_LIB_TCL="-L$dir -l$p"
+ break
+ fi
+ done
+ if test "$V_LIB_TCL" != FAIL; then
break
fi
done
@@ -98,15 +105,16 @@
fi
echo "checking for tcl/init.tcl"
V_LIBRARY_TCL=FAIL
- places="/usr/local/lib/tcl7.5 \
- /usr/contrib/lib/tcl7.5 \
- /usr/lib/tcl7.5 \
- /usr/lib/tk/tcl7.5 \
- /import/tcl/lib/tcl7.5 \
- $prefix/lib/tcl7.5 \
- $x_libraries/tcl7.5 \
+ places="/usr/local/lib/tcl8.0 \
+ /usr/contrib/lib/tcl8.0 \
+ /usr/lib/tcl8.0 \
+ /usr/lib/tk/tcl8.0 \
+ /import/tcl/lib/tcl8.0 \
+ $prefix/lib/tcl8.0 \
+ $x_libraries/tcl8.0 \
/usr/local/lib/tcl \
/usr/lib/tcl \
+ /usr/libdata/tcl \
/usr/lib/tk/tcl \
/import/tcl/lib/tcl \
$prefix/lib/tcl \
@@ -128,6 +136,7 @@
AC_SUBST(V_LIBRARY_TCL)
AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="")
+tkposs="tk8.0 tk80 tk"
if test "$d" != "" ; then
if test ! -d $d ; then
echo "'$d' is not a directory"
@@ -138,22 +147,22 @@
echo "can't find tk.h in $d/include"
exit 1
fi
- places="$d/lib/libtk4.1.so \
- $d/lib/libtk4.1.a \
- $d/lib/libtk.so \
- $d/lib/libtk.a"
V_LIB_TK=FAIL
- for dir in $places; do
- if test -r $dir ; then
- V_LIB_TK=$dir
+ for p in $tkposs; do
+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
+ V_LIB_TK="-L$d/lib -l$p"
+ break
+ fi
+ if test -r $d/lib/lib$p.a ; then
+ V_LIB_TK="-L$d/lib -l$p"
break
fi
done
- if test $V_LIB_TK = FAIL ; then
+ if test "$V_LIB_TK" = FAIL ; then
echo "can't find libtk.a in $d/lib"
exit 1
fi
- places="$d/lib/tk4.1 \
+ places="$d/lib/tk8.0 \
$d/lib/tk"
V_LIBRARY_TK=FAIL
for dir in $places; do
@@ -174,14 +183,15 @@
places="\
$prefix/include \
/usr/local/include \
+ /usr/local/include/tk8.0 \
/usr/contrib/include \
/usr/include/tcl \
/usr/include\
$x_includes/tk \
$x_includes \
- $PWD/../tk4.1 \
- /usr/src/local/tk4.1 \
- /import/tcl/include/tk4.1 \
+ $PWD/../tk8.0 \
+ /usr/src/local/tk8.0 \
+ /import/tcl/include/tk8.0 \
"
for dir in $places; do
if test -r $dir/tk.h ; then
@@ -194,7 +204,7 @@
exit 1
fi
fi
- AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL")
+ AC_CHECK_LIB(tk8.0, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL")
if test "$V_LIB_TK" = FAIL; then
echo "checking for libtk.a"
places="/usr/local/lib \
@@ -202,17 +212,22 @@
/usr/lib \
/usr/lib/tk \
/import/tcl/lib \
- $PWD/../tk4.1 \
- /usr/src/local/tk4.1 \
+ $PWD/../tk8.0 \
+ /usr/src/local/tk8.0 \
$prefix/lib \
$x_libraries"
for dir in $places; do
- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then
- V_LIB_TK="-L$dir -ltk4.1"
- break
- fi
- if test -r $dir/libtk.so -o -r $dir/libtk.a; then
- V_LIB_TK="-L$dir -ltk"
+ for p in $tkposs; do
+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
+ V_LIB_TK="-L$dir -l$p"
+ break
+ fi
+ if test -r $dir/lib$p.a ; then
+ V_LIB_TK="-L$dir -l$p"
+ break
+ fi
+ done
+ if test "$V_LIB_TK" != FAIL; then
break
fi
done
@@ -227,15 +242,15 @@
fi
echo "checking for tk/tk.tcl"
V_LIBRARY_TK=FAIL
- places="/usr/local/lib/tk4.1 \
- /usr/contrib/lib/tk4.1 \
- /usr/lib/tk4.1 \
- /usr/lib/tk/tk4.1 \
- /import/tcl/lib/tk4.1 \
- $prefix/lib/tk4.1 \
- $x_libraries/tk4.1 \
- $PWD/../tk4.1/library \
- /usr/src/local/tk4.1/library \
+ places="/usr/local/lib/tk8.0 \
+ /usr/contrib/lib/tk8.0 \
+ /usr/lib/tk8.0 \
+ /usr/lib/tk/tk8.0 \
+ /import/tcl/lib/tk8.0 \
+ $prefix/lib/tk8.0 \
+ $x_libraries/tk8.0 \
+ $PWD/../tk8.0/library \
+ /usr/src/local/tk8.0/library \
/usr/local/lib/tk \
/usr/lib/tk \
/usr/lib/tk/tk \

136
mbone/vat/patches/patch-ab
View File

@ -1,136 +0,0 @@
--- tkStripchart.c.orig Tue Sep 9 11:00:42 1997
+++ tkStripchart.c Tue Sep 9 10:52:30 1997
@@ -148,7 +148,7 @@
int scrollrequired;
int guarantee_draw;
int grow_up;
- XFontStruct *fontPtr; /* Information about text font, or NULL. */
+ Tk_Font tkfont; /* Information about text font, or NULL. */
XColor *textColorPtr; /* Color for drawing text. */
GC textGC; /* GC for drawing text. */
XColor *tickColorPtr; /* Color for drawing ticks. */
@@ -257,7 +257,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, tkfont),
0},
{TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing",
"Guaranteedrawing", DEF_GUARANTEE_DRAW,
@@ -570,8 +570,8 @@
if (StripchartPtr->value != NULL)
free(StripchartPtr->value);
- if (StripchartPtr->fontPtr != NULL)
- Tk_FreeFontStruct(StripchartPtr->fontPtr);
+ if (StripchartPtr->tkfont != NULL)
+ Tk_FreeFont(StripchartPtr->tkfont);
if (StripchartPtr->textColorPtr != NULL)
Tk_FreeColor(StripchartPtr->textColorPtr);
@@ -631,7 +631,7 @@
Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border);
- gcValues.font = StripchartPtr->fontPtr->fid;
+ gcValues.font = Tk_FontId(StripchartPtr->tkfont);
gcValues.foreground = StripchartPtr->textColorPtr->pixel;
newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues);
if (StripchartPtr->textGC != None && StripchartPtr->tkwin) {
@@ -692,8 +692,11 @@
{
int tt = hasatitle(StripchartPtr);
int bd = StripchartPtr->borderWidth;
- int lineHeight = StripchartPtr->fontPtr->ascent +
- StripchartPtr->fontPtr->descent;
+ Tk_FontMetrics fm;
+ int lineHeight;
+
+ Tk_GetFontMetrics(StripchartPtr->tkfont, &fm);
+ lineHeight = fm.ascent + fm.descent;
Tk_GeometryRequest(StripchartPtr->tkwin,
2 * (bd + PADDING) + StripchartPtr->num_strips *
@@ -726,11 +729,13 @@
/*
* 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->tkfont;
+ int x;
+ Tk_FontMetrics fm;
+ int lineHeight;
+
+ Tk_GetFontMetrics(tkf, &fm);
+ lineHeight = fm.ascent + fm.descent;
StripchartPtr->displaybits &= ~REDRAW_PENDING;
if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin))
@@ -747,18 +752,17 @@
* 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;
XClearArea(Tk_Display(tkwin), Tk_WindowId(tkwin), bd, bd,
Tk_Width(tkwin) - 2 * bd, lineHeight + PADDING, False);
XDrawString(Tk_Display(tkwin), Tk_WindowId(tkwin),
- StripchartPtr->textGC, x, fp->max_bounds.ascent + bd,
+ StripchartPtr->textGC, x, fm.ascent + bd, /*XXX no max_bounds */
StripchartPtr->title, strlen(StripchartPtr->title));
}
/*
@@ -1057,7 +1061,8 @@
DrawStripi(Stripchart* SPtr, int i)
{
Tk_Window tkwin = SPtr->tkwin;
- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent;
+ Tk_FontMetrics fm;
+ int lineHeight;
int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width;
int y = SPtr->borderWidth + PADDING +
hasatitle(SPtr) * (lineHeight + PADDING);
@@ -1066,6 +1071,9 @@
double maxv = SPtr->max_value;
double minv = SPtr->min_value;
+ Tk_GetFontMetrics(SPtr->tkfont, &fm);
+ lineHeight = fm.ascent + fm.descent;
+
if (i < 1 || i > SPtr->num_strips)
return;
@@ -1136,7 +1144,8 @@
ScrollStrips(Stripchart* SPtr)
{
Tk_Window tkwin = SPtr->tkwin;
- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent;
+ Tk_FontMetrics fm;
+ int lineHeight;
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;
int w = (SPtr->num_strips - 1) * SPtr->strip_width;
int h = SPtr->max_height;
+
+ 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);

36
mbone/vat/patches/patch-ac
View File

@ -1,36 +0,0 @@
*** main.cc.orig Fri May 3 08:27:22 1996
--- main.cc Thu Jul 15 16:42:31 1999
***************
*** 162,168 ****
else {
Tk_Window tk = t.tkmain();
Tk_Uid uid = Tk_GetUid((char*)argv[1]);
! XFontStruct* p = Tk_GetFontStruct(t.interp(), tk, uid);
t.result(p != 0 ? "1" : "0");
}
return (TCL_OK);
--- 162,168 ----
else {
Tk_Window tk = t.tkmain();
Tk_Uid uid = Tk_GetUid((char*)argv[1]);
! Tk_Font p = Tk_GetFont(t.interp(), tk, uid);
t.result(p != 0 ? "1" : "0");
}
return (TCL_OK);
***************
*** 356,362 ****
Tk_DefineBitmap(tcl, Tk_GetUid("linein2"),
linein2_bits, linein2_width, linein2_height);
Tk_DefineBitmap(tcl, Tk_GetUid("linein3"),
! linein3_bits, linein3_width, linein3_height);
Tk_DefineBitmap(tcl, Tk_GetUid("square"),
square_bits, square_width, square_height);
}
--- 356,362 ----
Tk_DefineBitmap(tcl, Tk_GetUid("linein2"),
linein2_bits, linein2_width, linein2_height);
Tk_DefineBitmap(tcl, Tk_GetUid("linein3"),
! (char *) linein3_bits, linein3_width, linein3_height);
Tk_DefineBitmap(tcl, Tk_GetUid("square"),
square_bits, square_width, square_height);
}

70
mbone/vat/patches/patch-ad
View File

@ -1,70 +0,0 @@
--- sitebox.cc.orig Tue Sep 9 11:24:41 1997
+++ sitebox.cc Tue Sep 9 11:24:43 1997
@@ -112,7 +112,7 @@
static Drawable pixmap_;
static int pixw_;
static int pixh_;
- static XFontStruct* fs_; /* font metrics */
+ static Tk_Font fs_; /* font metrics */
};
class SiteBox : public TkWidget, public IdleCallback {
@@ -160,7 +160,7 @@
GC Site::copy_gc_;
GC Site::fg_[4];
GC Site::bg_[4];
-XFontStruct* Site::fs_;
+Tk_Font Site::fs_;
XColor* Site::fc_;
XColor* Site::bc_;
XColor* Site::ac_;
@@ -190,15 +190,16 @@
sitebox_(sb)
{
Tcl& tcl = Tcl::instance();
+ Tk_FontMetrics fm;
if (fs_ == 0) {
const char* font = tcl.attr("siteFont");
- fs_ = Tk_GetFontStruct(tcl.interp(), tk_, (char*)font);
+ fs_ = Tk_GetFont(tcl.interp(), tk_, (char*)font);
if (fs_ == 0) {
fprintf(stderr,
"vat: couldn't find font: %s\n", font);
- fs_ = Tk_GetFontStruct(tcl.interp(), tk_, "screen");
+ fs_ = Tk_GetFont(tcl.interp(), tk_, "screen");
if (fs_ == 0)
- fs_ = Tk_GetFontStruct(tcl.interp(), tk_,
+ fs_ = Tk_GetFont(tcl.interp(), tk_,
"fixed");
if (fs_ == 0) {
fprintf(stderr,
@@ -220,8 +221,9 @@
copy_gc_ = sitebox_.lookup_gc(0, 0, 0);
}
- descent_ = fs_->descent;
- ascent_ = fs_->ascent;
+ Tk_GetFontMetrics(fs_, &fm);
+ descent_ = fm.descent;
+ ascent_ = fm.ascent;
major_ = ascent_;
minor_ = major_ / 2;
}
@@ -292,7 +294,7 @@
*/
inline int Site::textwidth(const char* s)
{
- return (XTextWidth(fs_, s, strlen(s)));
+ return (Tk_TextWidth(fs_, s, strlen(s)));
}
inline void Site::square(Display* dpy, Drawable window, GC gc,
@@ -450,7 +452,7 @@
free_gc(bg_[0]);
free_gc(bg_[1]);
}
- Font fid = fs_->fid;
+ Font fid = Tk_FontId(fs_);
fg_[0] = raw_gc(fid, fc_, bc_, pixmap_);
fg_[2] = raw_gc(fid, dc_, bc_, pixmap_);
bg_[0] = raw_gc(fid, bc_, bc_, pixmap_);

55
mbone/vat/patches/patch-ae
View File

@ -1,55 +0,0 @@
--- Tcl.h.orig Sat Mar 16 13:14:34 1996
+++ Tcl.h Tue Dec 17 14:39:45 1996
@@ -53,7 +53,8 @@
inline int dark() const { return (tcl_ == 0); }
inline Tcl_Interp* interp() const { return (tcl_); }
inline char* result() const { return (tcl_->result); }
- inline void result(const char* p) { tcl_->result = (char*)p; }
+ inline void result(const char* p, Tcl_FreeProc* freeProc = TCL_STATIC)
+ { Tcl_SetResult(tcl_, (char *)p, freeProc); }
void resultf(const char* fmt, ...);
inline void CreateCommand(const char* cmd, Tcl_CmdProc* cproc,
ClientData cd = 0,
--- source.cc.orig Thu Apr 4 07:05:45 1996
+++ source.cc Tue Dec 17 14:38:44 1996
@@ -251,8 +251,7 @@
return (TCL_OK);
}
if (strcmp(argv[1], "addr") == 0) {
- strcpy(wrk, InetNtoa(addr_));
- tcl.result(wrk);
+ tcl.result(InetNtoa(addr_), TCL_DYNAMIC);
return (TCL_OK);
}
if (strcmp(argv[1], "srcid") == 0) {
--- Tcl.cc.orig Tue Apr 2 20:53:27 1996
+++ Tcl.cc Tue Dec 17 15:45:30 1996
@@ -65,6 +65,7 @@
{
instance_.tcl_ = tcl;
instance_.application_ = application;
+ Tcl_Init(tcl);
}
void Tcl::evalc(const char* s)
@@ -162,6 +163,8 @@
Tcl& tcl = Tcl::instance();
if (!tcl.dark())
tcl.DeleteCommand(name_);
+ if (name_ != 0)
+ delete name_;
TclObject** p;
for (p = &all_; *p != this; p = &(*p)->next_)
;
@@ -197,8 +200,9 @@
void TclObject::setproc(const char* s)
{
Tcl& tcl = Tcl::instance();
- if (name_ != 0 && !tcl.dark()) {
- tcl.DeleteCommand(name_);
+ if (name_ != 0) {
+ if (!tcl.dark())
+ tcl.DeleteCommand(name_);
delete name_;
}
int n = strlen(s);

162
mbone/vat/patches/patch-af
View File

@ -1,162 +0,0 @@
*** net.cc.orig Thu Mar 21 06:49:18 1996
--- net.cc Thu Jul 15 16:43:56 1999
***************
*** 163,208 ****
{
int cc = ::send(fd, (char*)buf, len, 0);
if (cc < 0) {
! switch (errno) {
case ECONNREFUSED:
/* no one listening at some site - ignore */
- #if defined(__osf__) || defined(_AIX)
- /*
- * Due to a bug in kern/uipc_socket.c, on several
- * systems, datagram sockets incorrectly persist
- * in an error state on receipt of an ICMP
- * port-unreachable. This causes unicast connection
- * rendezvous problems, and worse, multicast
- * transmission problems because several systems
- * incorrectly send port unreachables for
- * multicast destinations. Our work around
- * is to simply close and reopen the socket
- * (by calling reset() below).
- *
- * This bug originated at CSRG in Berkeley
- * and was present in the BSD Reno networking
- * code release. It has since been fixed
- * in 4.4BSD and OSF-3.x. It is know to remain
- * in AIX-4.1.3.
- *
- * A fix is to change the following lines from
- * kern/uipc_socket.c:
- *
- * if (so_serror)
- * snderr(so->so_error);
- *
- * to:
- *
- * if (so->so_error) {
- * error = so->so_error;
- * so->so_error = 0;
- * splx(s);
- * goto release;
- * }
- *
- */
- reset();
- #endif
break;
case ENETUNREACH:
--- 163,210 ----
{
int cc = ::send(fd, (char*)buf, len, 0);
if (cc < 0) {
! /*
! * Due to a bug in kern/uipc_socket.c, on several
! * systems, datagram sockets incorrectly persist
! * in an error state on receipt of any ICMP
! * error. This causes unicast connection
! * rendezvous problems, and worse, multicast
! * transmission problems because several systems
! * incorrectly send port unreachables for
! * multicast destinations. Our work around
! * is to call getsockopt(..., SO_ERROR, ...)
! * which resets so->so_error.
! *
! * This bug originated at CSRG in Berkeley
! * and was present in the BSD Reno networking
! * code release. It has since been fixed
! * in OSF-3.x. It is know to remain
! * in 4.4BSD and AIX-4.1.3.
! *
! * A fix is to change the following lines from
! * kern/uipc_socket.c:
! *
! * if (so_serror)
! * snderr(so->so_error);
! *
! * to:
! *
! * if (so->so_error) {
! * error = so->so_error;
! * so->so_error = 0;
! * splx(s);
! * goto release;
! * }
! *
! */
! int err, errlen = sizeof(err), savederrno;
!
! savederrno = errno;
! getsockopt(fd, SOL_SOCKET, SO_ERROR, &err,
! (socklen_t *) &errlen);
! switch (savederrno) {
case ECONNREFUSED:
/* no one listening at some site - ignore */
break;
case ENETUNREACH:
***************
*** 217,223 ****
* icmp unreachable, so we should be able to
* send now.
*/
! (void)::send(ssock_, (char*)buf, len, 0);
break;
default:
--- 219,225 ----
* icmp unreachable, so we should be able to
* send now.
*/
! (void)::send(fd, (char*)buf, len, 0);
break;
default:
***************
*** 264,275 ****
}
int cc = ::sendmsg(ssock_, (msghdr*)&mh, 0);
if (cc < 0) {
! switch (errno) {
case ECONNREFUSED:
/* no one listening at some site - ignore */
- #if defined(__osf__) || defined(_AIX)
- reset();
- #endif
break;
case ENETUNREACH:
--- 266,279 ----
}
int cc = ::sendmsg(ssock_, (msghdr*)&mh, 0);
if (cc < 0) {
! int err, errlen = sizeof(err), savederrno;
!
! savederrno = errno;
! getsockopt(ssock_, SOL_SOCKET, SO_ERROR, &err,
! (socklen_t *) &errlen);
! switch (savederrno) {
case ECONNREFUSED:
/* no one listening at some site - ignore */
break;
case ENETUNREACH:
***************
*** 299,305 ****
sockaddr_in sfrom;
int fromlen = sizeof(sfrom);
int cc = ::recvfrom(fd, (char*)buf, len, 0,
! (sockaddr*)&sfrom, &fromlen);
if (cc < 0) {
if (errno != EWOULDBLOCK)
perror("recvfrom");
--- 303,309 ----
sockaddr_in sfrom;
int fromlen = sizeof(sfrom);
int cc = ::recvfrom(fd, (char*)buf, len, 0,
! (sockaddr*)&sfrom, (socklen_t *) &fromlen);
if (cc < 0) {
if (errno != EWOULDBLOCK)
perror("recvfrom");

45
mbone/vat/patches/patch-ag
View File

@ -1,45 +0,0 @@
--- ui-resource.tcl.orig Tue Mar 12 07:32:56 1996
+++ ui-resource.tcl Thu Feb 19 10:48:04 1998
@@ -111,32 +111,24 @@
#
option add *tearOff 0
- #
- # Make the color scheme a little darker than the default gray.
- # Go through all the palette resources and raise the option data
- # base priority from widgetDefault to 61 so that user's X resources
- # won't override these.
- #
- tk_setPalette gray80
- foreach option [array names tkPalette] {
- option add *$option $tkPalette($option) 61
- }
-
option add *highlightThickness 0
option add *Radiobutton.relief flat startupFile
option add *Checkbutton.anchor w startupFile
option add *Radiobutton.anchor w startupFile
option add *Radiobutton.relief flat startupFile
- option add *Scale.sliderForeground gray66 startupFile
- option add *Scale.activeForeground gray80 startupFile
- option add *Scale.background gray70 startupFile
- # vat widgets
- option add Vat.disabledColor gray50 startupFile
- option add Vat.highlightColor gray95 startupFile
+ # add color defaults for vat widgets - where possible, use
+ # the platform specific values compiled into tk widgets
+ scale .junk
+ option add *foreground [.junk cget -foreground] widgetDefault
+ option add *background [.junk cget -background] widgetDefault
+ option add *activeBackground [.junk cget -activebackground] widgetDefault
+ destroy .junk
+
+ option add *highlightColor white widgetDefault
option add Vat.infoHighlightColor LightYellow2 startupFile
- option add *VatVU.foreground black startupFile
+ option add Vat.disabledColor gray50 startupFile
option add *VatVU.peak gray50 startupFile
option add *VatVU.hot firebrick1 startupFile
option add *VatVU.hotLevel 90 startupFile

40
mbone/vat/patches/patch-ah
View File

@ -1,40 +0,0 @@
--- audio-voxware.cc.orig Fri Apr 26 14:22:37 1996
+++ audio-voxware.cc Thu Jul 29 23:32:37 1999
@@ -44,6 +44,9 @@
#include <sys/uio.h>
#include <unistd.h>
#include <machine/soundcard.h>
+#elif defined(__OpenBSD__)
+#include <sys/audioio.h>
+#include <soundcard.h>
#else
#include <sys/soundcard.h>
#endif
@@ -217,12 +220,27 @@
iport = p;
}
+static void
+playmode(int fd, int play)
+{
+ struct audio_info set;
+
+ AUDIO_INITINFO(&set);
+ if (ioctl(fd, AUDIO_GETINFO, &set))
+ printf("ioctl %d\n", errno);
+ set.mode = play ? AUMODE_PLAY : AUMODE_RECORD;
+ if (ioctl(fd, AUDIO_SETINFO, &set))
+ printf("ioctl %d\n", errno);
+}
+
void VoxWareAudio::RMute()
{
rmute |= 1;
+ playmode(fd, 1);
}
void VoxWareAudio::RUnmute()
{
rmute &=~ 1;
+ playmode(fd, 0);
}

14
mbone/vat/patches/patch-ai
View File

@ -1,14 +0,0 @@
*** config.guess.orig Thu Jul 15 16:29:33 1999
--- config.guess Thu Jul 15 16:29:59 1999
***************
*** 284,289 ****
--- 284,292 ----
i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
*:FreeBSD:*:*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;

36
mbone/vat/patches/patch-aj
View File

@ -1,36 +0,0 @@
*** config.h.orig Thu May 16 07:27:06 1996
--- config.h Thu Jul 15 16:40:35 1999
***************
*** 36,42 ****
#ifndef vic_config_h
#define vic_config_h
! #if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__)
#include <sys/types.h>
#elif defined(linux)
#include <sys/bitypes.h>
--- 36,42 ----
#ifndef vic_config_h
#define vic_config_h
! #if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__) || defined(__OpenBSD__)
#include <sys/types.h>
#elif defined(linux)
#include <sys/bitypes.h>
***************
*** 83,89 ****
#include <arpa/inet.h>
int strcasecmp(const char *, const char *);
clock_t clock(void);
! #if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__)
int gethostid(void);
#endif
time_t time(time_t *);
--- 83,89 ----
#include <arpa/inet.h>
int strcasecmp(const char *, const char *);
clock_t clock(void);
! #if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
int gethostid(void);
#endif
time_t time(time_t *);

36
mbone/vat/patches/patch-ak
View File

@ -1,36 +0,0 @@
*** iohandler.cc.orig Thu Jul 15 16:41:13 1999
--- iohandler.cc Thu Jul 15 16:41:33 1999
***************
*** 132,138 ****
}
#else
! Tk_CreateFileHandler((ClientData)fd, mask, callback, (ClientData)this);
#endif
}
--- 132,138 ----
}
#else
! Tk_CreateFileHandler(fd, mask, callback, (ClientData)this);
#endif
}
***************
*** 151,157 ****
}
#else
if (fd_ >= 0) {
! Tk_DeleteFileHandler((ClientData)fd_);
fd_ = -1;
}
#endif
--- 151,157 ----
}
#else
if (fd_ >= 0) {
! Tk_DeleteFileHandler(fd_);
fd_ = -1;
}
#endif

19
mbone/vat/patches/patch-al
View File

@ -1,19 +0,0 @@
*** net-ip.cc.orig Thu Jul 15 16:44:50 1999
--- net-ip.cc Thu Jul 15 16:45:07 1999
***************
*** 204,210 ****
memset((char *)p, 0, sizeof(*p));
p->sin_family = AF_INET;
int len = sizeof(*p);
! if (getsockname(ssock_, (struct sockaddr *)p, &len) < 0) {
perror("getsockname");
p->sin_addr.s_addr = 0;
p->sin_port = 0;
--- 204,210 ----
memset((char *)p, 0, sizeof(*p));
p->sin_family = AF_INET;
int len = sizeof(*p);
! if (getsockname(ssock_, (struct sockaddr *)p, (socklen_t *) &len) < 0) {
perror("getsockname");
p->sin_addr.s_addr = 0;
p->sin_port = 0;

14
mbone/vat/patches/patch-am
View File

@ -1,14 +0,0 @@
--- configure.in.orig Thu May 16 14:21:17 1996
+++ configure.in Thu Aug 5 02:36:37 1999
@@ -151,6 +151,11 @@
V_TARCMD="tar cfL"
V_CCOPT="-O2 -m486"
;;
+*-*-openbsd*)
+ V_OBJ_AUDIO="audio-voxware.o"
+ V_TARCMD="tar -h -c -f"
+ V_LIB="$V_LIB -lossaudio -L/usr/local/lib"
+ ;;
*-*-freebsd*)
V_OBJ_AUDIO="$V_OBJ_AUDIO audio-voxware.o"
;;

34
mbone/vat/patches/patch-an
View File

@ -1,34 +0,0 @@
*** sitebox.cc.orig Thu Jul 15 16:39:24 1999
--- sitebox.cc Thu Jul 15 16:46:44 1999
***************
*** 230,235 ****
--- 230,239 ----
Site::~Site()
{
+ if (text_)
+ delete text_;
+ if (tag_)
+ delete tag_;
}
int Site::command(int argc, const char*const* argv)
***************
*** 638,645 ****
need_sort_ = 0;
Tcl& tcl = Tcl::instance();
! Tk_Uid fg = mono()? "black" : (char*)tcl.attr("foreground");
! Tk_Uid bg = mono()? "white" : (char*)tcl.attr("background");
fg_ = lookup_gc(0, fg, bg);
bg_ = lookup_gc(0, bg, bg);
}
--- 642,649 ----
need_sort_ = 0;
Tcl& tcl = Tcl::instance();
! Tk_Uid fg = mono()? (char *)"black" : (char*)tcl.attr("foreground");
! Tk_Uid bg = mono()? (char *) "white" : (char*)tcl.attr("background");
fg_ = lookup_gc(0, fg, bg);
bg_ = lookup_gc(0, bg, bg);
}

19
mbone/vat/patches/patch-ao
View File

@ -1,19 +0,0 @@
*** config.sub.orig Thu Jul 15 16:59:20 1999
--- config.sub Thu Jul 15 16:59:54 1999
***************
*** 609,615 ****
| -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
| -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
| -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
! | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta | -udi | -eabi)
;;
--- 609,615 ----
| -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
| -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
| -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
! | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* | -openbsd* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta | -udi | -eabi)
;;

19
mbone/vat/patches/patch-ap
View File

@ -1,19 +0,0 @@
*** audio-bsd.cc.orig Thu Jul 15 17:08:02 1999
--- audio-bsd.cc Thu Jul 15 17:08:32 1999
***************
*** 40,46 ****
#ifdef sun
#include <sbusdev/bsd_audioio.h>
#else
! #include <machine/audioio.h>
#endif
class BSDAudio : public SUNAudio {
--- 40,46 ----
#ifdef sun
#include <sbusdev/bsd_audioio.h>
#else
! #include <sys/audioio.h>
#endif
class BSDAudio : public SUNAudio {

151
mbone/vat/patches/patch-aq
View File

@ -1,151 +0,0 @@
*** audio-sun.cc.orig Thu Jul 15 17:25:06 1999
--- audio-sun.cc Thu Jul 15 17:29:48 1999
***************
*** 35,48 ****
#undef resource_h
#ifdef __svr4__
#include <sys/audioio.h>
#include <sys/filio.h>
#else
! #include <sun/audioio.h>
#endif
#include <unistd.h>
- #include <stropts.h>
#include <errno.h>
#include <fcntl.h>
#include "audio-sun.h"
--- 35,49 ----
#undef resource_h
+ #include <sys/types.h>
+
#ifdef __svr4__
#include <sys/audioio.h>
#include <sys/filio.h>
#else
! #include <sys/audioio.h>
#endif
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include "audio-sun.h"
***************
*** 103,109 ****
* braindead driver will supply a weird, huge
* blocksize).
*/
! #ifndef __svr4__
int bs = info.record._xxx[2];
#else
int bs = info.record.buffer_size;
--- 104,110 ----
* braindead driver will supply a weird, huge
* blocksize).
*/
! #if !defined(__svr4_) && !defined(__OpenBSD__)
int bs = info.record._xxx[2];
#else
int bs = info.record.buffer_size;
***************
*** 273,279 ****
Obtain();
goto out;
! #ifndef __svr4__
case EWOULDBLOCK:
#endif
case EAGAIN:
--- 274,280 ----
Obtain();
goto out;
! #if !defined(__svr4__) && !defined(__OpenBSD__)
case EWOULDBLOCK:
#endif
case EAGAIN:
***************
*** 307,313 ****
perror("audio O_NONBLOCK");
int on = 1;
ioctl(fd, FIONBIO, &on);
! #ifndef __svr4__
int bsddrvr = 0;
AUDIO_INITINFO(&info);
getinfo(&info);
--- 308,314 ----
perror("audio O_NONBLOCK");
int on = 1;
ioctl(fd, FIONBIO, &on);
! #if !defined(__svr4__) && !defined(__OpenBSD__)
int bsddrvr = 0;
AUDIO_INITINFO(&info);
getinfo(&info);
***************
*** 330,336 ****
info.record.gain = rgain;
info.record.port = IPort(iport);
info.record.balance = rbalance;
! #ifndef __svr4__
/* solaris 2.2 hack: set buffer size.
* NB- this changes to _xxx[3] for os<4.1.3 */
info.record._xxx[2] = blksize;
--- 331,337 ----
info.record.gain = rgain;
info.record.port = IPort(iport);
info.record.balance = rbalance;
! #if !defined(__svr4__) && !defined(__OpenBSD__)
/* solaris 2.2 hack: set buffer size.
* NB- this changes to _xxx[3] for os<4.1.3 */
info.record._xxx[2] = blksize;
***************
*** 349,355 ****
info.monitor_gain = mgain;
setinfo(&info);
/* flush input to get rid of any data fragments */
! ioctl(fd, I_FLUSH, FLUSHR);
bufcur = buf;
}
--- 350,356 ----
info.monitor_gain = mgain;
setinfo(&info);
/* flush input to get rid of any data fragments */
! ioctl(fd, AUDIO_FLUSH, 0);
bufcur = buf;
}
***************
*** 646,652 ****
AUDIO_INITINFO(&info);
info.record.precision = 16;
info.record.encoding = AUDIO_ENCODING_LINEAR;
! #ifndef __svr4__
info.record._xxx[2] = blksize << 1;
#else
info.record.buffer_size = blksize << 1;
--- 647,653 ----
AUDIO_INITINFO(&info);
info.record.precision = 16;
info.record.encoding = AUDIO_ENCODING_LINEAR;
! #if !defined(__svr4__) && !defined(__OpenBSD__)
info.record._xxx[2] = blksize << 1;
#else
info.record.buffer_size = blksize << 1;
***************
*** 655,660 ****
info.play.encoding = AUDIO_ENCODING_LINEAR;
setinfo(&info);
/* flush input again to get rid of any data with wrong encoding */
! ioctl(fd, I_FLUSH, FLUSHR);
bufcur = buf;
}
--- 656,661 ----
info.play.encoding = AUDIO_ENCODING_LINEAR;
setinfo(&info);
/* flush input again to get rid of any data with wrong encoding */
! ioctl(fd, AUDIO_FLUSH, 0);
bufcur = buf;
}