Upgrading from 4.5->5.2 breaks in rescue/rescue/common

Hi All,
	A little while ago I posted that a buildworld from
RELENG_4_5_0_RELEASE to RELENG_5_2 failed. Whilst I got some help fixing
the problem it stopped at building rescue/rescue/common.

For the record, I'm running:
FreeBSD corvus.clearchain.com 4.5-RELEASE FreeBSD 4.5-RELEASE #0: Mon Jan
28 14:31:56 GMT 2002 murray_at_builder.freebsdmall.com:/usr/src/sys/compile/GENERIC i386

Trying to upgrade to:

*default host=cvsup.freebsd.org
*default base=/usr
*default prefix=/usr
*default release=cvs tag=RELENG_5_2
*default delete use-rel-suffix
*default compress
src-all

the first step: make -AALWAYS_CHECK_MAKE buildworld
fails with:

...
(cd /usr/src/rescue/rescue/../../sbin/dhclient &&  make -DRESCUE
CRUNCH_CFLAGS=-DRESCUE -DRELEASE_CRUNCH -Dlint depend && make -DRESCUE
CRUNCH_CFLAGS=-DRESCUE -DRELEASE_CRUNCH -Dlint client/clparse.o client/dhclient.o common/alloc.o
common/bpf.o common/comapi.o common/conflex.o common/ctrace.o common/discover.o
common/dispatch.o common/dlpi.o common/dns.o common/ethernet.o common/execute.o
common/fddi.o common/icmp.o common/inet.o common/lpf.o common/memory.o
common/nit.o common/options.o common/packet.o common/parse.o common/print.o common/raw.o
common/resolv.o common/socket.o common/tables.o common/tr.o common/tree.o
common/upf.o dst/base64.o dst/dst_api.o dst/dst_support.o dst/hmac_link.o dst/md5_dgst.o dst/
prandom.o minires/ns_date.o minires/ns_name.o minires/ns_parse%FIXED.o minires/n
s_samedomain.o minires/ns_sign.o minires/ns_verify.o minires/res_comp.o
minires/res_findzonecut.o minires/res_init.o minires/res_mkquery.o
minires/res_mkupdate.o minires/res_query%FIXED.o minires/res_send.o minire
minires/ns_samedomain.o minires/ns_sign.o minires/ns_verify.o minires/res_comp.o
minires/res_findzonecut.o minires/res_init.o minires/res_mkquery.o
minires/res_mkupdate.o minires/res_query%FIXED.o minires/res_send.o minires/res_sendsigned.o
minires/res_update.o omapip/alloc.o omapip/array.o omapip/auth.o omapip/buffer.o
omapip/connection.o omapip/convert.o omapip/dispatch.o omapip/errwarn.o
omapip/generic.o omapip/handle.o omapip/hash.o omapip/inet_addr.o omapip/listener.o
omapip/message.o omapip/mrtrace.o omapip/protocol.o omapip/result.o omapip/support.o
omapip/toisc.o omapip/trace.o dhcpctl/dhcpctl.o dhcpctl/callback.o
dhcpctl/remote.o)
===> rescue/rescue/common
"/usr/src/share/mk/bsd.lib.mk", line 18: Malformed conditional
(defined(SHLIB_NAME) && ${SHLIB_NAME:M*.so.*})
"/usr/src/share/mk/bsd.lib.mk", line 18: Missing dependency operator
"/usr/src/share/mk/bsd.lib.mk", line 22: if-less endif
make: fatal errors encountered -- cannot continue
*** Error code 1
Stop in /usr/src/sbin/dhclient.
*** Error code 1
Stop in /usr/obj/usr/src/rescue/rescue.
*** Error code 1
Stop in /usr/src/rescue/rescue.
*** Error code 1
Stop in /usr/src/rescue.
*** Error code 1
Stop in /usr/src.
*** Error code 1
Stop in /usr/src.
*** Error code 1
Stop in /usr/src.

A full buildworld log is available at
http://www.clearchain.com/people/benjsc/output2.gz

It would be really nice to fix this as there's a number of machines here
that are running 4.5 and will need upgrading soon. A full reinstall is
just too time consuming but a make world (following UPDATING) certainly is
not.

Thanks for your help

Cheers,
	Benjamin