[comp.sources.games] v01i053: warp7 - space war game, Patch3

games-request@tekred.UUCP (06/16/87)

Submitted by: lwall@sdcrdcf.UUCP (Larry Wall)
Comp.sources.games: Volume 1, Issue 53
Archive-name: warp7/Patch3

	[This was posted in comp.sources.bugs.  I am reposting it here
	 so the patch will get automatically archived along with the
	 original source.  Note that this is Patch #3.  The source
	 distributed in comp.sources.games was already at
	 patchlevel 2.		-br]


System: warp version 7.0
Patch #: 3
Priority: HIGH
Subject: Configure doesn't run right
From: everybody

Description:
	I neglected to rerun metaconfig before making the final version of
	the kits, so Configure was out of date and inconsistent, and doesn't
	run right.  A rookie trick.

Fix:	From rn, say "| patch -d DIR", where DIR is your warp source
	directory.  Outside of rn, say "cd DIR; patch <thisarticle".
	If you don't have the patch program, apply the following by hand,
	or get patch.

	If patch indicates that patchlevel is the wrong version, you may need
	to apply one or more previous patches, or the patch may already
	have been applied.  See the patchlevel.h file to find out what has or
	has not been applied.  In any event, don't continue with the patch.

	If you are missing previous patches they can be obtained from me:

	Larry Wall
	sdcrdcf!lwall

	(Note that the distributed version starts at patchlevel 2.)

	If you send a mail message of the following form it will greatly speed
	processing:

	Subject: Command
	@SH mailpatch PATH warp 7.0 LIST
		   ^ note the c

	where PATH is a return path FROM ME TO YOU in bang notation, and LIST
	is the number of one or more patches you need, separated by spaces,
	commas, and/or hyphens.  Saying 35- says everything from 35 to the end.

Index: patchlevel.h
Prereq: 2
1c1
< #define PATCHLEVEL 2
---
> #define PATCHLEVEL 3

Index: Configure
*** Configure.orig	Fri Jun 12 15:52:36 1987
--- Configure	Fri Jun 12 15:52:47 1987
***************
*** 8,14 ****
  # and edit it to reflect your system.  Some packages may include samples
  # of config.h for certain machines, so you might look for one of those.)
  #
! # $Header: Configure,v 7.0.1.2 86/12/12 16:44:05 lwall Exp $
  #
  # Yes, you may rip this off to use in other distribution packages.
  # (Note: this Configure script was generated automatically.  Rather than
--- 8,14 ----
  # and edit it to reflect your system.  Some packages may include samples
  # of config.h for certain machines, so you might look for one of those.)
  #
! # $Header: Configure,v 7.0.1.3 87/06/12 15:37:35 lwall Exp $
  #
  # Yes, you may rip this off to use in other distribution packages.
  # (Note: this Configure script was generated automatically.  Rather than
***************
*** 60,65 ****
--- 60,66 ----
  Mcc=''
  vi=''
  mailx=''
+ mail=''
  Log=''
  Header=''
  cc=''
***************
*** 229,238 ****
  cat <<EOH
   
  This installation shell script will examine your system and ask you questions
! to determine how $package and any auxiliary files should be installed.  If you
! get stuck on a question, you may use a ! shell escape to start a subshell or
! execute a command.  Many of the questions will have default answers in
! square brackets--typing carriage return will give you the default.
  
  On some of the questions which ask for file or directory names you are
  allowed to use the ~name construct to specify the login directory belonging
--- 230,239 ----
  cat <<EOH
   
  This installation shell script will examine your system and ask you questions
! to determine how the $package package should be installed.  If you get stuck
! on a question, you may use a ! shell escape to start a subshell or execute
! a command.  Many of the questions will have default answers in square
! brackets--typing carriage return will give you the default.
  
  On some of the questions which ask for file or directory names you are
  allowed to use the ~name construct to specify the login directory belonging
***************
*** 247,255 ****
  
  Much effort has been expended to ensure that this shell script will run
  on any Unix system.  If despite that it blows up on you, your best bet is
! to edit Configure and run it again.  (Trying to install this package
! without having run Configure may be well nigh impossible.)  Also, let me
! (lwall@sdcrdcf.UUCP) know how I blew it.
  
  This installation script affects things in two ways: 1) it may do direct
  variable substitutions on some of the files included in this kit, and
--- 248,256 ----
  
  Much effort has been expended to ensure that this shell script will run
  on any Unix system.  If despite that it blows up on you, your best bet is
! to edit Configure and run it again. Also, let me (lwall@sdcrdcf.UUCP) know
! how I blew it.  If you can't run Configure for some reason, you'll have
! to generate a config.sh file by hand.
  
  This installation script affects things in two ways: 1) it may do direct
  variable substitutions on some of the files included in this kit, and
***************
*** 465,471 ****
      echo "The archiver doesn't think $libc is a reasonable library."
      echo "Trying nm instead..."
      if nm -g $libc > libc.list; then
! 	echo "done"
      else
  	echo "That didn't work either.  Giving up."
  	exit 1
--- 466,472 ----
      echo "The archiver doesn't think $libc is a reasonable library."
      echo "Trying nm instead..."
      if nm -g $libc > libc.list; then
! 	echo "Done.  Maybe this is Unicos, or an Apollo?"
      else
  	echo "That didn't work either.  Giving up."
  	exit 1
***************
*** 989,998 ****
  $startsh
  : expand filename
  case "\$1" in
! ~/*|~)
      echo \$1 | $sed "s|~|\${HOME-\$LOGDIR}|"
      ;;
! ~*)
      if $test -f /bin/csh; then
  	/bin/csh -f -c "glob \$1"
  	echo ""
--- 990,999 ----
  $startsh
  : expand filename
  case "\$1" in
!  ~/*|~)
      echo \$1 | $sed "s|~|\${HOME-\$LOGDIR}|"
      ;;
!  ~*)
      if $test -f /bin/csh; then
  	/bin/csh -f -c "glob \$1"
  	echo ""
***************
*** 1967,1972 ****
--- 1968,1974 ----
  Mcc='$Mcc'
  vi='$vi'
  mailx='$mailx'
+ mail='$mail'
  Log='$Log'
  Header='$Header'
  cc='$cc'
***************
*** 2056,2062 ****
  echo "If you didn't make any mistakes, then just type a carriage return here."
  rp="If you need to edit config.sh, do it as a shell escape here:"
  $echo $n "$rp $c"
! . myread
  case "$ans" in
  '') ;;
  *) : in case they cannot read
--- 2058,2064 ----
  echo "If you didn't make any mistakes, then just type a carriage return here."
  rp="If you need to edit config.sh, do it as a shell escape here:"
  $echo $n "$rp $c"
! . UU/myread
  case "$ans" in
  '') ;;
  *) : in case they cannot read
***************
*** 2096,2102 ****
  EOM
      rp="Run make depend now? [$dflt]"
      $echo $n "$rp $c"
!     . myread
      case "$ans" in
      y*) make depend
  	echo "Now you must run a make."
--- 2098,2104 ----
  EOM
      rp="Run make depend now? [$dflt]"
      $echo $n "$rp $c"
!     . UU/myread
      case "$ans" in
      y*) make depend
  	echo "Now you must run a make."