Patch #:	172
Type:		bug fix
Priority:	low
Affects:	sites running Configure on SunOS 4.0.3
Reported:	Andrew J Cole <ajcole@cbl.leeds.ac.uk>
Reported:	Koula Courtot <koula@mugga.stats.mu.OZ.AU>
Archived:	munnari.OZ.AU	mac/cap.patches/cap60.patch172
Application:	'cd cap60; patch -p < cap60.patches/cap60.patch172'
Summary:	test for /bin/uname (not available in SunOS 4.0.3)
File:		cap60/Configure

*** Configure.orig	Tue Nov 23 19:01:29 1993
--- Configure		Wed Nov 24 23:32:38 1993
***************
*** 1,7 ****
  #!/bin/sh
! # $Author: djh $ $Date: 1993/11/23 08:01:18 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.68 1993/11/23 08:01:18 djh Rel djh $
! # $Revision: 2.68 $
  # CAP configuration shell script.  This ain't perfect, but it's a start.
  # Execute with /bin/sh Configure if your system won't run it (ksh is okay too)
  # 
--- 1,7 ----
  #!/bin/sh
! # $Author: djh $ $Date: 1993/11/24 12:32:24 $
! # $Header: /mac/src/cap60/RCS/Configure,v 2.69 1993/11/24 12:32:24 djh Rel djh $
! # $Revision: 2.69 $
  # CAP configuration shell script.  This ain't perfect, but it's a start.
  # Execute with /bin/sh Configure if your system won't run it (ksh is okay too)
  # 
***************
*** 85,93 ****
  	if [ -f /bin/sun ]; then
  		/bin/sun 2>/dev/null >/dev/null
  		if [ $? -eq 0 ]; then
! 			if [ `uname -r` -ge "5.0" ]; then
! 				echo "Solaris"
! 				osdefault="solaris"
  			else
  				echo "SunOS"
  				osdefault="sunos"
--- 85,98 ----
  	if [ -f /bin/sun ]; then
  		/bin/sun 2>/dev/null >/dev/null
  		if [ $? -eq 0 ]; then
! 			if [ -f /bin/uname ]; then
! 				if [ `uname -r` -ge "5.0" ]; then
! 					echo "Solaris"
! 					osdefault="solaris"
! 				else
! 					echo "SunOS"
! 					osdefault="sunos"
! 				fi
  			else
  				echo "SunOS"
  				osdefault="sunos"
*** lib/cap/abversion.c.orig	Wed Nov 24 22:08:18 1993
--- lib/cap/abversion.c		Wed Nov 24 23:33:33 1993
***************
*** 1,7 ****
  /*
!  * $Author: djh $ $Date: 1993/11/24 11:08:12 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.71 1993/11/24 11:08:12 djh Rel djh $
!  * $Revision: 2.71 $
   *
   */
  
--- 1,7 ----
  /*
!  * $Author: djh $ $Date: 1993/11/24 12:33:24 $
!  * $Header: /mac/src/cap60/lib/cap/RCS/abversion.c,v 2.72 1993/11/24 12:33:24 djh Rel djh $
!  * $Revision: 2.72 $
   *
   */
  
***************
*** 32,38 ****
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 171;
    myversion.cv_rmonth = "November";
    myversion.cv_ryear = "1993";
    switch (lap_proto) {
--- 32,38 ----
    myversion.cv_name = "CAP";
    myversion.cv_version = 6;
    myversion.cv_subversion = 0;
!   myversion.cv_patchlevel = 172;
    myversion.cv_rmonth = "November";
    myversion.cv_ryear = "1993";
    switch (lap_proto) {
*** README.orig		Wed Nov 24 22:09:18 1993
--- README		Wed Nov 24 23:34:38 1993
***************
*** 2,8 ****
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 171, November 1993
  
  Notice
  ------
--- 2,8 ----
  	       CAP - Columbia AppleTalk Package for UNIX
  
  	o RELEASE NOTES
! 	o CAP Distribution 6.0, Patch Level 172, November 1993
  
  Notice
  ------