*** config.h.orig	Thu Oct 15 12:08:03 1998
--- config.h	Fri Sep  3 12:16:06 1999
***************
*** 42,50 ****
--- 42,54 ----
  
  #include <sys/types.h>
  
+ #if !defined(__OpenBSD__)
  #define NEED_INET_ATON
  #define NEED_INET_PTON
  #define NEED_IN6_IS_ADDR_MULTICAST
+ #else
+ #define EXT_SCRIPT
+ #endif
  
  #ifdef WIN32
  typedef int		ttl_t;
***************
*** 67,74 ****
  #endif
  
  typedef int	fd_t;
  typedef unsigned long	in_addr_t;
! 
  #ifndef TRUE
  #define FALSE	0
  #define	TRUE	1
--- 71,79 ----
  #endif
  
  typedef int	fd_t;
+ #if !defined(__OpenBSD__)
  typedef unsigned long	in_addr_t;
! #endif
  #ifndef TRUE
  #define FALSE	0
  #define	TRUE	1
*** main.c.orig	Mon Dec 14 11:07:55 1998
--- main.c	Fri Sep  3 12:29:50 1999
***************
*** 20,26 ****
--- 20,30 ----
  
  #include <tcl.h>
  #include <tk.h>
+ 
+ #if !defined(__OpenBSD__)
  #include <malloc.h>
+ #endif
+ 
  #include <locale.h>
  #include <assert.h>
  #include <time.h>
***************
*** 281,287 ****
  	if (nteVersion>1.4) Tcl_SetVar(interp, "nte15", "1", TCL_GLOBAL_ONLY); else Tcl_SetVar(interp, "nte15", "0", TCL_GLOBAL_ONLY);
  
  #ifdef EXT_SCRIPT
! 	if (Tcl_VarEval(interp, "source ", "relate.tcl", (char *) NULL) != TCL_OK) {
  		goto error;
  		exit (-1);
  	}
--- 285,291 ----
  	if (nteVersion>1.4) Tcl_SetVar(interp, "nte15", "1", TCL_GLOBAL_ONLY); else Tcl_SetVar(interp, "nte15", "0", TCL_GLOBAL_ONLY);
  
  #ifdef EXT_SCRIPT
! 	if (Tcl_VarEval(interp, "source ", "/usr/local/bin/relate.tcl", (char *) NULL) != TCL_OK) {
  		goto error;
  		exit (-1);
  	}
*** makefile.orig	Mon Dec 14 10:40:17 1998
--- makefile	Fri Sep  3 12:16:06 1999
***************
*** 1,11 ****
  YFLAGS		= -dv
  CFLAGS		= -g $(LIBFLAGS) $(IFLAGS) -DNDEBUG -DRELATE_INT
! LIBDIR		= /cs/research/mice/starship/common/solaris/lib
! INCDIR		= /cs/research/mice/starship/common/solaris/include
  
  # The files needed from the tcl/tk library directories...
! LIBRARY_TK	= $(LIBDIR)/tk8.0
! LIBRARY_TCL	= $(LIBDIR)/tcl8.0
  
  
  # Uncomment these lines for SGI (IRIX 5.3).
--- 1,15 ----
  YFLAGS		= -dv
  CFLAGS		= -g $(LIBFLAGS) $(IFLAGS) -DNDEBUG -DRELATE_INT
! LIBDIR		= /usr/local/lib
! X11LIBDIR	= /usr/X11R6/lib
! INCDIR		= /usr/local/include
! TCLINCDIR	= /usr/local/include/tcl8.0
! TKINCDIR	= /usr/local/include/tk8.0
! X11INCDIR 	= /usr/X11R6/include
  
  # The files needed from the tcl/tk library directories...
! LIBRARY_TK	= $(LIBDIR)/tk80
! LIBRARY_TCL	= $(LIBDIR)/tcl80
  
  
  # Uncomment these lines for SGI (IRIX 5.3).
***************
*** 27,42 ****
  #LIBS		= -ll -ltk8.0 -ltcl8.0 -lm -lX11
  
  # Uncomment these lines for Sun (SunOS 5.5.1).
! CC		= gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi
! LIBFLAGS	= -L$(LIBDIR) -L/usr/openwin/lib
! IFLAGS		= -I$(INCDIR) -I/usr/openwin/include
! LIBS		= -ll -ltk8.0 -ltcl8.0 -lm -lX11 -lsocket -lnsl -ldl
  
  # Uncomment these lines for NetBSD 1.2.
! #CC              = cc -ansi
! #LIBFLAGS        = -L$(LIBDIR)
! #IFLAGS          = -I$(INCDIR)
! #LIBS            = -ll -ltk8.0 -ltcl8.0 -lm -lX11
  
  # Tcl initialisation files to be compiled into a C string.
  TCL_LIBS = \
--- 31,46 ----
  #LIBS		= -ll -ltk8.0 -ltcl8.0 -lm -lX11
  
  # Uncomment these lines for Sun (SunOS 5.5.1).
! #CC		= gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi
! #LIBFLAGS	= -L$(LIBDIR) -L/usr/openwin/lib
! #IFLAGS		= -I$(INCDIR) -I/usr/openwin/include
! #LIBS		= -ll -ltk8.0 -ltcl8.0 -lm -lX11 -lsocket -lnsl -ldl
  
  # Uncomment these lines for NetBSD 1.2.
! CC              = cc -ansi
! LIBFLAGS        = -L$(LIBDIR) -L$(X11LIBDIR)
! IFLAGS          = -I$(INCDIR) -I$(X11INCDIR) -I$(TCLINCDIR) -I$(TKINCDIR)
! LIBS            = -ll -ltk80 -ltcl80 -lm -lX11
  
  # Tcl initialisation files to be compiled into a C string.
  TCL_LIBS = \
***************
*** 69,84 ****
  OBJ	= tcllibs.o main.o mbus.o mbus_ui.o util.o lbl_confbus.o tcltk.o net_udp.o
  
  relate	:	$(OBJ) $(INC)
! 	$(CC) $(CFLAGS) $(OBJ) $(LIBS) -o relate
  
  clean	:
  	rm -f *.o tcl2c relate core
  
  tcl2c	:	tcl2c.o
! 	$(CC) $(CFLAGS) tcl2c.o $(LIBS) -o tcl2c
  
  # Tcl library files are turned into a single object file.
  tcllibs.o: $(TCL_FILES) tcl2c
  	rm -f $@ tcllibs.c; \
  	./tcl2c 1 $(TCL_FILES) > tcllibs.c ; \
! 	$(CC) -c $(CFLAGS) tcllibs.c ; rm -f tcllibs.c
--- 73,88 ----
  OBJ	= tcllibs.o main.o mbus.o mbus_ui.o util.o lbl_confbus.o tcltk.o net_udp.o
  
  relate	:	$(OBJ) $(INC)
! 	$(CC) $(CFLAGS) $(OBJ) $(LIBFLAGS) $(LIBS) -o relate
  
  clean	:
  	rm -f *.o tcl2c relate core
  
  tcl2c	:	tcl2c.o
! 	$(CC) $(CFLAGS) tcl2c.o $(LIBFLAGS) $(LIBS) -o tcl2c
  
  # Tcl library files are turned into a single object file.
  tcllibs.o: $(TCL_FILES) tcl2c
  	rm -f $@ tcllibs.c; \
  	./tcl2c 1 $(TCL_FILES) > tcllibs.c ; \
! 	$(CC) -c $(CFLAGS) tcllibs.c ; rm -f tcllibs.c
*** util.h.orig	Wed Oct 14 10:32:22 1998
--- util.h	Fri Sep  3 12:16:06 1999
***************
*** 44,50 ****
--- 44,52 ----
  #define _UTIL_H_
  
  #define UNUSED(x)	(x=x)
+ #if !defined(__OpenBSD__)
  #define IN_CLASSD(i)	(((long)(i) & 0xf0000000) == 0xe0000000)
+ #endif
  #define IN_MULTICAST(i)	IN_CLASSD(i)
  
  #define xmalloc(x)	_xmalloc(x,__FILE__,__LINE__)
***************
*** 74,77 ****
  };
  #endif
  
! typedef struct _socket_udp socket_udp;
--- 76,79 ----
  };
  #endif
  
! typedef struct _socket_udp socket_udp;
