diff -rc 7.2.6-a3/README 7.2.6-b1/README
*** 7.2.6-a3/README	Wed Jul 19 22:27:06 1995
--- 7.2.6-b1/README	Wed Feb 28 16:14:37 1996
***************
*** 254,260 ****
      style select() function.  If you do this, you must also add -lbsd to the
      OTHERLIBS macro definition in the Makefile.
      
!     For IRIX 4.x you should add -DIRIX4 to CFLAGS and use:
  	CC= cc -signed -cckr
  	OTHERLIBS= -lsun -lmalloc
      Note that -lsun is used in place of -lbsd here.  This provides network
--- 254,261 ----
      style select() function.  If you do this, you must also add -lbsd to the
      OTHERLIBS macro definition in the Makefile.
      
!     For IRIX 4.x, add -DIRIX4 -DBASENAME -DDECLARE_ERRLIST -DNO_FLOCK to
!     CFLAGS and use:
  	CC= cc -signed -cckr
  	OTHERLIBS= -lsun -lmalloc
      Note that -lsun is used in place of -lbsd here.  This provides network
***************
*** 490,495 ****
--- 491,502 ----
      System V, it has been reported, creates the .lock file without checking
      to see if it exists (therefore ruining someone else's lock).
  
+ NO_FLOCK
+     Define this if mush should NOT attempt kernel locking of mail files,
+     usually for NFS compatibility reasons.  This forces DOT_LOCK to be
+     defined, so you must be able to install mush with permission to create
+     files in the mail spool directory.
+ 
  ---------------
  Signals:
  
***************
*** 573,578 ****
--- 580,592 ----
  GETWD
      This should be defined if your system uses the getwd() system call, as
      opposed to getcwd(), and your system is not a BSD system (e.g. MIPS).
+ 
+ BASENAME
+     This should be defined if your system does NOT supply a basename()
+     function (to extract the trailing file name from a full path).
+ 
+ DECLARE_ERRLIST
+     Define this if you get unresolved symbol errors for sys_errlist[].
  
  ---------------
  The sprintf() function:
diff -rc 7.2.6-a3/makefile.hpux 7.2.6-b1/makefile.hpux
*** 7.2.6-a3/makefile.hpux	Wed Jul 19 22:27:11 1995
--- 7.2.6-b1/makefile.hpux	Wed Feb 28 15:54:27 1996
***************
*** 22,28 ****
  
  # If your HP-UX version is older than 6.5, you will need remove -DDIRECTORY
  
! HPFLAGS=	-DHPUX -DSELECT -DDIRECTORY
  CFLAGS= 	-O -DSYSV -DUSG -DCURSES -DREGCMP -DSIGRET=void $(HPFLAGS)
  LDFLAGS=
  LIBS= 		-lcurses -lPW -lmalloc
--- 22,28 ----
  
  # If your HP-UX version is older than 6.5, you will need remove -DDIRECTORY
  
! HPFLAGS=	-DHPUX -DSELECT -DDIRECTORY -DBASENAME -DDECLARE_ERRLIST
  CFLAGS= 	-O -DSYSV -DUSG -DCURSES -DREGCMP -DSIGRET=void $(HPFLAGS)
  LDFLAGS=
  LIBS= 		-lcurses -lPW -lmalloc
diff -rc 7.2.6-a3/makefile.solaris 7.2.6-b1/makefile.solaris
*** 7.2.6-a3/makefile.solaris	Wed Jul 19 22:27:11 1995
--- 7.2.6-b1/makefile.solaris	Wed Feb 28 15:55:42 1996
***************
*** 24,30 ****
  #
  #
  #
! CFLAGS= 	-O2 -g -DSYSV -DUSG -DCURSES -DSIGRET=void -DSVR4 -DREGCMP
  LDFLAGS=	-g
  LIBS= 		-L/usr/ccs/lib -lcurses -lgen -ltermlib -lsocket -lnsl -lc /usr/ucblib/libucb.a
  OTHERLIBS=
--- 24,30 ----
  #
  #
  #
! CFLAGS= 	-O2 -g -DSYSV -DUSG -DCURSES -DSIGRET=void -DSVR4 -DREGCMP -DDECLARE_ERRLIST
  LDFLAGS=	-g
  LIBS= 		-L/usr/ccs/lib -lcurses -lgen -ltermlib -lsocket -lnsl -lc /usr/ucblib/libucb.a
  OTHERLIBS=
diff -rc 7.2.6-a3/makefile.sys.v 7.2.6-b1/makefile.sys.v
*** 7.2.6-a3/makefile.sys.v	Wed Jul 19 22:27:11 1995
--- 7.2.6-b1/makefile.sys.v	Wed Feb 28 16:07:03 1996
***************
*** 27,35 ****
--- 27,37 ----
  # LIBS= -L/usr/5lib -lcurses
  
  # IRIX 3.2 systems (SGI Iris workstations) should add -DDIRECTORY to CFLAGS
+ # IRIX 4.x systems should add -DIRIX4 -DBASENAME -DDECLARE_ERRLIST -DNO_FLOCK
  # SCO UNIX 3.2 should add -DDIRECTORY -DSELECT and should avoid library -lx
  # System V Release 4 (SunOS 5?) should add -DSVR4 -DDIRECTORY to CFLAGS and
  #  should replace -lPW with -lgen
+ 
  
  CFLAGS= 	-O -DSYSV -DUSG -DCURSES -DREGCMP -DSIGRET=void
  LDFLAGS=
diff -rc 7.2.6-a3/mush.h 7.2.6-b1/mush.h
*** 7.2.6-a3/mush.h	Wed Jul 19 22:27:13 1995
--- 7.2.6-b1/mush.h	Wed Feb 28 15:58:43 1996
***************
*** 65,70 ****
--- 65,74 ----
  #endif /* SYSV && USG */
  #endif /* CURSES */
  
+ #ifdef HPUX
+ #include <termio.h>
+ #endif /* HPUX */
+ 
  #if defined(SVR4)
  #include <sys/ttold.h>
  #endif /* SVR4 */
***************
*** 575,581 ****
      *lock_fopen(),	/* open and lock a file as an atomic operation */
      *popen();		/* this should be in stdio.h */
  
! #if (__STDC__ > 0)
  extern char
  #ifndef BSD44
      *sys_errlist[],     /* system's list of global error messages */
--- 579,585 ----
      *lock_fopen(),	/* open and lock a file as an atomic operation */
      *popen();		/* this should be in stdio.h */
  
! #if (__STDC__ > 0) || defined(DECLARE_ERRLIST)
  extern char
  #ifndef BSD44
      *sys_errlist[],     /* system's list of global error messages */
diff -rc 7.2.6-a3/mush.h 7.2.6-b1/mush.h
*** 7.2.6-a3/version.h	Wed Jul 19 22:27:16 1995
--- 7.2.6-b1/version.h	Wed Feb 28 16:36:50 1996
***************
*** 1,7 ****
  /* @(#)version.h	(c) Copyright 1989, 1990, 1991 (Dan Heller) */
  
  #define MUSHNAME	"Mail User's Shell"
! #define RELEASE_DATE	"alpha(3) 7/19/95"
  #define RELEASE		7
  #define REVISION	"2"
  #define PATCHLEVEL	6
--- 1,7 ----
  /* @(#)version.h	(c) Copyright 1989, 1990, 1991 (Dan Heller) */
  
  #define MUSHNAME	"Mail User's Shell"
! #define RELEASE_DATE	"beta(1) 2/28/96"
  #define RELEASE		7
  #define REVISION	"2"
  #define PATCHLEVEL	6