Broken source tree

I did a CVSup a few minutes ago, and tried to do a clean install.
configure seemed to do the right thing, but initdb was not happy. Looks
like (perhaps) the recent changes to initdb to allow non-interactive use
might have broken things?

Regarding specific symptoms:
1) libpq.so.1 did get made and is in the right place afaik. Don't know
why pg_id is complaining.
2) initdb has a syntax error in the script.
3) initdb does not print a valid uid for the postgres user.
4) Bootstrapping the template database fails.

I haven't done a clean install (or a cvs update) for a few weeks, and
I've seen a bit of traffic on the list about problems like this. Help!

                     - Tom

golem$ initdb
initdb: using /opt/postgres/current/lib/local1_template1.bki.source as
input to create the template database.
initdb: using /opt/postgres/current/lib/global1.bki.source as input to
create the global classes.
initdb: using /opt/postgres/current/lib/pg_hba.conf.sample as the
host-based authentication control file.

pg_id: can't load library 'libpq.so.1'
/opt/postgres/current/bin/initdb: [: =: unary operator expected
pg_id: can't load library 'libpq.so.1'
pg_id: can't load library 'libpq.so.1'
/opt/postgres/current/bin/initdb: [: too many arguments
We are initializing the database system with username postgres (uid=).
This user will own all the files and must also own the server process.

Creating Postgres database system directory /opt/postgres/current/data

Creating Postgres database system directory
/opt/postgres/current/data/base

initdb: creating template database in
/opt/postgres/current/data/base/template1
Running: postgres -boot -C -F -D/opt/postgres/current/data -Q template1
ERROR:  pg_atoi: error in "f": can't parse "f"
ERROR:  pg_atoi: error in "f": can't parse "f"
initdb: could not create template database
initdb: cleaning up by wiping out
/opt/postgres/current/data/base/template1
golem$