freebsd-ports/benchmarks/unixbench/files/patch-aa

*** Makefile.orig	Wed Feb  5 11:08:43 1992
--- Makefile	Mon Jan  1 23:20:07 1996
***************
*** 25,33 ****
  ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15";
  SHELL = /bin/sh
! #HZ = ????  	   #(read from environment)
  CFLAGS = -DTIME
! OPTON = -O        #optimization on (give it your best shot) 
!                   #            -- check your compiler man
! OPTOFF = -Od      #optimization off -- check your compiler man
  # local directories
  PROGDIR = ./pgms
--- 25,34 ----
  ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15";
  SHELL = /bin/sh
! HZ = 128
  CFLAGS = -DTIME
! OPTON = -s -static -O -m486 -finline-functions -funroll-loops -fomit-frame-pointer
!                           #optimization on (give it your best shot) 
!                           #            -- check your compiler man
! OPTOFF = -O0 -static      #optimization off -- check your compiler man
  # local directories
  PROGDIR = ./pgms
***************
*** 36,40 ****
  TESTDIR = ./testdir
! RESULTDIR = ./results
! TMPDIR = ./tmp
  # other directories
  INCLDIR = /usr/include
--- 37,41 ----
  TESTDIR = ./testdir
! # RESULTDIR = ./results
! # TMPDIR = /var/tmp
  # other directories
  INCLDIR = /usr/include
*** Run.orig	Wed Feb  5 11:08:46 1992
--- Run	Wed Jan  3 00:13:43 1996
***************
*** 41,45 ****
  #	awk cat cc chmod comm cp date dc df echo ed expr
  #	kill ls make mkdir rm sed test time touch tty umask who
! #       AND /bin/time
  #  to generate result indexes, you will also need ...
  #       join
--- 41,45 ----
  #	awk cat cc chmod comm cp date dc df echo ed expr
  #	kill ls make mkdir rm sed test time touch tty umask who
! #       AND /usr/bin/time
  #  to generate result indexes, you will also need ...
  #       join
***************
*** 51,55 ****
  then
     # determine flavor of UNIX from number of lines generated by /bin/tim
!    Fcount=`/bin/time date 2>&1 | wc -l | sed 's/ //g'`
     case "$Fcount"
     in
--- 51,55 ----
  then
     # determine flavor of UNIX from number of lines generated by /bin/tim
!    Fcount=`/usr/bin/time date 2>&1 | wc -l | sed 's/ //g'`
     case "$Fcount"
     in
***************
*** 68,75 ****
  export FLAVOR
  # check that the required files are in the proper places
! if make check 
!         then :
!         else make all
! fi
  #
  #
--- 68,75 ----
  export FLAVOR
  # check that the required files are in the proper places
! #if make check 
! #        then :
! #        else make all
! #fi
  #
  #
***************
*** 93,97 ****
  cd $PWD
  
! TMPDIR=${HOMEDIR}/tmp
  cd $TMPDIR
  TMPDIR=`pwd`
--- 93,97 ----
  cd $PWD
  
! TMPDIR=${TMPDIR-${HOMEDIR}/tmp}
  cd $TMPDIR
  TMPDIR=`pwd`
***************
*** 304,312 ****
    C)  
      logmsg="C Compiler Test"
!     prog="looper ${looper-60} cc cctest.c"
      stdout=/dev/null
      repeat="$shortloop"
      cleanopt="-m $TMPTIMES"
!     rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out
      ;;
  
--- 304,312 ----
    C)  
      logmsg="C Compiler Test"
!     prog="looper ${looper-60} cc cctest.c -o ${TMPDIR}/a.out"
      stdout=/dev/null
      repeat="$shortloop"
      cleanopt="-m $TMPTIMES"
!     rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out
      ;;
  
***************
*** 418,426 ****
            if test "$stdin" = ""  
            then # without redirected stdin
!              /bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
            else # with redirected stdin
!              /bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
            fi 
- 	  /bin/time $benchcmd
  	  ###############################################
  	  cd $pwd                    # move back home
--- 418,425 ----
            if test "$stdin" = ""  
            then # without redirected stdin
!              /usr/bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
            else # with redirected stdin
!              /usr/bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
            fi 
  	  ###############################################
  	  cd $pwd                    # move back home
*** pgms/cleanup.sh.orig	Wed Feb  5 11:08:37 1992
--- pgms/cleanup.sh	Wed Jan  3 19:27:21 1996
***************
*** 87,92 ****
      
      -r) : reason for failure
! 	echo $1
! 	echo $1 >>$LOGFILE
  	shift
  	;;
--- 87,92 ----
      
      -r) : reason for failure
! 	echo -e $1
! 	echo -e $1 >>$LOGFILE
  	shift
  	;;
*** pgms/multi.sh.orig	Thu Jan  4 15:16:20 1996
--- pgms/multi.sh	Thu Jan  4 15:17:26 1996
***************
*** 15,18 ****
--- 15,19 ----
  ###############################################################################
  ID="@(#)multi.sh:3.4 -- 5/15/91 19:30:24";
+ cd $TMPDIR
  for i
  do