mergemaster broken -- take 2

[Mike Lempriere]

Hi folks -- sorry to be a nag, but my main production system is barely 
limping along on an old kernel with mismatched libraries.  I have no 
idea what else to do -- please help!
---
I'm upgrading 5-stable (was at 5.5) to 6-stable, in preparation for 
6-stable to 7-stable.
No problems with cvsup, make buildworld, make installworld, make 
buildkernel, mergemaster -p.
make installkernel, boot to single user.  Then mergemaster -- blammo:

config  /usr/src/etc/../usr.bin/mail/misc/mail.rc  
/usr/src/etc/../usr.bin/locate/locate/locate.rc printcap 
/var/tmp/temproot/etc;  cap_mkdb -l /var/tmp/temproot/etc/login.conf;  
install -o root -g wheel -m 755  netstart pccard_ether rc.suspend 
rc.resume /var/tmp/temproot/etc;  install -o root -g wheel -m 600  
master.passwd nsmb.conf opieaccess /var/tmp/temproot/etc;  pwd_mkdb -L 
-i -p -d /var/tmp/temproot/etc  /var/tmp/temproot/etc/master.passwd
cap_mkdb: illegal option -- l
usage: cap_mkdb [-v] [-f outfile] file [file ...]
*** Error code 1

Stop in /usr/src/etc.

 *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to
     the temproot environment

I've checked, the directory is there (/var/tmp/temproot/etc) however the 
file (master.passwd) is not.

Any suggestions anyone?  Thanks!

-- 
Mike Lempriere- Home: mike at vintners.net  Phone: 206-780-2146
Cellphone: 206-200-5902;  text pager: mikelemp at tmail.com