diff -c ../xemacs-19.11/src/symbols.c src/symbols.c
*** ../xemacs-19.11/src/symbols.c	Mon Jul 18 01:21:30 1994
--- src/symbols.c	Thu Sep 22 23:15:53 1994
***************
*** 1628,1633 ****
--- 1628,1634 ----
  /* some losing systems can't have static vars at function scope... */
  static struct symbol_value_magic guts_of_unbound_marker =
    { { { lrecord_symbol_value_forward }, 0, 69}, unbound_marker };
+ static struct symbol_value_magic *__dummy__ptr__ = &guts_of_unbound_marker;
  
  void
  init_symbols ()
***************
*** 1659,1665 ****
      *tem = Qnil;
    }
  
!   XSETR (Qunbound, Lisp_Symbol_Value_Magic, &guts_of_unbound_marker);
      if ((CONST void *) XPNTR (Qunbound) != (CONST void *) &guts_of_unbound_marker)
    {
      /* This might happen on DATA_SEG_BITS machines. */
--- 1660,1667 ----
      *tem = Qnil;
    }
  
! /*   XSETR (Qunbound, Lisp_Symbol_Value_Magic, &guts_of_unbound_marker); */
!     XSETR (Qunbound, Lisp_Symbol_Value_Magic,__dummy__ptr__);
      if ((CONST void *) XPNTR (Qunbound) != (CONST void *) &guts_of_unbound_marker)
    {
      /* This might happen on DATA_SEG_BITS machines. */
diff -c ../xemacs-19.11/src/sysdep.c src/sysdep.c
*** ../xemacs-19.11/src/sysdep.c	Thu Sep  1 18:39:59 1994
--- src/sysdep.c	Thu Sep 22 22:47:54 1994
***************
*** 1253,1259 ****
--- 1253,1261 ----
  	tty.main.c_iflag &= ~IXON;	/* Disable start/stop output control */
        tty.main.c_oflag &= ~ONLCR;	/* Disable map of NL to CR-NL 
  					   on output */
+ #ifdef TAB3
        tty.main.c_oflag &= ~TAB3;	/* Disable tab expansion */
+ #endif 
  #ifdef CS8
        if (meta_key)
  	{
diff -c ../xemacs-19.11/src/s/freebsd.h src/s/freebsd.h
*** ../xemacs-19.11/src/s/freebsd.h	Mon Apr  4 20:13:33 1994
--- src/s/freebsd.h	Sun Sep 25 08:05:00 1994
***************
*** 1,4 ****
! /* s/ file for freebsd system.  */
  
  /* Get most of the stuff from bsd4.3 */
  #include "bsd4-3.h"
--- 1,4 ----
! /* s/ file for freebsd 2.0 system.  */
  
  /* Get most of the stuff from bsd4.3 */
  #include "bsd4-3.h"
***************
*** 7,19 ****
  #define SYSTEM_TYPE "freebsd"
  
  #undef KERNEL_FILE
! #define KERNEL_FILE "/386bsd"
  
  #undef LDAV_SYMBOL
  #define LDAV_SYMBOL "_averunnable"
  
  #define SIGNALS_VIA_CHARACTERS
  
  #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
  
  #define A_TEXT_OFFSET(x) (sizeof (struct exec))
--- 7,22 ----
  #define SYSTEM_TYPE "freebsd"
  
  #undef KERNEL_FILE
! #define KERNEL_FILE "/kernel"
  
  #undef LDAV_SYMBOL
  #define LDAV_SYMBOL "_averunnable"
  
  #define SIGNALS_VIA_CHARACTERS
  
+ #define HAVE_VFORK
+ #define GETPGRP_NO_ARG
+ 
  #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
  
  #define A_TEXT_OFFSET(x) (sizeof (struct exec))
***************
*** 24,29 ****
--- 27,36 ----
  
  #define HAVE_GETLOADAVG
  
+ /* We don't need no stinking STARTFILES /usr/lib/crt0.o is just fine */
+ /* #define START_FILES /usr/lib/crt0.o */
+ #define START_FILES
+ 
  /* For mem-limits.h.  */
  #define BSD4_2
  
***************
*** 39,41 ****
--- 46,49 ----
  
  #define HAVE_TERMIOS
  #define NO_TERMIO
+ 
diff -c ../xemacs-19.11/lib-src/emacsclient.c lib-src/emacsclient.c
*** ../xemacs-19.11/lib-src/emacsclient.c	Fri Apr 29 17:24:52 1994
--- lib-src/emacsclient.c	Tue Sep 27 23:48:00 1994
***************
*** 58,65 ****
--- 58,67 ----
  #include <stdio.h>
  #include <errno.h>
  
+ #if __FreeBSD__ < 2
  extern int sys_nerr;
  extern char *sys_errlist[];
+ #endif
  extern int errno;
  
  void
diff -c ../xemacs-19.11/lib-src/env.c lib-src/env.c
*** ../xemacs-19.11/lib-src/env.c	Fri Apr 22 20:58:09 1994
--- lib-src/env.c	Tue Sep 27 23:48:34 1994
***************
*** 200,207 ****
      }
    else
      {
!       extern int errno, sys_nerr;
        extern char *sys_errlist[];
  
        environ = nenv;
        (void) execvp (*argv, argv);
--- 200,210 ----
      }
    else
      {
!       extern int errno;
! #if __FreeBSD__ < 2
!       extern int sys_nerr;
        extern char *sys_errlist[];
+ #endif
  
        environ = nenv;
        (void) execvp (*argv, argv);
diff -c ../xemacs-19.11/lib-src/movemail.c lib-src/movemail.c
*** ../xemacs-19.11/lib-src/movemail.c	Fri Apr 22 20:58:14 1994
--- lib-src/movemail.c	Tue Sep 27 23:48:54 1994
***************
*** 100,107 ****
--- 100,109 ----
  static void pfatal_with_name ();
  static void pfatal_and_delete ();
  
+ #if __FreeBSD__ < 2
  extern int sys_nerr;
  extern char *sys_errlist[];
+ #endif
  
  /* Nonzero means this is name of a lock file to delete on fatal error.  */
  char *delete_lockname;