FreeBSD_HEAD_i386 - Build #3371 - Fixed

[jenkins-admin at FreeBSD.org]

FreeBSD_HEAD_i386 - Build #3371 - Fixed:

Build information: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_i386/3371/
Full change log: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_i386/3371/changes
Full build log: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_i386/3371/console

Change summaries:

301778 by imp:
Commit the bits of nda that were missed. This should fix the build.

Approved by: re@

301777 by pfg:
Fix regression from r301461.

The fix to the __collate_range_cmp() ABI breakage missed some replacements
in libc's vfscanf().  Replace them with __wcollate_range_cmp() which
does what is expected.

This was breaking applications like xterm and pidgin when using wide
characters.

Reported by:	Vitalij Satanivskij
Approved by:	re