Still having problems with portupgrade

[Darin]

Hi,
   I've been following the messages about portupgrade-20040529_2 and am
still having problems
I'm running FreeBSD 5.2.1-RELEASE-p8.  I started having trouble a few days
ago.

I have since removed /usr/ports and reinstalled from the ports.tgz for
5.2.1.  I have also removed /usr/sup/ports-all/checkouts.cvs:. 
I have moved /var/db/pkg/pkgdb.db and rebuilt the database with pkgdb -vF
and I have also tried pkgdb -fu
I have removed INDEX and INDEX-5 and re cvsuped them.  I have also tried
make describe (which runs normally to completion) and make index (which also
completes normally).
I have removed portupgrade and re-cvsuped, recompiled and reinstalled.
I have also tried portsdb -fu and portsdb -Uu.  Whenever I do portupgrade, I
get the following:

# portupgrade -Rra
/usr/local/lib/ruby/site_ruby/1.8/pkgdb.rb:323:in `deorigin': cannot convert
nil into String (PkgDB::DBError)
        from /usr/local/lib/ruby/site_ruby/1.8/pkgdb.rb:916:in `tsort_build'
        from /usr/local/lib/ruby/site_ruby/1.8/pkgdb.rb:915:in `each'
        from /usr/local/lib/ruby/site_ruby/1.8/pkgdb.rb:915:in `tsort_build'
        from /usr/local/lib/ruby/site_ruby/1.8/pkgdb.rb:907:in `each'
        from /usr/local/lib/ruby/site_ruby/1.8/pkgdb.rb:907:in `tsort_build'
        from /usr/local/lib/ruby/site_ruby/1.8/pkgdb.rb:929:in `sort_build'
        from /usr/local/lib/ruby/site_ruby/1.8/pkgdb.rb:933:in `sort_build!'
        from /usr/local/sbin/portupgrade:674:in `main'
        from /usr/local/sbin/portupgrade:207:in `initialize'
        from /usr/local/sbin/portupgrade:207:in `new'
        from /usr/local/sbin/portupgrade:207:in `main'
        from /usr/local/sbin/portupgrade:1845


Here is my ports-supfile:

*default host=cvsup2.FreeBSD.org
*default base=/usr
*default prefix=/usr
*default release=cvs tag=.
*default delete use-rel-suffix
*default compress
ports-all

Here is my /etc/make.conf:

# -- use.perl generated deltas -- #
# Created: Mon Jun 21 02:17:36 2004
# Setting to use base perl from ports:
PERL_VER=5.6.1
PERL_VERSION=5.6.1
PERL_ARCH=mach
NOPERL=yo
NO_PERL=yo
NO_PERL_WRAPPER=yo


I've tried everything I've seen in the messages over the past week and cant
seem to make it go away.
Anyone have any ideas?

Thanks

Darin -