[continued from previous message]

+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO
@@ -145,7 +145,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
@@ -300,7 +300,7 @@
| avr-* \
| bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | cydra-* \
+ | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@@ -326,8 +326,9 @@
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
+ | mmix-* \
| msp430-* \
- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -445,6 +446,10 @@
basic_machine=j90-cray
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
cr16c)
basic_machine=cr16c-unknown
os=-elf
@@ -659,10 +664,6 @@
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
@@ -743,10 +744,6 @@
np1)
basic_machine=np1-gould
;;
- nv1)
- basic_machine=nv1-cray
- os=-unicosmp
- ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -1059,6 +1056,9 @@
romp)
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -1374,6 +1374,9 @@
*-ibm)
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
;;
diff -urN orig/adjtimex-1.18/debian/adjtimexconfig adjtimex-1.18/debian/adjtimexconfig
--- orig/adjtimex-1.18/debian/adjtimexconfig 2004-08-13 15:35:37.000000000 -0700
+++ adjtimex-1.18/debian/adjtimexconfig 2004-08-13 11:02:33.000000000 -0700
@@ -3,21 +3,23 @@
conffile=/etc/default/adjtimex
startfile=/etc/init.d/adjtimex

-echo -n "Comparing clocks (this will take 70 sec)... "
+echo -n "Comparing clocks (this will take 70 sec)..."

# Get the parameters

/sbin/adjtimex --print --tick 0 >/etc/adj.adjust 2>/dev/null
-baseline=`awk '/^ *[0-9].*tick/{print ($1+$NF)/2}' /etc/adj.adjust` +baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust`
hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust`
/sbin/adjtimex --tick $baseline --frequency 0
/sbin/adjtimex --adjust >/etc/adj.adjust
-ticks=`tail -1 /etc/adj.adjust|awk '{print $6}'`
-freq=`tail -1 /etc/adj.adjust|awk '{print $7}'`
+echo "done."
+ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'`
+freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'`
# cat /etc/adj.adjust
# echo hz=$hz baseline=$baseline ticks=$ticks f