Upgrading from 6.4-RELEASE to stable/8

Hi,

just tried to do $subject on an amd64 box and it fails. The following steps 
are required to build world:

1) cd /usr/src/usr.bin/make 
   make obj
   make depend
   make && make install
2) cd /usr/src
   make -DWITHOUT_CDDL buildworld

After installing and rebooting, one can recompile with CDDL to get zfs and 
dtrace support. The problem is that cddl/usr.bin/sgsmsg is a bootstrap tool 
that relies on libelf and I haven't found a switch to just disable this 
bootstrap tool and what relies on it, rather then anything with a CDDL license 
(unless of course anything in cddl relies on sgsmsg). Make has to be installed 
first, because of .sinclude usage in various Makefiles, and
-DALWAYS_CHECK_MAKE switch does not fix this issue.

Perhaps this could be added to UPDATING?
-- 
Mel