Update from 5.4 to 6.0

[Zimmerman, Eric]

> On Friday 18 November 2005 18:51, Yann Golanski wrote:
> >
>
/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/cryptlib.c:
11
> 1
> >:3: #error "Inconsistency between crypto.h and cryptlib.c"
> > In file included from
> >
>
/usr/src/secure/lib/libcrypto/../../../crypto/openssl/crypto/evp/e_rc5.c
:6
> 6
> >: /usr/obj/usr/src/tmp/usr/include/openssl/rc5.h:67:2: #error RC5 is
> 
> Just a guess: try removing /usr/obj


Did you do a 
cd /usr/src
make clean;make cleanworld;


I believe that takes care of cleaning up a lot of old stuff.