Upgrade broken by getopt_long_only()

I'm attempting to update from a 5.2-CURRENT system last built on Feb
9, and buildworld is failing with this:

cc -O -pipe -D_GNU_SOURCE -I. -I/usr/src/gnu/usr.bin/binutils/as/i386-freebsd -I/usr/src/gnu/usr.bin/binutils/as/i386-freebsd/../../libbfd/i386 -I/usr/src/gnu/usr.bin/binutils/as/i386-freebsd/../../../../../contrib/binutils/include -I/usr/src/gnu/usr.bin/binutils/as/i386-freebsd/../../../../../contrib/binutils/gas -I/usr/src/gnu/usr.bin/binutils/as/i386-freebsd/../../../../../contrib/binutils/gas/config -I/usr/src/gnu/usr.bin/binutils/as/i386-freebsd/../../../../../contrib/binutils -I/usr/src/gnu/usr.bin/binutils/as/i386-freebsd/.. -DVERSION=\""2.13.2 [FreeBSD] 2002-11-27"\" -DBFD_VERSION_STRING=\""2.13.2 [FreeBSD] 2002-11-27"\"  -I/usr/obj/usr/src/i386/legacy/usr/include  -static -L/usr/obj/usr/src/i386/legacy/usr/lib -o as app.o as.o atof-generic.o atof-ieee.o bignum-copy.o cond.o dwarf2dbg.o ecoff.o expr.o flonum-copy.o flonum-konst.o flonum-mult.o frags.o hash.o input-file.o input-scrub.o listing.o literal.o macro.o messages.o output-file.o read.o sb.o stabs.o subsegs.o symbols.o write.o depend.o ehopt.o obj-elf.o tc-i386.o ../../libbfd/libbfd.a ../../libiberty/libiberty.a ../../libopcodes/libopcodes.a /usr/obj/usr/src/i386/legacy/usr/lib/libegacy.a -legacy
as.o: In function `parse_args':
as.o(.text+0x388): undefined reference to `getopt_long_only'
*** Error code 1

Stop in /usr/src/gnu/usr.bin/binutils/as/i386-freebsd.
*** Error code 1

It looks like ache's getopt changes are causing continued problems.

Kris