Merge whimsy.udel.edu:/backroom/ntp-stable

into whimsy.udel.edu:/backroom/ntp-dev

bk: 3e4b0c0baT28dxHI8Qp7lD-A9vQ-nA

diff --cc flock-build
index 0f9846ccfc617dfefcca7fec78b47c51ad96cf34,dc0f2a99fa5bfb4ed4c8fc83840b5d08f15c0f7c..6e41b4f46c7483dd08c52c21e4490f268cde7ffc
--- 1/flock-build
--- 2/flock-build
+++ b/flock-build
@@@ -3,21 -3,22 +3,23 @@@
  BUILD_ARGS="$@"
  PARSE="--enable-parse-clocks"
  #PARSE=
 +SNTP="--with-sntp"
  
- # * baldwin        sparc-sun-solaris2.7
- #   bridgeport     sparc-sun-solaris2.6
- #   bunnylou       alpha-dec-osf4.0
- # * churchy        alpha-dec-osf4.0
- #   cowbird        alpha-dec-osf4.0
- #   grundoon       sparc-sun-sunos4.1.3
- # * hepzibah       freebsd-2.2.5
- #   malarky        sparc-sun-solaris2.8
- # * pogo           sparc-sun-solaris2.8
- # * porkypine      mips-dec-ultrix4.4
- # * rackety        sparc-sun-sunos4.1.3/cc
- # * snavely        hppa1.1-hp-hpux10.20
- #   whimsy         sparc-sun-solaris2.7
+ # * albert       redhat-8
+ #   baldwin      sparc-sun-solaris2.8
+ #   bridgeport           sparc-sun-solaris2.8
+ # * bunnylou     alpha-dec-osf4.0
+ # * churchy      alpha-dec-osf5.1
+ #   cowbird      alpha-dec-osf4.0
+ #   grundoon     sparc-sun-sunos4.1.3
+ # * hepzibah     freebsd-4
+ #   malarky      sparc-sun-solaris2.8
+ # * pogo         sparc-sun-solaris2.8
+ # * porkypine    mips-dec-ultrix4.4
+ # * rackety      sparc-sun-sunos4.1.3/cc
+ # ? roogey       debian
+ # * snavely      hppa1.1-hp-hpux10.20
+ #   whimsy       sparc-sun-solaris2.8
  
  c_d=`pwd`