can't bootstrap on OS X

[railmeat <railmeat%gmail.com@localhost>]

I tried to install pkgsrc from cvs onto my Mac OS X 10.4.10 on a Mac OS 
Extended (Journaled) disk, but failed in the bootstrap phase. I followed 
the instructions here:
http://wiki.netbsd.se/How_to_use_pkgsrc_on_Mac_OS_X

I tried
./bootstrap --ignore-case-check --unprivileged
and
sudo ./bootstrap --ignore-case-check

with the same result. They both stopped with:

gcc -DHAVE_CONFIG_H -DDEF_LOG_DIR=\"/var/db/pkg\" -DTAR_CMD=\"/bin/tar\" 
-DFTP_CMD=\"/bin/ftp\" -I../libnbcompat -I../../libnbcompat -I. -I. -g 
-O2 -c pkgdb.c
pkgdb.c: In function 'pkgdb_open':
pkgdb.c:105: error: 'BTREEINFO' undeclared (first use in this function)
pkgdb.c:105: error: (Each undeclared identifier is reported only once
pkgdb.c:105: error: for each function it appears in.)
pkgdb.c:105: error: parse error before 'info'
pkgdb.c:109: error: 'info' undeclared (first use in this function)
pkgdb.c: In function 'pkgdb_close':
pkgdb.c:130: error: too few arguments to function 'pkgdbp->close'
pkgdb.c: In function 'pkgdb_store':
pkgdb.c:158: error: 'R_NOOVERWRITE' undeclared (first use in this function)
pkgdb.c:158: warning: passing argument 2 of 'pkgdbp->put' from 
incompatible pointer type
pkgdb.c:158: error: too few arguments to function 'pkgdbp->put'
pkgdb.c: In function 'pkgdb_retrieve':
pkgdb.c:182: warning: passing argument 2 of 'pkgdbp->get' from 
incompatible pointer type
pkgdb.c:182: error: too few arguments to function 'pkgdbp->get'
pkgdb.c: In function 'pkgdb_dump':
pkgdb.c:200: error: 'R_FIRST' undeclared (first use in this function)
pkgdb.c:200: error: 'struct __db' has no member named 'seq'
pkgdb.c:200: error: 'R_NEXT' undeclared (first use in this function)
pkgdb.c: In function 'pkgdb_remove':
pkgdb.c:231: warning: passing argument 2 of 'pkgdbp->del' from 
incompatible pointer type
pkgdb.c:231: error: too few arguments to function 'pkgdbp->del'
pkgdb.c: In function 'pkgdb_remove_pkg':
pkgdb.c:255: error: 'R_FIRST' undeclared (first use in this function)
pkgdb.c:255: error: 'struct __db' has no member named 'seq'
pkgdb.c:255: error: 'R_NEXT' undeclared (first use in this function)
pkgdb.c:260: warning: passing argument 2 of 'pkgdbp->del' from 
incompatible pointer type
pkgdb.c:260: error: too few arguments to function 'pkgdbp->del'
*** Error code 1

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

Stop.
bmake: stopped in /Users/mattj/pkgsrc/bootstrap/work/pkg_install
===> exited with status 1
aborted.

This looks like a bug to me, but if I am doing something wrong please 
let me know. Is there a different How To or guide I should be using?

Thanks
-- Matt Johnson