Compiling ISC DHCP Server on current - ascii2addr() errors

Hello,

I am trying to compile isc-dhcp3-server on FreeBSD current:

# uname -a
FreeBSD freebsd7.geekgod.com 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Mon
Mar  5 14:59:45 UTC 2007
root_at_freebsd7.geekgod.com:/usr/obj/usr/src/sys/GENERIC  i386

And running into this issue:

p/libomapi.a ../dst/libdst.a
dhcpd.o(.text+0x640): In function `main':
: undefined reference to `ascii2addr'
dhcpd.o(.text+0xad1): In function `main':
: undefined reference to `ascii2addr'
*** Error code 1

Recently this function was renamed/moved(?) by bms.

Is there a solution or workaround to get DHCP compiling again?

Thanks for your help!

Scott