pkg/25264: bootstrap failure on FreeBSD 5.2.1

[dotz%irc.pl@localhost]

>Number:         25264
>Category:       pkg
>Synopsis:       bootstrap failure on FreeBSD 5.2.1
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Apr 20 21:05:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Michal Pasternak
>Release:        N/A
>Organization:
>Environment:
FreeBSD mainframe.w.lub.pl 5.2.1-RC FreeBSD 5.2.1-RC #0: Sat Jan 31 05:36:22 
GMT 2004     
root%cypress.btc.adpatec.com@localhost:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
While building bootstrap (pkg_install):
==================================================================
gcc -DHAVE_CONFIG_H -DDEF_LOG_DIR=\"/var/db/pkg\" -DTAR_CMD=\"/usr/pkg/bin/tar\"
 -DFTP_CMD=\"/usr/pkg/bin/ftp\" -I../libnbcompat -I../../libnbcompat -I. -I. -g 
-O2 -c ftpio.c
In file included from ftpio.c:87:
/usr/include/sys/poll.h:45: error: redefinition of `struct pollfd'
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/bootstrap/work/pkg_install/lib
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/bootstrap/work/pkg_install
===> exited with status 1
aborted.
==================================================================
>How-To-Repeat:
Obvious.
>Fix:
I have no idea where the 2nd definition of poll is coming from - 
libnbcompat perhaps?

I have played a bit with libnbcompat, but I have no idea, how does
it really detect poll functionality and wraps it in defines (or, 
perhaps it makes use of OS-internal poll.h if available) ?

There is full build log:
http://pkgsrc.w.lub.pl/bootstrap_failure.log

libnbcompat configure doesn't show anything unusual.

If you can give me hints how does libnbcompat does the stuff, I can
perhaps prepare a fix for this. If you can't, I'll perhaps hack
it myself, reviewing CVS logs and doing similar stuff, which will
take me much more time, which I don't have. So, if you can help 
me, please do so.
>Release-Note:
>Audit-Trail:
>Unformatted: