bootstrap error...

[topet]

i've tried reinstalling my dfly 1.3-preview system hoping i'd get
lucky this time with my setup. i updated my src and pkgsrc tree first
then built and installed world and kernel after. to begin my apps
installion, i tried bootstraping my pkgsrc but an error occured...

*last part of the error-----
creating libedit/Makefile
creating libedit/makelist
creating libnetbsd/Makefile
creating src/Makefile
creating config.h
config.h is unchanged
( cd libedit; make )
sh makelist -h ./common.c > common.h
sh makelist -h ./emacs.c > emacs.h
sh makelist -h ./vi.c > vi.h
sh makelist -fh vi.h emacs.h common.h > fcns.h
sh makelist -fc vi.h emacs.h common.h > fcns.c
sh makelist -bc ./vi.c ./emacs.c ./common.c > help.c
sh makelist -bh ./vi.c ./emacs.c ./common.c > help.h
gcc -g -O2 -I. -I./.. -I. -I.. -I./../libedit  -I./../libnetbsd -c chared.c
In file included from chared.c:36:
. /../tnftp.h:316: error: conflicting types for 'dirname'
/usr/include/libgen.h:40: error: previous declaration of 'dirname' was here
. /../tnftp.h:316: error: conflicting types for 'dirname'
/usr/include/libgen.h:40: error: previous declaration of 'dirname' was here
*** Error code 1

Stop in /usr/pkgsrc/bootstrap/work/tnftp/libedit.
*** Error code 1

Stop in /usr/pkgsrc/bootstrap/work/tnftp.
===> exited with status 1
aborted.

P.S. joerg, i applied your bmake.diff first (everything was
successfull) before trying "./bootstrap".

thanks again! ;o)
topet