*** utils/newmail.c.orig	Tue Aug  3 12:29:27 1993
--- utils/newmail.c	Sat Sep 24 12:56:44 1994
***************
*** 242,248 ****
  
  extern int errno;
  
! #if defined(BSD) && !defined(__convex__)
          time_t utime_buffer[2];         /* utime command */
  #else
          struct utimbuf utime_buffer;    /* utime command */
--- 242,248 ----
  
  extern int errno;
  
! #if defined(BSD) && !defined(__convex__) && !defined(__FreeBSD__)
          time_t utime_buffer[2];         /* utime command */
  #else
          struct utimbuf utime_buffer;    /* utime command */
***************
*** 468,474 ****
  	      /* try to set the file access times back, ignore
  		 failures */
  
! #if defined(BSD) && !defined(__convex__)
  	      utime(cur_folder->foldername, utime_buffer);
  #else
                utime(cur_folder->foldername, &utime_buffer);
--- 468,474 ----
  	      /* try to set the file access times back, ignore
  		 failures */
  
! #if defined(BSD) && !defined(__convex__) && !defined(__FreeBSD__)
  	      utime(cur_folder->foldername, utime_buffer);
  #else
                utime(cur_folder->foldername, &utime_buffer);
***************
*** 853,859 ****
  	
  	/* retain the access times for later use */
  
! #if defined(BSD) && !defined(__convex__)
          utime_buffer[0]     = buffer.st_atime;
          utime_buffer[1]     = buffer.st_mtime;
  #else
--- 853,859 ----
  	
  	/* retain the access times for later use */
  
! #if defined(BSD) && !defined(__convex__) && !defined(__FreeBSD__)
          utime_buffer[0]     = buffer.st_atime;
          utime_buffer[1]     = buffer.st_mtime;
  #else
*** hdrs/mime.h.bak	Sat Nov  7 23:50:23 1992
--- hdrs/mime.h	Sat Oct 15 16:16:49 1994
***************
*** 59,62 ****
  /* default charsets, which are a superset of US-ASCII, so we did not
     have to go out to metamail for us-ascii */
  
! #define COMPAT_CHARSETS "ISO-8859-1 ISO-8859-2 ISO-8859-3 ISO-8859-4 ISO-8859-5 ISO-8859-7 ISO-8859-8 ISO-8859-9"
--- 59,62 ----
  /* default charsets, which are a superset of US-ASCII, so we did not
     have to go out to metamail for us-ascii */
  
! #define COMPAT_CHARSETS "ISO-8859-1 ISO-8859-2 ISO-8859-3 ISO-8859-4 ISO-8859-5 ISO-8859-7 ISO-8859-8 ISO-8859-9 KOI8-R"
*** Configure.orig	Mon May 30 20:55:55 1994
--- Configure	Sat May 13 01:15:24 1995
***************
*** 2463,2470 ****
      lock_dir=/usr/spool/locks
  elif $test -d /usr/spool/uucp ; then
      lock_dir=/usr/spool/uucp
! elif $test -d /var/spool/locks ; then
!     lock_dir=/var/spool/locks
  elif $test -d /var/spool/uucp ; then
      lock_dir=/var/spool/uucp
  else
--- 2463,2470 ----
      lock_dir=/usr/spool/locks
  elif $test -d /usr/spool/uucp ; then
      lock_dir=/usr/spool/uucp
! elif $test -d /var/spool/lock ; then
!     lock_dir=/var/spool/lock
  elif $test -d /var/spool/uucp ; then
      lock_dir=/var/spool/uucp
  else
***************
*** 3289,3298 ****
  	$cat <<EOM
  
  The Character Set which your terminals support. You could set this
! to one of the ISO-8859 charsets, even if you set the default for
! the Text Messages to US-ASCII, as the ISO-8859 charsets could display
! US-ASCII as well. For a X-Windows environment, ISO-8859-1 would be 
! a convenient value.
  
  EOM
  	rp="Default Character Set which could be displayed [$dflt]"
--- 3289,3298 ----
  	$cat <<EOM
  
  The Character Set which your terminals support. You could set this
! to one of the ISO-8859 charsets or KOI8-R charset, even if you set
! the default for the Text Messages to US-ASCII, as the ISO-8859 and
! KOI8-R charsets could display US-ASCII as well. For a X-Windows
! environment, ISO-8859-1 would be a convenient value.
  
  EOM
  	rp="Default Character Set which could be displayed [$dflt]"
*** filter/Makefile.SH.ORIG	Sun Jun  6 19:34:54 1993
--- filter/Makefile.SH	Fri Feb 17 03:39:43 1995
***************
*** 114,120 ****
  
  # Standard targets
  all:		$(BIN)/filter
! 		
  install:	$(DEST)/filter
  
  uninstall:	
--- 114,120 ----
  
  # Standard targets
  all:		$(BIN)/filter
! 
  install:	$(DEST)/filter
  
  uninstall:	
*** src/mime.c.bak	Mon Aug 23 06:55:06 1993
--- src/mime.c	Sat May 13 01:25:23 1995
***************
*** 260,266 ****
      }
      fprintf(dest, "%s %s\n", MIME_CONTENTTYPE, Content_Type);
      fprintf(dest, "Content-Name: %s\n", Include_Filename);
!     fprintf(dest, "Content-Length: %d\n", file_status.st_size);
      if (Enc_Type != ENCODING_NONE) {
  	fprintf(dest, "Content-Transfer-Encoding: %s\n", Encoding);
      }
--- 260,266 ----
      }
      fprintf(dest, "%s %s\n", MIME_CONTENTTYPE, Content_Type);
      fprintf(dest, "Content-Name: %s\n", Include_Filename);
!     fprintf(dest, "Content-Length: %ld\n", (long)file_status.st_size);
      if (Enc_Type != ENCODING_NONE) {
  	fprintf(dest, "Content-Transfer-Encoding: %s\n", Encoding);
      }