diff -r +context ./Imakefile /usr/src/xpilot-2.0.3beta/src/Imakefile
*** ./Imakefile	Sun May  2 13:56:52 1993
--- /usr/src/xpilot-2.0.3beta/src/Imakefile	Mon Jun  7 22:10:47 1993
***************
*** 16,22 ****
  /*
   * Specify an ANSI compiler.
   */
! CC = cc -Aa -D_HPUX_SOURCE		# HPUX
  #CC = gcc -nostdin -ansi		# Sun's with gcc
  #CC = acc -fast
  #CC = cc -xansi -D__STDC__		# SGI Indigo?
--- 16,22 ----
  /*
   * Specify an ANSI compiler.
   */
! #CC = cc -Aa -D_HPUX_SOURCE		# HPUX
  #CC = gcc -nostdin -ansi		# Sun's with gcc
  #CC = acc -fast
  #CC = cc -xansi -D__STDC__		# SGI Indigo?
***************
*** 55,61 ****
   * CDEBUGFLAGS should specify optimalization or debug information (or both).
   */
  #CDEBUGFLAGS = +O3 +OS +ESlit		/* HPUX cc optimize flags */
! CDEBUGFLAGS = -g -z +w1			/* HPUX cc debug flags */
  #CDEBUGFLAGS = -O			/* General optimize flag */
  
  /*
--- 55,61 ----
   * CDEBUGFLAGS should specify optimalization or debug information (or both).
   */
  #CDEBUGFLAGS = +O3 +OS +ESlit		/* HPUX cc optimize flags */
! #CDEBUGFLAGS = -g -z +w1			/* HPUX cc debug flags */
  #CDEBUGFLAGS = -O			/* General optimize flag */
  
  /*
***************
*** 68,74 ****
  /*
   * Miscellaneous...
   */
! USLEEP_OBJ = usleep.o			/* Uncomment if you lack usleep() */
  /* STRCASECMP_OBJ = strcasecmp.o	/* Uncomment if you lack strcasecmp()*/
  /* CCOPTIONS = -I/usr/local/include	/* You might need this one */
  
--- 68,74 ----
  /*
   * Miscellaneous...
   */
! /* USLEEP_OBJ = usleep.o		/* Uncomment if you lack usleep() */
  /* STRCASECMP_OBJ = strcasecmp.o	/* Uncomment if you lack strcasecmp()*/
  /* CCOPTIONS = -I/usr/local/include	/* You might need this one */
  
*** ./config.h	Thu Apr 22 10:13:11 1993
--- /usr/src/xpilot-2.0.3beta/src/config.h	Mon May 31 20:01:09 1993
***************
*** 19,25 ****
   * Configure these, that's what they're here for.
   */
  #ifndef LOCALGURU
! #    define LOCALGURU		"xpilot@cs.uit.no"
  #endif
  
  #ifndef	DEFAULT_MAP
--- 19,25 ----
   * Configure these, that's what they're here for.
   */
  #ifndef LOCALGURU
! #    define LOCALGURU		"xpilot"
  #endif
  
  #ifndef	DEFAULT_MAP
***************
*** 27,33 ****
  #endif
  
  #ifndef LIBDIR
! #    define LIBDIR		"/usr/local/games/lib/xpilot/"
  #endif
  
  #ifndef DEFAULTS_FILE_NAME
--- 27,33 ----
  #endif
  
  #ifndef LIBDIR
! #    define LIBDIR		"/usr/games/lib/xpilot/"
  #endif
  
  #ifndef DEFAULTS_FILE_NAME
diff -r +context ./pack.h /usr/src/xpilot-2.0.3beta/src/pack.h
*** ./pack.h	Thu Apr 22 10:13:04 1993
--- /usr/src/xpilot-2.0.3beta/src/pack.h	Tue Jun  8 00:34:43 1993
***************
*** 20,26 ****
  #define SERVER_PORT	15345		/* Port which server listens to. */
  #define	MAGIC		0xACBDFE1UL	/* - Unique magic number - */
  
! #define	MAX_STR_LEN	4096
  #define	MAX_ARG_LEN	256
  #define	MAX_DISP_LEN	80
  #define	MAX_NAME_LEN	16
--- 20,26 ----
  #define SERVER_PORT	15345		/* Port which server listens to. */
  #define	MAGIC		0xACBDFE1UL	/* - Unique magic number - */
  
! #define	MAX_STR_LEN	512
  #define	MAX_ARG_LEN	256
  #define	MAX_DISP_LEN	80
  #define	MAX_NAME_LEN	16
diff -r +context ./socklib.c /usr/src/xpilot-2.0.3beta/src/socklib.c
*** ./socklib.c	Thu Apr 22 10:13:07 1993
--- /usr/src/xpilot-2.0.3beta/src/socklib.c	Mon Jun  7 22:12:05 1993
***************
*** 416,422 ****
  #endif /* __STDC__ */
  {
      int				socket;
! #ifdef	__hp9000s300
      long			linger = 1;
      int				lsize  = sizeof(long);
  #else
--- 416,422 ----
  #endif /* __STDC__ */
  {
      int				socket;
! #if defined(__hp9000s300) || defined(linux)
      long			linger = 1;
      int				lsize  = sizeof(long);
  #else
***************
*** 470,486 ****
  int	fd;
  #endif /* __STDC__ */
  {
!     int			readfds = 0, writefds = 0, exceptfds = 0;
      struct timeval	timeout;
  
      timerclear(&timeout); /* macro function */
      timeout.tv_sec = sl_timeout_s;
      timeout.tv_usec = sl_timeout_us;
!     readfds = (1 << fd);
  
      (void) select(fd + 1, &readfds, &writefds, &exceptfds, &timeout);
      
!     if (readfds & (1 << fd))
  	return (1);
      return (0);
  } /* SocketReadable */
--- 470,490 ----
  int	fd;
  #endif /* __STDC__ */
  {
!     fd_set		readfds, writefds, exceptfds;
      struct timeval	timeout;
  
+     FD_ZERO(&readfds);
+     FD_ZERO(&writefds);
+     FD_ZERO(&exceptfds);
+ 
      timerclear(&timeout); /* macro function */
      timeout.tv_sec = sl_timeout_s;
      timeout.tv_usec = sl_timeout_us;
!     FD_SET(fd, &readfds);
  
      (void) select(fd + 1, &readfds, &writefds, &exceptfds, &timeout);
      
!     if (FD_ISSET(fd, &readfds))
  	return (1);
      return (0);
  } /* SocketReadable */
*** ./xpilot.c	Thu Apr 22 10:13:06 1993
--- /usr/src/xpilot-2.0.3beta/src/xpilot.c	Tue Jun  8 00:38:21 1993
***************
*** 770,775 ****
--- 770,780 ----
      /*
       * Create an unbound datagram socket.  Only used for ioctls.
       */
+ 
+ #ifndef PF_UNSPEC
+ #define PF_UNSPEC AF_UNSPEC
+ #endif
+ 
      if ((fd = socket(AF_INET, SOCK_DGRAM, PF_UNSPEC)) == -1) {
  	error("socket");
  	return (-1);